diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-09 17:23:54 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:43 -0600 |
| commit | 8d2099cb53e933e94ebc17e9c186c0f4ece107cb (patch) | |
| tree | c7ec7b9192ecb4b267e39977f6c1f34963eeb3e7 /config/webpack.config.js | |
| parent | a8078d629e50ec1ea0e562e24e7bd7ea8931d896 (diff) | |
| download | gitlab-ce-8d2099cb53e933e94ebc17e9c186c0f4ece107cb.tar.gz | |
use ~ to reference non-local scripts instead of resolve.root
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 8dd9cf5b960..4060228c94b 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -82,15 +82,13 @@ var config = { resolve: { extensions: ['', '.js', '.es6', '.js.es6'], alias: { + '~': path.join(ROOT_PATH, 'app/assets/javascripts'), 'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap', 'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'), 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), 'vue$': 'vue/dist/vue.js', 'vue-resource$': 'vue-resource/dist/vue-resource.js' - }, - root: [ - path.join(ROOT_PATH, 'app/assets/javascripts'), - ], + } } } |