chore: update other packages

Author: alexander-akait

package-lock.json

@@ -48,10 +48,10 @@
     "icss-utils": "^5.0.0-rc.0",
     "loader-utils": "^2.0.0",
     "postcss": "^8.1.1",
-    "postcss-modules-extract-imports": "^2.0.0",
-    "postcss-modules-local-by-default": "^3.0.3",
-    "postcss-modules-scope": "^2.2.0",
-    "postcss-modules-values": "^3.0.0",
+    "postcss-modules-extract-imports": "^3.0.0-rc.1",
+    "postcss-modules-local-by-default": "^4.0.0-rc.1",
+    "postcss-modules-scope": "^3.0.0-rc.1",
+    "postcss-modules-values": "^4.0.0-rc.2",
     "postcss-value-parser": "^4.1.0",
     "schema-utils": "^3.0.0",
     "semver": "^7.3.2"

package.json

@@ -56,6 +56,35 @@ export default async function loader(content, map, meta) {
     plugins.push(...getModulesPlugins(options, this));
   }
 
+  const icssPluginImports = [];
+  const icssPluginApi = [];
+
+  if (shouldUseIcssPlugin(options)) {
+    const icssResolver = this.getResolve({
+      conditionNames: ['style'],
+      extensions: [],
+      mainFields: ['css', 'style', 'main', '...'],
+      mainFiles: ['index', '...'],
+    });
+
+    plugins.push(
+      icssParser({
+        imports: icssPluginImports,
+        api: icssPluginApi,
+        replacements,
+        exports,
+        context: this.context,
+        rootContext: this.rootContext,
+        resolver: icssResolver,
+        urlHandler: (url) =>
+          stringifyRequest(
+            this,
+            getPreRequester(this)(options.importLoaders) + url
+          ),
+      })
+    );
+  }
+
   const importPluginImports = [];
   const importPluginApi = [];
 
@@ -108,35 +137,6 @@ export default async function loader(content, map, meta) {
     );
   }
 
-  const icssPluginImports = [];
-  const icssPluginApi = [];
-
-  if (shouldUseIcssPlugin(options)) {
-    const icssResolver = this.getResolve({
-      conditionNames: ['style'],
-      extensions: [],
-      mainFields: ['css', 'style', 'main', '...'],
-      mainFiles: ['index', '...'],
-    });
-
-    plugins.push(
-      icssParser({
-        imports: icssPluginImports,
-        api: icssPluginApi,
-        replacements,
-        exports,
-        context: this.context,
-        rootContext: this.rootContext,
-        resolver: icssResolver,
-        urlHandler: (url) =>
-          stringifyRequest(
-            this,
-            getPreRequester(this)(options.importLoaders) + url
-          ),
-      })
-    );
-  }
-
   // Reuse CSS AST (PostCSS AST e.g 'postcss-loader') to avoid reparsing
   if (meta) {
     const { ast } = meta;

src/index.js

@@ -4072,15 +4072,12 @@ exports[`"modules" option should work with "url" and "namedExport": module 1`] =
 "// Imports
 import ___CSS_LOADER_API_IMPORT___ from \\"../../../../src/runtime/api.js\\";
 import ___CSS_LOADER_ICSS_IMPORT_0___, * as ___CSS_LOADER_ICSS_IMPORT_0____NAMED___ from \\"-!../../../../src/index.js??[ident]!./shared.css\\";
-import ___CSS_LOADER_GET_URL_IMPORT___ from \\"../../../../src/runtime/getUrl.js\\";
-import ___CSS_LOADER_URL_IMPORT_0___ from \\"./img.png\\";
 var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(function(i){return i[1]});
 ___CSS_LOADER_EXPORT___.i(___CSS_LOADER_ICSS_IMPORT_0___, \\"\\", true);
-var ___CSS_LOADER_URL_REPLACEMENT_0___ = ___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, \\"a {\\\\n  background: url(\\" + ___CSS_LOADER_URL_REPLACEMENT_0___ + \\");\\\\n}\\\\n\\\\nbody {\\\\n  background: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vUrlOther\\"] + \\";\\\\n}\\\\n\\", \\"\\"]);
+___CSS_LOADER_EXPORT___.push([module.id, \\"a {\\\\n  background: url('./img.png');\\\\n}\\\\n\\\\nbody {\\\\n  background: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vUrlOther\\"] + \\";\\\\n}\\\\n\\", \\"\\"]);
 // Exports
-export const vUrl = \\"url(\\" + ___CSS_LOADER_URL_REPLACEMENT_0___ + \\")\\";
+export const vUrl = \\"url('./img.png')\\";
 export const vUrlOther = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vUrlOther\\"] + \\"\\";
 export default ___CSS_LOADER_EXPORT___;
 "
@@ -4097,11 +4094,11 @@ Array [
   Array [
     "./modules/url/source.css",
     "a {
-  background: url(/webpack/public/path/img.png);
+  background: url('./img.png');
 }
 
 body {
-  background: url(/webpack/public/path/img.png);
+  background: url('./img.png');
 }
 ",
     "",
@@ -4117,16 +4114,13 @@ exports[`"modules" option should work with "url": module 1`] = `
 "// Imports
 import ___CSS_LOADER_API_IMPORT___ from \\"../../../../src/runtime/api.js\\";
 import ___CSS_LOADER_ICSS_IMPORT_0___ from \\"-!../../../../src/index.js??[ident]!./shared.css\\";
-import ___CSS_LOADER_GET_URL_IMPORT___ from \\"../../../../src/runtime/getUrl.js\\";
-import ___CSS_LOADER_URL_IMPORT_0___ from \\"./img.png\\";
 var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(function(i){return i[1]});
 ___CSS_LOADER_EXPORT___.i(___CSS_LOADER_ICSS_IMPORT_0___, \\"\\", true);
-var ___CSS_LOADER_URL_REPLACEMENT_0___ = ___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, \\"a {\\\\n  background: url(\\" + ___CSS_LOADER_URL_REPLACEMENT_0___ + \\");\\\\n}\\\\n\\\\nbody {\\\\n  background: \\" + ___CSS_LOADER_ICSS_IMPORT_0___.locals[\\"v-url-other\\"] + \\";\\\\n}\\\\n\\", \\"\\"]);
+___CSS_LOADER_EXPORT___.push([module.id, \\"a {\\\\n  background: url('./img.png');\\\\n}\\\\n\\\\nbody {\\\\n  background: \\" + ___CSS_LOADER_ICSS_IMPORT_0___.locals[\\"v-url-other\\"] + \\";\\\\n}\\\\n\\", \\"\\"]);
 // Exports
 ___CSS_LOADER_EXPORT___.locals = {
-	\\"v-url\\": \\"url(\\" + ___CSS_LOADER_URL_REPLACEMENT_0___ + \\")\\",
+	\\"v-url\\": \\"url('./img.png')\\",
 	\\"v-url-other\\": \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0___.locals[\\"v-url-other\\"] + \\"\\"
 };
 export default ___CSS_LOADER_EXPORT___;
@@ -4144,11 +4138,11 @@ Array [
   Array [
     "./modules/url/source.css",
     "a {
-  background: url(/webpack/public/path/img.png);
+  background: url('./img.png');
 }
 
 body {
-  background: url(/webpack/public/path/img.png);
+  background: url('./img.png');
 }
 ",
     "",