From dc0b70e437ac45ccb9402bb8724f5766eeb48146 Mon Sep 17 00:00:00 2001 From: "gaoyuan.1226" Date: Tue, 24 Oct 2023 18:43:11 +0800 Subject: [PATCH 1/5] chore(builder): update rspack to 0.3.8 --- .changeset/thirty-cars-leave.md | 7 ++ .../builder-rspack-provider/package.json | 6 +- pnpm-lock.yaml | 96 +++++++++---------- 3 files changed, 58 insertions(+), 51 deletions(-) create mode 100644 .changeset/thirty-cars-leave.md diff --git a/.changeset/thirty-cars-leave.md b/.changeset/thirty-cars-leave.md new file mode 100644 index 000000000000..47819ca965ca --- /dev/null +++ b/.changeset/thirty-cars-leave.md @@ -0,0 +1,7 @@ +--- +'@modern-js/builder-rspack-provider': patch +--- + +chore(builder): update rspack to 0.3.8 + +chore(builder): 升级 rspack 到 0.3.8 diff --git a/packages/builder/builder-rspack-provider/package.json b/packages/builder/builder-rspack-provider/package.json index 24c065a5b90c..aa691d492eb4 100644 --- a/packages/builder/builder-rspack-provider/package.json +++ b/packages/builder/builder-rspack-provider/package.json @@ -56,9 +56,9 @@ "@modern-js/types": "workspace:*", "@modern-js/utils": "workspace:*", "@babel/preset-typescript": "^7.22.15", - "@rspack/core": "0.3.6", - "@rspack/dev-client": "0.3.6", - "@rspack/plugin-html": "0.3.6", + "@rspack/core": "0.3.8", + "@rspack/dev-client": "0.3.8", + "@rspack/plugin-html": "0.3.8", "@swc/helpers": "0.5.1", "rspack-manifest-plugin": "5.0.0-alpha0", "caniuse-lite": "^1.0.30001520", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9979ceabc4c3..d97bd35190e6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -171,14 +171,14 @@ importers: specifier: workspace:* version: link:../../toolkit/utils '@rspack/core': - specifier: 0.3.6 - version: 0.3.6 + specifier: 0.3.8 + version: 0.3.8 '@rspack/dev-client': - specifier: 0.3.6 - version: 0.3.6(react-refresh@0.14.0)(webpack@5.88.1) + specifier: 0.3.8 + version: 0.3.8(react-refresh@0.14.0)(webpack@5.88.1) '@rspack/plugin-html': - specifier: 0.3.6 - version: 0.3.6(@rspack/core@0.3.6) + specifier: 0.3.8 + version: 0.3.8(@rspack/core@0.3.8) '@swc/helpers': specifier: 0.5.1 version: 0.5.1 @@ -14560,96 +14560,96 @@ packages: fs-extra: 11.1.1 dev: false - /@rspack/binding-darwin-arm64@0.3.6: - resolution: {integrity: sha512-E2Hzfek/vNvxzvtKzo6ERP7DZbJQtgATPHUvTFK3+x4NF+1pwFEqz7/+GXjYjY61dn/+sY5jBocJxVVfmYVxdw==} + /@rspack/binding-darwin-arm64@0.3.8: + resolution: {integrity: sha512-qvxzkUaqAbVmwJuVW3p7o1XVT5z2MbwpC9VZQr1fAd7/vEdDfiMm8Vz1AcY/WKxrUjX6rwNs3Ix1SdSBveThKQ==} cpu: [arm64] os: [darwin] requiresBuild: true dev: false optional: true - /@rspack/binding-darwin-x64@0.3.6: - resolution: {integrity: sha512-AV4U++zbq1E2Jvdy7WIIxRU7ApGzmJalwyUMMCnbcqqjkHS8xGJUJe5f2+JvQ4fBaalsDZgQQdeJUxv2b828lg==} + /@rspack/binding-darwin-x64@0.3.8: + resolution: {integrity: sha512-Ae3cJiTcXuBTZdLv+vDtbjGcx5D0rizg7nuRmtFmDvtPjYgFE9y0F+VzajQVySqvtAO8kowryC8BYjqnJ7A2Rg==} cpu: [x64] os: [darwin] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-arm64-gnu@0.3.6: - resolution: {integrity: sha512-nBm1ifhD7Y/NSNZsklvOjX9g2xs+k5axJIOia66KJO6/gygcOX0E1tsSeFWJLT98Pwewn3zIUobaq/eYF6b86w==} + /@rspack/binding-linux-arm64-gnu@0.3.8: + resolution: {integrity: sha512-aZ/cbLq8j85t4TLA94Oj+urPMDlBb+FHce4YGatX6+0juzxNUY23rSRB6pvtQz6DkFxFHDayiOcLkk8loiNiUQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-arm64-musl@0.3.6: - resolution: {integrity: sha512-VGgPFQCdqpdfpBaMyOrcvoWvn/Bd2hx3AF8CBBlG8I/ZoMNbAaEVjrEjxGyTrA5U1DC9ka2IgcT62r3BJsIuBw==} + /@rspack/binding-linux-arm64-musl@0.3.8: + resolution: {integrity: sha512-fcwnXl6BqnZ21LizWdcuFz1CNHHuMRoll1z5nfnWn5yzNo5eprXNqFgw0aC5R15Gri/GaiT7bZA7FXAU7eGR8g==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-x64-gnu@0.3.6: - resolution: {integrity: sha512-A+sZXcVNoLUHEwhy9PqypZrOPwRirA2tUuML8i2TlOuwj/ySMzzY7UnrghOyLN9So7MxJH68mVYOoQkdz+mLvA==} + /@rspack/binding-linux-x64-gnu@0.3.8: + resolution: {integrity: sha512-W7Kqf13GE/mT/HiQfnLMCkrNxekaJuk53sOYVehxBJ6J5NKvL/uzBvPa3m2EtbhUUkBnR0t87Yp04YS9JrnkeA==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-x64-musl@0.3.6: - resolution: {integrity: sha512-SjoPmgAFF2+8SmGZVjipwz8kIVjZdrydlLoy7iFc9xg5gu479kQKB952Wdw1FZHz+XjVlswTyC2M6t6UyNfZEA==} + /@rspack/binding-linux-x64-musl@0.3.8: + resolution: {integrity: sha512-KIRAj7WQ3JLaCENctA1aiREw9PPuLAFMxkXPGm2YeszfLhv+o3Suehc0OvsPcGeXg/laGKQzl0RV6dHyKfocQg==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-arm64-msvc@0.3.6: - resolution: {integrity: sha512-6ePvZx3uFGuP1nhs+RML/1HwGz1G5zcEhT/CWwsuPwTwdEdZRfvWVcLyr/87+BbWMhR0w9YapeF0jdFneR+gbQ==} + /@rspack/binding-win32-arm64-msvc@0.3.8: + resolution: {integrity: sha512-PHlMQu0uiUBiJCpxR1ql6HJBeFpsombiPRquoN2d/a5WfkETDX04BnfN7XW8Fe9j164iCe5yU0Xwk0gaaJp3Uw==} cpu: [arm64] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-ia32-msvc@0.3.6: - resolution: {integrity: sha512-egx2FyBXgPIO/4sGS0eOrg+vsWnACMyfnQ0nLSgcrBymODq9AfkcgFZFmTXjNpThy6b5vLKyuOycTo57BvBpxw==} + /@rspack/binding-win32-ia32-msvc@0.3.8: + resolution: {integrity: sha512-ln3js9wOQLJi9E1MVNtLui56a3pXmSnEags9YJhZs5ZMT5SJGsofoa0zXNxeTMuRQ0Gx5w0tVSXZXgyVUm1OdA==} cpu: [ia32] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-x64-msvc@0.3.6: - resolution: {integrity: sha512-bKf9LFy0vRsBmzng1gW9DgJlO1bLpOtVMmnUCrobrfhkxt0X0bksMQ+RgZdJJJ4VtC9S+XK6l6bieodHSu5bEQ==} + /@rspack/binding-win32-x64-msvc@0.3.8: + resolution: {integrity: sha512-UK70L1vsp5St0qPATB1UdrFh9Ax/G1VpWx3Fp4W5iNzfcLBDKbCpEyCetxZhjHCcFVfbSE74X34NzgDiLDFrHA==} cpu: [x64] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding@0.3.6: - resolution: {integrity: sha512-kxzYuMGMzwn5ZqN6JxwKNVAiaVOWYA5uPtGkGj1D4M7BieE+YaXgYMdLdr8MEMuuuQBJR2kDp/kS5U54K4guJA==} + /@rspack/binding@0.3.8: + resolution: {integrity: sha512-urM1+I6BL1jv6hUZ44Nv2kYYWVIQxRIJoZFrlubo1XhTJqTFUPNF/7E/ritNC9J6gxxZMQLc0NLJz4jdUTaUbg==} optionalDependencies: - '@rspack/binding-darwin-arm64': 0.3.6 - '@rspack/binding-darwin-x64': 0.3.6 - '@rspack/binding-linux-arm64-gnu': 0.3.6 - '@rspack/binding-linux-arm64-musl': 0.3.6 - '@rspack/binding-linux-x64-gnu': 0.3.6 - '@rspack/binding-linux-x64-musl': 0.3.6 - '@rspack/binding-win32-arm64-msvc': 0.3.6 - '@rspack/binding-win32-ia32-msvc': 0.3.6 - '@rspack/binding-win32-x64-msvc': 0.3.6 + '@rspack/binding-darwin-arm64': 0.3.8 + '@rspack/binding-darwin-x64': 0.3.8 + '@rspack/binding-linux-arm64-gnu': 0.3.8 + '@rspack/binding-linux-arm64-musl': 0.3.8 + '@rspack/binding-linux-x64-gnu': 0.3.8 + '@rspack/binding-linux-x64-musl': 0.3.8 + '@rspack/binding-win32-arm64-msvc': 0.3.8 + '@rspack/binding-win32-ia32-msvc': 0.3.8 + '@rspack/binding-win32-x64-msvc': 0.3.8 dev: false - /@rspack/core@0.3.6: - resolution: {integrity: sha512-1j/Z+R4qdDRlbxXi1WfWGKUjlGxm6625Kin9rDvO1Fk6DF2xxEkhVhBVmYxsmCkbsszp0T+4Q6EUURK1a45ZjQ==} + /@rspack/core@0.3.8: + resolution: {integrity: sha512-KUYYqm+PKVJBnnLuB+t0RCu0LhWm8mM3K3/VIGSATUi66Xgn7mxbSoab0IrCXWGekPUpUrmoA7hLg06wMtVJlQ==} dependencies: - '@rspack/binding': 0.3.6 + '@rspack/binding': 0.3.8 '@swc/helpers': 0.5.1 browserslist: 4.21.10 compare-versions: 6.0.0-rc.1 @@ -14687,15 +14687,15 @@ packages: - webpack-plugin-serve dev: false - /@rspack/dev-client@0.3.6(react-refresh@0.14.0)(webpack@5.88.1): - resolution: {integrity: sha512-h2OrQB1v7T2XqzATIfMf8p8nOk8zjBznWq+jNXNhDQUoII3cBmyqWdP/P8q8hhe6DOcGI2XGOvR0mWug/ztbYg==} + /@rspack/dev-client@0.3.8(react-refresh@0.14.0)(webpack@5.88.1): + resolution: {integrity: sha512-L+5ZdHj6DXKg9yaIjoDhnqPAXEXxuyvUJBNb8NVzshKqLhKYsAPQCSOtGLb984b0kVdh53lckZb3vwRbfei3lw==} peerDependencies: react-refresh: '>=0.10.0 <1.0.0' peerDependenciesMeta: react-refresh: optional: true dependencies: - '@rspack/plugin-react-refresh': 0.3.6(react-refresh@0.14.0)(webpack@5.88.1) + '@rspack/plugin-react-refresh': 0.3.8(react-refresh@0.14.0)(webpack@5.88.1) react-refresh: 0.14.0 transitivePeerDependencies: - '@types/webpack' @@ -14707,15 +14707,15 @@ packages: - webpack-plugin-serve dev: false - /@rspack/plugin-html@0.3.6(@rspack/core@0.3.6): - resolution: {integrity: sha512-r8xhVeGi2WWbZEVzwiQW/pWKQqHJ7KHbK12xDFpU4piwi9CDP5cdY1x9O8SpIddl1b1pcGy0c+x9jesbeYnKtQ==} + /@rspack/plugin-html@0.3.8(@rspack/core@0.3.8): + resolution: {integrity: sha512-eHZo+Ah2vrsS9pxT5Xue7SjSMN8joSNHDLui95Pnni1oj1ESuCojhxPCRxUhbort7xwsGYpnhfhsJZoHL8qN4w==} peerDependencies: - '@rspack/core': 0.3.6 + '@rspack/core': 0.3.8 peerDependenciesMeta: '@rspack/core': optional: true dependencies: - '@rspack/core': 0.3.6 + '@rspack/core': 0.3.8 '@types/html-minifier-terser': 7.0.0 html-minifier-terser: 7.0.0 lodash.template: 4.5.0 @@ -14723,8 +14723,8 @@ packages: tapable: 2.2.1 dev: false - /@rspack/plugin-react-refresh@0.3.6(react-refresh@0.14.0)(webpack@5.88.1): - resolution: {integrity: sha512-xv5w8kWrRpdpa1wUVmW3ELvMW2T/xrcBX6UyeRfyQsnHpLzjpkUMRwU4CnD1ex1PzoE+CKrJbN9uuVqX1aukBQ==} + /@rspack/plugin-react-refresh@0.3.8(react-refresh@0.14.0)(webpack@5.88.1): + resolution: {integrity: sha512-HF6liXhYJqXRYlQNRNTu1YpR4QykOAjh9/8bt6kYKsWZPj5D1zcPH+evpvF7QxcRpfSRXRujyHOXMIKBLTBqIQ==} peerDependencies: react-refresh: '>=0.10.0 <1.0.0' peerDependenciesMeta: @@ -27253,7 +27253,7 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.21 - ts-node: 10.9.1(@types/node@18.11.17)(typescript@5.2.2) + ts-node: 10.9.1(@types/node@16.11.68)(typescript@5.0.4) yaml: 1.10.2 dev: true From 42d32f6d5876e1b5f55746664686ca6cdcb39dad Mon Sep 17 00:00:00 2001 From: "gaoyuan.1226" Date: Tue, 24 Oct 2023 18:52:04 +0800 Subject: [PATCH 2/5] fix: snapshot --- .../tests/plugins/__snapshots__/default.test.ts.snap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/builder/builder-rspack-provider/tests/plugins/__snapshots__/default.test.ts.snap b/packages/builder/builder-rspack-provider/tests/plugins/__snapshots__/default.test.ts.snap index 915b5691d870..9d9aa3a450db 100644 --- a/packages/builder/builder-rspack-provider/tests/plugins/__snapshots__/default.test.ts.snap +++ b/packages/builder/builder-rspack-provider/tests/plugins/__snapshots__/default.test.ts.snap @@ -698,6 +698,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = ` Plugin { "_options": { "prefix": "Client", + "profile": false, }, "name": "ProgressPlugin", }, @@ -1464,6 +1465,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod Plugin { "_options": { "prefix": "Client", + "profile": false, }, "name": "ProgressPlugin", }, @@ -1944,6 +1946,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctyly when targ Plugin { "_options": { "prefix": "Server", + "profile": false, }, "name": "ProgressPlugin", }, @@ -2676,6 +2679,7 @@ exports[`tools.rspack > should match snapshot 1`] = ` Plugin { "_options": { "prefix": "Client", + "profile": false, }, "name": "ProgressPlugin", }, From 51b689351e0527237c74a1ff7dcb97f1d7132674 Mon Sep 17 00:00:00 2001 From: "gaoyuan.1226" Date: Wed, 25 Oct 2023 10:36:00 +0800 Subject: [PATCH 3/5] fix: type-check workflow --- .github/workflows/type-check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/type-check.yml b/.github/workflows/type-check.yml index 8d83ef1e68b7..a4b24a3cb5dc 100644 --- a/.github/workflows/type-check.yml +++ b/.github/workflows/type-check.yml @@ -26,15 +26,15 @@ jobs: - name: Install Pnpm uses: pnpm/action-setup@v2 - - name: Show Pnpm Version - run: pnpm -v - - name: Setup Node.js 18 uses: actions/setup-node@v3 with: node-version: 18 cache: 'pnpm' + - name: Show Pnpm Version + run: pnpm -v + - name: Check skip CI run: echo "RESULT=$(node ./scripts/skipCI.js)" >> "$GITHUB_OUTPUT" id: skip-ci From 4c2c744c6ab5f6acff10511791fe75de3cf4eed6 Mon Sep 17 00:00:00 2001 From: "gaoyuan.1226" Date: Wed, 25 Oct 2023 10:44:07 +0800 Subject: [PATCH 4/5] fix: remove Show Pnpm Version --- .github/workflows/type-check.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/type-check.yml b/.github/workflows/type-check.yml index a4b24a3cb5dc..2ab03e039032 100644 --- a/.github/workflows/type-check.yml +++ b/.github/workflows/type-check.yml @@ -32,9 +32,6 @@ jobs: node-version: 18 cache: 'pnpm' - - name: Show Pnpm Version - run: pnpm -v - - name: Check skip CI run: echo "RESULT=$(node ./scripts/skipCI.js)" >> "$GITHUB_OUTPUT" id: skip-ci From 1e830b1e04a27424e7863c3e598b05ca89aff62a Mon Sep 17 00:00:00 2001 From: "gaoyuan.1226" Date: Wed, 25 Oct 2023 10:54:47 +0800 Subject: [PATCH 5/5] fix: workflow --- .github/workflows/integration-test-Windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-test-Windows.yml b/.github/workflows/integration-test-Windows.yml index da511fbd2b8b..145bd2e94640 100644 --- a/.github/workflows/integration-test-Windows.yml +++ b/.github/workflows/integration-test-Windows.yml @@ -36,6 +36,7 @@ jobs: run: corepack enable - name: Check skip CI + shell: bash run: echo "RESULT=$(node ./scripts/skipCI.js)" >> "$GITHUB_OUTPUT" id: skip-ci