diff --git a/.vitrine-hooks/pre-merge-commit b/.vitrine-hooks/pre-merge-commit new file mode 100755 index 000000000..946d5cbb7 --- /dev/null +++ b/.vitrine-hooks/pre-merge-commit @@ -0,0 +1,3 @@ +#!/bin/sh +echo "error: merge is not allowed in task worktrees" >&2 +exit 1 diff --git a/.yarn/cache/@emnapi-core-npm-1.10.0-e5e48f37ba-d32f386084.zip b/.yarn/cache/@emnapi-core-npm-1.10.0-e5e48f37ba-d32f386084.zip new file mode 100644 index 000000000..1e9dc131c Binary files /dev/null and b/.yarn/cache/@emnapi-core-npm-1.10.0-e5e48f37ba-d32f386084.zip differ diff --git a/.yarn/cache/@emnapi-core-npm-1.4.5-ec124a1813-412322102d.zip b/.yarn/cache/@emnapi-core-npm-1.4.5-ec124a1813-412322102d.zip deleted file mode 100644 index 11e70eae3..000000000 Binary files a/.yarn/cache/@emnapi-core-npm-1.4.5-ec124a1813-412322102d.zip and /dev/null differ diff --git a/.yarn/cache/@emnapi-runtime-npm-1.10.0-4648518988-d21083d07f.zip b/.yarn/cache/@emnapi-runtime-npm-1.10.0-4648518988-d21083d07f.zip new file mode 100644 index 000000000..5a9a47fda Binary files /dev/null and b/.yarn/cache/@emnapi-runtime-npm-1.10.0-4648518988-d21083d07f.zip differ diff --git a/.yarn/cache/@emnapi-runtime-npm-1.4.5-3b801be1ae-1d6f406ff1.zip b/.yarn/cache/@emnapi-runtime-npm-1.4.5-3b801be1ae-1d6f406ff1.zip deleted file mode 100644 index 893ed3387..000000000 Binary files a/.yarn/cache/@emnapi-runtime-npm-1.4.5-3b801be1ae-1d6f406ff1.zip and /dev/null differ diff --git a/.yarn/cache/@emnapi-wasi-threads-npm-1.0.4-ac6c94b37b-86688f4160.zip b/.yarn/cache/@emnapi-wasi-threads-npm-1.0.4-ac6c94b37b-86688f4160.zip deleted file mode 100644 index a425bfcc2..000000000 Binary files a/.yarn/cache/@emnapi-wasi-threads-npm-1.0.4-ac6c94b37b-86688f4160.zip and /dev/null differ diff --git a/.yarn/cache/@emnapi-wasi-threads-npm-1.2.1-8626cfd5d3-57cd4292be.zip b/.yarn/cache/@emnapi-wasi-threads-npm-1.2.1-8626cfd5d3-57cd4292be.zip new file mode 100644 index 000000000..92d5d0f81 Binary files /dev/null and b/.yarn/cache/@emnapi-wasi-threads-npm-1.2.1-8626cfd5d3-57cd4292be.zip differ diff --git a/.yarn/cache/@module-federation-error-codes-npm-0.17.0-d14ba3b686-24fc014773.zip b/.yarn/cache/@module-federation-error-codes-npm-0.17.0-d14ba3b686-24fc014773.zip deleted file mode 100644 index 62c837569..000000000 Binary files a/.yarn/cache/@module-federation-error-codes-npm-0.17.0-d14ba3b686-24fc014773.zip and /dev/null differ diff --git a/.yarn/cache/@module-federation-runtime-core-npm-0.17.0-62091e644b-0378bb5b40.zip b/.yarn/cache/@module-federation-runtime-core-npm-0.17.0-62091e644b-0378bb5b40.zip deleted file mode 100644 index cc19d76f5..000000000 Binary files a/.yarn/cache/@module-federation-runtime-core-npm-0.17.0-62091e644b-0378bb5b40.zip and /dev/null differ diff --git a/.yarn/cache/@module-federation-runtime-npm-0.17.0-f55807e762-442ac33131.zip b/.yarn/cache/@module-federation-runtime-npm-0.17.0-f55807e762-442ac33131.zip deleted file mode 100644 index 93b7dc99d..000000000 Binary files a/.yarn/cache/@module-federation-runtime-npm-0.17.0-f55807e762-442ac33131.zip and /dev/null differ diff --git a/.yarn/cache/@module-federation-runtime-tools-npm-0.17.0-568c21a1ba-330b145a37.zip b/.yarn/cache/@module-federation-runtime-tools-npm-0.17.0-568c21a1ba-330b145a37.zip deleted file mode 100644 index dac3e8935..000000000 Binary files a/.yarn/cache/@module-federation-runtime-tools-npm-0.17.0-568c21a1ba-330b145a37.zip and /dev/null differ diff --git a/.yarn/cache/@module-federation-sdk-npm-0.17.0-a99f6584d5-fec4e42439.zip b/.yarn/cache/@module-federation-sdk-npm-0.17.0-a99f6584d5-fec4e42439.zip deleted file mode 100644 index bfddbff1a..000000000 Binary files a/.yarn/cache/@module-federation-sdk-npm-0.17.0-a99f6584d5-fec4e42439.zip and /dev/null differ diff --git a/.yarn/cache/@module-federation-webpack-bundler-runtime-npm-0.17.0-5c944fec12-ce3e9dd45a.zip b/.yarn/cache/@module-federation-webpack-bundler-runtime-npm-0.17.0-5c944fec12-ce3e9dd45a.zip deleted file mode 100644 index 0bbf6f8de..000000000 Binary files a/.yarn/cache/@module-federation-webpack-bundler-runtime-npm-0.17.0-5c944fec12-ce3e9dd45a.zip and /dev/null differ diff --git a/.yarn/cache/@napi-rs-wasm-runtime-npm-1.0.1-7d235277fa-8ed2a1f124.zip b/.yarn/cache/@napi-rs-wasm-runtime-npm-1.0.1-7d235277fa-8ed2a1f124.zip deleted file mode 100644 index 51db92733..000000000 Binary files a/.yarn/cache/@napi-rs-wasm-runtime-npm-1.0.1-7d235277fa-8ed2a1f124.zip and /dev/null differ diff --git a/.yarn/cache/@napi-rs-wasm-runtime-npm-1.1.4-53a1e4ec11-1db3dc7eeb.zip b/.yarn/cache/@napi-rs-wasm-runtime-npm-1.1.4-53a1e4ec11-1db3dc7eeb.zip new file mode 100644 index 000000000..a60cb2a00 Binary files /dev/null and b/.yarn/cache/@napi-rs-wasm-runtime-npm-1.1.4-53a1e4ec11-1db3dc7eeb.zip differ diff --git a/.yarn/cache/@rspack-binding-darwin-x64-npm-1.4.9-a6721e6e17-10.zip b/.yarn/cache/@rspack-binding-darwin-arm64-npm-2.0.8-2c7653370c-10.zip similarity index 58% rename from .yarn/cache/@rspack-binding-darwin-x64-npm-1.4.9-a6721e6e17-10.zip rename to .yarn/cache/@rspack-binding-darwin-arm64-npm-2.0.8-2c7653370c-10.zip index 37fe98d57..85555b5e9 100644 Binary files a/.yarn/cache/@rspack-binding-darwin-x64-npm-1.4.9-a6721e6e17-10.zip and b/.yarn/cache/@rspack-binding-darwin-arm64-npm-2.0.8-2c7653370c-10.zip differ diff --git a/.yarn/cache/@rspack-binding-linux-arm64-gnu-npm-1.4.9-20f0084d99-10.zip b/.yarn/cache/@rspack-binding-darwin-x64-npm-2.0.8-b938dd84f4-10.zip similarity index 65% rename from .yarn/cache/@rspack-binding-linux-arm64-gnu-npm-1.4.9-20f0084d99-10.zip rename to .yarn/cache/@rspack-binding-darwin-x64-npm-2.0.8-b938dd84f4-10.zip index f27da5072..94aae0b05 100644 Binary files a/.yarn/cache/@rspack-binding-linux-arm64-gnu-npm-1.4.9-20f0084d99-10.zip and b/.yarn/cache/@rspack-binding-darwin-x64-npm-2.0.8-b938dd84f4-10.zip differ diff --git a/.yarn/cache/@rspack-binding-linux-x64-gnu-npm-1.4.9-8d6dfd3b56-10.zip b/.yarn/cache/@rspack-binding-linux-arm64-gnu-npm-2.0.8-311b702ee2-10.zip similarity index 60% rename from .yarn/cache/@rspack-binding-linux-x64-gnu-npm-1.4.9-8d6dfd3b56-10.zip rename to .yarn/cache/@rspack-binding-linux-arm64-gnu-npm-2.0.8-311b702ee2-10.zip index 57d158e40..47b233ea7 100644 Binary files a/.yarn/cache/@rspack-binding-linux-x64-gnu-npm-1.4.9-8d6dfd3b56-10.zip and b/.yarn/cache/@rspack-binding-linux-arm64-gnu-npm-2.0.8-311b702ee2-10.zip differ diff --git a/.yarn/cache/@rspack-binding-darwin-arm64-npm-1.4.9-02b139ea2a-10.zip b/.yarn/cache/@rspack-binding-linux-x64-gnu-npm-2.0.8-35fcd46f51-10.zip similarity index 64% rename from .yarn/cache/@rspack-binding-darwin-arm64-npm-1.4.9-02b139ea2a-10.zip rename to .yarn/cache/@rspack-binding-linux-x64-gnu-npm-2.0.8-35fcd46f51-10.zip index 8c1c05994..6b15fdc76 100644 Binary files a/.yarn/cache/@rspack-binding-darwin-arm64-npm-1.4.9-02b139ea2a-10.zip and b/.yarn/cache/@rspack-binding-linux-x64-gnu-npm-2.0.8-35fcd46f51-10.zip differ diff --git a/.yarn/cache/@rspack-binding-npm-1.4.9-4253cfc345-e2b8dc00bb.zip b/.yarn/cache/@rspack-binding-npm-1.4.9-4253cfc345-e2b8dc00bb.zip deleted file mode 100644 index 89ba22446..000000000 Binary files a/.yarn/cache/@rspack-binding-npm-1.4.9-4253cfc345-e2b8dc00bb.zip and /dev/null differ diff --git a/.yarn/cache/@rspack-binding-npm-2.0.8-7aa585d6b0-aface75866.zip b/.yarn/cache/@rspack-binding-npm-2.0.8-7aa585d6b0-aface75866.zip new file mode 100644 index 000000000..5bae13ba8 Binary files /dev/null and b/.yarn/cache/@rspack-binding-npm-2.0.8-7aa585d6b0-aface75866.zip differ diff --git a/.yarn/cache/@rspack-core-npm-1.4.9-674cfa0952-06f7dbd327.zip b/.yarn/cache/@rspack-core-npm-1.4.9-674cfa0952-06f7dbd327.zip deleted file mode 100644 index 6866d7860..000000000 Binary files a/.yarn/cache/@rspack-core-npm-1.4.9-674cfa0952-06f7dbd327.zip and /dev/null differ diff --git a/.yarn/cache/@rspack-core-npm-2.0.8-043c62071f-93e34b878d.zip b/.yarn/cache/@rspack-core-npm-2.0.8-043c62071f-93e34b878d.zip new file mode 100644 index 000000000..f8a4fd239 Binary files /dev/null and b/.yarn/cache/@rspack-core-npm-2.0.8-043c62071f-93e34b878d.zip differ diff --git a/.yarn/cache/@rspack-lite-tapable-npm-1.0.1-a0c24b9689-240b783296.zip b/.yarn/cache/@rspack-lite-tapable-npm-1.0.1-a0c24b9689-240b783296.zip deleted file mode 100644 index 9142b76da..000000000 Binary files a/.yarn/cache/@rspack-lite-tapable-npm-1.0.1-a0c24b9689-240b783296.zip and /dev/null differ diff --git a/.yarn/cache/@tybys-wasm-util-npm-0.10.0-5601bb24f9-779d047a77.zip b/.yarn/cache/@tybys-wasm-util-npm-0.10.0-5601bb24f9-779d047a77.zip deleted file mode 100644 index 7704fff6d..000000000 Binary files a/.yarn/cache/@tybys-wasm-util-npm-0.10.0-5601bb24f9-779d047a77.zip and /dev/null differ diff --git a/.yarn/cache/@tybys-wasm-util-npm-0.10.2-18d4347432-d12f1dafe1.zip b/.yarn/cache/@tybys-wasm-util-npm-0.10.2-18d4347432-d12f1dafe1.zip new file mode 100644 index 000000000..8e0aeae51 Binary files /dev/null and b/.yarn/cache/@tybys-wasm-util-npm-0.10.2-18d4347432-d12f1dafe1.zip differ diff --git a/LICENSES-3rdparty.csv b/LICENSES-3rdparty.csv index b49ace056..5fc4e89ae 100644 --- a/LICENSES-3rdparty.csv +++ b/LICENSES-3rdparty.csv @@ -168,12 +168,6 @@ Component,Origin,Licence,Copyright @jridgewell/trace-mapping,npm,MIT,Justin Ridgewell (https://github.com/jridgewell/sourcemaps/tree/main/packages/trace-mapping) @kwsites/file-exists,npm,MIT,Steve King (https://www.npmjs.com/package/@kwsites/file-exists) @kwsites/promise-deferred,npm,MIT,Steve King (https://www.npmjs.com/package/@kwsites/promise-deferred) -@module-federation/error-codes,npm,MIT,zhanghang (https://www.npmjs.com/package/@module-federation/error-codes) -@module-federation/runtime,npm,MIT,zhouxiao (https://www.npmjs.com/package/@module-federation/runtime) -@module-federation/runtime-core,npm,MIT,zhouxiao (https://www.npmjs.com/package/@module-federation/runtime-core) -@module-federation/runtime-tools,npm,MIT,zhanghang (https://www.npmjs.com/package/@module-federation/runtime-tools) -@module-federation/sdk,npm,MIT,zhanghang (https://www.npmjs.com/package/@module-federation/sdk) -@module-federation/webpack-bundler-runtime,npm,MIT,zhanghang (https://www.npmjs.com/package/@module-federation/webpack-bundler-runtime) @mswjs/interceptors,npm,MIT,Artem Zakharchenko (https://www.npmjs.com/package/@mswjs/interceptors) @nodelib/fs.scandir,npm,MIT,(https://www.npmjs.com/package/@nodelib/fs.scandir) @nodelib/fs.stat,npm,MIT,(https://www.npmjs.com/package/@nodelib/fs.stat) @@ -198,7 +192,6 @@ Component,Origin,Licence,Copyright @rspack/binding-darwin-arm64,npm,MIT,(https://rspack.rs) @rspack/binding-darwin-x64,npm,MIT,(https://rspack.rs) @rspack/core,virtual,MIT,(https://rspack.rs) -@rspack/lite-tapable,npm,MIT,(https://www.npmjs.com/package/@rspack/lite-tapable) @samverschueren/stream-to-observable,virtual,MIT,(https://www.npmjs.com/package/@samverschueren/stream-to-observable) @simple-git/args-pathspec,npm,MIT,(https://www.npmjs.com/package/@simple-git/args-pathspec) @simple-git/argv-parser,npm,MIT,(https://www.npmjs.com/package/@simple-git/argv-parser) diff --git a/packages/published/rspack-plugin/package.json b/packages/published/rspack-plugin/package.json index 0b9f54888..4b271608d 100644 --- a/packages/published/rspack-plugin/package.json +++ b/packages/published/rspack-plugin/package.json @@ -88,7 +88,7 @@ "@babel/parser": "^7.24.5", "@babel/traverse": "^7.24.5", "@babel/types": "^7.24.5", - "@rspack/core": "1.x", + "@rspack/core": "1.x || 2.x", "magic-string": "^0.30.0" }, "peerDependenciesMeta": { diff --git a/packages/tests/jest.config.ts b/packages/tests/jest.config.ts index f50b0576b..7960a9ea3 100644 --- a/packages/tests/jest.config.ts +++ b/packages/tests/jest.config.ts @@ -12,6 +12,9 @@ const config: JestConfigWithTsJest = { clearMocks: true, globalSetup: '/src/_jest/globalSetup.ts', roots: ['/../'], + // @rspack/core v2 is pure ESM; use a custom resolver to load it via a .cjs shim + // so Jest's CJS mode can require() it without triggering ERR_REQUIRE_ESM. + resolver: '/src/_jest/rspack-jest-resolver.cjs', setupFilesAfterEnv: ['/src/_jest/setupAfterEnv.ts'], testEnvironment: 'node', testMatch: ['**/*.test.*'], diff --git a/packages/tests/package.json b/packages/tests/package.json index e4c6ec842..77116bb52 100644 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -48,7 +48,7 @@ "ts-jest": "29.4.0" }, "devDependencies": { - "@rspack/core": "1.4.9", + "@rspack/core": "2.0.8", "@types/faker": "5.5.9", "@types/jest": "^29", "@types/node": "^20", diff --git a/packages/tests/src/_jest/rspack-cjs-shim.cjs b/packages/tests/src/_jest/rspack-cjs-shim.cjs new file mode 100644 index 000000000..d69622645 --- /dev/null +++ b/packages/tests/src/_jest/rspack-cjs-shim.cjs @@ -0,0 +1,26 @@ +/** + * CJS shim for @rspack/core v2 (which is pure ESM). + * + * @rspack/core v2 is a pure ESM package. Jest's CJS module runtime cannot + * require() it directly when --experimental-vm-modules is active (because + * shouldLoadAsEsm() returns true for packages with "type":"module", causing + * Jest to throw ERR_REQUIRE_ESM before reaching its transformer). + * + * This shim is resolved by the Jest custom resolver (rspack-jest-resolver.cjs) + * for any require('@rspack/core') call. It re-exports rspack using Node's + * createRequire(), which bypasses Jest's module interception entirely and + * uses Node's native loader that supports require(esm) in Node >=20.17. + * + * The shim file uses the .cjs extension so that shouldLoadAsEsm() returns + * false unconditionally, bypassing the ESM guard in Jest's requireModule(). + */ + +const { createRequire } = require('module'); + +// Create a require function anchored to this file's location. +// Unlike module.require (which Jest patches), createRequire() returns Node's +// native loader function, allowing it to load ESM packages via require(esm). +const nativeRequire = createRequire(__filename); +const rspack = nativeRequire('@rspack/core'); + +module.exports = rspack; diff --git a/packages/tests/src/_jest/rspack-jest-resolver.cjs b/packages/tests/src/_jest/rspack-jest-resolver.cjs new file mode 100644 index 000000000..6e3f9ba48 --- /dev/null +++ b/packages/tests/src/_jest/rspack-jest-resolver.cjs @@ -0,0 +1,23 @@ +/** + * Custom Jest resolver that maps @rspack/core to a CJS-compatible shim. + * + * @rspack/core v2 is a pure ESM package. Jest's CJS module runtime cannot + * require() it directly when --experimental-vm-modules is active (because + * shouldLoadAsEsm() returns true for packages with "type":"module", causing + * Jest to throw ERR_REQUIRE_ESM before reaching its transformer). + * + * This resolver intercepts require('@rspack/core') and returns the path to + * rspack-cjs-shim.cjs instead. The .cjs extension makes shouldLoadAsEsm() + * return false unconditionally, allowing Jest to load the module normally. + * The shim itself uses Node's native Module._load to load the real rspack + * (Node >=20.17 supports require(esm) natively). + */ + +const path = require('path'); + +module.exports = (request, options) => { + if (request === '@rspack/core') { + return path.resolve(__dirname, 'rspack-cjs-shim.cjs'); + } + return options.defaultResolver(request, options); +}; diff --git a/packages/tools/package.json b/packages/tools/package.json index e2724f687..e4eca7e1f 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -48,7 +48,7 @@ "@inquirer/select": "2.3.3", "@rollup/plugin-commonjs": "28.0.1", "@rollup/plugin-node-resolve": "15.3.0", - "@rspack/core": "1.4.9", + "@rspack/core": "2.0.8", "chalk": "2.3.1", "clipanion": "4.0.0-rc.3", "esbuild": "0.25.8", diff --git a/packages/tools/src/bundlers.ts b/packages/tools/src/bundlers.ts index 98a0cd72d..207599769 100644 --- a/packages/tools/src/bundlers.ts +++ b/packages/tools/src/bundlers.ts @@ -194,9 +194,6 @@ export const configXpack = (config: BundlerConfig): Configuration & RspackOption const baseConfig: Configuration & RspackOptions = { context: config.workingDir, entry, - experiments: { - css: true, - }, mode: 'none', output: { path: config.outDir, @@ -226,7 +223,11 @@ export const configXpack = (config: BundlerConfig): Configuration & RspackOption extensions: ['.tsx', '.ts', '.js'], }; baseConfig.module = { - rules: [{ test: /\.([cm]?ts|tsx)$/, loader: 'ts-loader' }], + rules: [ + { test: /\.([cm]?ts|tsx)$/, loader: 'ts-loader' }, + // rspack v2 requires explicit CSS type rule (experiments.css was removed) + { test: /\.css$/, type: 'css' }, + ], }; return baseConfig; diff --git a/yarn.lock b/yarn.lock index 495ca9fae..5cf4e7774 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1830,7 +1830,7 @@ __metadata: "@babel/parser": ^7.24.5 "@babel/traverse": ^7.24.5 "@babel/types": ^7.24.5 - "@rspack/core": 1.x + "@rspack/core": 1.x || 2.x magic-string: ^0.30.0 peerDependenciesMeta: "@babel/parser": @@ -2200,7 +2200,7 @@ __metadata: "@playwright/test": "npm:1.49.1" "@rollup/plugin-commonjs": "npm:28.0.1" "@rollup/plugin-typescript": "npm:12.1.4" - "@rspack/core": "npm:1.4.9" + "@rspack/core": "npm:2.0.8" "@types/faker": "npm:5.5.9" "@types/jest": "npm:^29" "@types/node": "npm:^20" @@ -2242,7 +2242,7 @@ __metadata: "@rollup/plugin-commonjs": "npm:28.0.1" "@rollup/plugin-esm-shim": "npm:0.1.8" "@rollup/plugin-node-resolve": "npm:15.3.0" - "@rspack/core": "npm:1.4.9" + "@rspack/core": "npm:2.0.8" "@types/chalk": "npm:2.2.0" "@types/lodash.template": "npm:^4" "@types/node": "npm:^20" @@ -2261,6 +2261,16 @@ __metadata: languageName: unknown linkType: soft +"@emnapi/core@npm:1.10.0": + version: 1.10.0 + resolution: "@emnapi/core@npm:1.10.0" + dependencies: + "@emnapi/wasi-threads": "npm:1.2.1" + tslib: "npm:^2.4.0" + checksum: 10/d32f386084e64deaf2609aabb8295d1ad5af6144d0f46d2060b76cc53f1f3b486df54bec9b0f33c37d85a3822e1193ebcd4e3deb4a5f0e4cd650aa2ffc631715 + languageName: node + linkType: hard + "@emnapi/core@npm:^1.4.3": version: 1.4.3 resolution: "@emnapi/core@npm:1.4.3" @@ -2271,13 +2281,12 @@ __metadata: languageName: node linkType: hard -"@emnapi/core@npm:^1.4.5": - version: 1.4.5 - resolution: "@emnapi/core@npm:1.4.5" +"@emnapi/runtime@npm:1.10.0": + version: 1.10.0 + resolution: "@emnapi/runtime@npm:1.10.0" dependencies: - "@emnapi/wasi-threads": "npm:1.0.4" tslib: "npm:^2.4.0" - checksum: 10/412322102dc861e8aa78123ae20560ac980362a220c736fe59ddea3228d490757780ea4cdc3bd54903a5ca2a92085f119e42f2c07f60e2aec2c0b8a69ea094c0 + checksum: 10/d21083d07fa0c2da171c142e78ef986b66b07d45b06accc0bcaf49fcc61bb4dbc10e1c1760813070165b9f49b054376a931045347f21c0f42ff1eb2d2040faac languageName: node linkType: hard @@ -2290,15 +2299,6 @@ __metadata: languageName: node linkType: hard -"@emnapi/runtime@npm:^1.4.5": - version: 1.4.5 - resolution: "@emnapi/runtime@npm:1.4.5" - dependencies: - tslib: "npm:^2.4.0" - checksum: 10/1d6f406ff116d2363e60aef3ed49eb8d577387f4941abea508ba376900d8831609d5cce92a58076b1a9613f8e83c75c2e3fea71e4fbcdbe06019876144c2559b - languageName: node - linkType: hard - "@emnapi/wasi-threads@npm:1.0.2": version: 1.0.2 resolution: "@emnapi/wasi-threads@npm:1.0.2" @@ -2308,12 +2308,12 @@ __metadata: languageName: node linkType: hard -"@emnapi/wasi-threads@npm:1.0.4": - version: 1.0.4 - resolution: "@emnapi/wasi-threads@npm:1.0.4" +"@emnapi/wasi-threads@npm:1.2.1": + version: 1.2.1 + resolution: "@emnapi/wasi-threads@npm:1.2.1" dependencies: tslib: "npm:^2.4.0" - checksum: 10/86688f416095b59d8d3e5ea2d8b5574a7c180257fe0c067c7a492f3de2cf5ebc2c8b00af17d6341c7555c614266d3987f332015d7ce6e88b234a9a314e66f396 + checksum: 10/57cd4292be81c05d26aa886d68a9e4c449ff666e8503fed6463dfc6b64a4e4213f03c152d53296b7cda32840271e38cd33347332070658f01befeb9bf4e59f36 languageName: node linkType: hard @@ -3258,61 +3258,6 @@ __metadata: languageName: node linkType: hard -"@module-federation/error-codes@npm:0.17.0": - version: 0.17.0 - resolution: "@module-federation/error-codes@npm:0.17.0" - checksum: 10/24fc0147737415b1834a612911bd31bab682a1b165c3ea588fa2a9c3052bbbd26609be59c4ec67d902253a791a57fe1b1dcfa2a9964c9dd91bc97ac91b6d6f5d - languageName: node - linkType: hard - -"@module-federation/runtime-core@npm:0.17.0": - version: 0.17.0 - resolution: "@module-federation/runtime-core@npm:0.17.0" - dependencies: - "@module-federation/error-codes": "npm:0.17.0" - "@module-federation/sdk": "npm:0.17.0" - checksum: 10/0378bb5b4080f9c7ddbcaff7b2259f7e3630cc2cebb41a667d5d3db6cf6c81a7ad3c7c089a99065e4c99e3b04ae29e6fc1715cb7c50c9d515ed31d7b9cf74cf4 - languageName: node - linkType: hard - -"@module-federation/runtime-tools@npm:0.17.0": - version: 0.17.0 - resolution: "@module-federation/runtime-tools@npm:0.17.0" - dependencies: - "@module-federation/runtime": "npm:0.17.0" - "@module-federation/webpack-bundler-runtime": "npm:0.17.0" - checksum: 10/330b145a37065d0fd99445e7dbd745b6dee4d739b54547bbd9c5cacd83cbbd4ab4ae0d0c1ffd3bc27370e917bae491176b78fd10002b3112f4b2e05c7c36db11 - languageName: node - linkType: hard - -"@module-federation/runtime@npm:0.17.0": - version: 0.17.0 - resolution: "@module-federation/runtime@npm:0.17.0" - dependencies: - "@module-federation/error-codes": "npm:0.17.0" - "@module-federation/runtime-core": "npm:0.17.0" - "@module-federation/sdk": "npm:0.17.0" - checksum: 10/442ac331316d727db2fcfe68017f10fefb550234213f68053b9080cb0538e578e8ee32e75a9233af61cbd785cb40325556ebc13952e14fe61bd328da75dcfbb3 - languageName: node - linkType: hard - -"@module-federation/sdk@npm:0.17.0": - version: 0.17.0 - resolution: "@module-federation/sdk@npm:0.17.0" - checksum: 10/fec4e4243953274368ae16d668cd7fba9bbc01c7e38954f2a8e1261dd6159828ba3471c1a160092dde86ebe32a5d824abe75d1645f0155b2127a9f50518e7b40 - languageName: node - linkType: hard - -"@module-federation/webpack-bundler-runtime@npm:0.17.0": - version: 0.17.0 - resolution: "@module-federation/webpack-bundler-runtime@npm:0.17.0" - dependencies: - "@module-federation/runtime": "npm:0.17.0" - "@module-federation/sdk": "npm:0.17.0" - checksum: 10/ce3e9dd45a16fb62f1645105cce6d19f1f62a2b68c65c8835f69bf9a2729cebac23d8a9b046c5ea53e974d2df025011e746ab95e0086237d24124bddd78cb40c - languageName: node - linkType: hard - "@mswjs/interceptors@npm:^0.37.3": version: 0.37.6 resolution: "@mswjs/interceptors@npm:0.37.6" @@ -3327,6 +3272,18 @@ __metadata: languageName: node linkType: hard +"@napi-rs/wasm-runtime@npm:1.1.4": + version: 1.1.4 + resolution: "@napi-rs/wasm-runtime@npm:1.1.4" + dependencies: + "@tybys/wasm-util": "npm:^0.10.1" + peerDependencies: + "@emnapi/core": ^1.7.1 + "@emnapi/runtime": ^1.7.1 + checksum: 10/1db3dc7eeb981306b09360487bd8ce4dfa5588d273bd8ea9f07dccca1b4ade57b675414180fc9bb66966c6c50b17208b0263194993e2f7f92cc7af28bda4d1af + languageName: node + linkType: hard + "@napi-rs/wasm-runtime@npm:^0.2.11": version: 0.2.11 resolution: "@napi-rs/wasm-runtime@npm:0.2.11" @@ -3338,17 +3295,6 @@ __metadata: languageName: node linkType: hard -"@napi-rs/wasm-runtime@npm:^1.0.1": - version: 1.0.1 - resolution: "@napi-rs/wasm-runtime@npm:1.0.1" - dependencies: - "@emnapi/core": "npm:^1.4.5" - "@emnapi/runtime": "npm:^1.4.5" - "@tybys/wasm-util": "npm:^0.10.0" - checksum: 10/8ed2a1f1246ecbef04b73e06c994f635ebb8c7b929620f28859c49cb7e373adee4fd1b9529bab286171c0ef0f668331d683bcf30ab193e5bf05a04b4e07cd56a - languageName: node - linkType: hard - "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -3725,92 +3671,94 @@ __metadata: languageName: node linkType: hard -"@rspack/binding-darwin-arm64@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-darwin-arm64@npm:1.4.9" +"@rspack/binding-darwin-arm64@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-darwin-arm64@npm:2.0.8" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rspack/binding-darwin-x64@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-darwin-x64@npm:1.4.9" +"@rspack/binding-darwin-x64@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-darwin-x64@npm:2.0.8" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rspack/binding-linux-arm64-gnu@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-linux-arm64-gnu@npm:1.4.9" +"@rspack/binding-linux-arm64-gnu@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-linux-arm64-gnu@npm:2.0.8" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rspack/binding-linux-arm64-musl@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-linux-arm64-musl@npm:1.4.9" +"@rspack/binding-linux-arm64-musl@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-linux-arm64-musl@npm:2.0.8" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rspack/binding-linux-x64-gnu@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-linux-x64-gnu@npm:1.4.9" +"@rspack/binding-linux-x64-gnu@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-linux-x64-gnu@npm:2.0.8" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rspack/binding-linux-x64-musl@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-linux-x64-musl@npm:1.4.9" +"@rspack/binding-linux-x64-musl@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-linux-x64-musl@npm:2.0.8" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rspack/binding-wasm32-wasi@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-wasm32-wasi@npm:1.4.9" +"@rspack/binding-wasm32-wasi@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-wasm32-wasi@npm:2.0.8" dependencies: - "@napi-rs/wasm-runtime": "npm:^1.0.1" + "@emnapi/core": "npm:1.10.0" + "@emnapi/runtime": "npm:1.10.0" + "@napi-rs/wasm-runtime": "npm:1.1.4" conditions: cpu=wasm32 languageName: node linkType: hard -"@rspack/binding-win32-arm64-msvc@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-win32-arm64-msvc@npm:1.4.9" +"@rspack/binding-win32-arm64-msvc@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-win32-arm64-msvc@npm:2.0.8" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rspack/binding-win32-ia32-msvc@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-win32-ia32-msvc@npm:1.4.9" +"@rspack/binding-win32-ia32-msvc@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-win32-ia32-msvc@npm:2.0.8" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@rspack/binding-win32-x64-msvc@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding-win32-x64-msvc@npm:1.4.9" +"@rspack/binding-win32-x64-msvc@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding-win32-x64-msvc@npm:2.0.8" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@rspack/binding@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/binding@npm:1.4.9" - dependencies: - "@rspack/binding-darwin-arm64": "npm:1.4.9" - "@rspack/binding-darwin-x64": "npm:1.4.9" - "@rspack/binding-linux-arm64-gnu": "npm:1.4.9" - "@rspack/binding-linux-arm64-musl": "npm:1.4.9" - "@rspack/binding-linux-x64-gnu": "npm:1.4.9" - "@rspack/binding-linux-x64-musl": "npm:1.4.9" - "@rspack/binding-wasm32-wasi": "npm:1.4.9" - "@rspack/binding-win32-arm64-msvc": "npm:1.4.9" - "@rspack/binding-win32-ia32-msvc": "npm:1.4.9" - "@rspack/binding-win32-x64-msvc": "npm:1.4.9" +"@rspack/binding@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/binding@npm:2.0.8" + dependencies: + "@rspack/binding-darwin-arm64": "npm:2.0.8" + "@rspack/binding-darwin-x64": "npm:2.0.8" + "@rspack/binding-linux-arm64-gnu": "npm:2.0.8" + "@rspack/binding-linux-arm64-musl": "npm:2.0.8" + "@rspack/binding-linux-x64-gnu": "npm:2.0.8" + "@rspack/binding-linux-x64-musl": "npm:2.0.8" + "@rspack/binding-wasm32-wasi": "npm:2.0.8" + "@rspack/binding-win32-arm64-msvc": "npm:2.0.8" + "@rspack/binding-win32-ia32-msvc": "npm:2.0.8" + "@rspack/binding-win32-x64-msvc": "npm:2.0.8" dependenciesMeta: "@rspack/binding-darwin-arm64": optional: true @@ -3832,30 +3780,24 @@ __metadata: optional: true "@rspack/binding-win32-x64-msvc": optional: true - checksum: 10/e2b8dc00bba74a2f3ac494aadeb766f675f03ce423b2bbba48d49966e62da83593aa65b172d2a4a8dffe48526d598ea6569d8cce942f541a2ce3af6abf2a9565 + checksum: 10/aface75866ff0bcd4934fda26e856e8de63e710a1489e654f1c6e5108d6ca46d2183b01aad2a76db1511e99843522272882ece53c2a4cf9fbfe0ac5ab5bcd5c2 languageName: node linkType: hard -"@rspack/core@npm:1.4.9": - version: 1.4.9 - resolution: "@rspack/core@npm:1.4.9" +"@rspack/core@npm:2.0.8": + version: 2.0.8 + resolution: "@rspack/core@npm:2.0.8" dependencies: - "@module-federation/runtime-tools": "npm:0.17.0" - "@rspack/binding": "npm:1.4.9" - "@rspack/lite-tapable": "npm:1.0.1" + "@rspack/binding": "npm:2.0.8" peerDependencies: - "@swc/helpers": ">=0.5.1" + "@module-federation/runtime-tools": ^0.24.1 || ^2.0.0 + "@swc/helpers": ^0.5.23 peerDependenciesMeta: + "@module-federation/runtime-tools": + optional: true "@swc/helpers": optional: true - checksum: 10/06f7dbd3270eae75380ed49e022912c6e0d2089c45105f236a5d83d80f34ee40496734913eb938096fcc0d24b2518f1ab1ee13784d01ba3374c90f47d85339b2 - languageName: node - linkType: hard - -"@rspack/lite-tapable@npm:1.0.1": - version: 1.0.1 - resolution: "@rspack/lite-tapable@npm:1.0.1" - checksum: 10/240b7832965bca5a52d1f03a8539dab5810958ce24b5a670405b2505d81350f10d668f4055648f5918bc18ac033e637bcb7f92189345f0f2f671b546019c2f9e + checksum: 10/93e34b878dbc69c12f9b06909354246597a5c387c5df77f61e56f3a20e2b45434b9fa8734866f4e662ab0e3456064bf8133ae6f58a3afffee5053a27b8395195 languageName: node linkType: hard @@ -3944,12 +3886,12 @@ __metadata: languageName: node linkType: hard -"@tybys/wasm-util@npm:^0.10.0": - version: 0.10.0 - resolution: "@tybys/wasm-util@npm:0.10.0" +"@tybys/wasm-util@npm:^0.10.1": + version: 0.10.2 + resolution: "@tybys/wasm-util@npm:0.10.2" dependencies: tslib: "npm:^2.4.0" - checksum: 10/779d047a77e8a619b6e26b6fe556f413316d846e9a35438668a15510a4d6e7294388c998f65911f6f1a13838745575d7793cb1d27182752f6f95991725b15d45 + checksum: 10/d12f1dafe12d7a573c406b35ffef0038042b9cc9fbcc74d657267eb635499b956276afc05eebdbd81bea582e1c4c921421a1dd7243a93daaa8c8216b19395c23 languageName: node linkType: hard