From 6d8cb685b971bd6a1f721d0249a381145d196f44 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 20 Sep 2023 15:55:40 +0800 Subject: [PATCH] chore: downgrade Rspack to stable version (#4690) --- .../builder-rspack-provider/package.json | 6 +- pnpm-lock.yaml | 94 +++++++++---------- tests/utils/applyBaseConfig.ts | 9 +- 3 files changed, 58 insertions(+), 51 deletions(-) diff --git a/packages/builder/builder-rspack-provider/package.json b/packages/builder/builder-rspack-provider/package.json index cec450d8602d..95e76a333604 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.4-canary-9d910ae-20230918010610", - "@rspack/dev-client": "0.3.4-canary-9d910ae-20230918010610", - "@rspack/plugin-html": "0.3.4-canary-9d910ae-20230918010610", + "@rspack/core": "0.3.4", + "@rspack/dev-client": "0.3.4", + "@rspack/plugin-html": "0.3.4", "@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 16d791b3c081..b6cfb4bb8ea4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -165,14 +165,14 @@ importers: specifier: workspace:* version: link:../../toolkit/utils '@rspack/core': - specifier: 0.3.4-canary-9d910ae-20230918010610 - version: 0.3.4-canary-9d910ae-20230918010610 + specifier: 0.3.4 + version: 0.3.4 '@rspack/dev-client': - specifier: 0.3.4-canary-9d910ae-20230918010610 - version: 0.3.4-canary-9d910ae-20230918010610(react-refresh@0.14.0)(webpack@5.88.1) + specifier: 0.3.4 + version: 0.3.4(react-refresh@0.14.0)(webpack@5.88.1) '@rspack/plugin-html': - specifier: 0.3.4-canary-9d910ae-20230918010610 - version: 0.3.4-canary-9d910ae-20230918010610(@rspack/core@0.3.4-canary-9d910ae-20230918010610) + specifier: 0.3.4 + version: 0.3.4(@rspack/core@0.3.4) '@swc/helpers': specifier: 0.5.1 version: 0.5.1 @@ -14322,96 +14322,96 @@ packages: rollup: 3.23.0 dev: true - /@rspack/binding-darwin-arm64@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-bvwmHRMYV8MMdCaX3h5Jvxf4FM42F575PKk254QFKRcBH9MMuQmBapaVKg81t6BMjGzqHUEeAlXdx6vPrVH7LA==} + /@rspack/binding-darwin-arm64@0.3.4: + resolution: {integrity: sha512-/B9Xp9mfz+tiq2caM37PvrWDyzvQ4aGBPCbKbnRq13kfOrwJmT9nUAy1y+D8bDl1gLYT+7eVHczGZwMooPa2AA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: false optional: true - /@rspack/binding-darwin-x64@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-Vy2e7Hi9ty78a4cwOIydAgPtroOlqHXlQnxmWEUu8BElIcehHicWg1itdADEcZff+mJR5n6NO+12lUtXQ8Ywcg==} + /@rspack/binding-darwin-x64@0.3.4: + resolution: {integrity: sha512-NEazY8uHAhGQ3qxs2sY/DFSSgkF8QGd6ls/n1V3sArwcSozRQZhIT79RBhwBJ7qK3o1QIc2a6OjDzkUSPBNEzw==} cpu: [x64] os: [darwin] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-arm64-gnu@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-lvKXeTym1LVZamRdjhoeQbio2DQStcEj8dR0jglTtYWz38c91UKRMWqBeqWfiOWL27WipmWM8t5AyPWsp+4j7A==} + /@rspack/binding-linux-arm64-gnu@0.3.4: + resolution: {integrity: sha512-zsVroEhA5T6HhFxiQCrEZiqEAeHP379iT+Scupp3JD7ITfDvNqCTcXObJUUhZctQWPlxn4MqtuL3goRPgvpWWQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-arm64-musl@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-VPiB5jSlEah1CVvFoOi48hi398HIx4gE6M2mvN6kqP92LjyG9aw9FTsok7TOl0BeMFMyOcTtYX++gd1v2GOWTQ==} + /@rspack/binding-linux-arm64-musl@0.3.4: + resolution: {integrity: sha512-5x8i92eP9ubMDEO3OLT31GdjF9nEyQCPNequAspwv98spaazbiUawPcWZN5XPhsAR41f/w2CvrNUNL7EOHJMkQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-x64-gnu@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-e3WgG7zZ8cE5H4O5b/3Ehz+J9lCh6PkfWEe4oZatuMvHqSSkrZWHsdhmbTCmtIpMQ9d+LhmjKIYqq+Um1PdlJg==} + /@rspack/binding-linux-x64-gnu@0.3.4: + resolution: {integrity: sha512-oOtLICpLwdgKexHBQi9DERo2Ciweadf2b942Gh9vnMrVJz/oXf9eubewmN4mni5/S+RpSGJoChVvtV1E8ugN/Q==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-x64-musl@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-imODBQ9o9KBiMtAOvFpH3BVLoi/n4svmOubtXV/y+P6yREanU6CJOndlFZfgluk5f/Ckl4QaHTKYnZmxpfvtIw==} + /@rspack/binding-linux-x64-musl@0.3.4: + resolution: {integrity: sha512-yCEb90A3uWOvW4XKxTSaAma70P9UuPffgvt16W+uNb/rGSmTDcZr9/jytvmB5nbOwOq7dx2cu2NEJwWdSvMvxQ==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-arm64-msvc@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-y4JmhUk/zho4onIBLMbKx1MTu+glkUKXOS6cWTZk4EB6Dr0oz+Q3ac3YEOzWIU5FkftJ6aCkOkgzdZaG43G24g==} + /@rspack/binding-win32-arm64-msvc@0.3.4: + resolution: {integrity: sha512-fp1weWXd/ByMg0L94xKemxnyH9KOLecfbRMcmalmqGyTunneP1YLGiYvBAl2U4Uh0hTKAt3DZ80NCLIHRnqq+Q==} cpu: [arm64] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-ia32-msvc@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-IdGPDjCRUlQo+UMxjED9ZQ947lNeJX3AM+LtACMuusFUh0Ekii+ZQRaFBN3CaZiNDZs024BkqyFc1hWX85XzBQ==} + /@rspack/binding-win32-ia32-msvc@0.3.4: + resolution: {integrity: sha512-h0wLL8CdLFAQoPaiNU9tbW+ppPYMtgNBmSr77ARNC9M252KuBgEQjOhRhCvVpK/xTVrXxdYddQ+ruhI+VfSo5g==} cpu: [ia32] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-x64-msvc@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-u6YHBgzcgK9jUBYRFY/0DijCZJ/3ds48+SPvu1doY14yvR1tfrrWxc8WbzTY44VAy/du80DFnvYnS9oG0jM+ag==} + /@rspack/binding-win32-x64-msvc@0.3.4: + resolution: {integrity: sha512-AA0XgfefL2TpfFPXc3iN+WhMYAt4B0BvWOijC0n9Xjq+hSh3fx68l+eg2vKDNiG0c1Iji3V0S2Ux+HLV/XuMcA==} cpu: [x64] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-Pn+HvoGy0RqTHbC8TdHhcgyraAzJRvp15JWWD9vW/558ZRpig8deICBI4rtM6NWAD4x1y4GpRkX6kgT94IEQeA==} + /@rspack/binding@0.3.4: + resolution: {integrity: sha512-HIhzKlL/XKhiww4koZDw5ehnQ0zvtAqy0Lr2JYAZJicIsdFkkOoMRXCqgo2ivcEypHAaVNY66/AaWyDLHHmXkg==} optionalDependencies: - '@rspack/binding-darwin-arm64': 0.3.4-canary-9d910ae-20230918010610 - '@rspack/binding-darwin-x64': 0.3.4-canary-9d910ae-20230918010610 - '@rspack/binding-linux-arm64-gnu': 0.3.4-canary-9d910ae-20230918010610 - '@rspack/binding-linux-arm64-musl': 0.3.4-canary-9d910ae-20230918010610 - '@rspack/binding-linux-x64-gnu': 0.3.4-canary-9d910ae-20230918010610 - '@rspack/binding-linux-x64-musl': 0.3.4-canary-9d910ae-20230918010610 - '@rspack/binding-win32-arm64-msvc': 0.3.4-canary-9d910ae-20230918010610 - '@rspack/binding-win32-ia32-msvc': 0.3.4-canary-9d910ae-20230918010610 - '@rspack/binding-win32-x64-msvc': 0.3.4-canary-9d910ae-20230918010610 + '@rspack/binding-darwin-arm64': 0.3.4 + '@rspack/binding-darwin-x64': 0.3.4 + '@rspack/binding-linux-arm64-gnu': 0.3.4 + '@rspack/binding-linux-arm64-musl': 0.3.4 + '@rspack/binding-linux-x64-gnu': 0.3.4 + '@rspack/binding-linux-x64-musl': 0.3.4 + '@rspack/binding-win32-arm64-msvc': 0.3.4 + '@rspack/binding-win32-ia32-msvc': 0.3.4 + '@rspack/binding-win32-x64-msvc': 0.3.4 dev: false - /@rspack/core@0.3.4-canary-9d910ae-20230918010610: - resolution: {integrity: sha512-x8CpDT1rNcjf2ShQxRVtfJ7zK622Qltn3iBYhEnCGL3Cnu4BeGX9SuK5YOY2FqjR/wiHip9EgVC0qil0umi18A==} + /@rspack/core@0.3.4: + resolution: {integrity: sha512-Z0IJxZG7IxlORy/VdmoUd+l3ekA89vKh7xH0WR3OsEJ8qLBn+k26Waq8CcaCAWlDt40Vxw7zOi/Vxwops6Mo0w==} dependencies: - '@rspack/binding': 0.3.4-canary-9d910ae-20230918010610 + '@rspack/binding': 0.3.4 '@swc/helpers': 0.5.1 browserslist: 4.21.10 compare-versions: 6.0.0-rc.1 @@ -14429,15 +14429,15 @@ packages: zod-validation-error: 1.2.0(zod@3.21.4) dev: false - /@rspack/dev-client@0.3.4-canary-9d910ae-20230918010610(react-refresh@0.14.0)(webpack@5.88.1): - resolution: {integrity: sha512-+AF5LVFAW2PpSuJH/7teqwX0epIkGBvKCN6MzcYMOOmQ7jZlirus8rnHUEjWt9ugD3Q4dVSgs1k8ikbm8rxWeA==} + /@rspack/dev-client@0.3.4(react-refresh@0.14.0)(webpack@5.88.1): + resolution: {integrity: sha512-+s5gpTJm529AUJ80tOu0/JlspyT/keqK7BGOwj7wT6I6uVl9jKInmVowtiDX/LGL57z5J7PmZPO5L30fPuGQZw==} peerDependencies: react-refresh: '>=0.10.0 <1.0.0' peerDependenciesMeta: react-refresh: optional: true dependencies: - '@rspack/plugin-react-refresh': 0.3.4-canary-9d910ae-20230918010610(react-refresh@0.14.0)(webpack@5.88.1) + '@rspack/plugin-react-refresh': 0.3.4(react-refresh@0.14.0)(webpack@5.88.1) react-refresh: 0.14.0 transitivePeerDependencies: - '@types/webpack' @@ -14449,15 +14449,15 @@ packages: - webpack-plugin-serve dev: false - /@rspack/plugin-html@0.3.4-canary-9d910ae-20230918010610(@rspack/core@0.3.4-canary-9d910ae-20230918010610): - resolution: {integrity: sha512-HbQ1TOfq2zhcTr2XBtMO7ruIRWR6PmbgRtIHyB1kR7tWI2G+EVPXoukXmtt4hcZnj22RrjJRYPygPFHoJ3+3eQ==} + /@rspack/plugin-html@0.3.4(@rspack/core@0.3.4): + resolution: {integrity: sha512-wvg/YHz3IRloOVYdXGG1PXI/tgfzfivlSi5pT36Opp3+wRDMc7s+Qt0V2gK20BojC5hXI+R3zwB8wld3OS+Fow==} peerDependencies: - '@rspack/core': 0.3.4-canary-9d910ae-20230918010610 + '@rspack/core': 0.3.4 peerDependenciesMeta: '@rspack/core': optional: true dependencies: - '@rspack/core': 0.3.4-canary-9d910ae-20230918010610 + '@rspack/core': 0.3.4 '@types/html-minifier-terser': 7.0.0 html-minifier-terser: 7.0.0 lodash.template: 4.5.0 @@ -14465,8 +14465,8 @@ packages: tapable: 2.2.1 dev: false - /@rspack/plugin-react-refresh@0.3.4-canary-9d910ae-20230918010610(react-refresh@0.14.0)(webpack@5.88.1): - resolution: {integrity: sha512-9OJct74th+C1CXP9+SmEfhxo+qwHA5omX7CHTagoRH57X09GymXETbE4QAKmTYoTQPPG0pBr3sHn9VQxDUVf5w==} + /@rspack/plugin-react-refresh@0.3.4(react-refresh@0.14.0)(webpack@5.88.1): + resolution: {integrity: sha512-4SJlntJg2RSfTzf9/s4zXDqZzINzit134N9QhVKdm+FoJsJOD5KF3a20fMqhuI1NGtuuT3tZ7kCRNi05fC9XNw==} peerDependencies: react-refresh: '>=0.10.0 <1.0.0' peerDependenciesMeta: diff --git a/tests/utils/applyBaseConfig.ts b/tests/utils/applyBaseConfig.ts index ca75d714278a..cd6ff3faa2e4 100644 --- a/tests/utils/applyBaseConfig.ts +++ b/tests/utils/applyBaseConfig.ts @@ -15,7 +15,14 @@ export const applyBaseConfig = ( polyfill: 'off', disableTsChecker: true, }, - plugins: [appTools({ bundler: 'experimental-rspack' })], + plugins: [ + appTools({ + bundler: + process.env.BUNDLER === 'webpack' + ? 'webpack' + : 'experimental-rspack', + }), + ], }, config, ]);