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
2 changes: 1 addition & 1 deletion e2e/dom/fixtures/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"react-dom": "^19.2.3"
},
"devDependencies": {
"@rsbuild/core": "1.7.0",
"@rsbuild/core": "1.7.1",
"@rsbuild/plugin-react": "^1.4.2",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/dom": "^10.4.1",
Expand Down
2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"typecheck": "tsc --noEmit"
},
"devDependencies": {
"@rsbuild/core": "1.7.0",
"@rsbuild/core": "1.7.1",
"@rslib/core": "0.18.6",
"@rstest/core": "workspace:*",
"@rstest/tsconfig": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion e2e/projects/fixtures/packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"react-dom": "^19.2.3"
},
"devDependencies": {
"@rsbuild/core": "1.7.0",
"@rsbuild/core": "1.7.1",
"@rsbuild/plugin-react": "^1.4.2",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/dom": "^10.4.1",
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.7.0",
"@rsbuild/core": "1.7.1",
"@rsbuild/plugin-babel": "^1.0.6",
"@rsbuild/plugin-vue": "^1.2.2",
"@rsbuild/plugin-vue-jsx": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"react-dom": "^19.2.3"
},
"devDependencies": {
"@rsbuild/core": "1.7.0",
"@rsbuild/core": "1.7.1",
"@rsbuild/plugin-react": "^1.4.2",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
},
"dependencies": {
"@types/chai": "^5.2.3",
"@rsbuild/core": "1.7.0",
"@rsbuild/core": "1.7.1",
"tinypool": "^1.1.1"
},
"devDependencies": {
Expand Down
130 changes: 52 additions & 78 deletions packages/core/tests/core/__snapshots__/rsbuild.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ exports[`prepareRsbuild > should generate rspack config correctly (esm output) 1
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -176,12 +180,6 @@ exports[`prepareRsbuild > should generate rspack config correctly (esm output) 1
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand All @@ -205,6 +203,10 @@ exports[`prepareRsbuild > should generate rspack config correctly (esm output) 1
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -230,12 +232,6 @@ exports[`prepareRsbuild > should generate rspack config correctly (esm output) 1
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand Down Expand Up @@ -706,6 +702,10 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -731,12 +731,6 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand All @@ -760,6 +754,10 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -785,12 +783,6 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand Down Expand Up @@ -1236,6 +1228,10 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -1261,12 +1257,6 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand All @@ -1290,6 +1280,10 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -1315,12 +1309,6 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand Down Expand Up @@ -1768,6 +1756,10 @@ exports[`prepareRsbuild > should generate rspack config correctly in watch mode
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -1793,12 +1785,6 @@ exports[`prepareRsbuild > should generate rspack config correctly in watch mode
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand All @@ -1822,6 +1808,10 @@ exports[`prepareRsbuild > should generate rspack config correctly in watch mode
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -1847,12 +1837,6 @@ exports[`prepareRsbuild > should generate rspack config correctly in watch mode
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand Down Expand Up @@ -2307,6 +2291,10 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -2332,12 +2320,6 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand All @@ -2361,6 +2343,10 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -2386,12 +2372,6 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand Down Expand Up @@ -2837,6 +2817,10 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -2862,12 +2846,6 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand All @@ -2891,6 +2869,10 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -2916,12 +2898,6 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
"legacyDecorator": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand Down Expand Up @@ -3247,6 +3223,10 @@ exports[`prepareRsbuild > should generate swc config correctly with user customi
{
"loader": "builtin:swc-loader",
"options": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
"env": {
"targets": [
"node >= 16",
Expand All @@ -3273,12 +3253,6 @@ exports[`prepareRsbuild > should generate swc config correctly with user customi
"useDefineForClassFields": false,
},
},
"rspackExperiments": {
"collectTypeScriptInfo": {
"exportedEnum": false,
"typeExports": true,
},
},
},
},
],
Expand Down
13 changes: 8 additions & 5 deletions packages/coverage-istanbul/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,14 @@ export const pluginCoverage: (

api.modifyBundlerChain({
handler: (chain, { rspack, CHAIN_ID, environment }) => {
const { rspackExperiments: _rspackExperiments, ...swcOptions } =
chain.module
.rule(CHAIN_ID.RULE.JS)
.use(CHAIN_ID.USE.SWC)
.get('options') || {};
const {
rspackExperiments: _rspackExperiments,
collectTypeScriptInfo: _collectTypeScriptInfo,
...swcOptions
} = chain.module
.rule(CHAIN_ID.RULE.JS)
.use(CHAIN_ID.USE.SWC)
.get('options') || {};

transformCoverageFns[environment.name] = async (
code: string,
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"package:vsce": "npm run build && vsce package"
},
"devDependencies": {
"@rsbuild/core": "1.7.0",
"@rsbuild/core": "1.7.1",
"@rslib/core": "^0.19.0",
"@rstest/core": "workspace:*",
"@rstest/coverage-istanbul": "workspace:*",
Expand Down
Loading
Loading