diff --git a/package.json b/package.json index 3e2fcfc..79fca14 100644 --- a/package.json +++ b/package.json @@ -32,13 +32,13 @@ "@types/lodash": "^4.14.149", "@typescript-eslint/eslint-plugin": "^2.33.0", "@typescript-eslint/parser": "^2.33.0", - "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-eslint": "~4.5.0", - "@vue/cli-plugin-router": "~4.5.0", - "@vue/cli-plugin-typescript": "~4.5.0", - "@vue/cli-plugin-unit-jest": "~4.5.0", - "@vue/cli-plugin-vuex": "~4.5.0", - "@vue/cli-service": "~4.5.0", + "@vue/cli-plugin-babel": "~4.5.6", + "@vue/cli-plugin-eslint": "~4.5.6", + "@vue/cli-plugin-router": "~4.5.6", + "@vue/cli-plugin-typescript": "~4.5.6", + "@vue/cli-plugin-unit-jest": "~4.5.6", + "@vue/cli-plugin-vuex": "~4.5.6", + "@vue/cli-service": "~4.5.6", "@vue/eslint-config-typescript": "^5.0.2", "@vue/test-utils": "1.0.0-beta.29", "eslint": "^6.8.0", @@ -46,16 +46,11 @@ "lint-staged": "^10.1.1", "sass": "^1.26.5", "sass-loader": "^8.0.2", - "typescript": "^3.9.3", + "typescript": "~3.9.3", "vue-cli-plugin-vuetify": "^2.0.5", "vue-template-compiler": "^2.6.11", "vuetify-loader": "^1.4.3" }, - "resolutions": { - "babel-jest": "^25.0.0", - "ts-jest": "^25.0.0", - "jest": "^25.0.0" - }, "gitHooks": { "pre-commit": "lint-staged" }, @@ -63,5 +58,10 @@ "*.{js,vue,ts}": [ "vue-cli-service lint" ] + }, + "resolutions": { + "babel-jest": "^25.0.0", + "ts-jest": "^25.0.0", + "jest": "^25.0.0" } } diff --git a/src/buildInfo.ts b/src/buildInfo.ts index 3ad4558..9c157a4 100644 --- a/src/buildInfo.ts +++ b/src/buildInfo.ts @@ -1,4 +1,4 @@ -let buildInfo = process.env.COMMIT_ID +export let buildInfo = process.env.GIT_TAG if (!buildInfo) { buildInfo = 'dev' diff --git a/vue.config.js b/vue.config.js index 6fdd96b..d031d5f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -16,7 +16,7 @@ module.exports = { let arg = args[0] arg = { ...arg, - 'process.env.COMMIT_ID': JSON.stringify(process.env.COMMIT_ID) + 'process.env.GIT_TAG': JSON.stringify(process.env.GIT_TAG) } return [arg] diff --git a/yarn.lock b/yarn.lock index 83f6abc..ffb6064 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,25 +2,6 @@ # yarn lockfile v1 -"@ant-design-vue/babel-helper-vue-transform-on@^1.0.0": - version "1.0.1" - resolved "https://registry.npm.taobao.org/@ant-design-vue/babel-helper-vue-transform-on/download/@ant-design-vue/babel-helper-vue-transform-on-1.0.1.tgz#d219d92f4e1fc5e7add211c347c7fa000518b623" - integrity sha1-0hnZL04fxeet0hHDR8f6AAUYtiM= - -"@ant-design-vue/babel-plugin-jsx@^1.0.0-0": - version "1.0.0-rc.1" - resolved "https://registry.npm.taobao.org/@ant-design-vue/babel-plugin-jsx/download/@ant-design-vue/babel-plugin-jsx-1.0.0-rc.1.tgz#ae56cecbda9f08691bcf92dfe98e2416e77d758b" - integrity sha1-rlbOy9qfCGkbz5Lf6Y4kFud9dYs= - dependencies: - "@ant-design-vue/babel-helper-vue-transform-on" "^1.0.0" - "@babel/helper-module-imports" "^7.0.0" - "@babel/plugin-syntax-jsx" "^7.0.0" - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" - camelcase "^6.0.0" - html-tags "^3.1.0" - svg-tags "^1.0.0" - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4": version "7.10.4" resolved "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" @@ -1685,13 +1666,6 @@ resolved "https://registry.npm.taobao.org/@types/mime/download/@types/mime-2.0.3.tgz?cache=0&sync_timestamp=1596840690654&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fmime%2Fdownload%2F%40types%2Fmime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a" integrity sha1-yJO3NyHbc2mZQ7/DZTsd63+qSjo= -"@types/mini-css-extract-plugin@^0.9.1": - version "0.9.1" - resolved "https://registry.npm.taobao.org/@types/mini-css-extract-plugin/download/@types/mini-css-extract-plugin-0.9.1.tgz#d4bdde5197326fca039d418f4bdda03dc74dc451" - integrity sha1-1L3eUZcyb8oDnUGPS92gPcdNxFE= - dependencies: - "@types/webpack" "*" - "@types/minimatch@*": version "3.0.3" resolved "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" @@ -1886,6 +1860,25 @@ resolved "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040" integrity sha1-BI/leZWNpAj7eosqPsBQtQpmEEA= +"@vue/babel-helper-vue-transform-on@^1.0.0-rc.2": + version "1.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.0-rc.2.tgz#7246341f666e7c6e65b13da420e2ce85714fbbca" + integrity sha512-1+7CwjQ0Kasml6rHoNQUmbISwqLNNfFVBUcZl6QBremUl296ZmLrVQPqJP5pyAAWjZke5bpI1hlj+LVVuT7Jcg== + +"@vue/babel-plugin-jsx@^1.0.0-0": + version "1.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.0.0-rc.3.tgz#ab477ee95c764fbe68842a2eddd474f122e70ac6" + integrity sha512-/Ibq0hoKsidnHWPhgRpjcjYhYcHpqEm2fiKVAPO88OXZNHGwaGgS4yXkC6TDEvlZep4mBDo+2S5T81wpbVh90Q== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.0.0" + "@babel/traverse" "^7.0.0" + "@babel/types" "^7.0.0" + "@vue/babel-helper-vue-transform-on" "^1.0.0-rc.2" + camelcase "^6.0.0" + html-tags "^3.1.0" + svg-tags "^1.0.0" + "@vue/babel-plugin-transform-vue-jsx@^1.1.2": version "1.1.2" resolved "https://registry.npm.taobao.org/@vue/babel-plugin-transform-vue-jsx/download/@vue/babel-plugin-transform-vue-jsx-1.1.2.tgz#c0a3e6efc022e75e4247b448a8fc6b86f03e91c0" @@ -1898,12 +1891,11 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-app@^4.5.4": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/babel-preset-app/download/@vue/babel-preset-app-4.5.4.tgz#bb164e8ab55673c561e6e83511631eda19efd7e4" - integrity sha1-uxZOirVWc8Vh5ug1EWMe2hnv1+Q= +"@vue/babel-preset-app@^4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.5.6.tgz#391db83518790c07f241ca52ac97c6a71bd9d851" + integrity sha512-Eps83UNiBJeqlbpR9afYnhvjVLElVtA4fDLNuVUr1r3RbepoxWuq+mUTr3TBArPQebnAaDcrZaNHBWTLRbfo3A== dependencies: - "@ant-design-vue/babel-plugin-jsx" "^1.0.0-0" "@babel/core" "^7.11.0" "@babel/helper-compilation-targets" "^7.9.6" "@babel/helper-module-imports" "^7.8.3" @@ -1914,6 +1906,7 @@ "@babel/plugin-transform-runtime" "^7.11.0" "@babel/preset-env" "^7.11.0" "@babel/runtime" "^7.11.0" + "@vue/babel-plugin-jsx" "^1.0.0-0" "@vue/babel-preset-jsx" "^1.1.2" babel-plugin-dynamic-import-node "^2.3.3" core-js "^3.6.5" @@ -1967,50 +1960,50 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.1.2" camelcase "^5.0.0" -"@vue/cli-overlay@^4.5.4": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-overlay/download/@vue/cli-overlay-4.5.4.tgz#e07e3ccc2e4d770d4fdbd45cdde777d592822c19" - integrity sha1-4H48zC5Ndw1P29Rc3ed31ZKCLBk= +"@vue/cli-overlay@^4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.5.6.tgz#56544f9d3d4f74a3d8d593a497b137450ebfe171" + integrity sha512-8kFIdiErtGRlvKWJV0AcF6SXakQDxeuqqcMhWt3qIJxRH6aD33RTC37Q3KWuMsYryBZpEY3tNWGhS1d4spQu0g== -"@vue/cli-plugin-babel@~4.5.0": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-plugin-babel/download/@vue/cli-plugin-babel-4.5.4.tgz#a01cdcb3d46064675dd88d61b640adadcc851e2b" - integrity sha1-oBzcs9RgZGdd2I1htkCtrcyFHis= +"@vue/cli-plugin-babel@~4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.6.tgz#50e98221a775d926b708dab046879cc64920982a" + integrity sha512-jkeXIpvxg2Og+6igsck6qBMFwFN5poqbgDL7JEQP94DPRMAGt+AOoEz6Ultwvykd9lRDD/xLmzZ2MTeXvrpq4A== dependencies: "@babel/core" "^7.11.0" - "@vue/babel-preset-app" "^4.5.4" - "@vue/cli-shared-utils" "^4.5.4" + "@vue/babel-preset-app" "^4.5.6" + "@vue/cli-shared-utils" "^4.5.6" babel-loader "^8.1.0" cache-loader "^4.1.0" thread-loader "^2.1.3" webpack "^4.0.0" -"@vue/cli-plugin-eslint@~4.5.0": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-plugin-eslint/download/@vue/cli-plugin-eslint-4.5.4.tgz#0f1f307abfe1e4ad67dcb97693640942b15fae76" - integrity sha1-Dx8wer/h5K1n3Ll2k2QJQrFfrnY= +"@vue/cli-plugin-eslint@~4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.6.tgz#d6721bc96f797b9d978e13bd0afd39999f92caf1" + integrity sha512-maG3dy64pGVT9mMQq7KvP6kbBK6TeVgcj1aa1QwzT5yrw65E2So8bKMrEMEjy53b88bgR9jZ7gshOks00jrYsg== dependencies: - "@vue/cli-shared-utils" "^4.5.4" + "@vue/cli-shared-utils" "^4.5.6" eslint-loader "^2.2.1" globby "^9.2.0" inquirer "^7.1.0" webpack "^4.0.0" yorkie "^2.0.0" -"@vue/cli-plugin-router@^4.5.4", "@vue/cli-plugin-router@~4.5.0": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-plugin-router/download/@vue/cli-plugin-router-4.5.4.tgz#06f22408c7ed6aceddbf7302cb47a293b7af4347" - integrity sha1-BvIkCMftas7dv3MCy0eik7evQ0c= +"@vue/cli-plugin-router@^4.5.6", "@vue/cli-plugin-router@~4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.5.6.tgz#96f43cdeea6931ae25adb065dd757d6ff4f81354" + integrity sha512-QEqOGglg0JEKddZPuyiSnAzAVK7IzLrdTPCUegigzGSbUXDW4gQiltY3/2nij2q538YvdIM7JXtW1sUfy4MgHQ== dependencies: - "@vue/cli-shared-utils" "^4.5.4" + "@vue/cli-shared-utils" "^4.5.6" -"@vue/cli-plugin-typescript@~4.5.0": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-plugin-typescript/download/@vue/cli-plugin-typescript-4.5.4.tgz#50e78207daa7595670c5626ee9b2251d0f6ab345" - integrity sha1-UOeCB9qnWVZwxWJu6bIlHQ9qs0U= +"@vue/cli-plugin-typescript@~4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-4.5.6.tgz#8479b16cdddee091c5c1de47c85199f4d362bd56" + integrity sha512-zr/N1hX5gQQjR2BBFJdZPXatyKC9Scaw8vRDUhu6AE8phcQqf81DhRRVHICss9mMt7DTLKEHHjcYgFrotjEaew== dependencies: "@types/webpack-env" "^1.15.2" - "@vue/cli-shared-utils" "^4.5.4" + "@vue/cli-shared-utils" "^4.5.6" cache-loader "^4.1.0" fork-ts-checker-webpack-plugin "^3.1.1" globby "^9.2.0" @@ -2022,15 +2015,15 @@ optionalDependencies: fork-ts-checker-webpack-plugin-v5 "npm:fork-ts-checker-webpack-plugin@^5.0.11" -"@vue/cli-plugin-unit-jest@~4.5.0": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-plugin-unit-jest/download/@vue/cli-plugin-unit-jest-4.5.4.tgz#15e5464c44c00f0a085f9260ea3d7cfa111bff63" - integrity sha1-FeVGTETADwoIX5Jg6j18+hEb/2M= +"@vue/cli-plugin-unit-jest@~4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-4.5.6.tgz#21992c60d5bcba8b1947b21ba9dbdc0e9eddc0a8" + integrity sha512-ZJgyH3RylVnAEyj1xP9EkojcpXXKKe9EKe1vh2FSU6s8lSdw0smB7WPN5Ft0ersfO1Q/pighgsTnFiGcdFMddQ== dependencies: "@babel/core" "^7.11.0" "@babel/plugin-transform-modules-commonjs" "^7.9.6" "@types/jest" "^24.0.19" - "@vue/cli-shared-utils" "^4.5.4" + "@vue/cli-shared-utils" "^4.5.6" babel-core "^7.0.0-bridge.0" babel-jest "^24.9.0" babel-plugin-transform-es2015-modules-commonjs "^6.26.2" @@ -2043,15 +2036,15 @@ ts-jest "^24.2.0" vue-jest "^3.0.5" -"@vue/cli-plugin-vuex@^4.5.4", "@vue/cli-plugin-vuex@~4.5.0": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-plugin-vuex/download/@vue/cli-plugin-vuex-4.5.4.tgz#6296e307388f61132117e0ac03188013652b0c55" - integrity sha1-YpbjBziPYRMhF+CsAxiAE2UrDFU= +"@vue/cli-plugin-vuex@^4.5.6", "@vue/cli-plugin-vuex@~4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.6.tgz#484687d85369b0dca065c4491bf18efff5e31ecf" + integrity sha512-cWxj0jIhhupU+oFl0mc1St3ig9iF5F01XKwAhKEbvvuHR97zHxLd29My/vvcRwojZMy4aY320oJ+0ljoCIbueQ== -"@vue/cli-service@~4.5.0": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-service/download/@vue/cli-service-4.5.4.tgz#f903edf555d107404624de2fed5996da8cedc524" - integrity sha1-+QPt9VXRB0BGJN4v7VmW2oztxSQ= +"@vue/cli-service@~4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.5.6.tgz#a63fd390ed8cbfb5d36201f54dec9aeb90ca93e3" + integrity sha512-wl0rhjHSpy2Mc2zNU6sfhaUVNNaRzgXNfZMIpTZMO3wJalPMLuvGC3KLMaXcpvuI01zeQBmkEocAdhzay4lQ0w== dependencies: "@intervolga/optimize-cssnano-plugin" "^1.0.5" "@soda/friendly-errors-webpack-plugin" "^1.7.1" @@ -2059,10 +2052,10 @@ "@types/minimist" "^1.2.0" "@types/webpack" "^4.0.0" "@types/webpack-dev-server" "^3.11.0" - "@vue/cli-overlay" "^4.5.4" - "@vue/cli-plugin-router" "^4.5.4" - "@vue/cli-plugin-vuex" "^4.5.4" - "@vue/cli-shared-utils" "^4.5.4" + "@vue/cli-overlay" "^4.5.6" + "@vue/cli-plugin-router" "^4.5.6" + "@vue/cli-plugin-vuex" "^4.5.6" + "@vue/cli-shared-utils" "^4.5.6" "@vue/component-compiler-utils" "^3.1.2" "@vue/preload-webpack-plugin" "^1.1.0" "@vue/web-component-wrapper" "^1.2.0" @@ -2109,12 +2102,12 @@ webpack-dev-server "^3.11.0" webpack-merge "^4.2.2" optionalDependencies: - vue-loader-v16 "npm:vue-loader@^16.0.0-beta.3" + vue-loader-v16 "npm:vue-loader@^16.0.0-beta.7" -"@vue/cli-shared-utils@^4.5.4": - version "4.5.4" - resolved "https://registry.npm.taobao.org/@vue/cli-shared-utils/download/@vue/cli-shared-utils-4.5.4.tgz?cache=0&sync_timestamp=1597717139051&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vue%2Fcli-shared-utils%2Fdownload%2F%40vue%2Fcli-shared-utils-4.5.4.tgz#ed36b2971dc02653f7f2ad4e66bbe9510e1bd414" - integrity sha1-7Taylx3AJlP38q1OZrvpUQ4b1BQ= +"@vue/cli-shared-utils@^4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.5.6.tgz#14644972043c95566788d07d9a9367edd438a4d6" + integrity sha512-p6ePDlEa7Xc0GEt99KDOCwPZtR7UnoEaZLMfwPYU5LAWkdCmtAw8HPAY/WWcjtoiaAkY4k9tz7ZehQasZ9mJxg== dependencies: "@hapi/joi" "^15.0.1" chalk "^2.4.2" @@ -7266,6 +7259,15 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.0, loader-utils@^1.2 emojis-list "^3.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -10763,10 +10765,10 @@ typedarray@^0.0.6: resolved "https://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.9.3: +typescript@~3.9.3: version "3.9.7" - resolved "https://registry.npm.taobao.org/typescript/download/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" - integrity sha1-mNYApevcOPQMsndSLxLcgA6eJfo= + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" + integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== uglify-js@3.4.x: version "3.4.10" @@ -11058,17 +11060,14 @@ vue-jest@^3.0.5: tsconfig "^7.0.0" vue-template-es2015-compiler "^1.6.0" -"vue-loader-v16@npm:vue-loader@^16.0.0-beta.3": - version "16.0.0-beta.5" - resolved "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.0.0-beta.5.tgz#04edc889492b03a445e7ac66e9226a70175ca8a0" - integrity sha1-BO3IiUkrA6RF56xm6SJqcBdcqKA= +"vue-loader-v16@npm:vue-loader@^16.0.0-beta.7": + version "16.0.0-beta.8" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.0.0-beta.8.tgz#1f523d9fea8e8c6e4f5bb99fd768165af5845879" + integrity sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g== dependencies: - "@types/mini-css-extract-plugin" "^0.9.1" - chalk "^3.0.0" + chalk "^4.1.0" hash-sum "^2.0.0" - loader-utils "^1.2.3" - merge-source-map "^1.1.0" - source-map "^0.6.1" + loader-utils "^2.0.0" vue-loader@^15.9.2: version "15.9.3"