refactor: code

webpack-contrib · Jul 4, 2020 · 8226b65 · 8226b65
1 parent 671b8d5
commit 8226b65
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/src/index.js b/src/index.js
@@ -21,7 +21,6 @@ import {
   getModulesPlugins,
   normalizeSourceMap,
   shouldUseModulesPlugins,
-  sortByName,
 } from './utils';
 
 export default function loader(content, map, meta) {
@@ -110,7 +109,13 @@ export default function loader(content, map, meta) {
         this.emitWarning(new Warning(warning));
       }
 
-      const imports = [];
+      const imports = {
+        CSS_LOADER_ICSS_IMPORT: [],
+        CSS_LOADER_AT_RULE_IMPORT: [],
+        CSS_LOADER_GET_URL_IMPORT: [],
+        CSS_LOADER_URL_IMPORT: [],
+        CSS_LOADER_URL_REPLACEMENT: [],
+      };
       const apiImports = [];
       const urlReplacements = [];
       const icssReplacements = [];
@@ -120,7 +125,7 @@ export default function loader(content, map, meta) {
         // eslint-disable-next-line default-case
         switch (message.type) {
           case 'import':
-            imports.push(message.value);
+            imports[message.value.key].push(message.value);
             break;
           case 'api-import':
             apiImports.push(message.value);
@@ -137,16 +142,13 @@ export default function loader(content, map, meta) {
         }
       }
 
-      imports.sort((a, b) => a.index - b.index);
       apiImports.sort((a, b) => a.index - b.index);
 
-      const sortedImports = sortByName(imports, [
-        'CSS_LOADER_ICSS_IMPORT',
-        'CSS_LOADER_AT_RULE_IMPORT',
-        'CSS_LOADER_GET_URL_IMPORT',
-        'CSS_LOADER_URL_IMPORT',
-        'CSS_LOADER_URL_REPLACEMENT',
-      ]);
+      const sortedImports = Object.keys(imports).reduce((accumulator, key) => {
+        return accumulator.concat(
+          imports[key].sort((a, b) => a.index - b.index)
+        );
+      }, []);
 
       const { localsConvention } = options;
       const esModule =

diff --git a/src/plugins/postcss-icss-parser.js b/src/plugins/postcss-icss-parser.js
@@ -42,6 +42,7 @@ export default postcss.plugin(
         {
           type: 'import',
           value: {
+            key: 'CSS_LOADER_ICSS_IMPORT',
             importName,
             url: options.urlHandler ? options.urlHandler(url) : url,
           },

diff --git a/src/plugins/postcss-import-parser.js b/src/plugins/postcss-import-parser.js
@@ -125,8 +125,7 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
 
               try {
                 resolvedUrl = await resolveRequests(resolver, context, [
-                  normalizedUrl,
-                  url,
+                  ...new Set([normalizedUrl, url]),
                 ]);
               } catch (error) {
                 throw error;
@@ -135,6 +134,7 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
               result.messages.push({
                 type: 'import',
                 value: {
+                  key: 'CSS_LOADER_AT_RULE_IMPORT',
                   importName,
                   url: options.urlHandler
                     ? options.urlHandler(resolvedUrl)

diff --git a/src/plugins/postcss-url-parser.js b/src/plugins/postcss-url-parser.js
@@ -114,6 +114,7 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
             pluginName,
             type: 'import',
             value: {
+              key: 'CSS_LOADER_GET_URL_IMPORT',
               importName: '___CSS_LOADER_GET_URL_IMPORT___',
               url: options.urlHandler
                 ? options.urlHandler(urlToHelper)
@@ -129,6 +130,7 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
           pluginName,
           type: 'import',
           value: {
+            key: 'CSS_LOADER_URL_IMPORT',
             importName,
             url: options.urlHandler
               ? options.urlHandler(normalizedUrl)
@@ -148,7 +150,14 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
         result.messages.push({
           pluginName,
           type: 'url-replacement',
-          value: { replacementName, importName, hash, needQuotes, index },
+          value: {
+            key: 'CSS_LOADER_URL_REPLACEMENT',
+            replacementName,
+            importName,
+            hash,
+            needQuotes,
+            index,
+          },
         });
       }
 

diff --git a/src/utils.js b/src/utils.js
@@ -450,16 +450,6 @@ async function resolveRequests(resolve, context, possibleRequests) {
     });
 }
 
-function sortByName(array, orderNames) {
-  const result = [];
-
-  for (const name of orderNames) {
-    result.push(...array.filter((i) => i.importName.includes(name)));
-  }
-
-  return result;
-}
-
 /*
  * May be url is server-relative url, but not //example.com
  * */
@@ -490,6 +480,5 @@ export {
   getExportCode,
   shouldUseModulesPlugins,
   resolveRequests,
-  sortByName,
   isUrlRequestable,
 };