Commit 09ffa984 authored by Jacob Schatz's avatar Jacob Schatz Committed by Ruben Davila

Merge branch 'fix-vue-production-build' into 'master'

Utilize bundler-ready Vue distribution

See merge request !9357
parent 77254ab7
...@@ -91,8 +91,7 @@ var config = { ...@@ -91,8 +91,7 @@ var config = {
'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap', 'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap',
'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'), 'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'),
'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'),
'vue$': 'vue/dist/vue.js', 'vue$': IS_PRODUCTION ? 'vue/dist/vue.min.js' : 'vue/dist/vue.js',
'vue-resource$': 'vue-resource/dist/vue-resource.js'
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment