From 05a5f33e160ee7cd8f3c173396af4cf147129f93 Mon Sep 17 00:00:00 2001 From: dragooncjw <289056872@qq.com> Date: Thu, 13 Mar 2025 12:47:29 +0800 Subject: [PATCH] fix: demo dep --- apps/demo-free-layout-simple/package.json | 5 +- apps/demo-free-layout-simple/rspack.config.js | 28 ------- apps/demo-free-layout/package.json | 3 +- apps/demo-free-layout/rspack.config.js | 18 +---- common/config/rush/pnpm-lock.yaml | 73 +------------------ 5 files changed, 8 insertions(+), 119 deletions(-) diff --git a/apps/demo-free-layout-simple/package.json b/apps/demo-free-layout-simple/package.json index 904433b5..6fe711b3 100644 --- a/apps/demo-free-layout-simple/package.json +++ b/apps/demo-free-layout-simple/package.json @@ -44,10 +44,7 @@ "@types/react-dom": "^18", "@types/styled-components": "^5", "@typescript-eslint/parser": "^6.10.0", - "eslint": "^8.54.0", - "less": "^4.1.2", - "less-loader": "^6", - "postcss-loader": "^7.3.3" + "eslint": "^8.54.0" }, "publishConfig": { "access": "public", diff --git a/apps/demo-free-layout-simple/rspack.config.js b/apps/demo-free-layout-simple/rspack.config.js index 30a01574..e2f05408 100644 --- a/apps/demo-free-layout-simple/rspack.config.js +++ b/apps/demo-free-layout-simple/rspack.config.js @@ -13,12 +13,6 @@ module.exports = { entry: { main: './src/app.tsx', }, - resolve: { - alias: { - react: require.resolve('react'), - 'react-dom': require.resolve('react-dom'), - }, - }, builtins: { // https://www.rspack.dev/config/builtins.html#builtinshtml html: [ @@ -36,28 +30,6 @@ module.exports = { test: /\.(png|gif|jpg|jpeg|svg|woff2)$/, type: 'asset', }, - { - test: /\.(css|less)$/, - use: [ - { - loader: 'postcss-loader', - }, - ], - type: 'css', - }, - { - test: /\.module\.css$/i, - type: 'css/module', - }, - { - test: /\.less$/, - use: [ - { - loader: 'less-loader', - }, - ], - type: 'css', - }, ], }, plugins: [], diff --git a/apps/demo-free-layout/package.json b/apps/demo-free-layout/package.json index c6f94c23..de73eb02 100644 --- a/apps/demo-free-layout/package.json +++ b/apps/demo-free-layout/package.json @@ -53,8 +53,7 @@ "@typescript-eslint/parser": "^6.10.0", "eslint": "^8.54.0", "less": "^4.1.2", - "less-loader": "^6", - "postcss-loader": "^7.3.3" + "less-loader": "^6" }, "publishConfig": { "access": "public", diff --git a/apps/demo-free-layout/rspack.config.js b/apps/demo-free-layout/rspack.config.js index 30a01574..19b8c3b8 100644 --- a/apps/demo-free-layout/rspack.config.js +++ b/apps/demo-free-layout/rspack.config.js @@ -37,23 +37,13 @@ module.exports = { type: 'asset', }, { - test: /\.(css|less)$/, - use: [ - { - loader: 'postcss-loader', - }, - ], - type: 'css', - }, - { - test: /\.module\.css$/i, - type: 'css/module', - }, - { - test: /\.less$/, + test: /\.(less|css)$/, use: [ { loader: 'less-loader', + options: { + // ... + }, }, ], type: 'css', diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 79f30f6d..10981df2 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -98,7 +98,7 @@ importers: version: link:../../config/ts-config '@rspack/cli': specifier: 0.2.1 - version: 0.2.1(react-refresh@0.16.0)(webpack@5.76.0) + version: 0.2.1(react-refresh@0.14.0)(webpack@5.76.0) '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -162,7 +162,7 @@ importers: devDependencies: '@rspack/cli': specifier: 0.2.1 - version: 0.2.1(react-refresh@0.14.0)(webpack@5.76.0) + version: 0.2.1(react-refresh@0.16.0)(webpack@5.76.0) '@types/node': specifier: ^18 version: 18.19.68 @@ -260,9 +260,6 @@ importers: less-loader: specifier: ^6 version: 6.2.0(webpack@5.76.0) - postcss-loader: - specifier: ^7.3.3 - version: 7.3.4(postcss@8.5.1)(typescript@5.0.4)(webpack@5.76.0) ../../apps/demo-free-layout-simple: dependencies: @@ -312,15 +309,6 @@ importers: eslint: specifier: ^8.54.0 version: 8.57.1 - less: - specifier: ^4.1.2 - version: 4.2.2 - less-loader: - specifier: ^6 - version: 6.2.0(webpack@5.76.0) - postcss-loader: - specifier: ^7.3.3 - version: 7.3.4(postcss@8.5.1)(typescript@5.0.4)(webpack@5.76.0) ../../apps/docs: dependencies: @@ -8590,22 +8578,6 @@ packages: /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - /cosmiconfig@8.3.6(typescript@5.0.4): - resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} - engines: {node: '>=14'} - peerDependencies: - typescript: '>=4.9.5' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - import-fresh: 3.3.0 - js-yaml: 4.1.0 - parse-json: 5.2.0 - path-type: 4.0.0 - typescript: 5.0.4 - dev: true - /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} dev: false @@ -9134,12 +9106,6 @@ packages: dev: true optional: true - /error-ex@1.3.2: - resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} - dependencies: - is-arrayish: 0.2.1 - dev: true - /error-stack-parser@2.1.4: resolution: {integrity: sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==} dependencies: @@ -10950,10 +10916,6 @@ packages: call-bind: 1.0.8 get-intrinsic: 1.2.6 - /is-arrayish@0.2.1: - resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} - dev: true - /is-async-function@2.0.0: resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==} engines: {node: '>= 0.4'} @@ -11292,11 +11254,6 @@ packages: merge-stream: 2.0.0 supports-color: 8.1.1 - /jiti@1.21.7: - resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==} - hasBin: true - dev: true - /jju@1.4.0: resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} dev: false @@ -13172,16 +13129,6 @@ packages: is-decimal: 2.0.1 is-hexadecimal: 2.0.1 - /parse-json@5.2.0: - resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} - engines: {node: '>=8'} - dependencies: - '@babel/code-frame': 7.26.2 - error-ex: 1.3.2 - json-parse-even-better-errors: 2.3.1 - lines-and-columns: 1.2.4 - dev: true - /parse-node-version@1.0.1: resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==} engines: {node: '>= 0.10'} @@ -13332,22 +13279,6 @@ packages: lilconfig: 3.1.3 dev: true - /postcss-loader@7.3.4(postcss@8.5.1)(typescript@5.0.4)(webpack@5.76.0): - resolution: {integrity: sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==} - engines: {node: '>= 14.15.0'} - peerDependencies: - postcss: ^7.0.0 || ^8.0.1 - webpack: ^5.0.0 - dependencies: - cosmiconfig: 8.3.6(typescript@5.0.4) - jiti: 1.21.7 - postcss: 8.5.1 - semver: 7.6.3 - webpack: 5.76.0 - transitivePeerDependencies: - - typescript - dev: true - /postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}