Skip to content

Commit ed48d2a

Browse files
authored
[feat] [frontend] upgrade rsbuild (#504)
* feat(frontend): upgrade rsbuild * feat(rsbuild-config): rm subspace-resolve-plugin
1 parent 10d5a75 commit ed48d2a

8 files changed

Lines changed: 382 additions & 544 deletions

File tree

‎common/config/subspaces/default/pnpm-lock.yaml‎

Lines changed: 361 additions & 522 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/apps/cozeloop/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"author": "qihai@bytedance.com",
99
"maintainers": [],
1010
"sideEffects": false,
11+
"type": "module",
1112
"scripts": {
1213
"analyze": "cross-env BUNDLE_ANALYZE=true rsbuild build",
1314
"build": "cross-env REGION=cn npm run build:prod",
@@ -60,7 +61,7 @@
6061
"@coze-arch/vitest-config": "workspace:*",
6162
"@cozeloop/rsbuild-config": "workspace:*",
6263
"@cozeloop/tailwind-config": "workspace:*",
63-
"@rsbuild/core": "~1.1.0",
64+
"@rsbuild/core": "^1.7.5",
6465
"@types/node": "^24",
6566
"@types/react": "18.2.37",
6667
"@types/react-dom": "18.2.15",
@@ -71,3 +72,4 @@
7172
"vitest": "~3.0.5"
7273
}
7374
}
75+

‎frontend/packages/loop-base/api-schema/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"@coze-arch/ts-config": "workspace:*",
6666
"@coze-arch/vitest-config": "workspace:*",
6767
"@microsoft/api-extractor": "7.43.0",
68-
"@rsbuild/core": "~1.1.0",
69-
"@rslib/core": "~0.11.0",
68+
"@rsbuild/core": "^1.7.5",
69+
"@rslib/core": "^0.21.2",
7070
"@types/node": "^24",
7171
"@vitest/coverage-v8": "~3.0.5",
7272
"sucrase": "^3.32.0",

‎frontend/packages/loop-components/observation-components/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@
8181
"@cozeloop/tailwind-config": "workspace:*",
8282
"@cozeloop/tailwind-plugin": "workspace:*",
8383
"@douyinfe/semi-rspack-plugin": "2.90.10",
84-
"@rsbuild/core": "~1.1.0",
85-
"@rsbuild/plugin-less": "~1.1.0",
86-
"@rsbuild/plugin-node-polyfill": "~0.3.0",
87-
"@rsbuild/plugin-react": "~1.1.0",
88-
"@rsbuild/plugin-sass": "~1.1.0",
89-
"@rsbuild/plugin-svgr": "~1.0.6",
90-
"@rslib/core": "~0.11.0",
84+
"@rsbuild/core": "^1.7.5",
85+
"@rsbuild/plugin-less": "^1.6.2",
86+
"@rsbuild/plugin-node-polyfill": "^1.4.4",
87+
"@rsbuild/plugin-react": "^1.4.6",
88+
"@rsbuild/plugin-sass": "^1.5.1",
89+
"@rsbuild/plugin-svgr": "^1.3.1",
90+
"@rslib/core": "^0.21.2",
9191
"@storybook/addon-essentials": "^7.6.7",
9292
"@storybook/addon-interactions": "^7.6.7",
9393
"@storybook/addon-links": "^7.6.7",

frontend/packages/loop-config/rsbuild-config/eslint.config.js renamed to frontend/packages/loop-config/rsbuild-config/eslint.config.cjs

File renamed without changes.

‎frontend/packages/loop-config/rsbuild-config/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version": "0.0.1",
44
"description": "Rsbuild config for cozeloop",
55
"author": "qihai@bytedance.com",
6+
"type": "module",
67
"main": "./src/index.ts",
78
"scripts": {
89
"build": "exit 0",
@@ -19,15 +20,14 @@
1920
"@coze-arch/pkg-root-webpack-plugin": "workspace:*",
2021
"@coze-arch/postcss-plugin": "workspace:*",
2122
"@coze-arch/semi-theme-hand01": "0.0.6-alpha.346d77",
22-
"@coze-arch/subspace-resolve-plugin": "workspace:*",
2323
"@coze-arch/ts-config": "workspace:*",
2424
"@coze-arch/vitest-config": "workspace:*",
2525
"@douyinfe/semi-rspack-plugin": "2.90.10",
26-
"@rsbuild/core": "~1.1.0",
27-
"@rsbuild/plugin-less": "~1.1.0",
28-
"@rsbuild/plugin-react": "~1.1.0",
29-
"@rsbuild/plugin-sass": "~1.1.0",
30-
"@rsbuild/plugin-svgr": "~1.0.6",
26+
"@rsbuild/core": "^1.7.5",
27+
"@rsbuild/plugin-less": "^1.6.2",
28+
"@rsbuild/plugin-react": "^1.4.6",
29+
"@rsbuild/plugin-sass": "^1.5.1",
30+
"@rsbuild/plugin-svgr": "^1.3.1",
3131
"@types/node": "^24",
3232
"@vitest/coverage-v8": "~3.0.5",
3333
"react": "~18.2.0",

‎frontend/packages/loop-config/rsbuild-config/src/rsbuild.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { pluginLess } from '@rsbuild/plugin-less';
1010
import { type RsbuildConfig, mergeRsbuildConfig } from '@rsbuild/core';
1111
import { SemiRspackPlugin } from '@douyinfe/semi-rspack-plugin';
1212
import { GLOBAL_ENVS } from '@coze-studio/bot-env-adapter';
13-
import SubspaceResolvePlugin from '@coze-arch/subspace-resolve-plugin';
1413
import PkgRootWebpackPlugin from '@coze-arch/pkg-root-webpack-plugin';
1514

1615
import { formatDefineVars, getLatestGitCommitHash } from './utils';
@@ -29,11 +28,10 @@ export function createRsbuildConfig(rsbuildConfig: RsbuildConfig) {
2928
'process.env.SCM_BUILD_TYPE': process.env.BUILD_TYPE,
3029
...GLOBAL_ENVS,
3130
}),
31+
},
32+
resolve: {
33+
dedupe: ['react', 'react-dom', 'react-router', 'react-router-dom'],
3234
alias: {
33-
'react-dom': require.resolve('react-dom'),
34-
react: require.resolve('react'),
35-
'react-router-dom': require.resolve('react-router-dom'),
36-
'react-router': require.resolve('react-router'),
3735
// fix https://github.com/react-dnd/react-dnd/issues/3433
3836
'react/jsx-runtime.js': 'react/jsx-runtime',
3937
'react/jsx-dev-runtime.js': 'react/jsx-dev-runtime',
@@ -94,7 +92,6 @@ export function createRsbuildConfig(rsbuildConfig: RsbuildConfig) {
9492

9593
appendPlugins([
9694
new PkgRootWebpackPlugin({}),
97-
new SubspaceResolvePlugin({ currSubspace: 'default' }),
9895
new SemiRspackPlugin({ theme: '@coze-arch/semi-theme-hand01' }),
9996
]);
10097

0 commit comments

Comments
 (0)