Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kocal committed Feb 5, 2018
2 parents bbd31fb + 8465e02 commit 28c4b5c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
6 changes: 4 additions & 2 deletions template/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"presets": [
["latest", {
"es2015": { "modules": "commonjs"}
["@babel/preset-env", {
"targets": {
"useBuiltIns": "usage"
}
}]
]
}
18 changes: 9 additions & 9 deletions template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
},
"dependencies": {
{{#axios}}"axios": "^0.16.2",{{/axios}}
{{#router}}"vue-router": "^2.7.0",{{/router}}
{{#store}}"vuex": "^2.3.1",{{/store}}
"vue": "^2.4.1"
{{#router}}"vue-router": "^3.0.1",{{/router}}
{{#store}}"vuex": "^3.0.1",{{/store}}
"vue": "^2.5.13"
},
"devDependencies": {
"babel-core": "^6.25.0",
"babel-loader": "^7.1.1",
"babel-preset-latest": "^6.24.1",
"@babel/core": "^7.0.0-beta.39",
"@babel/preset-env": "^7.0.0-beta.39",
"babel-loader": "8.0.0-beta.0",
"copy-webpack-plugin": "^4.0.1",
"cross-env": "^5.0.5",
"css-loader": "^0.28.4",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"node-sass": "^4.5.3",
"sass-loader": "^6.0.6",
"vue-loader": "^13.0.4",
"vue-template-compiler": "^2.4.1",
"webpack": "^3.3.0",
"vue-loader": "^14.1.1",
"vue-template-compiler": "^2.5.13",
"webpack": "^3.10.0",
"webpack-shell-plugin": "^0.5.0",
"zip-folder": "^1.0.0"
}
Expand Down

0 comments on commit 28c4b5c

Please sign in to comment.