Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/2.1.3/schema.json",
"$schema": "https://biomejs.dev/schemas/2.2.0/schema.json",
"assist": { "actions": { "source": { "organizeImports": "on" } } },
"vcs": {
"enabled": true,
Expand All @@ -9,7 +9,7 @@
},
"files": {
"ignoreUnknown": true,
"includes": ["**", "!**/*.vue", "!**/dist/**", "!**/dist-types/**"]
"includes": ["**", "!**/*.vue", "!**/dist", "!**/dist-types"]
},
"formatter": {
"indentStyle": "space"
Expand Down
6 changes: 3 additions & 3 deletions e2e/dom/fixtures/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"react-dom": "^19.1.1"
},
"devDependencies": {
"@rsbuild/core": "1.4.15",
"@rsbuild/core": "1.5.0-beta.4",
"@rsbuild/plugin-react": "^1.3.5",
"@testing-library/jest-dom": "^6.6.4",
"@testing-library/jest-dom": "^6.7.0",
"@testing-library/dom": "^10.4.1",
"@testing-library/react": "^16.3.0",
"@types/react": "^19.1.9",
"@types/react": "^19.1.10",
"@types/react-dom": "^19.1.7",
"happy-dom": "^18.0.1",
"jsdom": "^26.1.0",
Expand Down
1 change: 0 additions & 1 deletion e2e/mock/tests/mockRequire.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ it('mocked redux', () => {
const redux = require('redux').default;
redux.isAction('string');
expect(redux.isAction).toHaveBeenCalledWith('string');
// @ts-ignore
expect(redux.mocked).toBe('redux_yes');
});
2 changes: 1 addition & 1 deletion e2e/mock/tests/reduxMocked.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ rs.mock('redux');
it('mocked redux', async () => {
await redux.isAction('string');
expect(redux.isAction).toHaveBeenCalledWith('string');
// @ts-ignore
// @ts-expect-error
expect(redux.mocked).toBe('redux_yes');
});

Expand Down
4 changes: 2 additions & 2 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"typecheck": "tsc --noEmit"
},
"devDependencies": {
"@rsbuild/core": "1.4.15",
"@rslib/core": "0.11.2",
"@rsbuild/core": "1.5.0-beta.4",
"@rslib/core": "0.12.2",
"@rstest/core": "workspace:*",
"@rstest/tsconfig": "workspace:*",
"@types/jest-image-snapshot": "^6.4.0",
Expand Down
2 changes: 1 addition & 1 deletion e2e/ssr/fixtures/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"devDependencies": {
"@rsbuild/plugin-react": "^1.3.5",
"@types/react": "^19.1.9",
"@types/react": "^19.1.10",
"@types/react-dom": "^19.1.7",
"typescript": "^5.9.2"
}
Expand Down
2 changes: 1 addition & 1 deletion e2e/vue/fixtures/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"devDependencies": {
"@rstest/core": "workspace:*",
"@rsbuild/core": "1.4.15",
"@rsbuild/core": "1.5.0-beta.4",
"@rsbuild/plugin-babel": "^1.0.6",
"@rsbuild/plugin-vue": "^1.1.1",
"@rsbuild/plugin-vue-jsx": "^1.1.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"react-dom": "^19.1.1"
},
"devDependencies": {
"@rsbuild/core": "1.4.15",
"@rsbuild/core": "1.5.0-beta.4",
"@rsbuild/plugin-react": "^1.3.5",
"@testing-library/dom": "^10.4.1",
"@testing-library/react": "^16.3.0",
"@types/react": "^19.1.9",
"@types/react": "^19.1.10",
"@types/react-dom": "^19.1.7",
"jsdom": "^26.1.0",
"typescript": "^5.9.2"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"pnpm-lock.yaml": "pnpm dedupe --check"
},
"devDependencies": {
"@biomejs/biome": "^2.1.4",
"@changesets/cli": "^2.29.5",
"@biomejs/biome": "^2.2.0",
"@changesets/cli": "^2.29.6",
"@rsdoctor/rspack-plugin": "^1.2.2",
"@rslint/core": "^0.1.5",
"@rslint/core": "^0.1.11",
"@rstest/core": "workspace:*",
"@types/fs-extra": "^11.0.4",
"@types/node": "^22.13.8",
Expand All @@ -44,7 +44,7 @@
"fs-extra": "^11.3.1",
"heading-case": "^1.0.0",
"nano-staged": "^0.8.0",
"nx": "^21.3.11",
"nx": "^21.4.0",
"path-serializer": "0.5.1",
"prettier": "^3.6.2",
"prettier-plugin-packagejson": "^2.5.19",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/licensePlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { LicenseIdentifiedModule } from 'license-webpack-plugin/dist/Licens

export function licensePlugin() {
const formatLicenseTitle = (module: LicenseIdentifiedModule) => {
// @ts-ignore
// @ts-expect-error
const gitUrl = module.packageJson?.repository?.url;
return `Licensed under ${module.licenseId} license${
gitUrl ? ` in the repository at ${gitUrl}` : ''
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"chai": "^5.2.1",
"@types/chai": "^5.2.2",
"@rsbuild/core": "1.4.15",
"@rsbuild/core": "1.5.0-beta.4",
"birpc": "2.5.0",
"pathe": "^2.0.3",
"std-env": "^3.9.0",
Expand All @@ -62,9 +62,9 @@
"@vitest/expect": "^3.2.4",
"@vitest/snapshot": "^3.2.4",
"@babel/code-frame": "^7.27.1",
"@jridgewell/trace-mapping": "0.3.29",
"@jridgewell/trace-mapping": "0.3.30",
"@microsoft/api-extractor": "^7.52.10",
"@rslib/core": "0.11.2",
"@rslib/core": "0.12.2",
"@rstest/tsconfig": "workspace:*",
"@sinonjs/fake-timers": "^14.0.0",
"@types/babel__code-frame": "^7.0.6",
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/runtime/worker/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ const preparePool = async ({
});

// Reset listeners only when preparePool is called again (running without isolation)
listeners.forEach((fn) => fn());
listeners.forEach((fn) => {
fn();
});
listeners.length = 0;

const unhandledErrors: Error[] = [];
Expand Down
22 changes: 13 additions & 9 deletions packages/core/tests/core/__snapshots__/rsbuild.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
"entry": {},
"experiments": {
"asyncWebAssembly": true,
"inlineEnum": true,
"lazyBarrel": true,
"rspackFuture": {
"bundlerInfo": {
"force": false,
Expand Down Expand Up @@ -169,7 +171,7 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"exportedEnum": true,
"typeExports": true,
},
},
Expand Down Expand Up @@ -223,7 +225,7 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"exportedEnum": true,
"typeExports": true,
},
},
Expand Down Expand Up @@ -358,7 +360,7 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
{
"dependency": "url",
"generator": {
"filename": "static/wasm/[hash].module.wasm",
"filename": "static/wasm/[contenthash:8].module.wasm",
},
"test": /\\\\\\.wasm\\$/,
"type": "asset/resource",
Expand Down Expand Up @@ -414,7 +416,7 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
"path": "<ROOT>/dist/.rstest-temp",
"pathinfo": false,
"publicPath": "/",
"webassemblyModuleFilename": "static/wasm/[hash].module.wasm",
"webassemblyModuleFilename": "static/wasm/[contenthash:8].module.wasm",
},
"performance": {
"hints": false,
Expand Down Expand Up @@ -523,6 +525,8 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
"entry": {},
"experiments": {
"asyncWebAssembly": true,
"inlineEnum": true,
"lazyBarrel": true,
"rspackFuture": {
"bundlerInfo": {
"force": false,
Expand Down Expand Up @@ -686,7 +690,7 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"exportedEnum": true,
"typeExports": true,
},
},
Expand Down Expand Up @@ -740,7 +744,7 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"exportedEnum": true,
"typeExports": true,
},
},
Expand Down Expand Up @@ -875,7 +879,7 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
{
"dependency": "url",
"generator": {
"filename": "static/wasm/[hash].module.wasm",
"filename": "static/wasm/[contenthash:8].module.wasm",
},
"test": /\\\\\\.wasm\\$/,
"type": "asset/resource",
Expand Down Expand Up @@ -920,7 +924,7 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
"path": "<ROOT>/dist/.rstest-temp",
"pathinfo": false,
"publicPath": "/",
"webassemblyModuleFilename": "static/wasm/[hash].module.wasm",
"webassemblyModuleFilename": "static/wasm/[contenthash:8].module.wasm",
},
"performance": {
"hints": false,
Expand Down Expand Up @@ -1080,7 +1084,7 @@ exports[`prepareRsbuild > should generate swc config correctly with user customi
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"exportedEnum": true,
"typeExports": true,
},
},
Expand Down
Loading
Loading