Merge branch 'dev' of github.com:element-plus/element-plus into feat/test

This commit is contained in:
Herrington Darkholme 2020-07-24 18:50:34 +08:00
commit d24bbc9be9
2 changed files with 3 additions and 2 deletions

View File

@ -9,7 +9,7 @@
"test": "lerna run test --stream",
"gc": "sh ./scripts/gc.sh"
},
"dependencies": {
"peerDependencies": {
"vue": "^3.0.0-rc.1",
"vue-router": "^4.0.0-beta.2"
},

View File

@ -3,10 +3,11 @@
"version": "0.0.0",
"main": "dist/index.js",
"license": "MIT",
<<<<<<< HEAD
"scripts": {
"test": "jest --config ../../jest.config.js --rootDir ."
},
"dependencies": {
"peerDependencies": {
"vue": "^3.0.0-rc.1"
},
"devDependencies": {