chore: resolve conflicts from merge with master

Author: stephenkao

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.11.0](https://github.com/webpack-contrib/css-loader/compare/v6.10.0...v6.11.0) (2024-04-03)
+
+
+### Features
+
+* supports multiple composes ([#1582](https://github.com/webpack-contrib/css-loader/issues/1582)) ([bbca614](https://github.com/webpack-contrib/css-loader/commit/bbca61411dc5f82964653a6d1aa27854519b743d))
+
+
+### Bug Fixes
+
+* do not break `@scope` at-rule without params ([#1581](https://github.com/webpack-contrib/css-loader/issues/1581)) ([e022e3b](https://github.com/webpack-contrib/css-loader/commit/e022e3bb405472ac7d51ff1114783fc2811dfe04))
+
 ## [6.10.0](https://github.com/webpack-contrib/css-loader/compare/v6.9.1...v6.10.0) (2024-01-30)
 
 

README.md

@@ -498,6 +498,15 @@ To import a local classname from another module.
 
 To import from multiple modules use multiple `composes:` rules.
 
+```css
+:local(.className) {
+  composes: edit highlight from "./edit.css", button from "module/button.css", classFromThisModule;
+  background: red;
+}
+```
+
+or
+
 ```css
 :local(.className) {
   composes: edit highlight from "./edit.css";

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "6.10.0",
+  "version": "6.11.0",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -57,9 +57,9 @@
   "dependencies": {
     "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-scope": "^3.1.1",
+    "postcss-modules-extract-imports": "^3.1.0",
+    "postcss-modules-local-by-default": "^4.0.5",
+    "postcss-modules-scope": "^3.2.0",
     "postcss-modules-values": "^4.0.0",
     "postcss-value-parser": "^4.2.0",
     "semver": "^7.5.4"

package.json

@@ -10468,6 +10468,12 @@ ___CSS_LOADER_EXPORT___.push([module.id, \`@scope (.kthHR5ALtmYK9QgapjA3) {
     color: plum;
   }
 }
+
+@scope() {
+  :scope {
+    color: red;
+  }
+}
 \`, \\"\\"]);
 // Exports
 ___CSS_LOADER_EXPORT___.locals = {
@@ -10502,6 +10508,12 @@ Array [
     color: plum;
   }
 }
+
+@scope() {
+  :scope {
+    color: red;
+  }
+}
 ",
     "",
   ],
@@ -21104,6 +21116,59 @@ 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 multiple compose: module 1`] = `undefined`;
+
 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`] = `

test/__snapshots__/modules-option.test.js.snap

@@ -0,0 +1,7 @@
+.imported-alias-2 {
+  background: red;
+}
+
+.imported-alias-3 {
+  background: red;
+}

test/fixtures/modules/composes/alias-1.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;
+}

test/fixtures/modules/composes/global.css

@@ -0,0 +1,5 @@
+import css from './global.css';
+
+__export__ = css;
+
+export default css;

test/fixtures/modules/composes/global.js

@@ -0,0 +1,38 @@
+.other-class {
+  color: red;
+}
+
+.class-1 {
+  color: blue;
+}
+
+.class-2 {
+  color: blue;
+}
+
+:global(.global-class) {
+  padding: 10px;
+}
+
+:global(.global-class-1) {
+  padding: 10px;
+}
+
+:global(.global-class-2) {
+  padding: 10px;
+}
+
+.class {
+  composes:
+    other-class,
+    class-1 class-2,
+    imported-alias from './alias.css',
+    imported-alias-2 imported-alias-3 from './alias-1.css',
+    global-class from global,
+    global-class-1 global-class-2 from global;
+  color: gainsboro;
+}
+
+.class-other {
+  composes: other-class class-1;
+}

test/fixtures/modules/composes/multiple.css

@@ -0,0 +1,5 @@
+import css from './multiple.css';
+
+__export__ = css;
+
+export default css;

test/fixtures/modules/composes/multiple.js

@@ -18,3 +18,9 @@
     color: plum;
   }
 }
+
+@scope {
+  :scope {
+    color: red;
+  }
+}

test/fixtures/modules/scope/css.css

@@ -2420,6 +2420,38 @@ describe('"modules" option', () => {
     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");
+  });
+
+  it("should work with multiple compose", async () => {
+    const compiler = getCompiler("./modules/composes/multiple.js", {
+      modules: true,
+    });
+    const stats = await compile(compiler);
+
+    expect(
+      getModuleSource("./modules/composes/multiple.css", stats)
+    ).toMatchSnapshot("module");
+    expect(getExecutedCode("main.bundle.js", compiler, stats)).toMatchSnapshot(
+      "result"
+    );
+    expect(getWarnings(stats)).toMatchSnapshot("warnings");
+    expect(getErrors(stats)).toMatchSnapshot("errors");
+  });
+
   it("should invoke the custom getJSON function if provided", async () => {
     const getJSONSpy = jest.fn();
     const compiler = getCompiler("./modules/getJSON/source.js", {