prepare for using system webpack

This commit is contained in:
Pirate Praveen 2017-09-04 10:08:05 +05:30
parent 1ffb582697
commit 4574c88a7c
3 changed files with 23 additions and 0 deletions

View file

@ -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": {

View file

@ -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'),

View file

@ -15,3 +15,5 @@ pid-log-paths.patch
0280-relax-pg.patch 0280-relax-pg.patch
0400-use-npm-webpack.patch 0400-use-npm-webpack.patch
0410-set-webpack-root.patch 0410-set-webpack-root.patch
0420-use-system-libs.patch
add-system-lib-path-for-webpack.patch