diff --git a/package-lock.json b/package-lock.json index 8a57e32b..48e341a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,3 @@ { - "name": "smart-admin", - "lockfileVersion": 2, - "requires": true, - "packages": {} + "lockfileVersion": 1 } diff --git a/smart-admin-h5/package.json b/smart-admin-h5/package.json index cd09ecb3..27004afa 100644 --- a/smart-admin-h5/package.json +++ b/smart-admin-h5/package.json @@ -20,6 +20,8 @@ "axios": "^0.19.2", "core-js": "^3.6.5", "fastclick": "^1.0.6", + "joi": "^17.6.0", + "join": "^3.0.0", "js-cookie": "^2.2.1", "lib-flexible": "^0.3.2", "lodash": "^4.17.20", @@ -27,19 +29,21 @@ "nprogress": "^0.2.0", "regenerator-runtime": "^0.13.5", "vant": "^2.11.1", - "vue": "^2.6.12", + "vue": "^3.2.31", "vue-enum": "^1.0.5", + "vue-loader": "^17.0.0", "vue-loading-overlay": "^3.4.2", "vue-router": "^3.4.0", "vuex": "^3.6.0" }, "devDependencies": { - "@sentry/webpack-plugin": "^1.11.1", + "@sentry/webpack-plugin": "^1.18.8", "@vue/cli-plugin-babel": "~4.5.0", "@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-service": "~4.5.0", + "@vue/compiler-sfc": "^3.2.31", "babel-eslint": "^10.1.0", "babel-plugin-import": "^1.13.0", "babel-plugin-transform-remove-console": "^6.9.4", diff --git a/smart-admin-h5/vue.config.js b/smart-admin-h5/vue.config.js index a31f3a23..51e5fa10 100644 --- a/smart-admin-h5/vue.config.js +++ b/smart-admin-h5/vue.config.js @@ -11,6 +11,9 @@ const projectConfig = require('./src/config/index.js'); // 生产环境,测试和正式 const isProductionEnv = ['production'].includes(process.env.NODE_ENV); const isProductionAppEnv = ['prod', 'pre'].includes(process.env.VUE_APP_ENV); +const addOptions = { + preserveWhitespace: true +} module.exports = { publicPath: projectConfig.publicPath, @@ -93,7 +96,7 @@ module.exports = { .use('vue-loader') .loader('vue-loader') .tap(options => { - options.compilerOptions.preserveWhitespace = true; + options.compilerOptions = addOptions; return options; }) .end(); diff --git a/smart-admin-web/package-lock.json b/smart-admin-web/package-lock.json index 86b799c5..197e40a8 100644 --- a/smart-admin-web/package-lock.json +++ b/smart-admin-web/package-lock.json @@ -4084,8 +4084,7 @@ "core-js": { "version": "2.6.11", "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.11.tgz?cache=0&sync_timestamp=1586450269267&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.11.tgz", - "integrity": "sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw=", - "dev": true + "integrity": "sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw=" }, "core-util-is": { "version": "1.0.2", diff --git a/smart-admin-web/package.json b/smart-admin-web/package.json index ee82b487..275dda9f 100644 --- a/smart-admin-web/package.json +++ b/smart-admin-web/package.json @@ -23,7 +23,7 @@ "cropperjs": "^1.2.2", "dayjs": "^1.7.7", "decimal.js": "^10.1.1", - "core-js":"^2.0.0", + "core-js": "^2.0.0", "e-guide-layer": "^0.1.1", "echarts": "^4.0.4", "gq-plus": "^2.1.5",