[DRE-commits] [gitlab] 01/07: prepare for using system webpack

[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 4574c88a7c47877dc5e69b8b91a2587f249f5dd0
Author: Pirate Praveen <praveen at debian.org>
Date:   Mon Sep 4 10:08:05 2017 +0530

    prepare for using system webpack
---
 debian/patches/0420-use-system-libs.patch            | 11 +++++++++++
 debian/patches/add-system-lib-path-for-webpack.patch | 10 ++++++++++
 debian/patches/series                                |  2 ++
 3 files changed, 23 insertions(+)

diff --git a/debian/patches/0420-use-system-libs.patch b/debian/patches/0420-use-system-libs.patch
new file mode 100644
index 0000000..0a1d85a
--- /dev/null
+++ b/debian/patches/0420-use-system-libs.patch
@@ -0,0 +1,11 @@
+--- a/package.json
++++ b/package.json
+@@ -57,7 +57,7 @@
+     "vue-loader": "^11.3.4",
+     "vue-resource": "^0.9.3",
+     "vue-template-compiler": "^2.2.6",
+-    "webpack": "^2.3.3",
++//    "webpack": "^2.3.3",
+     "webpack-bundle-analyzer": "^2.3.0"
+   },
+   "devDependencies": {
diff --git a/debian/patches/add-system-lib-path-for-webpack.patch b/debian/patches/add-system-lib-path-for-webpack.patch
new file mode 100644
index 0000000..03f9720
--- /dev/null
+++ b/debian/patches/add-system-lib-path-for-webpack.patch
@@ -0,0 +1,10 @@
+--- a/config/webpack.config.js
++++ b/config/webpack.config.js
+@@ -186,6 +186,7 @@
+ 
+   resolve: {
+     extensions: ['.js'],
++    modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
+     alias: {
+       '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
+       'emojis':         path.join(ROOT_PATH, 'fixtures/emojis'),
diff --git a/debian/patches/series b/debian/patches/series
index 7d5de1f..209efdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,5 @@ pid-log-paths.patch
 0280-relax-pg.patch
 0400-use-npm-webpack.patch
 0410-set-webpack-root.patch
+0420-use-system-libs.patch
+add-system-lib-path-for-webpack.patch

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