Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: bump Rsbuild 0.3.0 and Rspack 0.5.0 #5200

Merged
merged 12 commits into from
Jan 10, 2024
Merged

feat: bump Rsbuild 0.3.0 and Rspack 0.5.0 #5200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8963b6f
chore: explicitly declare Node version of babel target
chenjiahan Jan 5, 2024
b298ac3
Merge branch 'babel_target_0105' into bump_rsbuild_030
chenjiahan Jan 9, 2024
da218da
chore: bump Rsbuild 0.3.0 canary
chenjiahan Jan 9, 2024
b76c8a6
chore: register toml and yaml plugin
chenjiahan Jan 9, 2024
97ff5ca
chore: set server bundles path
chenjiahan Jan 9, 2024
2a3628a
test: update define config
chenjiahan Jan 9, 2024
79ccf06
chore: update snapshot
chenjiahan Jan 9, 2024
89b7f8c
docs: fix
chenjiahan Jan 9, 2024
f89cf75
Merge branch 'main' into bump_rsbuild_030
chenjiahan Jan 10, 2024
3ecb3c5
chore: bump rsbuild 0.3.0
chenjiahan Jan 10, 2024
94d9e12
Merge branch 'bump_rsbuild_030' of https://github.com/chenjiahan/mode…
chenjiahan Jan 10, 2024
0aeb6d1
chore: snapshot
chenjiahan Jan 10, 2024
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
7 changes: 7 additions & 0 deletions .changeset/sour-tools-juggle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@modern-js/uni-builder': minor
---

feat: bump Rsbuild 0.3.0 and Rspack 0.5.0

feat: 升级 Rsbuild 0.3.0 和 Rspack 0.5.0
9 changes: 9 additions & 0 deletions .changeset/young-vans-carry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@modern-js/builder-webpack-provider': patch
'@modern-js/uni-builder': patch
'@modern-js/server-utils': patch
---

chore: explicitly declare Node version of babel target

