From 437c370dbbd8a96509702aa7b24bf7c3ee3751ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Dec 2024 07:19:50 +0800 Subject: [PATCH] chore(deps): update dependency css-loader to v7 (#8024) * chore(deps): update dependency css-loader to v7 * test: fix failed cases * fix --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: neverland --- packages/rspack-test-tools/package.json | 2 +- .../css-modules-classname/rspack.config.js | 4 ++- .../hotCases/css/css-extract/rspack.config.js | 9 +++++- .../watch-loader-failed-css/rspack.config.js | 3 +- pnpm-lock.yaml | 28 +++++++++---------- tests/e2e/package.json | 2 +- .../expected/main.mjs | 4 +-- .../expected/main.js | 4 +-- .../cases/export-only-locals/expected/main.js | 26 +++++++++++++++++ .../export-only-locals/webpack.config.js | 1 + .../cases/hmr-locals/expected/main.js | 6 ++-- .../expected/main.css | 6 ++-- .../cases/pathinfo/expected/main.css | 6 ++-- .../css-extract/emitOption.test.js | 10 +++++-- tests/plugin-test/package.json | 2 +- tests/webpack-examples/package.json | 2 +- 16 files changed, 80 insertions(+), 35 deletions(-) diff --git a/packages/rspack-test-tools/package.json b/packages/rspack-test-tools/package.json index c2b020d025b6..de0344faf8b1 100644 --- a/packages/rspack-test-tools/package.json +++ b/packages/rspack-test-tools/package.json @@ -92,7 +92,7 @@ "coffeescript": "^2.5.1", "copy-webpack-plugin": "5.1.2", "core-js": "3.38.1", - "css-loader": "^6.11.0", + "css-loader": "^7.1.2", "file-loader": "^6.2.0", "html-loader": "^5.0.0", "html-webpack-plugin": "^5.5.0", diff --git a/packages/rspack-test-tools/tests/configCases/css-loader/css-modules-classname/rspack.config.js b/packages/rspack-test-tools/tests/configCases/css-loader/css-modules-classname/rspack.config.js index 86714c2af4ab..becfab230bdc 100644 --- a/packages/rspack-test-tools/tests/configCases/css-loader/css-modules-classname/rspack.config.js +++ b/packages/rspack-test-tools/tests/configCases/css-loader/css-modules-classname/rspack.config.js @@ -13,7 +13,9 @@ module.exports = { loader: "css-loader", options: { modules: { - localIdentName: "[name]__[local]--[contenthash]" + namedExport: false, + localIdentName: "[name]__[local]--[contenthash]", + exportLocalsConvention: 'camel-case', } } } diff --git a/packages/rspack-test-tools/tests/hotCases/css/css-extract/rspack.config.js b/packages/rspack-test-tools/tests/hotCases/css/css-extract/rspack.config.js index 87ebbf060869..07dd1759c7d4 100644 --- a/packages/rspack-test-tools/tests/hotCases/css/css-extract/rspack.config.js +++ b/packages/rspack-test-tools/tests/hotCases/css/css-extract/rspack.config.js @@ -17,7 +17,14 @@ module.exports = { esModule: true, } }, - "css-loader", + { + loader: "css-loader", + options: { + modules: { + namedExport: false, + } + } + }, "./loader.js" ] }, diff --git a/packages/rspack-test-tools/tests/watchCases/build-failed/watch-loader-failed-css/rspack.config.js b/packages/rspack-test-tools/tests/watchCases/build-failed/watch-loader-failed-css/rspack.config.js index faad443b5c59..e0c0b2cc9856 100644 --- a/packages/rspack-test-tools/tests/watchCases/build-failed/watch-loader-failed-css/rspack.config.js +++ b/packages/rspack-test-tools/tests/watchCases/build-failed/watch-loader-failed-css/rspack.config.js @@ -15,7 +15,8 @@ module.exports = { loader: "css-loader", options: { modules: { - namedExport: true + namedExport: true, + exportLocalsConvention: 'camel-case-only' } } }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 32072ec2ea5a..67c96df2d2da 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -568,8 +568,8 @@ importers: specifier: 3.38.1 version: 3.38.1 css-loader: - specifier: ^6.11.0 - version: 6.11.0(@rspack/core@packages+rspack)(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))) + specifier: ^7.1.2 + version: 7.1.2(@rspack/core@packages+rspack)(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))) file-loader: specifier: ^6.2.0 version: 6.2.0(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))) @@ -746,8 +746,8 @@ importers: specifier: 3.38.1 version: 3.38.1 css-loader: - specifier: ^6.11.0 - version: 6.11.0(@rspack/core@packages+rspack)(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))) + specifier: ^7.1.2 + version: 7.1.2(@rspack/core@packages+rspack)(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))) fs-extra: specifier: ^11.2.0 version: 11.2.0 @@ -797,8 +797,8 @@ importers: specifier: ^0.2.37 version: 0.2.37(@swc/core@1.10.1(@swc/helpers@0.5.15)) css-loader: - specifier: ^6.11.0 - version: 6.11.0(@rspack/core@packages+rspack)(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))) + specifier: ^7.1.2 + version: 7.1.2(@rspack/core@packages+rspack)(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))) del: specifier: ^6.0.0 version: 6.1.1 @@ -860,8 +860,8 @@ importers: specifier: 3.36.1 version: 3.36.1 css-loader: - specifier: ^6.11.0 - version: 6.11.0(@rspack/core@1.1.8(@swc/helpers@0.5.15))(webpack@5.94.0) + specifier: ^7.1.2 + version: 7.1.2(@rspack/core@1.1.8(@swc/helpers@0.5.15))(webpack@5.94.0) date-fns: specifier: ^2.29.3 version: 2.30.0 @@ -4809,12 +4809,12 @@ packages: peerDependencies: webpack: ^4.27.0 || ^5.0.0 - css-loader@6.11.0: - resolution: {integrity: sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==} - engines: {node: '>= 12.13.0'} + css-loader@7.1.2: + resolution: {integrity: sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==} + engines: {node: '>= 18.12.0'} peerDependencies: '@rspack/core': 0.x || 1.x - webpack: ^5.0.0 + webpack: ^5.27.0 peerDependenciesMeta: '@rspack/core': optional: true @@ -14418,7 +14418,7 @@ snapshots: semver: 7.6.3 webpack: 5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0)) - css-loader@6.11.0(@rspack/core@1.1.8(@swc/helpers@0.5.15))(webpack@5.94.0): + css-loader@7.1.2(@rspack/core@1.1.8(@swc/helpers@0.5.15))(webpack@5.94.0): dependencies: icss-utils: 5.1.0(postcss@8.4.49) postcss: 8.4.49 @@ -14432,7 +14432,7 @@ snapshots: '@rspack/core': 1.1.8(@swc/helpers@0.5.15) webpack: 5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4) - css-loader@6.11.0(@rspack/core@packages+rspack)(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))): + css-loader@7.1.2(@rspack/core@packages+rspack)(webpack@5.94.0(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack-cli@5.1.4(webpack@5.94.0))): dependencies: icss-utils: 5.1.0(postcss@8.4.49) postcss: 8.4.49 diff --git a/tests/e2e/package.json b/tests/e2e/package.json index 77ccf614d5e9..eba6bdb37e8a 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -27,7 +27,7 @@ "tailwindcss": "^3.3.0", "vue": "^3.4.21", "vue-loader": "^17.3.1", - "css-loader": "^6.11.0", + "css-loader": "^7.1.2", "webpack-dev-server": "5.0.4", "ws": "^8.16.0" } diff --git a/tests/plugin-test/css-extract/cases/es-named-export-output-module/expected/main.mjs b/tests/plugin-test/css-extract/cases/es-named-export-output-module/expected/main.mjs index e3a39c326ac5..cb5557ba71f5 100644 --- a/tests/plugin-test/css-extract/cases/es-named-export-output-module/expected/main.mjs +++ b/tests/plugin-test/css-extract/cases/es-named-export-output-module/expected/main.mjs @@ -2,8 +2,8 @@ var __webpack_modules__ = ({ "./style.css": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) { __webpack_require__.r(__webpack_exports__); __webpack_require__.d(__webpack_exports__, { - aClass: function() { return _1; }, - bClass: function() { return _2; }, + "a-class": function() { return _1; }, + b__class: function() { return _2; }, cClass: function() { return _3; } }); // extracted by css-extract-rspack-plugin diff --git a/tests/plugin-test/css-extract/cases/export-only-locals-and-es-named-export/expected/main.js b/tests/plugin-test/css-extract/cases/export-only-locals-and-es-named-export/expected/main.js index 009a7a54796e..bb57ea0cab8f 100644 --- a/tests/plugin-test/css-extract/cases/export-only-locals-and-es-named-export/expected/main.js +++ b/tests/plugin-test/css-extract/cases/export-only-locals-and-es-named-export/expected/main.js @@ -4,8 +4,8 @@ var __webpack_modules__ = ({ "./style.css": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) { __webpack_require__.r(__webpack_exports__); __webpack_require__.d(__webpack_exports__, { - aClass: function() { return _1; }, - bClass: function() { return _2; }, + "a-class": function() { return _1; }, + b__class: function() { return _2; }, cClass: function() { return _3; } }); // extracted by css-extract-rspack-plugin diff --git a/tests/plugin-test/css-extract/cases/export-only-locals/expected/main.js b/tests/plugin-test/css-extract/cases/export-only-locals/expected/main.js index ef53b9233ccb..009a7a54796e 100644 --- a/tests/plugin-test/css-extract/cases/export-only-locals/expected/main.js +++ b/tests/plugin-test/css-extract/cases/export-only-locals/expected/main.js @@ -3,7 +3,16 @@ var __webpack_modules__ = ({ "./style.css": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) { __webpack_require__.r(__webpack_exports__); +__webpack_require__.d(__webpack_exports__, { + aClass: function() { return _1; }, + bClass: function() { return _2; }, + cClass: function() { return _3; } +}); // extracted by css-extract-rspack-plugin +var _1 = "foo__style__a-class"; +var _2 = "foo__style__b__class"; +var _3 = "foo__style__cClass"; + }), @@ -34,6 +43,23 @@ return module.exports; } /************************************************************************/ +// webpack/runtime/define_property_getters +(() => { +__webpack_require__.d = function(exports, definition) { + for(var key in definition) { + if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) { + Object.defineProperty(exports, key, { enumerable: true, get: definition[key] }); + } + } +}; +})(); +// webpack/runtime/has_own_property +(() => { +__webpack_require__.o = function (obj, prop) { + return Object.prototype.hasOwnProperty.call(obj, prop); +}; + +})(); // webpack/runtime/make_namespace_object (() => { // define __esModule on exports diff --git a/tests/plugin-test/css-extract/cases/export-only-locals/webpack.config.js b/tests/plugin-test/css-extract/cases/export-only-locals/webpack.config.js index a7aba283911c..ad1bc7f320dc 100644 --- a/tests/plugin-test/css-extract/cases/export-only-locals/webpack.config.js +++ b/tests/plugin-test/css-extract/cases/export-only-locals/webpack.config.js @@ -16,6 +16,7 @@ module.exports = { options: { modules: { localIdentName: "foo__[name]__[local]", + exportLocalsConvention: 'camel-case-only', exportOnlyLocals: true } } diff --git a/tests/plugin-test/css-extract/cases/hmr-locals/expected/main.js b/tests/plugin-test/css-extract/cases/hmr-locals/expected/main.js index 95953705e032..e984b3b3e481 100644 --- a/tests/plugin-test/css-extract/cases/hmr-locals/expected/main.js +++ b/tests/plugin-test/css-extract/cases/hmr-locals/expected/main.js @@ -229,10 +229,12 @@ function cssReload(moduleId, options) { "./index.css": (function (module, __webpack_exports__, __webpack_require__) { __webpack_require__.r(__webpack_exports__); __webpack_require__.d(__webpack_exports__, { - "default": function() { return __WEBPACK_DEFAULT_EXPORT__; } + x: function() { return _1; } }); // extracted by css-extract-rspack-plugin -/* ESM default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({"x":"VoofDB21D_QzDbRdwMiY"}); +var _1 = "VoofDB21D_QzDbRdwMiY"; + + if(true) { (function() { var localsJsonString = "{\"x\":\"VoofDB21D_QzDbRdwMiY\"}"; diff --git a/tests/plugin-test/css-extract/cases/pathinfo-devtool-source-map/expected/main.css b/tests/plugin-test/css-extract/cases/pathinfo-devtool-source-map/expected/main.css index 08addedb604b..d5d2ce5ee3d1 100644 --- a/tests/plugin-test/css-extract/cases/pathinfo-devtool-source-map/expected/main.css +++ b/tests/plugin-test/css-extract/cases/pathinfo-devtool-source-map/expected/main.css @@ -1,19 +1,19 @@ /*!**********************************************************************************************************************************************************************************************************************!*\ - !*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./style.css ***! + !*** css ../../../../../node_modules/.pnpm/css-loader@7.1.2_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0._sroe7k2leveebxngymnh5tghna/node_modules/css-loader/dist/cjs.js!./style.css ***! \**********************************************************************************************************************************************************************************************************************/ body { background: red; } /*!**********************************************************************************************************************************************************************************************************************!*\ - !*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./other.css ***! + !*** css ../../../../../node_modules/.pnpm/css-loader@7.1.2_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0._sroe7k2leveebxngymnh5tghna/node_modules/css-loader/dist/cjs.js!./other.css ***! \**********************************************************************************************************************************************************************************************************************/ body { background: blue; } /*!**********************************************************************************************************************************************************************************************************************!*\ - !*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./extra.css ***! + !*** css ../../../../../node_modules/.pnpm/css-loader@7.1.2_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0._sroe7k2leveebxngymnh5tghna/node_modules/css-loader/dist/cjs.js!./extra.css ***! \**********************************************************************************************************************************************************************************************************************/ body { background: yellow; diff --git a/tests/plugin-test/css-extract/cases/pathinfo/expected/main.css b/tests/plugin-test/css-extract/cases/pathinfo/expected/main.css index c13cef1e2872..7b95d4639665 100644 --- a/tests/plugin-test/css-extract/cases/pathinfo/expected/main.css +++ b/tests/plugin-test/css-extract/cases/pathinfo/expected/main.css @@ -1,19 +1,19 @@ /*!**********************************************************************************************************************************************************************************************************************!*\ - !*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./style.css ***! + !*** css ../../../../../node_modules/.pnpm/css-loader@7.1.2_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0._sroe7k2leveebxngymnh5tghna/node_modules/css-loader/dist/cjs.js!./style.css ***! \**********************************************************************************************************************************************************************************************************************/ body { background: red; } /*!**********************************************************************************************************************************************************************************************************************!*\ - !*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./other.css ***! + !*** css ../../../../../node_modules/.pnpm/css-loader@7.1.2_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0._sroe7k2leveebxngymnh5tghna/node_modules/css-loader/dist/cjs.js!./other.css ***! \**********************************************************************************************************************************************************************************************************************/ body { background: blue; } /*!**********************************************************************************************************************************************************************************************************************!*\ - !*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./extra.css ***! + !*** css ../../../../../node_modules/.pnpm/css-loader@7.1.2_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0._sroe7k2leveebxngymnh5tghna/node_modules/css-loader/dist/cjs.js!./extra.css ***! \**********************************************************************************************************************************************************************************************************************/ body { background: yellow; diff --git a/tests/plugin-test/css-extract/emitOption.test.js b/tests/plugin-test/css-extract/emitOption.test.js index 04eb6019e38b..ca327cfcac09 100644 --- a/tests/plugin-test/css-extract/emitOption.test.js +++ b/tests/plugin-test/css-extract/emitOption.test.js @@ -120,7 +120,10 @@ describe("emit option", () => { { loader: "css-loader", options: { - modules: true + modules: { + namedExport: false, + exportLocalsConvention: "as-is" + } } } ] @@ -190,7 +193,10 @@ describe("emit option", () => { { loader: "css-loader", options: { - modules: true + modules: { + namedExport: false, + exportLocalsConvention: "as-is" + } } } ] diff --git a/tests/plugin-test/package.json b/tests/plugin-test/package.json index 46f20a86bf17..3af263ddae6c 100644 --- a/tests/plugin-test/package.json +++ b/tests/plugin-test/package.json @@ -13,7 +13,7 @@ "@rspack/core": "workspace:*", "@swc/core": "1.10.1", "@swc/jest": "^0.2.37", - "css-loader": "^6.11.0", + "css-loader": "^7.1.2", "file-loader": "^6.2.0", "html-loader": "2.1.1", "pug-loader": "2.4.0", diff --git a/tests/webpack-examples/package.json b/tests/webpack-examples/package.json index 07d77b9851f5..1aeccce8d2a6 100644 --- a/tests/webpack-examples/package.json +++ b/tests/webpack-examples/package.json @@ -19,7 +19,7 @@ "coffee-loader": "^1.0.0", "coffeescript": "^2.5.1", "@babel/preset-react": "^7.22.15", - "css-loader": "^6.11.0", + "css-loader": "^7.1.2", "style-loader": "^4.0.0", "wast-loader": "^1.12.1" }