Merge branch '2.0'

# Conflicts:
#	package-lock.json
This commit is contained in:
zhigang.li 2018-08-21 22:40:44 +08:00
commit 73cb524f65
2 changed files with 9 additions and 5 deletions

View File

@ -1,5 +1,8 @@
{
"presets": [
"@vue/app"
],
"plugins": [
"@babel/plugin-syntax-dynamic-import"
]
}
}

View File

@ -31,10 +31,11 @@
"xlsx": "^0.13.3"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.0.0-beta.10",
"@vue/cli-plugin-eslint": "^3.0.0-beta.10",
"@vue/cli-plugin-unit-mocha": "^3.0.0-beta.10",
"@vue/cli-service": "^3.0.0-beta.10",
"@babel/plugin-syntax-dynamic-import": "^7.0.0-rc.1",
"@vue/cli-plugin-babel": "^3.0.1",
"@vue/cli-plugin-eslint": "^3.0.1",
"@vue/cli-plugin-unit-mocha": "^3.0.1",
"@vue/cli-service": "^3.0.1",
"@vue/eslint-config-standard": "^3.0.0-beta.10",
"@vue/test-utils": "^1.0.0-beta.10",
"chai": "^4.1.2",