fix: respected style field from package.json

webpack-contrib · Jul 2, 2020 · e2205af · e2205af
1 parent b8e7732
commit e2205af
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -21,6 +21,7 @@ import {
   getModulesPlugins,
   normalizeSourceMap,
   shouldUseModulesPlugins,
+  sortByName,
 } from './utils';
 
 export default function loader(content, map, meta) {
@@ -137,11 +138,24 @@ 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 { localsConvention } = options;
       const esModule =
         typeof options.esModule !== 'undefined' ? options.esModule : false;
 
-      const importCode = getImportCode(this, exportType, imports, esModule);
+      const importCode = getImportCode(
+        this,
+        exportType,
+        sortedImports,
+        esModule
+      );
       const moduleCode = getModuleCode(
         result,
         exportType,

diff --git a/src/plugins/postcss-url-parser.js b/src/plugins/postcss-url-parser.js
@@ -65,6 +65,8 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
 
   let hasHelper = false;
 
+  let index = 0;
+
   css.walkDecls((decl) => {
     if (!needParseDecl.test(decl.value)) {
       return;
@@ -99,6 +101,8 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
       const importKey = normalizedUrl;
       let importName = importsMap.get(importKey);
 
+      index += 1;
+
       if (!importName) {
         importName = `___CSS_LOADER_URL_IMPORT_${importsMap.size}___`;
         importsMap.set(importKey, importName);
@@ -114,6 +118,7 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
               url: options.urlHandler
                 ? options.urlHandler(urlToHelper)
                 : urlToHelper,
+              index,
             },
           });
 
@@ -128,6 +133,7 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
             url: options.urlHandler
               ? options.urlHandler(normalizedUrl)
               : normalizedUrl,
+            index,
           },
         });
       }
@@ -142,7 +148,7 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
         result.messages.push({
           pluginName,
           type: 'url-replacement',
-          value: { replacementName, importName, hash, needQuotes },
+          value: { replacementName, importName, hash, needQuotes, index },
         });
       }
 

diff --git a/src/utils.js b/src/utils.js
@@ -442,6 +442,16 @@ 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;
+}
+
 export {
   normalizeUrl,
   getFilter,
@@ -453,4 +463,5 @@ export {
   getExportCode,
   shouldUseModulesPlugins,
   resolveRequests,
+  sortByName,
 };