Skip to content

Commit 911639c

Browse files
Timeless0911Timeless0911
authored
chore: bump Rsbuild 1.6.0-beta.1 and remove special output.distPath merge logic (#1285)
1 parent d03f804 commit 911639c

File tree

28 files changed

+351
-235
lines changed

28 files changed

+351
-235
lines changed

‎examples/module-federation/mf-host/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@module-federation/rsbuild-plugin": "^0.21.1",
16-
"@rsbuild/core": "1.6.0-beta.0",
16+
"@rsbuild/core": "1.6.0-beta.1",
1717
"@rsbuild/plugin-react": "^1.4.1",
1818
"@types/react": "^19.2.2",
1919
"@types/react-dom": "^19.2.2",

‎examples/module-federation/mf-remote/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@module-federation/rsbuild-plugin": "^0.21.1",
16-
"@rsbuild/core": "1.6.0-beta.0",
16+
"@rsbuild/core": "1.6.0-beta.1",
1717
"@rsbuild/plugin-react": "^1.4.1",
1818
"@types/react": "^19.2.2",
1919
"@types/react-dom": "^19.2.2",

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"type-check": "tsc --noEmit && tsc --noEmit -p tests"
4444
},
4545
"dependencies": {
46-
"@rsbuild/core": "1.6.0-beta.0",
46+
"@rsbuild/core": "1.6.0-beta.1",
4747
"rsbuild-plugin-dts": "workspace:*"
4848
},
4949
"devDependencies": {

‎packages/core/src/config.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,16 +1905,6 @@ export async function composeCreateRsbuildConfig(
19051905
userConfig.output ??= {};
19061906
delete userConfig.output.externals;
19071907

1908-
// Convert output.distPath to an object to ensure it merges correctly with the built-in constant config
1909-
if (
1910-
userConfig.output.distPath &&
1911-
typeof userConfig.output.distPath === 'string'
1912-
) {
1913-
userConfig.output.distPath = {
1914-
root: userConfig.output.distPath,
1915-
};
1916-
}
1917-
19181908
const config: RsbuildConfigWithLibInfo = {
19191909
format: libConfig.format ?? 'esm',
19201910
// The merge order represents the priority of the configuration

‎packages/core/tests/__snapshots__/config.test.ts.snap‎

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,6 @@
22

33
exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config in each format > inspected Rsbuild configs 1`] = `
44
"{
5-
dev: {
6-
hmr: true,
7-
liveReload: true,
8-
browserLogs: true,
9-
watchFiles: [
10-
{
11-
paths: [
12-
'<WORKSPACE>/tsconfig.json'
13-
],
14-
type: 'reload-server'
15-
}
16-
],
17-
assetPrefix: '/',
18-
writeToDisk: false,
19-
cliShortcuts: false,
20-
client: {
21-
path: '/rsbuild-hmr',
22-
port: '',
23-
host: '',
24-
overlay: true,
25-
reconnect: 100
26-
},
27-
lazyCompilation: {
28-
imports: true,
29-
entries: false
30-
}
31-
},
325
server: {
336
port: 3000,
347
host: '0.0.0.0',
@@ -86,6 +59,57 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
8659
},
8760
tsconfigPath: '<WORKSPACE>/tsconfig.json'
8861
},
62+
tools: {
63+
cssExtract: {
64+
loaderOptions: {},
65+
pluginOptions: {
66+
ignoreOrder: true
67+
}
68+
}
69+
},
70+
security: {
71+
nonce: '',
72+
sri: {
73+
enable: false
74+
}
75+
},
76+
performance: {
77+
profile: false,
78+
printFileSize: true,
79+
removeConsole: false,
80+
removeMomentLocale: false,
81+
chunkSplit: {
82+
strategy: 'split-by-experience'
83+
}
84+
},
85+
mode: 'production',
86+
dev: {
87+
hmr: true,
88+
liveReload: true,
89+
browserLogs: true,
90+
watchFiles: [
91+
{
92+
paths: [
93+
'<WORKSPACE>/tsconfig.json'
94+
],
95+
type: 'reload-server'
96+
}
97+
],
98+
assetPrefix: '/',
99+
writeToDisk: false,
100+
cliShortcuts: false,
101+
client: {
102+
path: '/rsbuild-hmr',
103+
port: '',
104+
host: '',
105+
overlay: true,
106+
reconnect: 100
107+
},
108+
lazyCompilation: {
109+
imports: true,
110+
entries: false
111+
}
112+
},
89113
output: {
90114
target: 'web',
91115
cleanDistPath: 'auto',
@@ -132,30 +156,6 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
132156
},
133157
emitAssets: true
134158
},
135-
tools: {
136-
cssExtract: {
137-
loaderOptions: {},
138-
pluginOptions: {
139-
ignoreOrder: true
140-
}
141-
}
142-
},
143-
security: {
144-
nonce: '',
145-
sri: {
146-
enable: false
147-
}
148-
},
149-
performance: {
150-
profile: false,
151-
printFileSize: true,
152-
removeConsole: false,
153-
removeMomentLocale: false,
154-
chunkSplit: {
155-
strategy: 'split-by-experience'
156-
}
157-
},
158-
mode: 'production',
159159
root: '<WORKSPACE>',
160160
plugins: [
161161
{
@@ -318,7 +318,6 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
318318
aggregateTimeout: 0
319319
},
320320
experiments: {
321-
lazyBarrel: true,
322321
inlineEnum: true,
323322
inlineConst: true,
324323
typeReexportsPresence: true,
@@ -1021,7 +1020,6 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
10211020
aggregateTimeout: 0
10221021
},
10231022
experiments: {
1024-
lazyBarrel: true,
10251023
inlineEnum: true,
10261024
inlineConst: true,
10271025
typeReexportsPresence: true,
@@ -1718,7 +1716,6 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
17181716
aggregateTimeout: 0
17191717
},
17201718
experiments: {
1721-
lazyBarrel: true,
17221719
inlineEnum: true,
17231720
inlineConst: true,
17241721
typeReexportsPresence: true,
@@ -2320,7 +2317,6 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
23202317
aggregateTimeout: 0
23212318
},
23222319
experiments: {
2323-
lazyBarrel: true,
23242320
inlineEnum: true,
23252321
inlineConst: true,
23262322
typeReexportsPresence: true,
@@ -2923,7 +2919,6 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
29232919
aggregateTimeout: 0
29242920
},
29252921
experiments: {
2926-
lazyBarrel: true,
29272922
inlineEnum: true,
29282923
inlineConst: true,
29292924
typeReexportsPresence: true,
@@ -3481,6 +3476,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
34813476
[
34823477
{
34833478
"config": {
3479+
"dev": undefined,
34843480
"output": {
34853481
"assetPrefix": "auto",
34863482
"dataUriLimit": 0,
@@ -3767,6 +3763,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
37673763
},
37683764
{
37693765
"config": {
3766+
"dev": undefined,
37703767
"output": {
37713768
"assetPrefix": "auto",
37723769
"dataUriLimit": 0,
@@ -4050,6 +4047,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
40504047
},
40514048
{
40524049
"config": {
4050+
"dev": undefined,
40534051
"output": {
40544052
"distPath": {
40554053
"css": "./",
@@ -4294,6 +4292,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
42944292
},
42954293
{
42964294
"config": {
4295+
"dev": undefined,
42974296
"output": {
42984297
"distPath": {
42994298
"css": "./",

‎packages/create-rslib/fragments/tools/storybook-react-js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"storybook": "storybook dev"
55
},
66
"devDependencies": {
7-
"@rsbuild/core": "1.6.0-beta.0",
7+
"@rsbuild/core": "1.6.0-beta.1",
88
"@storybook/addon-docs": "^9.1.13",
99
"@storybook/addon-onboarding": "^9.1.13",
1010
"@storybook/react": "^9.1.13",

‎packages/create-rslib/fragments/tools/storybook-react-ts/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"storybook": "storybook dev"
55
},
66
"devDependencies": {
7-
"@rsbuild/core": "1.6.0-beta.0",
7+
"@rsbuild/core": "1.6.0-beta.1",
88
"@storybook/addon-docs": "^9.1.13",
99
"@storybook/addon-onboarding": "^9.1.13",
1010
"@storybook/react": "^9.1.13",

‎packages/create-rslib/fragments/tools/storybook-vue-js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"storybook": "storybook dev"
55
},
66
"devDependencies": {
7-
"@rsbuild/core": "1.6.0-beta.0",
7+
"@rsbuild/core": "1.6.0-beta.1",
88
"@storybook/addon-docs": "^9.1.13",
99
"@storybook/addon-onboarding": "^9.1.13",
1010
"@storybook/vue3": "^9.1.13",

‎packages/create-rslib/fragments/tools/storybook-vue-ts/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"storybook": "storybook dev"
55
},
66
"devDependencies": {
7-
"@rsbuild/core": "1.6.0-beta.0",
7+
"@rsbuild/core": "1.6.0-beta.1",
88
"@storybook/addon-docs": "^9.1.13",
99
"@storybook/addon-onboarding": "^9.1.13",
1010
"@storybook/vue3": "^9.1.13",

‎packages/create-rslib/template-[react]-[rstest,storybook]-js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"test": "rstest"
1919
},
2020
"devDependencies": {
21-
"@rsbuild/core": "1.6.0-beta.0",
21+
"@rsbuild/core": "1.6.0-beta.1",
2222
"@rsbuild/plugin-react": "^1.4.1",
2323
"@rslib/core": "workspace:*",
2424
"@rstest/core": "^0.5.4",

0 commit comments

Comments
 (0)