Merge branch 'master' of http://gitlab.essenptl.com/purplevin/component
# Conflicts: # lib/index.common.js # lib/index.umd.js # lib/index.umd.min.js
Showing
This source diff could not be displayed because it is too large. You can view the blob instead.
| ... | @@ -8,15 +8,6 @@ | ... | @@ -8,15 +8,6 @@ |
| "build": "vue-cli-service build", | "build": "vue-cli-service build", | ||
| "lib": "vue-cli-service build --target lib --name index --dest lib packages/index.js" | "lib": "vue-cli-service build --target lib --name index --dest lib packages/index.js" | ||
| }, | }, | ||
| "dependencies": { | |||
| "axios": "^0.27.2", | |||
| "core-js": "^3.25.0", | |||
| "element-ui": "2.15.8", | |||
| "moment": "^2.29.4", | |||
| "vue": "2.6.14", | |||
| "vuex": "^3.4.0", | |||
| "xlsx": "^0.18.5" | |||
| }, | |||
| "devDependencies": { | "devDependencies": { | ||
| "@vue/cli-plugin-babel": "~5.0.0", | "@vue/cli-plugin-babel": "~5.0.0", | ||
| "@vue/cli-service": "~5.0.0", | "@vue/cli-service": "~5.0.0", | ||
| ... | @@ -26,8 +17,13 @@ | ... | @@ -26,8 +17,13 @@ |
| }, | }, | ||
| "peerDependencies": { | "peerDependencies": { | ||
| "sass-loader": "8.0.2", | "sass-loader": "8.0.2", | ||
| "axios": "^0.27.2", | |||
| "core-js": "^3.25.0", | |||
| "element-ui": "2.15.8", | "element-ui": "2.15.8", | ||
| "vue": "2.6.14" | "moment": "^2.29.4", | ||
| "vue": "2.6.14", | |||
| "vuex": "^3.4.0", | |||
| "xlsx": "^0.18.5" | |||
| }, | }, | ||
| "browserslist": [ | "browserslist": [ | ||
| "> 1%", | "> 1%", | ||
| ... | ... |
Please register or sign in to comment