fix: do not break @scope at-rule without params (#1581)

webpack-contrib · Apr 3, 2024 · e022e3b · e022e3b
1 parent 6274480
commit e022e3b
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "icss-utils": "^5.1.0",
     "postcss": "^8.4.33",
     "postcss-modules-extract-imports": "^3.0.0",
-    "postcss-modules-local-by-default": "^4.0.4",
+    "postcss-modules-local-by-default": "^4.0.5",
     "postcss-modules-scope": "^3.1.2",
     "postcss-modules-values": "^4.0.0",
     "postcss-value-parser": "^4.2.0",

diff --git a/test/__snapshots__/modules-option.test.js.snap b/test/__snapshots__/modules-option.test.js.snap
@@ -10330,6 +10330,12 @@ ___CSS_LOADER_EXPORT___.push([module.id, \`@scope (.kthHR5ALtmYK9QgapjA3) {
     color: plum;
   }
 }
+
+@scope {
+  :scope {
+    color: red;
+  }
+}
 \`, \\"\\"]);
 // Exports
 ___CSS_LOADER_EXPORT___.locals = {
@@ -10366,6 +10372,12 @@ Array [
     color: plum;
   }
 }
+
+@scope {
+  :scope {
+    color: red;
+  }
+}
 ",
     "",
   ],
@@ -20968,6 +20980,57 @@ Array [
 
 exports[`"modules" option should work with composes when the "namedExport" is enabled and "exportLocalsConvention" options has "dashesOnly" value: warnings 1`] = `Array []`;
 
+exports[`"modules" option should work with global compose: errors 1`] = `Array []`;
+
+exports[`"modules" option should work with global compose: module 1`] = `
+"// Imports
+import ___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___ from \\"../../../../src/runtime/noSourceMaps.js\\";
+import ___CSS_LOADER_API_IMPORT___ from \\"../../../../src/runtime/api.js\\";
+var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___);
+// Module
+___CSS_LOADER_EXPORT___.push([module.id, \`.global-class {
+  color: red;
+}
+
+.other-global-class {
+  color: red;
+}
+
+.oNDnA1BRHWFMyAdR4iF1 {
+  color: blue;
+}
+\`, \\"\\"]);
+// Exports
+___CSS_LOADER_EXPORT___.locals = {
+	\\"otherClassName\\": \`oNDnA1BRHWFMyAdR4iF1 global-class other-global-class\`
+};
+export default ___CSS_LOADER_EXPORT___;
+"
+`;
+
+exports[`"modules" option should work with global compose: result 1`] = `
+Array [
+  Array [
+    "./modules/composes/global.css",
+    ".global-class {
+  color: red;
+}
+
+.other-global-class {
+  color: red;
+}
+
+.oNDnA1BRHWFMyAdR4iF1 {
+  color: blue;
+}
+",
+    "",
+  ],
+]
+`;
+
+exports[`"modules" option should work with global compose: warnings 1`] = `Array []`;
+
 exports[`"modules" option should work with the "[local]" placeholder for the "localIdentName" option: errors 1`] = `Array []`;
 
 exports[`"modules" option should work with the "[local]" placeholder for the "localIdentName" option: module 1`] = `

diff --git a/test/fixtures/modules/composes/global.css b/test/fixtures/modules/composes/global.css
@@ -0,0 +1,13 @@
+:global(.global-class) {
+  color: red;
+}
+
+:global(.other-global-class) {
+  color: red;
+}
+
+.otherClassName {
+  composes: global-class from global;
+  composes: other-global-class from global;
+  color: blue;
+}
diff --git a/test/fixtures/modules/composes/global.js b/test/fixtures/modules/composes/global.js
@@ -0,0 +1,5 @@
+import css from './global.css';
+
+__export__ = css;
+
+export default css;
diff --git a/test/fixtures/modules/scope/css.css b/test/fixtures/modules/scope/css.css
@@ -18,3 +18,9 @@
     color: plum;
   }
 }
+
+@scope {
+  :scope {
+    color: red;
+  }
+}
diff --git a/test/modules-option.test.js b/test/modules-option.test.js
@@ -2417,4 +2417,20 @@ describe('"modules" option', () => {
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(getErrors(stats)).toMatchSnapshot("errors");
   });
+
+  it("should work with global compose", async () => {
+    const compiler = getCompiler("./modules/composes/global.js", {
+      modules: true,
+    });
+    const stats = await compile(compiler);
+
+    expect(
+      getModuleSource("./modules/composes/global.css", stats)
+    ).toMatchSnapshot("module");
+    expect(getExecutedCode("main.bundle.js", compiler, stats)).toMatchSnapshot(
+      "result"
+    );
+    expect(getWarnings(stats)).toMatchSnapshot("warnings");
+    expect(getErrors(stats)).toMatchSnapshot("errors");
+  });
 });