Skip to content

Commit 28c4b5c

Browse files
committed
Merge branch 'develop'
2 parents bbd31fb + 8465e02 commit 28c4b5c

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

Diff for: template/.babelrc

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"presets": [
3-
["latest", {
4-
"es2015": { "modules": "commonjs"}
3+
["@babel/preset-env", {
4+
"targets": {
5+
"useBuiltIns": "usage"
6+
}
57
}]
68
]
79
}

Diff for: template/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212
},
1313
"dependencies": {
1414
{{#axios}}"axios": "^0.16.2",{{/axios}}
15-
{{#router}}"vue-router": "^2.7.0",{{/router}}
16-
{{#store}}"vuex": "^2.3.1",{{/store}}
17-
"vue": "^2.4.1"
15+
{{#router}}"vue-router": "^3.0.1",{{/router}}
16+
{{#store}}"vuex": "^3.0.1",{{/store}}
17+
"vue": "^2.5.13"
1818
},
1919
"devDependencies": {
20-
"babel-core": "^6.25.0",
21-
"babel-loader": "^7.1.1",
22-
"babel-preset-latest": "^6.24.1",
20+
"@babel/core": "^7.0.0-beta.39",
21+
"@babel/preset-env": "^7.0.0-beta.39",
22+
"babel-loader": "8.0.0-beta.0",
2323
"copy-webpack-plugin": "^4.0.1",
2424
"cross-env": "^5.0.5",
2525
"css-loader": "^0.28.4",
2626
"extract-text-webpack-plugin": "^3.0.0",
2727
"file-loader": "^0.11.2",
2828
"node-sass": "^4.5.3",
2929
"sass-loader": "^6.0.6",
30-
"vue-loader": "^13.0.4",
31-
"vue-template-compiler": "^2.4.1",
32-
"webpack": "^3.3.0",
30+
"vue-loader": "^14.1.1",
31+
"vue-template-compiler": "^2.5.13",
32+
"webpack": "^3.10.0",
3333
"webpack-shell-plugin": "^0.5.0",
3434
"zip-folder": "^1.0.0"
3535
}

0 commit comments

Comments
 (0)