Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 6 insertions, 3 deletions

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 360c5be05d4..aff906353f6 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -326,7 +326,7 @@ module.exports = {
         ],
       },
       {
-        test: /\.(worker(\.min)?\.js|pdf|bmpr)$/,
+        test: /\.(worker(\.min)?\.js|pdf)$/,
         exclude: /node_modules/,
         loader: 'file-loader',
         options: {
@@ -702,7 +702,10 @@ module.exports = {
       const incrementalCompilerMiddleware = incrementalCompiler.createMiddleware(devServer);
 
       if (incrementalCompilerMiddleware) {
-        middlewares.unshift(incrementalCompilerMiddleware);
+        middlewares.unshift({
+          name: 'incremental-compiler',
+          middleware: incrementalCompilerMiddleware,
+        });
       }
 
       return middlewares;
@@ -735,7 +738,7 @@ module.exports = {
   devtool: NO_SOURCEMAPS ? false : devtool,
 
   node: {
-    fs: 'empty', // sqljs requires fs
+    fs: 'empty', // editorconfig requires 'fs'
     setImmediate: false,
   },
 };