Revert "Revert "Merge pull request #127874 from microsoft/joh/webpack5""

This reverts commit c5f12c7226.

build/lib/extensions.js

@@ -390,7 +390,7 @@ async function webpackExtensions(taskName, isWatch, webpackConfigLocations) {
                     reject();
                 }
                 else {
-                    reporter(stats.toJson());
+                    reporter(stats === null || stats === void 0 ? void 0 : stats.toJson());
                 }
             });
         }
@@ -401,7 +401,7 @@ async function webpackExtensions(taskName, isWatch, webpackConfigLocations) {
                     reject();
                 }
                 else {
-                    reporter(stats.toJson());
+                    reporter(stats === null || stats === void 0 ? void 0 : stats.toJson());
                     resolve();
                 }
             });

build/lib/extensions.ts

@@ -475,7 +475,7 @@ export async function webpackExtensions(taskName: string, isWatch: boolean, webp
 				if (err) {
 					reject();
 				} else {
-					reporter(stats.toJson());
+					reporter(stats?.toJson());
 				}
 			});
 		} else {
@@ -484,7 +484,7 @@ export async function webpackExtensions(taskName: string, isWatch: boolean, webp
 					fancyLog.error(err);
 					reject();
 				} else {
-					reporter(stats.toJson());
+					reporter(stats?.toJson());
 					resolve();
 				}
 			});

build/monaco/monaco.webpack.config.js

@@ -33,7 +33,6 @@ module.exports = {
 	stats: {
 		all: false,
 		modules: true,
-		maxModules: 0,
 		errors: true,
 		warnings: true,
 		// our additional options

extensions/json-language-features/server/extension.webpack.config.js

@@ -23,6 +23,6 @@ const config = withDefaults({
 });
 
 // add plugin, don't replace inherited
-config.plugins.push(new webpack.IgnorePlugin(/vertx/)); // request-light dependency
+config.plugins.push(new webpack.IgnorePlugin({ resourceRegExp: /vertx/ })); // request-light dependency
 
 module.exports = config;

extensions/tsconfig.base.json

@@ -1,8 +1,29 @@
 {
 	"compilerOptions": {
-		"target": "es2019",
+		"target": "es2020",
 		"lib": [
-			"es2019"
+			"ES2016",
+			"ES2017.Object",
+			"ES2017.String",
+			"ES2017.Intl",
+			"ES2017.TypedArrays",
+			"ES2018.AsyncIterable",
+			"ES2018.AsyncGenerator",
+			"ES2018.Promise",
+			"ES2018.Regexp",
+			"ES2018.Intl",
+			"ES2019.Array",
+			"ES2019.Object",
+			"ES2019.String",
+			"ES2019.Symbol",
+			"ES2020.BigInt",
+			"ES2020.Promise",
+			"ES2020.String",
+			"ES2020.Symbol.WellKnown",
+			"ES2020.Intl",
+			"ES2021.Promise",
+			"ES2021.String",
+			"ES2021.Weakref"
 		],
 		"module": "commonjs",
 		"strict": true,

package.json

@@ -189,7 +189,7 @@
     "source-map": "0.6.1",
     "source-map-support": "^0.3.2",
     "style-loader": "^1.0.0",
-    "ts-loader": "^6.2.1",
+    "ts-loader": "^9.2.3",
     "tsec": "0.1.4",
     "typescript": "^4.4.0-dev.20210607",
     "typescript-formatter": "7.1.0",
@@ -199,9 +199,9 @@
     "vscode-debugprotocol": "1.47.0",
     "vscode-nls-dev": "^3.3.1",
     "vscode-telemetry-extractor": "^1.8.0",
-    "webpack": "^4.43.0",
+    "webpack": "^5.42.0",
-    "webpack-cli": "^3.3.12",
+    "webpack-cli": "^4.7.2",
-    "webpack-stream": "^5.2.1",
+    "webpack-stream": "^6.1.2",
     "xml2js": "^0.4.17",
     "yaserver": "^0.2.0"
   },