WRO-231: Merge feature/webpack5 to develop (#95)

* WRN-18582: Migrate to webpack5 (#90) * WRN-18582: webpack5 initial commit Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * WRN-18582: Migrated isomorphic and snapshot plugin Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * update verbose plugin Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * fix travis errors Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * update dependencies Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * fix Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * fix based on review Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * update shrinkwrap Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * WRN-12124: Remove deprecated babel-eslint module (#87) * use @babel/eslint-parser * remove babel-preset-react-app * remove @babel/eslint-parser * Revert "remove @babel/eslint-parser" This reverts commit 98ec872. * Revert "remove babel-preset-react-app" This reverts commit 70a93e2. * Revert "use @babel/eslint-parser" This reverts commit 5c15b55. * babel-eslint -> @babel/eslint-parser * add CHANGELOG.md * Update package.json Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com> * update npm-shrinkwrap.json * removed unused dependency Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * update eslint-config-prettier Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com> * WRN-19252: Fix VerboseLogPlugin is not working (#91) * WRN-19252: Use ProgressPlugin from originated place Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * pinned webpack version Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * WRN-12748: Update eslint 8 related modules (#88) * update eslint 8 * Update package.json * Update package.json Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com> Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com> * WRN-19694: Support for React18 (#92) * update react version Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * update dependencies Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * WRN-19694: Add react18 support Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * fix Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * WRN-20218: Fix eanct pack --framework and --externals options (#93) * WRN-20218: Fix enact pack --framework Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * fix context Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * fix lint Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * fix local node_modules files and files ends with .js module id Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * fix Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * WRN-20481: Fixed miss made module id and miss referenced library (#94) Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * Fix prerendering regex Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * update dependencies Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) Co-authored-by: taeyoung.hong <35059065+hong6316@users.noreply.github.com>
enactjs · Apr 11, 2022 · 1738bbe · 1738bbe
1 parent 10e795c
commit 1738bbe
Show file tree

Hide file tree

Showing 18 changed files with 7,049 additions and 7,162 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,7 +2,7 @@ module.exports = {
 	env: {
 		node: true
 	},
-	extends: ['enact', 'plugin:prettier/recommended', 'prettier/babel', 'prettier/react'],
+	extends: ['enact', 'plugin:prettier/recommended', 'prettier'],
 	plugins: ['import'],
 	rules: {
 		'import/no-unresolved': ['error', {commonjs: true, caseSensitive: true}],

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# unreleased
+
+* Updated all dependencies, with webpack peer dependency restricted to >=5.0.0.
+* Updated all webpack plugins to use WeakMap since `compilation.hooks` became frozen.
+* `IlibPlugin`:
+  * Added `ILIB_ADDITIONAL_RESOURCES_PATH` to defined constants if provided.
+  * Added `publicPath` option to specify webpack public path.
+* `PrerenderPlugin`: Added React18 support for `ReactDOMClient.hydrateRoot` instead of `ReactDOMClient.createRoot` for prerendered apps.
+
 # 4.1.4 (February 18, 2022)
 
 * `option-parser`: Added `additionalModulePaths` to specify paths to check when resolving modules.

diff --git a/mixins/externals.js b/mixins/externals.js
@@ -11,6 +11,7 @@ module.exports = {
 
 		// Include plugin to hook into its events
 		const htmlPluginInstance = helper.getPluginByName(config, 'HtmlWebpackPlugin');
+		const webOSMetaPluginInstance = helper.getPluginByName(config, 'WebOSMetaPlugin');
 
 		const libraries = ['@enact', 'react', 'react-dom', 'ilib'];
 
@@ -32,7 +33,8 @@ module.exports = {
 					publicPath: opts['externals-public'] || opts.externalsPublic || opts.externals,
 					snapshot: opts.snapshot
 				},
-				htmlPlugin: htmlPluginInstance && htmlPluginInstance.constructor
+				htmlPlugin: htmlPluginInstance && htmlPluginInstance.constructor,
+				webOSMetaPlugin: webOSMetaPluginInstance && webOSMetaPluginInstance.constructor
 			})
 		);
 

diff --git a/mixins/isomorphic.js b/mixins/isomorphic.js
@@ -39,6 +39,7 @@ module.exports = {
 
 		// Include plugin to prerender the html into the index.html
 		const htmlPluginInstance = helper.getPluginByName(config, 'HtmlWebpackPlugin');
+		const webOSMetaPluginInstance = helper.getPluginByName(config, 'WebOSMetaPlugin');
 		config.plugins.push(
 			new PrerenderPlugin({
 				server: reactDOMServer,
@@ -49,7 +50,8 @@ module.exports = {
 				fontGenerator: app.fontGenerator,
 				externalStartup: app.externalStartup,
 				mapfile: opts.mapfile,
-				htmlPlugin: htmlPluginInstance && htmlPluginInstance.constructor
+				htmlPlugin: htmlPluginInstance && htmlPluginInstance.constructor,
+				webOSMetaPlugin: webOSMetaPluginInstance && webOSMetaPluginInstance.constructor
 			})
 		);
 
@@ -63,7 +65,8 @@ module.exports = {
 			// Include plugin to attempt generation of v8 snapshot binary if V8_MKSNAPSHOT env var is set
 			config.plugins.push(
 				new SnapshotPlugin({
-					target: 'main.js'
+					target: 'main.js',
+					webOSMetaPlugin: webOSMetaPluginInstance && webOSMetaPluginInstance.constructor
 				})
 			);
 		}

diff --git a/mixins/verbose.js b/mixins/verbose.js
@@ -1,7 +1,17 @@
+const helper = require('../config-helper');
 const VerboseLogPlugin = require('../plugins/VerboseLogPlugin');
 
 module.exports = {
-	apply: function (config) {
-		return config.plugins.push(new VerboseLogPlugin());
+	apply: function (config, opts = {}) {
+		const prerenderInstance = helper.getPluginByName(config, 'PrerenderPlugin');
+		const snapshotPluginInstance = helper.getPluginByName(config, 'SnapshotPlugin');
+
+		return config.plugins.push(
+			new VerboseLogPlugin({
+				prerenderPlugin: prerenderInstance && prerenderInstance.constructor,
+				ProgressPlugin: opts.ProgressPlugin,
+				snapshotPlugin: snapshotPluginInstance && snapshotPluginInstance.constructor
+			})
+		);
 	}
 };