From 228564749dcbbcd7284141dee50e52cef8ea300e Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 21 Mar 2017 20:28:20 -0500 Subject: move common vue script to vue_shared directory --- app/assets/javascripts/commons/vue.js | 8 -------- app/assets/javascripts/vue_shared/common_vue.js | 6 ++++++ config/webpack.config.js | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 app/assets/javascripts/commons/vue.js create mode 100644 app/assets/javascripts/vue_shared/common_vue.js diff --git a/app/assets/javascripts/commons/vue.js b/app/assets/javascripts/commons/vue.js deleted file mode 100644 index 9e54c406d0a..00000000000 --- a/app/assets/javascripts/commons/vue.js +++ /dev/null @@ -1,8 +0,0 @@ -import Vue from 'vue'; -import VueResource from 'vue-resource'; - -Vue.use(VueResource); - -if (process.env.NODE_ENV !== 'production') { - Vue.config.productionTip = false; -} diff --git a/app/assets/javascripts/vue_shared/common_vue.js b/app/assets/javascripts/vue_shared/common_vue.js new file mode 100644 index 00000000000..eb2a6071fda --- /dev/null +++ b/app/assets/javascripts/vue_shared/common_vue.js @@ -0,0 +1,6 @@ +import Vue from 'vue'; +import './vue_resource_interceptor'; + +if (process.env.NODE_ENV !== 'production') { + Vue.config.productionTip = false; +} diff --git a/config/webpack.config.js b/config/webpack.config.js index a38c7967002..3cf94b9b435 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -18,7 +18,7 @@ var config = { context: path.join(ROOT_PATH, 'app/assets/javascripts'), entry: { common: './commons/index.js', - common_vue: './commons/vue.js', + common_vue: ['vue', './vue_shared/common_vue.js'], common_d3: ['d3'], main: './main.js', blob_edit: './blob_edit/blob_edit_bundle.js', -- cgit v1.2.1