Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
5 changes: 5 additions & 0 deletions .changeset/flat-flies-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@modern-js/uni-builder': patch
---

feat: bump Rsbuild 1.0.x stable
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
"husky": "^8.0.0",
"lint-staged": "~13.1.0",
"nx": "^17.0.1",
"vitest": "0.33.0",
"rimraf": "^6.0.1"
"rimraf": "^6.0.1",
"vitest": "0.33.0"
},
"pnpm": {
"overrides": {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/babel-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
"@babel/preset-typescript": "^7.24.7",
"@babel/runtime": "^7.24.7",
"@babel/types": "^7.24.7",
"@rsbuild/plugin-babel": "1.0.1-rc.4",
"@swc/helpers": "0.5.3",
"@rsbuild/plugin-babel": "1.0.1",
"@swc/helpers": "0.5.13",
"@types/babel__core": "^7.20.5",
"babel-plugin-dynamic-import-node": "2.3.3",
"core-js": "~3.37.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@modern-js/node-bundle-require": "workspace:*",
"@modern-js/plugin": "workspace:*",
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3"
"@swc/helpers": "0.5.13"
},
"devDependencies": {
"@modern-js/types": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-bff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@modern-js/server-core": "workspace:*",
"@modern-js/server-utils": "workspace:*",
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3"
"@swc/helpers": "0.5.13"
},
"devDependencies": {
"@modern-js/app-tools": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-changeset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@changesets/read": "^0.5.9",
"@modern-js/plugin-i18n": "workspace:*",
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3",
"@swc/helpers": "0.5.13",
"axios": "^1.7.4",
"resolve-from": "^5.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-data-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@babel/core": "^7.24.7",
"@modern-js/runtime-utils": "workspace:*",
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3",
"@swc/helpers": "0.5.13",
"path-to-regexp": "^6.2.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
},
"dependencies": {
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3"
"@swc/helpers": "0.5.13"
},
"devDependencies": {
"@scripts/build": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-lint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@modern-js/tsconfig": "workspace:*",
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3",
"@swc/helpers": "0.5.13",
"cross-spawn": "^7.0.3",
"husky": "^8.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"dependencies": {
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3",
"@swc/helpers": "0.5.13",
"whistle": "^2.7.18"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-ssg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"dependencies": {
"@modern-js/prod-server": "workspace:*",
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3",
"@swc/helpers": "0.5.13",
"node-mocks-http": "^1.11.0",
"normalize-path": "3.0.0",
"portfinder": "^1.0.28"
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/plugin-swc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
},
"dependencies": {
"@modern-js/utils": "workspace:*",
"@rsbuild/core": "1.0.1-rc.4",
"@rsbuild/plugin-swc": "1.0.1-rc.4",
"@swc/helpers": "0.5.3"
"@rsbuild/core": "1.0.2",
"@rsbuild/plugin-webpack-swc": "1.0.2",
"@swc/helpers": "0.5.13"
},
"devDependencies": {
"@modern-js/app-tools": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-swc/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
type ObjPluginSwcOptions,
type PluginSwcOptions,
pluginSwc,
} from '@rsbuild/plugin-swc';
} from '@rsbuild/plugin-webpack-swc';

export function factory(
name: string,
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-swc/tests/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { logger } from '@modern-js/utils/logger';
import type {
FnPluginSwcOptions,
ObjPluginSwcOptions,
} from '@rsbuild/plugin-swc';
} from '@rsbuild/plugin-webpack-swc';
import { applyBuilderSwcConfig } from '../src';

describe('plugin config', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/plugin-tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@modern-js/node-bundle-require": "workspace:*",
"@modern-js/runtime-utils": "workspace:*",
"@modern-js/utils": "workspace:*",
"@swc/helpers": "0.5.3",
"@swc/helpers": "0.5.13",
"babel-plugin-macros": "3.1.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/rsbuild-plugin-esbuild/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"build": "modern-lib build"
},
"dependencies": {
"@swc/helpers": "0.5.3",
"@swc/helpers": "0.5.13",
"esbuild": "0.17.19",
"webpack": "^5.94.0"
},
"devDependencies": {
"@rsbuild/core": "1.0.1-rc.4",
"@rsbuild/webpack": "1.0.1-rc.4",
"@rsbuild/core": "1.0.2",
"@rsbuild/webpack": "1.0.2",
"@scripts/build": "workspace:*",
"typescript": "^5.4.2"
},
Expand Down
22 changes: 11 additions & 11 deletions packages/cli/uni-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,25 @@
"@modern-js/babel-preset": "workspace:*",
"@modern-js/utils": "workspace:*",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
"@rsbuild/core": "1.0.1-rc.4",
"@rsbuild/plugin-assets-retry": "1.0.1-rc.4",
"@rsbuild/plugin-babel": "1.0.1-rc.4",
"@rsbuild/core": "1.0.2",
"@rsbuild/plugin-assets-retry": "1.0.1",
"@rsbuild/plugin-babel": "1.0.1",
"@rsbuild/plugin-check-syntax": "1.0.1",
"@rsbuild/plugin-css-minimizer": "1.0.2",
"@rsbuild/plugin-less": "1.0.1-rc.4",
"@rsbuild/plugin-less": "1.0.1",
"@rsbuild/plugin-pug": "1.0.2",
"@rsbuild/plugin-react": "1.0.1-rc.4",
"@rsbuild/plugin-react": "1.0.1",
"@rsbuild/plugin-rem": "1.0.1",
"@rsbuild/plugin-sass": "1.0.1-rc.4",
"@rsbuild/plugin-sass": "1.0.1",
"@rsbuild/plugin-source-build": "1.0.1",
"@rsbuild/plugin-styled-components": "1.0.1",
"@rsbuild/plugin-svgr": "1.0.1-rc.4",
"@rsbuild/plugin-svgr": "1.0.1",
"@rsbuild/plugin-toml": "1.0.1",
"@rsbuild/plugin-type-check": "1.0.1-rc.4",
"@rsbuild/plugin-type-check": "1.0.1",
"@rsbuild/plugin-typed-css-modules": "1.0.2",
"@rsbuild/plugin-yaml": "1.0.2",
"@rsbuild/webpack": "1.0.1-rc.4",
"@swc/helpers": "0.5.3",
"@rsbuild/webpack": "1.0.2",
"@swc/helpers": "0.5.13",
"autoprefixer": "10.4.19",
"babel-loader": "9.1.3",
"babel-plugin-import": "1.13.5",
Expand Down Expand Up @@ -82,7 +82,7 @@
"webpack-subresource-integrity": "5.1.0"
},
"devDependencies": {
"@rsbuild/plugin-swc": "1.0.1-rc.4",
"@rsbuild/plugin-webpack-swc": "1.0.2",
"@scripts/build": "workspace:*",
"@scripts/vitest-config": "workspace:*",
"@types/html-minifier-terser": "^7.0.2",
Expand Down
18 changes: 18 additions & 0 deletions packages/cli/uni-builder/tests/__snapshots__/default.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 1,
"modules": {
"auto": true,
Expand Down Expand Up @@ -382,6 +383,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 3,
"modules": {
"auto": true,
Expand Down Expand Up @@ -460,6 +462,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 2,
"modules": {
"auto": true,
Expand Down Expand Up @@ -1028,6 +1031,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when node
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 0,
"modules": {
"auto": true,
Expand Down Expand Up @@ -1331,6 +1335,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when node
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 2,
"modules": {
"auto": true,
Expand Down Expand Up @@ -1373,6 +1378,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when node
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 1,
"modules": {
"auto": true,
Expand Down Expand Up @@ -1775,6 +1781,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 1,
"modules": {
"auto": true,
Expand Down Expand Up @@ -2113,6 +2120,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 3,
"modules": {
"auto": true,
Expand Down Expand Up @@ -2191,6 +2199,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 2,
"modules": {
"auto": true,
Expand Down Expand Up @@ -2724,6 +2733,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when serv
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 0,
"modules": {
"auto": true,
Expand Down Expand Up @@ -3011,6 +3021,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when serv
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 2,
"modules": {
"auto": true,
Expand Down Expand Up @@ -3053,6 +3064,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when serv
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 1,
"modules": {
"auto": true,
Expand Down Expand Up @@ -3469,6 +3481,7 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 1,
"modules": {
"auto": true,
Expand Down Expand Up @@ -3895,6 +3908,7 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 3,
"modules": {
"auto": true,
Expand Down Expand Up @@ -3973,6 +3987,7 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 2,
"modules": {
"auto": true,
Expand Down Expand Up @@ -4587,6 +4602,7 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 1,
"modules": {
"auto": true,
Expand Down Expand Up @@ -5019,6 +5035,7 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 3,
"modules": {
"auto": true,
Expand Down Expand Up @@ -5097,6 +5114,7 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
{
"loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/compiled/css-loader/index.js",
"options": {
"_skipReuseAST": false,
"importLoaders": 2,
"modules": {
"auto": true,
Expand Down
Loading
Loading