2017-09-04 10:08:05 +05:30
|
|
|
--- a/config/webpack.config.js
|
|
|
|
|
+++ b/config/webpack.config.js
|
2018-03-27 20:24:05 +05:30
|
|
|
@@ -234,6 +234,7 @@
|
2017-09-04 10:08:05 +05:30
|
|
|
|
|
|
|
|
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'),
|
2018-03-27 20:24:05 +05:30
|
|
|
@@ -246,6 +247,10 @@
|
2017-09-15 14:00:02 +05:30
|
|
|
}
|
2018-03-27 20:24:05 +05:30
|
|
|
},
|
|
|
|
|
|
2017-09-15 14:00:02 +05:30
|
|
|
+ resolveLoader: {
|
|
|
|
|
+ modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
|
2018-03-27 20:24:05 +05:30
|
|
|
+ },
|
2017-09-15 14:00:02 +05:30
|
|
|
+
|
2018-03-27 20:24:05 +05:30
|
|
|
// sqljs requires fs
|
|
|
|
|
node: {
|
|
|
|
|
fs: 'empty',
|
