diff --git a/debian/patches/0420-use-system-libs.patch b/debian/patches/0420-use-system-libs.patch index a2794920b0..22133a8bac 100644 --- a/debian/patches/0420-use-system-libs.patch +++ b/debian/patches/0420-use-system-libs.patch @@ -45,7 +45,7 @@ "react-dev-utils": "^0.5.2", "select2": "3.5.2-browserify", "sql.js": "^0.4.0", -@@ -56,14 +38,11 @@ +@@ -56,15 +38,11 @@ "three-orbit-controls": "^82.1.0", "three-stl-loader": "^1.0.4", "timeago.js": "^2.0.5", @@ -57,6 +57,7 @@ "vue-resource": "^1.3.4", "vue-template-compiler": "^2.2.6", - "webpack": "^3.4.0", - "webpack-bundle-analyzer": "^2.8.2", +- "webpack-bundle-analyzer": "^2.8.2", "webpack-stats-plugin": "^0.1.5" }, + "devDependencies": { diff --git a/debian/patches/remove-bundle-analyzer.patch b/debian/patches/remove-bundle-analyzer.patch new file mode 100644 index 0000000000..eb2a91848a --- /dev/null +++ b/debian/patches/remove-bundle-analyzer.patch @@ -0,0 +1,27 @@ +--- 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'; +@@ -310,16 +309,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/series b/debian/patches/series index b3d523ff88..5c70b6854c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,4 +22,5 @@ pid-log-paths.patch 0410-set-webpack-root.patch 0420-use-system-libs.patch add-system-lib-path-for-webpack.patch +remove-bundle-analyzer.patch fix-mail-room-path.patch diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh index c996916d81..eb25fa47f3 100755 --- a/debian/rake-tasks.sh +++ b/debian/rake-tasks.sh @@ -36,6 +36,7 @@ runuser -u ${gitlab_user} -- sh -c 'npm i document-register-element@1.3.0' echo "Webpacking..." runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/webpack' +runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/webpack-bundle-analyzer' runuser -u ${gitlab_user} -- sh -c 'NODE_PATH=/usr/share/gitlab/node_modules webpack --config config/webpack.config.js' echo "Precompiling assets..."