Skip to content

Commit f77dec4

Browse files
Update r161718 (#3843)
* migrate to enhanced * migrate to enhanced * migrate to enhanced * move react 16 17 18 ssr to rspack * move react 16 17 18 ssr to rspack --------- Co-authored-by: ScriptedAlchemy <[email protected]>
1 parent dfb8457 commit f77dec4

14 files changed

+136
-50
lines changed

pnpm-lock.yaml

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

react-16-17-18-ssr/remote1/config/module-federation.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const deps = require('../package.json').dependencies;
2-
const { ModuleFederationPlugin } = require('@module-federation/enhanced');
3-
const { UniversalFederationPlugin } = require('@module-federation/node');
2+
const { ModuleFederationPlugin } = require('@module-federation/enhanced/rspack');
43

54
module.exports = {
65
client: new ModuleFederationPlugin({
@@ -25,9 +24,9 @@ module.exports = {
2524
},
2625
}),
2726
server: [
28-
new UniversalFederationPlugin({
27+
new ModuleFederationPlugin({
28+
runtimePlugins: [require.resolve('@module-federation/node/runtimePlugin')],
2929
remoteType: 'script',
30-
isServer:true,
3130
name: 'remote1',
3231
filename: 'remoteEntry.js',
3332
library: { type: 'commonjs-module' },

react-16-17-18-ssr/remote1/config/webpack.client.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const path = require('path');
22
const { merge } = require('webpack-merge');
33
const sharedWebpackConfig = require('./webpack.shared');
44
const moduleFederationPlugin = require('./module-federation');
5-
const HtmlWebPackPlugin = require('html-webpack-plugin');
5+
const {HtmlRspackPlugin} = require('@rspack/core')
66

77
/**
88
* @type {import('webpack').Configuration}
@@ -14,7 +14,7 @@ const webpackConfig = {
1414
},
1515
plugins: [
1616
moduleFederationPlugin.client,
17-
new HtmlWebPackPlugin({
17+
new HtmlRspackPlugin({
1818
template: './src/index.html',
1919
}),
2020
],

react-16-17-18-ssr/remote1/config/webpack.server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const webpackConfig = {
1212
filename: '[name].js',
1313
libraryTarget: 'commonjs-module',
1414
},
15-
target: false,
15+
target: 'async-node',
1616
name: 'server',
1717
plugins: [...moduleFederationPlugin.server],
1818
};

react-16-17-18-ssr/remote1/package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"start": "pnpm build && pnpm serve",
66
"serve": "npx serve dist/ -p 3001",
77
"build": "pnpm build:client && pnpm build:server",
8-
"build:client": "rimraf dist/client && webpack --mode production --config config/webpack.client.js",
9-
"build:server": "rimraf dist/server && webpack --mode production --config config/webpack.server.js"
8+
"build:client": "rimraf dist/client && rspack --mode production --config config/webpack.client.js",
9+
"build:server": "rimraf dist/server && rspack --mode production --config config/webpack.server.js"
1010
},
1111
"dependencies": {
1212
"react": "16.14.0",
@@ -28,6 +28,9 @@
2828
"rimraf": "3.0.2",
2929
"webpack": "^5.91.0",
3030
"webpack-cli": "4.9.2",
31-
"webpack-merge": "5.10.0"
31+
"webpack-merge": "5.10.0",
32+
"@rspack/core": "^0.6.3",
33+
"@rspack/cli": "^0.6.3",
34+
"@rspack/dev-server": "^0.6.3"
3235
}
33-
}
36+
}

react-16-17-18-ssr/remote2/config/module-federation.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const deps = require('../package.json').dependencies;
2-
const { ModuleFederationPlugin } = require('@module-federation/enhanced');
3-
const { UniversalFederationPlugin } = require('@module-federation/node');
2+
const { ModuleFederationPlugin } = require('@module-federation/enhanced/rspack');
43

54
module.exports = {
65
client: new ModuleFederationPlugin({
@@ -23,9 +22,11 @@ module.exports = {
2322
},
2423
}),
2524
server: [
26-
new UniversalFederationPlugin({
25+
new ModuleFederationPlugin({
2726
remoteType: 'script',
28-
isServer:true,
27+
runtimePlugins: [
28+
require.resolve('@module-federation/node/runtimePlugin')
29+
],
2930
name: 'remote2',
3031
filename: 'remoteEntry.js',
3132
library: { type: 'commonjs-module' },

react-16-17-18-ssr/remote2/config/webpack.client.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const path = require('path');
22
const { merge } = require('webpack-merge');
33
const sharedWebpackConfig = require('./webpack.shared');
44
const moduleFederationPlugin = require('./module-federation');
5-
const HtmlWebPackPlugin = require('html-webpack-plugin');
5+
const {HtmlRspackPlugin} = require('@rspack/core')
66

77
/**
88
* @type {import('webpack').Configuration}
@@ -14,7 +14,7 @@ const webpackConfig = {
1414
},
1515
plugins: [
1616
moduleFederationPlugin.client,
17-
new HtmlWebPackPlugin({
17+
new HtmlRspackPlugin({
1818
template: './src/index.html',
1919
}),
2020
],

0 commit comments

Comments
 (0)