chore: 显式声明 babel 的目标 Node 版本
2 changes: 1 addition & 1 deletion packages/builder/builder-webpack-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"@modern-js/types": "workspace:*",
"@modern-js/utils": "workspace:*",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
"@rsbuild/babel-preset": "0.2.17",
"@rsbuild/babel-preset": "0.3.0",
"@swc/helpers": "0.5.3",
"babel-plugin-import": "1.13.5",
"babel-plugin-styled-components": "1.13.3",
Expand Down
3 changes: 3 additions & 0 deletions packages/builder/builder-webpack-provider/src/plugins/babel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ export const builderPluginBabel = (): BuilderPlugin => ({
const baseBabelConfig =
isServer || isServiceWorker
? getBabelConfigForNode({
presetEnv: {
targets: ['node >= 14'],
},
pluginDecorators: decoratorConfig,
})
: getBabelConfigForWeb({
Expand Down
2 changes: 1 addition & 1 deletion packages/builder/builder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"dependencies": {
"@modern-js/builder-shared": "workspace:*",
"@modern-js/utils": "workspace:*",
"@rsbuild/monorepo-utils": "0.2.17",
"@rsbuild/monorepo-utils": "0.3.0",
"@svgr/webpack": "8.1.0",
"@swc/helpers": "0.5.3",
"deepmerge": "^4.3.1",
Expand Down
34 changes: 18 additions & 16 deletions packages/builder/uni-builder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,23 @@
"@modern-js/server": "workspace:*",
"@modern-js/prod-server": "workspace:*",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
"@rsbuild/babel-preset": "0.2.17",
"@rsbuild/core": "0.2.17",
"@rsbuild/plugin-assets-retry": "0.2.17",
"@rsbuild/plugin-babel": "0.2.17",
"@rsbuild/plugin-check-syntax": "0.2.17",
"@rsbuild/plugin-css-minimizer": "0.2.17",
"@rsbuild/plugin-pug": "0.2.17",
"@rsbuild/plugin-react": "0.2.17",
"@rsbuild/plugin-rem": "0.2.17",
"@rsbuild/plugin-source-build": "0.2.17",
"@rsbuild/plugin-styled-components": "0.2.17",
"@rsbuild/plugin-svgr": "0.2.17",
"@rsbuild/plugin-type-check": "0.2.17",
"@rsbuild/shared": "0.2.17",
"@rsbuild/webpack": "0.2.17",
"@rsbuild/babel-preset": "0.3.0",
"@rsbuild/core": "0.3.0",
"@rsbuild/plugin-assets-retry": "0.3.0",
"@rsbuild/plugin-babel": "0.3.0",
"@rsbuild/plugin-check-syntax": "0.3.0",
"@rsbuild/plugin-css-minimizer": "0.3.0",
"@rsbuild/plugin-pug": "0.3.0",
"@rsbuild/plugin-react": "0.3.0",
"@rsbuild/plugin-rem": "0.3.0",
"@rsbuild/plugin-source-build": "0.3.0",
"@rsbuild/plugin-styled-components": "0.3.0",
"@rsbuild/plugin-svgr": "0.3.0",
"@rsbuild/plugin-type-check": "0.3.0",
"@rsbuild/plugin-toml": "0.3.0",
"@rsbuild/plugin-yaml": "0.3.0",
"@rsbuild/shared": "0.3.0",
"@rsbuild/webpack": "0.3.0",
"@swc/helpers": "0.5.3",
"babel-loader": "9.1.3",
"babel-plugin-import": "1.13.5",
Expand All @@ -74,7 +76,7 @@
},
"devDependencies": {
"@modern-js/builder-plugin-node-polyfill": "workspace:*",
"@rsbuild/plugin-swc": "0.2.17",
"@rsbuild/plugin-swc": "0.3.0",
"@scripts/build": "workspace:*",
"@scripts/vitest-config": "workspace:*",
"@types/lodash": "^4.14.202",
Expand Down
2 changes: 1 addition & 1 deletion packages/builder/uni-builder/src/shared/devServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export async function startDevServer(
await rsbuildServer.beforeStart();

const protocol = devConfig.https ? 'https' : 'http';
const urls = getAddressUrls(protocol, port, host);
const urls = getAddressUrls({ protocol, port, host });

debug('listen dev server');

Expand Down
5 changes: 5 additions & 0 deletions packages/builder/uni-builder/src/shared/parseCommonConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import {
type RsbuildConfig,
} from '@rsbuild/core';
import type { CreateBuilderCommonOptions, UniBuilderConfig } from '../types';
import { pluginToml } from '@rsbuild/plugin-toml';
import { pluginYaml } from '@rsbuild/plugin-yaml';
import { pluginReact } from '@rsbuild/plugin-react';
import { pluginGlobalVars } from './plugins/globalVars';
import { pluginRuntimeChunk } from './plugins/runtimeChunk';
Expand Down Expand Up @@ -102,6 +104,7 @@ export async function parseCommonConfig(

output.distPath ??= {};
output.distPath.html ??= 'html';
output.distPath.server ??= 'bundles';

output.polyfill ??= 'entry';

Expand Down Expand Up @@ -254,6 +257,8 @@ export async function parseCommonConfig(
disableSourceMap: uniBuilderConfig.output?.disableSourceMap,
}),
pluginEmitRouteFile(),
pluginToml(),
pluginYaml(),
];

const checkSyntaxOptions = uniBuilderConfig.security?.checkSyntax;
Expand Down
3 changes: 3 additions & 0 deletions packages/builder/uni-builder/src/webpack/plugins/babel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ export const pluginBabel = (options?: PluginBabelOptions): RsbuildPlugin => ({
const baseBabelConfig =
isServer || isServiceWorker
? getBabelConfigForNode({
presetEnv: {
targets: ['node >= 14'],
},
pluginDecorators: decoratorConfig,
})
: getBabelConfigForWeb({
Expand Down
Loading