Skip to content

Commit 14b14c5

Browse files
ScriptedAlchemyScriptedAlchemy
authored
Fix react 18 example (#3125)
* try and fix lerna workspace output parse * try and fix lerna workspace output parse * try and fix lerna workspace output parse * update node federation use
1 parent 5bfee6d commit 14b14c5

File tree

7 files changed

+29
-42
lines changed

7 files changed

+29
-42
lines changed

‎react-18-ssr/remote1/config/module-federation.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const deps = require('../package.json').dependencies;
22
const { ModuleFederationPlugin } = require('webpack').container;
3-
const { NodeFederationPlugin, StreamingTargetPlugin } = require('@module-federation/node');
3+
const { UniversalFederationPlugin } = require('@module-federation/node');
44

55
module.exports = {
66
client: new ModuleFederationPlugin({
@@ -25,10 +25,11 @@ module.exports = {
2525
},
2626
}),
2727
server: [
28-
new NodeFederationPlugin({
28+
new UniversalFederationPlugin({
2929
name: 'remote1',
3030
filename: 'remoteEntry.js',
3131
library: { type: 'commonjs-module' },
32+
isServer: true,
3233
remotes: {
3334
remote2: 'remote2@http://localhost:3002/server/remoteEntry.js',
3435
},
@@ -47,12 +48,5 @@ module.exports = {
4748
},
4849
},
4950
}),
50-
new StreamingTargetPlugin({
51-
name: 'remote1',
52-
library: { type: 'commonjs-module' },
53-
remotes: {
54-
remote2: 'remote2@http://localhost:3002/server/remoteEntry.js',
55-
},
56-
}),
5751
],
5852
};

‎react-18-ssr/remote1/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@babel/preset-env": "7.21.4",
2020
"@babel/preset-react": "7.18.6",
2121
"@babel/preset-typescript": "7.21.4",
22-
"@module-federation/node": "0.12.2",
22+
"@module-federation/node": "1.0.5",
2323
"@types/react": "18.0.38",
2424
"@types/react-dom": "18.0.11",
2525
"babel-loader": "8.2.5",

‎react-18-ssr/remote2/config/module-federation.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const deps = require('../package.json').dependencies;
22
const { ModuleFederationPlugin } = require('webpack').container;
3-
const { NodeFederationPlugin, StreamingTargetPlugin } = require('@module-federation/node');
3+
const {UniversalFederationPlugin } = require('@module-federation/node');
44

55
module.exports = {
66
client: new ModuleFederationPlugin({
@@ -23,8 +23,9 @@ module.exports = {
2323
},
2424
}),
2525
server: [
26-
new NodeFederationPlugin({
26+
new UniversalFederationPlugin({
2727
name: 'remote2',
28+
isServer: true,
2829
filename: 'remoteEntry.js',
2930
library: { type: 'commonjs-module' },
3031
remotes: {},
@@ -43,10 +44,5 @@ module.exports = {
4344
},
4445
},
4546
}),
46-
new StreamingTargetPlugin({
47-
name: 'remote2',
48-
library: { type: 'commonjs-module' },
49-
remotes: {},
50-
}),
5147
],
5248
};

‎react-18-ssr/remote2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@babel/preset-env": "7.21.4",
2020
"@babel/preset-react": "7.18.6",
2121
"@babel/preset-typescript": "7.21.4",
22-
"@module-federation/node": "0.12.2",
22+
"@module-federation/node": "1.0.5",
2323
"@types/react": "18.0.38",
2424
"@types/react-dom": "18.0.11",
2525
"babel-loader": "8.2.5",

‎react-18-ssr/shell/config/module-federation.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const deps = require('../package.json').dependencies;
22
const { ModuleFederationPlugin } = require('webpack').container;
3-
const { NodeFederationPlugin, StreamingTargetPlugin } = require('@module-federation/node');
3+
const { UniversalFederationPlugin } = require('@module-federation/node');
44

55
module.exports = {
66
client: new ModuleFederationPlugin({
@@ -12,21 +12,15 @@ module.exports = {
1212
shared: [{ react: deps.react, 'react-dom': deps['react-dom'] }],
1313
}),
1414
server: [
15-
new NodeFederationPlugin({
15+
new UniversalFederationPlugin({
1616
name: 'shell',
17+
isServer: true,
1718
library: { type: 'commonjs-module' },
1819
filename: 'remoteEntry.js',
1920
remotes: {
2021
remote1: 'remote1@http://localhost:3001/server/remoteEntry.js',
2122
},
2223
shared: [{ react: deps.react, 'react-dom': deps['react-dom'] }],
2324
}),
24-
new StreamingTargetPlugin({
25-
name: 'shell',
26-
library: { type: 'commonjs-module' },
27-
remotes: {
28-
remote1: 'remote1@http://localhost:3001/server/remoteEntry.js',
29-
},
30-
}),
3125
],
3226
};

‎react-18-ssr/shell/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@babel/preset-env": "7.21.4",
2424
"@babel/preset-react": "7.18.6",
2525
"@babel/preset-typescript": "7.21.4",
26-
"@module-federation/node": "0.12.2",
26+
"@module-federation/node": "1.0.5",
2727
"@types/express": "4.17.14",
2828
"@types/react": "18.0.38",
2929
"@types/react-dom": "18.0.11",

‎react-18-ssr/yarn.lock

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1954,19 +1954,22 @@
19541954
npmlog "^4.1.2"
19551955
write-file-atomic "^2.3.0"
19561956

1957-
"@module-federation/node@0.12.2":
1958-
version "0.12.2"
1959-
resolved "https://registry.yarnpkg.com/@module-federation/node/-/node-0.12.2.tgz#9abf138ef579692ffd316e0b44e7bd69bb512fd2"
1960-
integrity sha512-eh2hq5cx92S7S1Y9Vp/OVpbzEmWhiBIcSWaUf9kUqyjNpH5pzMgh9cX6Etp2hn63OFv2SaYvZ84h0rqrf/C7VA==
1957+
"@module-federation/node@1.0.5":
1958+
version "1.0.5"
1959+
resolved "https://registry.yarnpkg.com/@module-federation/node/-/node-1.0.5.tgz#29cbb4a1128da2e26609bec6c857a3d5b78a2ec4"
1960+
integrity sha512-9NH9GE3uEIcL5laJKJgdyCk1n1mvn2ROFE3HdmHvQNfSsBDHKW3yBjYk0aOSvW0gelhEMVeltpFWqhXy7Q3exg==
19611961
dependencies:
1962-
"@module-federation/utilities" "1.4.0"
1963-
encoding "0.1.13"
1964-
node-fetch "2.6.7"
1962+
"@module-federation/utilities" "2.0.4"
1963+
encoding "^0.1.13"
1964+
node-fetch "^2.6.7"
1965+
webpack-sources "3.2.3"
19651966

1966-
"@module-federation/[email protected]":
1967-
version "1.4.0"
1968-
resolved "https://registry.yarnpkg.com/@module-federation/utilities/-/utilities-1.4.0.tgz#c7b8c6e08262af6377714d94557929a3df67e64e"
1969-
integrity sha512-J4KISJvLmFhZEgBhdntn6MWqElWU6vMC/JuQT7MdNe8Apc8qoYis0FKGp4gp8YkIPPhplkQExy2vS14+3KxoJA==
1967+
"@module-federation/[email protected]":
1968+
version "2.0.4"
1969+
resolved "https://registry.yarnpkg.com/@module-federation/utilities/-/utilities-2.0.4.tgz#5fc673101ebfb6f7e8befee0bbbac95170a5b364"
1970+
integrity sha512-2youICrL7FWSGGPe+GwZTr5IsNZMdUv6kFRrH+gXV1/TfR1zeQ0y0ixRJUFskOt22nSeH6fOEhiCuqIWD1dQGQ==
1971+
dependencies:
1972+
webpack-sources "3.2.3"
19701973

19711974
"@mrmlnc/readdir-enhanced@^2.2.1":
19721975
version "2.2.1"
@@ -3685,7 +3688,7 @@ encodeurl@~1.0.2:
36853688
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
36863689
integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
36873690

3688-
[email protected].13, encoding@^0.1.11:
3691+
encoding@^0.1.11, encoding@^0.1.13:
36893692
version "0.1.13"
36903693
resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
36913694
integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -5806,7 +5809,7 @@ node-fetch-npm@^2.0.2:
58065809
json-parse-better-errors "^1.0.0"
58075810
safe-buffer "^5.1.1"
58085811

5809-
node-fetch@2.6.7, node-fetch@^2.5.0, node-fetch@^2.6.7:
5812+
node-fetch@^2.5.0, node-fetch@^2.6.7:
58105813
version "2.6.7"
58115814
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
58125815
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
@@ -8074,7 +8077,7 @@ [email protected], webpack-merge@^5.7.3:
80748077
clone-deep "^4.0.1"
80758078
wildcard "^2.0.0"
80768079

8077-
webpack-sources@^3.2.3:
8080+
webpack-sources@3.2.3, webpack-sources@^3.2.3:
80788081
version "3.2.3"
80798082
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
80808083
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

0 commit comments

Comments
 (0)