[DRE-commits] [gitlab] 02/02: set ROOT_PATH in webpack.config.js

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master-9.2
in repository gitlab.

commit a1423d278af74faebd0d7046a9c2d144a365fcad
Author: Pirate Praveen <praveen at debian.org>
Date:   Wed Aug 23 09:38:10 2017 +0530

    set ROOT_PATH in webpack.config.js
---
 debian/patches/0400-use-npm-webpack.patch  |  2 +-
 debian/patches/0410-set-webpack-root.patch | 11 +++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0400-use-npm-webpack.patch b/debian/patches/0400-use-npm-webpack.patch
index 913890a..27b1ada 100644
--- a/debian/patches/0400-use-npm-webpack.patch
+++ b/debian/patches/0400-use-npm-webpack.patch
@@ -5,7 +5,7 @@
      "karma-start": "karma start config/karma.config.js",
      "webpack": "webpack --config config/webpack.config.js",
 -    "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
-+    "webpack-prod": "NODE_ENV=production NODE_PATH=/usr/share/gitlab/node_modules node_modules/.bin/webpack --context /usr/share/gitlab/app/assets/javascripts --config config/webpack.config.js"
++    "webpack-prod": "NODE_ENV=production NODE_PATH=/usr/share/gitlab/node_modules node_modules/.bin/webpack --config config/webpack.config.js"
    },
    "dependencies": {
      "babel-core": "^6.22.1",
diff --git a/debian/patches/0410-set-webpack-root.patch b/debian/patches/0410-set-webpack-root.patch
new file mode 100644
index 0000000..5fc65a4
--- /dev/null
+++ b/debian/patches/0410-set-webpack-root.patch
@@ -0,0 +1,11 @@
+--- a/config/webpack.config.js
++++ b/config/webpack.config.js
+@@ -8,7 +8,7 @@
+ var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+ var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
+ 
+-var ROOT_PATH = path.resolve(__dirname, '..');
++var ROOT_PATH = '/usr/share/gitlab';
+ var IS_PRODUCTION = process.env.NODE_ENV === 'production';
+ var IS_DEV_SERVER = process.argv[1].indexOf('webpack-dev-server') !== -1;
+ var DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost';
diff --git a/debian/patches/series b/debian/patches/series
index 50e7415..7d5de1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ pid-log-paths.patch
 0270-relax-toml-rb.patch
 0280-relax-pg.patch
 0400-use-npm-webpack.patch
+0410-set-webpack-root.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git