refactor: migrate on message api for postcss-import-parser (#837)

webpack-contrib · Dec 3, 2018 · 476ebca · 476ebca
1 parent 7b967c7
commit 476ebca
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/lib/loader.js b/lib/loader.js
@@ -91,11 +91,11 @@ module.exports = function loader(content, map) {
   ];
 
   if (resolveImport) {
-    plugins.push(importParser(parserOptions));
+    plugins.push(importParser());
   }
 
   if (resolveUrl) {
-    plugins.push(urlParser(parserOptions));
+    plugins.push(urlParser());
   }
 
   plugins.push(icssParser(parserOptions));

diff --git a/lib/plugins/postcss-icss-parser.js b/lib/plugins/postcss-icss-parser.js
@@ -9,7 +9,10 @@ module.exports = postcss.plugin(
   pluginName,
   (options) =>
     function process(css, result) {
-      const importItems = options.importItems || [];
+      const importItems = (result.messages || [])
+        .filter((message) => message.type === 'import')
+        .map((message) => message.item);
+
       const imports = {};
       const icss = icssUtils.extractICSS(css);
       const exports = icss.icssExports;
@@ -21,6 +24,7 @@ module.exports = postcss.plugin(
           imports[`$${prop}`] = importItems.length;
           importItems.push({
             url,
+            media: '',
             export: icss.icssImports[key][prop],
           });
         });

diff --git a/lib/plugins/postcss-import-parser.js b/lib/plugins/postcss-import-parser.js
@@ -46,10 +46,8 @@ function parseImport(params) {
 
 module.exports = postcss.plugin(
   pluginName,
-  (options) =>
+  () =>
     function process(css, result) {
-      const importItems = [];
-
       css.walkAtRules(/^import$/i, (atRule) => {
         // Convert only top-level @import
         if (atRule.parent.type !== 'root') {
@@ -84,16 +82,23 @@ module.exports = postcss.plugin(
           url = loaderUtils.urlToRequest(url);
         }
 
-        const includes = importItems.find(
-          (el) => el.url === url && el.media === media
+        const alreadyIncluded = result.messages.find(
+          (message) =>
+            message.pluginName === pluginName &&
+            message.type === 'import' &&
+            message.item.url === url &&
+            message.item.media === media
         );
 
-        if (!includes) {
-          importItems.push({ url, media, isUrlRequest });
+        if (alreadyIncluded) {
+          return;
         }
-      });
 
-      // eslint-disable-next-line no-param-reassign
-      options.importItems = importItems;
+        result.messages.push({
+          pluginName,
+          type: 'import',
+          item: { url, media },
+        });
+      });
     }
 );
diff --git a/lib/plugins/postcss-url-parser.js b/lib/plugins/postcss-url-parser.js
@@ -97,9 +97,8 @@ function uniq(array) {
 
 module.exports = postcss.plugin(
   pluginName,
-  (options) =>
+  () =>
     function process(css, result) {
-      const urlItems = [];
       const traversed = walkDeclsWithUrl(css, result, (value) =>
         isUrlRequest(value)
       );
@@ -128,8 +127,5 @@ module.exports = postcss.plugin(
         // eslint-disable-next-line no-param-reassign
         item.decl.value = item.parsed.toString();
       });
-
-      // eslint-disable-next-line no-param-reassign
-      options.urlItems = urlItems;
     }
 );