Update webpack-merge.

This update forces a change in how we import webpack-merge in commonjs contexts. Typescript is smart enough to import correctly.

buildutils/package.json

@@ -64,7 +64,7 @@
     "sort-package-json": "~1.31.0",
     "typescript": "~3.9.2",
     "webpack": "~5.0.0-beta.26",
-    "webpack-merge": "^5.1.1",
+    "webpack-merge": "^5.1.2",
     "which": "^2.0.2"
   },
   "devDependencies": {

dev_mode/package.json

@@ -85,7 +85,7 @@
     "webpack": "~5.0.0-beta.26",
     "webpack-bundle-analyzer": "^3.6.0",
     "webpack-cli": "^3.3.10",
-    "webpack-merge": "^4.2.2",
+    "webpack-merge": "^5.1.2",
     "whatwg-fetch": "^3.0.0",
     "worker-loader": "^2.0.0",
     "yarn-deduplicate": "^1.1.1"

dev_mode/webpack.config.js

@@ -8,7 +8,7 @@ const fs = require('fs-extra');
 const Handlebars = require('handlebars');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const merge = require('webpack-merge').default;
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
   .BundleAnalyzerPlugin;
 const baseConfig = require('@jupyterlab/buildutils/lib/webpack.config.base');

dev_mode/webpack.prod.config.js

@@ -1,4 +1,4 @@
-const merge = require('webpack-merge');
+const merge = require('webpack-merge').default;
 const config = require('./webpack.config');
 
 config[0] = merge(config[0], {

dev_mode/webpack.prod.minimize.config.js

@@ -1,5 +1,5 @@
 const TerserPlugin = require('terser-webpack-plugin');
-const merge = require('webpack-merge');
+const merge = require('webpack-merge').default;
 const config = require('./webpack.config');
 
 config[0] = merge(config[0], {

dev_mode/webpack.prod.release.config.js

@@ -1,4 +1,4 @@
-const merge = require('webpack-merge');
+const merge = require('webpack-merge').default;
 const config = require('./webpack.prod.minimize.config');
 
 config[0] = merge(config[0], {

examples/federated/core_package/package.json

@@ -70,7 +70,7 @@
     "watch": "~1.0.2",
     "webpack": "~5.0.0-beta.26",
     "webpack-cli": "^3.3.10",
-    "webpack-merge": "^5.1.1",
+    "webpack-merge": "^5.1.2",
     "whatwg-fetch": "^3.0.0"
   },
   "resolutions": {

examples/federated/core_package/webpack.config.js

@@ -3,7 +3,7 @@
 const data = require('./package.json');
 const Build = require('@jupyterlab/buildutils').Build;
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const merge = require('webpack-merge').default;
 const baseConfig = require('@jupyterlab/buildutils/lib/webpack.config.base');
 const { ModuleFederationPlugin } = webpack.container;
 const fs = require('fs-extra');