--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -5,7 +5,6 @@
 const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
 const CompressionPlugin = require('compression-webpack-plugin');
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const ROOT_PATH = '/usr/share/gitlab';
@@ -127,12 +126,12 @@
 
   resolve: {
     extensions: ['.js', '.gql', '.graphql'],
-    modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'],
+    modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/vendor/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs', '/usr/share/nodejs'],
     alias,
   },
 
   resolveLoader: {
-    modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
+    modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs','/usr/share/nodejs'],
   },
 
   module: {
@@ -370,19 +369,6 @@
     // enable HMR only in webpack-dev-server
     DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
 
-    // optionally generate webpack bundle analysis
-    WEBPACK_REPORT &&
-      new BundleAnalyzerPlugin({
-        analyzerMode: 'static',
-        generateStatsFile: true,
-        openAnalyzer: false,
-        reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
-        statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
-        statsOptions: {
-          source: false,
-        },
-      }),
-
     new webpack.DefinePlugin({
       // This one is used to define window.gon.ee and other things properly in tests:
       'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -408,6 +394,7 @@
 
   node: {
     fs: 'empty', // sqljs requires fs
+    Buffer: 'mock',
     setImmediate: false,
   },
 };