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

Utilize bundler-ready Vue distribution See merge request !9357

Merge branch 'fix-vue-production-build' into 'master'
09ffa984 · Jacob Schatz · Ruben Davila · 77254ab7 · 09ffa984
Commit 09ffa984 authored Feb 20, 2017 by Jacob Schatz Committed by Ruben Davila Feb 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

webpack.config.js config/webpack.config.js +1 -2

No files found.
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -91,8 +91,7 @@ var config = {
      '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'
+      'vue$':           IS_PRODUCTION ? 'vue/dist/vue.min.js' : 'vue/dist/vue.js',
    }
  }
 }