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: upgrade rspack to 0.5 canary #1171

Merged
merged 3 commits into from
Jan 8, 2024
Merged

feat: upgrade rspack to 0.5 canary #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0989f4
feat: upgrade rspack to 0.5
ahabhgk Jan 4, 2024
191bed3
fix
ahabhgk Jan 5, 2024
9891868
fix
ahabhgk Jan 5, 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
3 changes: 2 additions & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@
},
"dependencies": {
"@rsbuild/shared": "workspace:*",
"@rspack/core": "0.4.5",
"@rspack/core": "0.4.5-canary-be59383-20240105051840",
"@swc/helpers": "0.5.3",
"core-js": "~3.32.2",
"html-webpack-plugin": "npm:[email protected]",
"postcss": "8.4.31"
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/provider/plugins/hmr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
import type { RsbuildPlugin } from '../../types';

import { setConfig, isUsingHMR } from '@rsbuild/shared';
import { isUsingHMR } from '@rsbuild/shared';

export const pluginHMR = (): RsbuildPlugin => ({
name: 'rsbuild:hmr',

setup(api) {
api.modifyRspackConfig((rspackConfig, utils) => {
api.modifyBundlerChain((chain, utils) => {
const config = api.getNormalizedConfig();

const usingHMR = isUsingHMR(config, utils);

setConfig(rspackConfig, 'devServer.hot', usingHMR);
if (usingHMR) {
chain
.plugin(utils.CHAIN_ID.PLUGIN.HMR)
.use(utils.bundler.HotModuleReplacementPlugin);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

devServer is remove from core, now dev-server need to apply HotModuleReplacementPlugin manually

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

get 👌

}
});
},
});
7 changes: 7 additions & 0 deletions packages/core/src/provider/plugins/swc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ export const pluginSwc = (): RsbuildPlugin => ({

applyDecorator(swcConfig, config.output.enableLatestDecorators);

if (swcConfig.jsc?.externalHelpers) {
chain.resolve.alias.set(
'@swc/helpers',
path.dirname(require.resolve('@swc/helpers/package.json')),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@swc/helpers is a peerDependencies of @rspack/core in 0.5, before the alias is added by rspack

);
}

// apply polyfill
if (isWebTarget(target)) {
const polyfillMode = config.output.polyfill;
Expand Down
7 changes: 4 additions & 3 deletions packages/core/tests/__snapshots__/builder.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ exports[`should use rspack as default bundler > apply rspack correctly 1`] = `
},
},
"context": "<ROOT>",
"devServer": {
"hot": true,
},
"devtool": "cheap-module-source-map",
"entry": {
"index": [
Expand Down Expand Up @@ -649,9 +646,13 @@ exports[`should use rspack as default bundler > apply rspack correctly 1`] = `
RemoveCssSourcemapPlugin {
"name": "RemoveCssSourcemapPlugin",
},
HotModuleReplacementPlugin {
"name": "HotModuleReplacementPlugin",
},
],
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
"extensions": [
Expand Down
28 changes: 15 additions & 13 deletions packages/core/tests/rspack-provider/plugins/__snapshots__/default.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
},
},
"context": "<ROOT>",
"devServer": {
"hot": true,
},
"devtool": "cheap-module-source-map",
"entry": {
"index": [
Expand Down Expand Up @@ -649,9 +646,13 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
RemoveCssSourcemapPlugin {
"name": "RemoveCssSourcemapPlugin",
},
HotModuleReplacementPlugin {
"name": "HotModuleReplacementPlugin",
},
],
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
"extensions": [
Expand Down Expand Up @@ -682,9 +683,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod
},
},
"context": "<ROOT>",
"devServer": {
"hot": false,
},
"devtool": false,
"entry": {
"index": [
Expand Down Expand Up @@ -1243,7 +1241,9 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod
"_options": {
"compress": "{"passes":1,"pure_funcs":[],"drop_console":false}",
"exclude": undefined,
"extractComments": "true",
"extractComments": {
"condition": "@preserve|@lic|@cc_on|^/**!",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true will be resolve to "@preserve|@lic|@cc_on|^/**!", so the minify result should be the same

},
"format": "{"comments":false,"asciiOnly":true}",
"include": undefined,
"mangle": "{"keep_classnames":false,"keep_fnames":false}",
Expand Down Expand Up @@ -1370,6 +1370,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod
],
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
"extensions": [
Expand Down Expand Up @@ -1400,9 +1401,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
},
},
"context": "<ROOT>",
"devServer": {
"hot": false,
},
"devtool": "cheap-module-source-map",
"entry": {
"index": [
Expand Down Expand Up @@ -1786,6 +1784,9 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
},
],
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
},
"conditionNames": [
"require",
"node",
Expand Down Expand Up @@ -1815,9 +1816,6 @@ exports[`tools.rspack > should match snapshot 1`] = `
},
},
"context": "<ROOT>",
"devServer": {
"hot": true,
},
"devtool": "cheap-module-source-map",
"entry": {
"index": [
Expand Down Expand Up @@ -2463,9 +2461,13 @@ exports[`tools.rspack > should match snapshot 1`] = `
RemoveCssSourcemapPlugin {
"name": "RemoveCssSourcemapPlugin",
},
HotModuleReplacementPlugin {
"name": "HotModuleReplacementPlugin",
},
],
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
"extensions": [
Expand Down
24 changes: 24 additions & 0 deletions packages/core/tests/rspack-provider/plugins/__snapshots__/swc.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ exports[`plugin-swc > should add antd pluginImport 1`] = `
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down Expand Up @@ -205,6 +206,7 @@ exports[`plugin-swc > should add browserslist 1`] = `
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down Expand Up @@ -309,6 +311,7 @@ exports[`plugin-swc > should add browserslist 2`] = `
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down Expand Up @@ -433,6 +436,7 @@ exports[`plugin-swc > should add pluginImport 1`] = `
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down Expand Up @@ -542,6 +546,7 @@ exports[`plugin-swc > should disable all pluginImport 1`] = `
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down Expand Up @@ -637,6 +642,11 @@ exports[`plugin-swc > should disable preset_env in target other than web 1`] = `
},
],
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
},
},
},
]
`;
Expand Down Expand Up @@ -738,6 +748,11 @@ exports[`plugin-swc > should disable preset_env mode 1`] = `
},
],
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
},
},
},
]
`;
Expand Down Expand Up @@ -844,6 +859,7 @@ exports[`plugin-swc > should enable entry mode preset_env 1`] = `
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down Expand Up @@ -954,6 +970,7 @@ exports[`plugin-swc > should enable usage mode preset_env 1`] = `
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down Expand Up @@ -1063,6 +1080,7 @@ exports[`plugin-swc > should has correct core-js 1`] = `
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down Expand Up @@ -1159,6 +1177,11 @@ exports[`plugin-swc > should has correct core-js 2`] = `
},
],
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
},
},
},
]
`;
Expand Down Expand Up @@ -1266,6 +1289,7 @@ exports[`plugin-swc > should'n override browserslist when target platform is not
},
"resolve": {
"alias": {
"@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
"core-js": "<ROOT>/node_modules/<PNPM_INNER>/core-js",
},
},
Expand Down
16 changes: 12 additions & 4 deletions packages/core/tests/rspack-provider/plugins/minimize.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ describe('plugin-minimize', () => {
"_options": {
"compress": "{"passes":1,"pure_funcs":[],"drop_console":false}",
"exclude": undefined,
"extractComments": "true",
"extractComments": {
"condition": "@preserve|@lic|@cc_on|^/**!",
},
"format": "{"comments":false,"asciiOnly":true}",
"include": undefined,
"mangle": "{"keep_classnames":false,"keep_fnames":false}",
Expand Down Expand Up @@ -97,7 +99,9 @@ describe('plugin-minimize', () => {
"_options": {
"compress": "{"passes":1,"pure_funcs":[],"drop_console":true}",
"exclude": undefined,
"extractComments": "true",
"extractComments": {
"condition": "@preserve|@lic|@cc_on|^/**!",
},
"format": "{"comments":false,"asciiOnly":true}",
"include": undefined,
"mangle": "{"keep_classnames":false,"keep_fnames":false}",
Expand Down Expand Up @@ -140,7 +144,9 @@ describe('plugin-minimize', () => {
"_options": {
"compress": "{"passes":1,"pure_funcs":["console.log","console.warn"],"drop_console":false}",
"exclude": undefined,
"extractComments": "true",
"extractComments": {
"condition": "@preserve|@lic|@cc_on|^/**!",
},
"format": "{"comments":false,"asciiOnly":true}",
"include": undefined,
"mangle": "{"keep_classnames":false,"keep_fnames":false}",
Expand Down Expand Up @@ -183,7 +189,9 @@ describe('plugin-minimize', () => {
"_options": {
"compress": "{"passes":1,"pure_funcs":[],"drop_console":false}",
"exclude": undefined,
"extractComments": "true",
"extractComments": {
"condition": "@preserve|@lic|@cc_on|^/**!",
},
"format": "{"comments":false,"asciiOnly":false}",
"include": undefined,
"mangle": "{"keep_classnames":false,"keep_fnames":false}",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@rsbuild/shared": "workspace:*",
"@rspack/plugin-react-refresh": "0.4.5",
"@rspack/plugin-react-refresh": "0.4.5-canary-be59383-20240105051840",
"react-refresh": "^0.14.0"
},
"devDependencies": {
Expand Down
Loading