chore：更换到主分支

node_modules/postcss-import/lib/join-media.js

@@ -1,6 +1,6 @@
 "use strict"
 
-module.exports = function(parentMedia, childMedia) {
+module.exports = function (parentMedia, childMedia) {
   if (!parentMedia.length && childMedia.length) return childMedia
   if (parentMedia.length && !childMedia.length) return parentMedia
   if (!parentMedia.length && !childMedia.length) return []

node_modules/postcss-import/lib/parse-statements.js

@@ -4,7 +4,7 @@
 const valueParser = require("postcss-value-parser")
 
 // extended tooling
-const stringify = valueParser.stringify
+const { stringify } = valueParser
 
 function split(params, start) {
   const list = []
@@ -20,7 +20,7 @@ function split(params, start) {
   return list
 }
 
-module.exports = function(result, styles) {
+module.exports = function (result, styles) {
   const statements = []
   let nodes = []
 
@@ -29,13 +29,14 @@ module.exports = function(result, styles) {
     if (node.type === "atrule") {
       if (node.name === "import") stmt = parseImport(result, node)
       else if (node.name === "media") stmt = parseMedia(result, node)
+      else if (node.name === "charset") stmt = parseCharset(result, node)
     }
 
     if (stmt) {
       if (nodes.length) {
         statements.push({
           type: "nodes",
-          nodes: nodes,
+          nodes,
           media: [],
         })
         nodes = []
@@ -47,7 +48,7 @@ module.exports = function(result, styles) {
   if (nodes.length) {
     statements.push({
       type: "nodes",
-      nodes: nodes,
+      nodes,
       media: [],
     })
   }
@@ -64,19 +65,34 @@ function parseMedia(result, atRule) {
   }
 }
 
+function parseCharset(result, atRule) {
+  if (atRule.prev()) {
+    return result.warn("@charset must precede all other statements", {
+      node: atRule,
+    })
+  }
+  return {
+    type: "charset",
+    node: atRule,
+    media: [],
+  }
+}
+
 function parseImport(result, atRule) {
-  let prev = getPrev(atRule)
+  let prev = atRule.prev()
   if (prev) {
     do {
       if (
-        prev.type !== "atrule" ||
-        (prev.name !== "import" && prev.name !== "charset")
+        prev.type !== "comment" &&
+        (prev.type !== "atrule" ||
+          (prev.name !== "import" && prev.name !== "charset"))
       ) {
         return result.warn(
           "@import must precede all other statements (besides @charset)",
           { node: atRule }
         )
-      } else prev = getPrev(prev)
+      }
+      prev = prev.prev()
     } while (prev)
   }
 
@@ -127,11 +143,3 @@ function parseImport(result, atRule) {
 
   return stmt
 }
-
-function getPrev(item) {
-  let prev = item.prev()
-  while (prev && prev.type === "comment") {
-    prev = prev.prev()
-  }
-  return prev
-}

node_modules/postcss-import/lib/process-content.js

@@ -10,7 +10,7 @@ const postcss = require("postcss")
 let sugarss
 
 module.exports = function processContent(result, content, filename, options) {
-  const plugins = options.plugins
+  const { plugins } = options
   const ext = path.extname(filename)
 
   const parserList = []
@@ -20,9 +20,7 @@ module.exports = function processContent(result, content, filename, options) {
     if (!sugarss) {
       try {
         sugarss = require("sugarss")
-      } catch (e) {
-        // Ignore
-      }
+      } catch {} // Ignore
     }
     if (sugarss) return runPostcss(content, filename, plugins, [sugarss])
   }

node_modules/postcss-import/lib/resolve-id.js

@@ -11,13 +11,13 @@ function resolveModule(id, opts) {
   })
 }
 
-module.exports = function(id, base, options) {
+module.exports = function (id, base, options) {
   const paths = options.path
 
   const resolveOpts = {
     basedir: base,
     moduleDirectory: moduleDirectories.concat(options.addModulesDirectories),
-    paths: paths,
+    paths,
     extensions: [".css"],
     packageFilter: function processPackage(pkg) {
       if (pkg.style) pkg.main = pkg.style