Skip to content

Commit 605ac91

Browse files
committed
Update vue/vuetify to latest versions
1 parent 779eb65 commit 605ac91

File tree

4 files changed

+2763
-4369
lines changed

4 files changed

+2763
-4369
lines changed

babel.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
22
presets: [
3-
'@vue/app'
3+
'@vue/cli-plugin-babel/preset'
44
]
55
}

package.json

+31-31
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,48 @@
88
"lint": "vue-cli-service lint"
99
},
1010
"dependencies": {
11-
"@vue/cli": "^3.11.0",
12-
"apollo-cache-inmemory": "^1.6.3",
13-
"apollo-link": "^1.2.12",
14-
"apollo-link-http": "^1.5.15",
15-
"graphql": "^14.4.2",
11+
"apollo-cache-inmemory": "^1.6.5",
12+
"apollo-link": "^1.2.13",
13+
"apollo-link-http": "^1.5.16",
14+
"core-js": "^3.4.4",
15+
"graphql": "^14.6.0",
1616
"graphql-tag": "^2.10.1",
17-
"pixi.js": "^5.1.1",
17+
"pixi.js": "^5.2.1",
1818
"register-service-worker": "^1.6.2",
19-
"vue": "^2.6.10",
20-
"vue-apollo": "^3.0.0-rc.2",
21-
"vue-cesium": "^0.0.22",
22-
"vue-cli-plugin-apollo": "^0.21.0",
19+
"vue": "^2.6.11",
20+
"vue-apollo": "^3.0.3",
21+
"vue-cesium": "^2.0.5",
22+
"vue-cli-plugin-apollo": "^0.21.3",
2323
"vue-fullscreen": "^2.1.5",
2424
"vue-lodash": "^2.0.2",
25-
"vue-router": "^3.0.7",
26-
"vue-timers": "^2.0.2",
25+
"vue-router": "^3.1.5",
26+
"vue-timers": "^2.0.4",
2727
"vue-visibility-change": "^1.2.1",
2828
"vuebar": "^0.0.20",
29-
"vuelayers": "^0.11.5-beta.8",
30-
"vuetify": "^2.0.4",
31-
"vuex": "^3.1.1",
29+
"vuelayers": "^0.11.21",
30+
"vuetify": "^2.2.8",
31+
"vuex": "^3.1.2",
3232
"vuex-router-sync": "^5.0.0"
3333
},
3434
"devDependencies": {
35-
"@vue/cli-plugin-babel": "^3.10.0",
36-
"@vue/cli-plugin-eslint": "^3.10.0",
37-
"@vue/cli-service": "^3.10.0",
38-
"@vue/cli-shared-utils": "^3.10.0",
39-
"babel-eslint": "^10.0.2",
40-
"deepmerge": "^4.0.0",
41-
"eslint": "^6.1.0",
42-
"eslint-plugin-vue": "^5.2.3",
43-
"fibers": "^4.0.1",
35+
"@vue/cli-plugin-babel": "^4.1.2",
36+
"@vue/cli-plugin-eslint": "^4.1.2",
37+
"@vue/cli-service": "^4.1.2",
38+
"@vue/cli-shared-utils": "^4.1.2",
39+
"babel-eslint": "^10.0.3",
40+
"deepmerge": "^4.2.2",
41+
"eslint": "^6.8.0",
42+
"eslint-plugin-vue": "^6.1.2",
43+
"fibers": "^4.0.2",
4444
"pug": "^2.0.4",
4545
"pug-plain-loader": "^1.0.0",
46-
"sass": "^1.22.9",
47-
"sass-loader": "^7.1.0",
48-
"typescript": "^3.5.3",
49-
"vue-cli-plugin-vuetify": "^0.6.1",
50-
"vue-template-compiler": "^2.6.10",
51-
"vuetify-loader": "^1.3.0",
52-
"webpack": "^4.39.1"
46+
"sass": "^1.25.0",
47+
"sass-loader": "^8.0.2",
48+
"typescript": "^3.7.5",
49+
"vue-cli-plugin-vuetify": "^2.0.3",
50+
"vue-template-compiler": "^2.6.11",
51+
"vuetify-loader": "^1.4.3",
52+
"webpack": "^4.41.5"
5353
},
5454
"eslintConfig": {
5555
"root": true,

vue.config.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ module.exports = {
44

55
// tweak internal webpack configuration.
66
// see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md
7+
8+
"transpileDependencies": [
9+
"vuetify"
10+
],
711

812
/*
913
chainWebpack: config => {
@@ -50,15 +54,15 @@ module.exports = {
5054
css: {
5155
loaderOptions: {
5256
sass: {
53-
data: `@import "~@/sass/main.scss"`,
57+
prependData: `@import "~@/sass/main.scss"`,
5458
},
5559
},
5660
},
5761

5862
chainWebpack: config => {
5963
["vue-modules", "vue", "normal-modules", "normal"].forEach((match) => {
6064
config.module.rule('scss').oneOf(match).use('sass-loader')
61-
.tap(opt => Object.assign(opt, { data: `@import '~@/sass/main.scss';` }))
65+
.tap(opt => Object.assign(opt, { prependData: `@import '~@/sass/main.scss';` }))
6266
})
6367
},
6468

0 commit comments

Comments
 (0)