Skip to content

Commit 8ee5110

Browse files
authored
Merge pull request #376 from izaera/LPS-124287
feat: upgrade webpack and add more portal projects to federated build
2 parents 27935d8 + 8611de3 commit 8ee5110

File tree

7 files changed

+26
-10
lines changed

7 files changed

+26
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"terser-webpack-plugin": "^5.0.3",
4040
"ts-jest": "^26.4.1",
4141
"typescript": "^4.0.3",
42-
"webpack": "^5.4.0",
42+
"webpack": "^5.11.1",
4343
"webpack-cli": "^4.2.0",
4444
"webpack-dev-server": "^3.11.0",
4545
"xml-js": "^1.6.11",

projects/js-toolkit/packages/js-toolkit-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"read-json-sync": "^2.0.1",
1414
"resolve": "^1.8.1",
1515
"source-map": "^0.7.3",
16-
"webpack": "^5.4.0"
16+
"webpack": "^5.11.1"
1717
},
1818
"description": "Utility library for Liferay NPM Build Tools.",
1919
"license": "LGPL-3.0",

projects/js-toolkit/packages/npm-bundler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"pretty-time": "^1.1.0",
1717
"read-json-sync": "^2.0.1",
1818
"source-map": "^0.7.3",
19-
"webpack": "^5.4.0",
19+
"webpack": "^5.11.1",
2020
"xml-js": "^1.6.8",
2121
"yargs": "^14.0.0"
2222
},

projects/js-toolkit/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"moduleResolution": "node",
88
"resolveJsonModule": true,
99
"sourceMap": false,
10-
"target": "ES2018"
10+
"target": "ES2018",
11+
"types": ["jest"]
1112
},
1213
"exclude": ["node_modules", "**/__tests__/**"]
1314
}

projects/npm-tools/packages/npm-scripts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"terser": "5.3.8",
6868
"ts-loader": "^8.0.4",
6969
"typescript": "^4.0.3",
70-
"webpack": "^5.4.0",
70+
"webpack": "^5.11.1",
7171
"webpack-cli": "^4.2.0",
7272
"webpack-dev-server": "^3.11.0"
7373
},

projects/npm-tools/packages/npm-scripts/src/utils/createFederationConfig.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,24 @@ const writeWebpackFederationEntryPoint = require('./writeWebpackFederationEntryP
2121
* the relation is not used for anything. However, it is better to do it this
2222
* way, because if we mix all together we end up with a very entangled
2323
* configuration.
24+
*
25+
* Note also that when you want to include a project in the federated build to
26+
* consume other packages (even if it doesn't publish any package) you must
27+
* declare it here.
2428
*/
2529
const FEDERATED_PACKAGES = {
26-
'frontend-js-react-web': ['react'],
30+
'frontend-js-react-web': [
31+
'classnames',
32+
'formik',
33+
'prop-types',
34+
'react',
35+
'react-dnd',
36+
'react-dnd-html5-backend',
37+
'react-dom',
38+
],
39+
'frontend-js-web': [],
40+
'frontend-taglib-clay': ['@clayui/icon'],
41+
'portal-template-react-renderer-impl': [],
2742
};
2843

2944
/**

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15745,10 +15745,10 @@ webpack-sources@^2.1.1:
1574515745
source-list-map "^2.0.1"
1574615746
source-map "^0.6.1"
1574715747

15748-
webpack@^5.4.0:
15749-
version "5.11.0"
15750-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.11.0.tgz#1647abc060441d86d01d8835b8f0fc1dae2fe76f"
15751-
integrity sha512-ubWv7iP54RqAC/VjixgpnLLogCFbAfSOREcSWnnOlZEU8GICC5eKmJSu6YEnph2N2amKqY9rvxSwgyHxVqpaRw==
15748+
webpack@^5.11.1:
15749+
version "5.11.1"
15750+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.11.1.tgz#39b2b9daeb5c6c620e03b7556ec674eaed4016b4"
15751+
integrity sha512-tNUIdAmYJv+nupRs/U/gqmADm6fgrf5xE+rSlSsf2PgsGO7j2WG7ccU6AWNlOJlHFl+HnmXlBmHIkiLf+XA9mQ==
1575215752
dependencies:
1575315753
"@types/eslint-scope" "^3.7.0"
1575415754
"@types/estree" "^0.0.45"

0 commit comments

Comments
 (0)