Commit a1b68aa4 authored by Fatih Acet's avatar Fatih Acet

Merge branch '29043-upgrade-vue-and-remove-warnings' into 'master'

Resolve "Upgrade Vue to >=2.2.0 and disable development warnings in tests"

Closes #29043

See merge request !9981
parents 57f79da9 22856474
import Vue from 'vue';
import './vue_resource_interceptor';
if (process.env.NODE_ENV !== 'production') {
Vue.config.productionTip = false;
}
---
title: Upgrade VueJS to v2.2.4 and disable dev mode warnings
merge_request: 9981
author:
...@@ -18,7 +18,7 @@ var config = { ...@@ -18,7 +18,7 @@ var config = {
context: path.join(ROOT_PATH, 'app/assets/javascripts'), context: path.join(ROOT_PATH, 'app/assets/javascripts'),
entry: { entry: {
common: './commons/index.js', common: './commons/index.js',
common_vue: ['vue', 'vue-resource'], common_vue: ['vue', './vue_shared/common_vue.js'],
common_d3: ['d3'], common_d3: ['d3'],
main: './main.js', main: './main.js',
blob_edit: './blob_edit/blob_edit_bundle.js', blob_edit: './blob_edit/blob_edit_bundle.js',
...@@ -132,7 +132,7 @@ var config = { ...@@ -132,7 +132,7 @@ var config = {
'empty_states': path.join(ROOT_PATH, 'app/views/shared/empty_states'), 'empty_states': path.join(ROOT_PATH, 'app/views/shared/empty_states'),
'icons': path.join(ROOT_PATH, 'app/views/shared/icons'), 'icons': path.join(ROOT_PATH, 'app/views/shared/icons'),
'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'),
'vue$': 'vue/dist/vue.common.js', 'vue$': 'vue/dist/vue.esm.js',
} }
} }
} }
......
...@@ -4464,9 +4464,9 @@ vue-resource@^0.9.3: ...@@ -4464,9 +4464,9 @@ vue-resource@^0.9.3:
version "0.9.3" version "0.9.3"
resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d"
vue@^2.1.10: vue@^2.2.4:
version "2.1.10" version "2.2.4"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.1.10.tgz#c9235ca48c7925137be5807832ac4e3ac180427b" resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.4.tgz#d0a3a050a80a12356d7950ae5a7b3131048209cc"
watchpack@^1.2.0: watchpack@^1.2.0:
version "1.2.1" version "1.2.1"
......
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