From a8dd7613ab799420d43628c0585a23576dc34370 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 18 Jan 2018 20:57:10 +0530
Subject: [PATCH] remove webpack-bundle-analyzer

---
 debian/patches/0420-use-system-libs.patch     | 33 +++++++++++++++++--
 debian/patches/0430-remove-devdeps.patch      |  4 +--
 .../add-system-lib-path-for-webpack.patch     |  4 +--
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0420-use-system-libs.patch b/debian/patches/0420-use-system-libs.patch
index dfeae243e2..c9e4a15f26 100644
--- a/debian/patches/0420-use-system-libs.patch
+++ b/debian/patches/0420-use-system-libs.patch
@@ -1,6 +1,6 @@
 --- a/package.json
 +++ b/package.json
-@@ -12,60 +12,27 @@
+@@ -12,60 +12,26 @@
      "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
    },
    "dependencies": {
@@ -52,13 +52,40 @@
 -    "url-loader": "^0.5.8",
      "visibilityjs": "^1.2.4",
      "vue": "^2.2.6",
-     "vue-loader": "^11.3.4",
+-    "vue-loader": "^11.3.4",
 -    "vue-resource": "^1.3.4",
 -    "vue-template-compiler": "^2.2.6",
 -    "webpack": "^3.4.0",
 -    "webpack-bundle-analyzer": "^2.8.2",
 -    "webpack-stats-plugin": "^0.1.5"
-+    "webpack-bundle-analyzer": "^2.8.2"
++    "vue-loader": "^11.3.4"
    },
    "devDependencies": {
      "babel-plugin-istanbul": "^4.0.0",
+--- a/config/webpack.config.js
++++ b/config/webpack.config.js
+@@ -7,7 +7,6 @@
+ var CopyWebpackPlugin = require('copy-webpack-plugin');
+ var CompressionPlugin = require('compression-webpack-plugin');
+ var NameAllModulesPlugin = require('name-all-modules-plugin');
+-var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+ var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
+ 
+ var ROOT_PATH = '/usr/share/gitlab';
+@@ -304,16 +303,4 @@
+   }
+ }
+ 
+-if (WEBPACK_REPORT) {
+-  config.plugins.push(
+-    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'),
+-    })
+-  );
+-}
+-
+ module.exports = config;
diff --git a/debian/patches/0430-remove-devdeps.patch b/debian/patches/0430-remove-devdeps.patch
index b1d7bddf29..1eb854b425 100644
--- a/debian/patches/0430-remove-devdeps.patch
+++ b/debian/patches/0430-remove-devdeps.patch
@@ -1,7 +1,7 @@
 --- a/package.json
 +++ b/package.json
-@@ -35,25 +35,5 @@
-     "webpack-bundle-analyzer": "^2.8.2"
+@@ -34,25 +34,5 @@
+     "vue-loader": "^11.3.4"
    },
    "devDependencies": {
 -    "babel-plugin-istanbul": "^4.0.0",
diff --git a/debian/patches/add-system-lib-path-for-webpack.patch b/debian/patches/add-system-lib-path-for-webpack.patch
index 71f4d983c4..3da8c5fda9 100644
--- a/debian/patches/add-system-lib-path-for-webpack.patch
+++ b/debian/patches/add-system-lib-path-for-webpack.patch
@@ -1,6 +1,6 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -245,6 +245,7 @@
+@@ -244,6 +244,7 @@
  
    resolve: {
      extensions: ['.js'],
@@ -8,7 +8,7 @@
      alias: {
        '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
        'emojis':         path.join(ROOT_PATH, 'fixtures/emojis'),
-@@ -254,7 +255,12 @@
+@@ -253,7 +254,12 @@
        'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
        'vue$':           'vue/dist/vue.esm.js',
      }