diff --git a/package.json b/package.json index cef169ddb..dbe4ff267 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ }, "dependencies": { "@ant-design/icons-vue": "^6.1.0", - "@vueuse/core": "^8.1.1", - "ant-design-vue": "3.1.0-rc.1", + "@vueuse/core": "^8.1.2", + "ant-design-vue": "3.1.0-rc.2", "axios": "^0.26.1", "core-js": "^3.21.1", "dayjs": "^1.11.0", @@ -42,7 +42,7 @@ "pinia": "2.0.12", "qs": "^6.10.3", "socket.io-client": "4.4.1", - "sortablejs": "^1.14.0", + "sortablejs": "^1.15.0", "vue": "^3.2.31", "vue-i18n": "9.2.0-beta.30", "vue-router": "^4.0.14", @@ -53,10 +53,10 @@ "@commitlint/cli": "^16.2.3", "@commitlint/config-conventional": "^16.2.1", "@types/lodash-es": "^4.17.6", - "@types/node": "^17.0.21", + "@types/node": "^17.0.22", "@types/webpack-env": "^1.16.3", - "@typescript-eslint/eslint-plugin": "^5.15.0", - "@typescript-eslint/parser": "^5.15.0", + "@typescript-eslint/eslint-plugin": "^5.16.0", + "@typescript-eslint/parser": "^5.16.0", "@vue/cli-plugin-babel": "^5.0.3", "@vue/cli-plugin-eslint": "^5.0.3", "@vue/cli-plugin-router": "^5.0.3", diff --git a/src/views/account/about.vue b/src/views/account/about.vue index e465c8dcd..b82905bd1 100644 --- a/src/views/account/about.vue +++ b/src/views/account/about.vue @@ -24,13 +24,21 @@ + + + 点击链接加入群聊 + + @@ -39,7 +47,7 @@ @@ -52,7 +60,7 @@ const { pkg, lastBuildTime } = __APP_INFO__; const BlankLink = ({ url = '', text }) => ( - + {text} ); diff --git a/types/global.d.ts b/types/global.d.ts index 162837710..f5e3bd859 100644 --- a/types/global.d.ts +++ b/types/global.d.ts @@ -1,5 +1,12 @@ import packageJSON from '../package.json'; -import type { ComponentRenderProxy, VNode, VNodeChild, PropType as VuePropType } from 'vue'; +import type { + ComponentRenderProxy, + VNode, + VNodeChild, + SetupContext, + EmitsOptions, + PropType as VuePropType, +} from 'vue'; declare global { const __APP_INFO__: { @@ -48,20 +55,7 @@ declare global { declare function parseFloat(string: string | number): number; - declare type EmitFn< - Options = ObjectEmitsOptions, - Event extends keyof Options = keyof Options, - > = Options extends Array - ? (event: V, ...args: any[]) => void - : {} extends Options - ? (event: string, ...args: any[]) => void - : UnionToIntersection< - { - [key in Event]: Options[key] extends (...args: infer Args) => any - ? (event: key, ...args: Args) => void - : (event: key, ...args: any[]) => void; - }[Event] - >; + declare type EmitFn = SetupContext['emit']; namespace JSX { // tslint:disable no-empty-interface diff --git a/vue.config.js b/vue.config.js index ae06f0868..e2309d21b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -16,16 +16,6 @@ const IS_PROD = ['production', 'prod'].includes(process.env.NODE_ENV); // port = 8098 npm run dev OR npm run dev --port = 8098 const port = process.env.port || process.env.npm_config_port || 8098; // dev port -// 获取所有依赖地址 -['dependencies', 'devDependencies'].forEach((name) => { - Object.keys(pkg[name]).forEach((key) => { - const devPkg = require(`./node_modules/${key}/package.json`); - pkg[name][key] = { - url: devPkg.repository?.url || devPkg.repository || devPkg.homepage, - version: pkg[name][key], - }; - }); -}); const __APP_INFO__ = { pkg, diff --git a/yarn.lock b/yarn.lock index 8cdc35d36..fb13806f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1459,11 +1459,16 @@ resolved "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/node@*", "@types/node@>=12", "@types/node@^17.0.21": +"@types/node@*", "@types/node@>=12": version "17.0.21" resolved "https://registry.npmmirror.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== +"@types/node@^17.0.22": + version "17.0.22" + resolved "https://registry.npmmirror.com/@types/node/-/node-17.0.22.tgz#38b6c4b9b2f3ed9f2e376cce42a298fb2375251e" + integrity sha512-8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw== + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -1523,7 +1528,7 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^5.0.0", "@typescript-eslint/eslint-plugin@^5.15.0": +"@typescript-eslint/eslint-plugin@^5.0.0": version "5.15.0" resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.15.0.tgz#c28ef7f2e688066db0b6a9d95fb74185c114fb9a" integrity sha512-u6Db5JfF0Esn3tiAKELvoU5TpXVSkOpZ78cEGn/wXtT2RVqs2vkt4ge6N8cRCyw7YVKhmmLDbwI2pg92mlv7cA== @@ -1538,7 +1543,22 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.15.0": +"@typescript-eslint/eslint-plugin@^5.16.0": + version "5.16.0" + resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.16.0.tgz#78f246dd8d1b528fc5bfca99a8a64d4023a3d86d" + integrity sha512-SJoba1edXvQRMmNI505Uo4XmGbxCK9ARQpkvOd00anxzri9RNQk0DDCxD+LIl+jYhkzOJiOMMKYEHnHEODjdCw== + dependencies: + "@typescript-eslint/scope-manager" "5.16.0" + "@typescript-eslint/type-utils" "5.16.0" + "@typescript-eslint/utils" "5.16.0" + debug "^4.3.2" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.2.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/parser@^5.0.0": version "5.15.0" resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.15.0.tgz#95f603f8fe6eca7952a99bfeef9b85992972e728" integrity sha512-NGAYP/+RDM2sVfmKiKOCgJYPstAO40vPAgACoWPO/+yoYKSgAXIFaBKsV8P0Cc7fwKgvj27SjRNX4L7f4/jCKQ== @@ -1548,6 +1568,16 @@ "@typescript-eslint/typescript-estree" "5.15.0" debug "^4.3.2" +"@typescript-eslint/parser@^5.16.0": + version "5.16.0" + resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.16.0.tgz#e4de1bde4b4dad5b6124d3da227347616ed55508" + integrity sha512-fkDq86F0zl8FicnJtdXakFs4lnuebH6ZADDw6CYQv0UZeIjHvmEw87m9/29nk2Dv5Lmdp0zQ3zDQhiMWQf/GbA== + dependencies: + "@typescript-eslint/scope-manager" "5.16.0" + "@typescript-eslint/types" "5.16.0" + "@typescript-eslint/typescript-estree" "5.16.0" + debug "^4.3.2" + "@typescript-eslint/scope-manager@5.15.0": version "5.15.0" resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz#d97afab5e0abf4018d1289bd711be21676cdd0ee" @@ -1556,6 +1586,14 @@ "@typescript-eslint/types" "5.15.0" "@typescript-eslint/visitor-keys" "5.15.0" +"@typescript-eslint/scope-manager@5.16.0": + version "5.16.0" + resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.16.0.tgz#7e7909d64bd0c4d8aef629cdc764b9d3e1d3a69a" + integrity sha512-P+Yab2Hovg8NekLIR/mOElCDPyGgFZKhGoZA901Yax6WR6HVeGLbsqJkZ+Cvk5nts/dAlFKm8PfL43UZnWdpIQ== + dependencies: + "@typescript-eslint/types" "5.16.0" + "@typescript-eslint/visitor-keys" "5.16.0" + "@typescript-eslint/type-utils@5.15.0": version "5.15.0" resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.15.0.tgz#d2c02eb2bdf54d0a645ba3a173ceda78346cf248" @@ -1565,11 +1603,25 @@ debug "^4.3.2" tsutils "^3.21.0" +"@typescript-eslint/type-utils@5.16.0": + version "5.16.0" + resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.16.0.tgz#b482bdde1d7d7c0c7080f7f2f67ea9580b9e0692" + integrity sha512-SKygICv54CCRl1Vq5ewwQUJV/8padIWvPgCxlWPGO/OgQLCijY9G7lDu6H+mqfQtbzDNlVjzVWQmeqbLMBLEwQ== + dependencies: + "@typescript-eslint/utils" "5.16.0" + debug "^4.3.2" + tsutils "^3.21.0" + "@typescript-eslint/types@5.15.0": version "5.15.0" resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501" integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA== +"@typescript-eslint/types@5.16.0": + version "5.16.0" + resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.16.0.tgz#5827b011982950ed350f075eaecb7f47d3c643ee" + integrity sha512-oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g== + "@typescript-eslint/typescript-estree@5.15.0": version "5.15.0" resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac" @@ -1583,6 +1635,19 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@5.16.0": + version "5.16.0" + resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz#32259459ec62f5feddca66adc695342f30101f61" + integrity sha512-SE4VfbLWUZl9MR+ngLSARptUv2E8brY0luCdgmUevU6arZRY/KxYoLI/3V/yxaURR8tLRN7bmZtJdgmzLHI6pQ== + dependencies: + "@typescript-eslint/types" "5.16.0" + "@typescript-eslint/visitor-keys" "5.16.0" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + "@typescript-eslint/utils@5.15.0": version "5.15.0" resolved "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.15.0.tgz#468510a0974d3ced8342f37e6c662778c277f136" @@ -1595,6 +1660,18 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" +"@typescript-eslint/utils@5.16.0": + version "5.16.0" + resolved "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.16.0.tgz#42218b459d6d66418a4eb199a382bdc261650679" + integrity sha512-iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.16.0" + "@typescript-eslint/types" "5.16.0" + "@typescript-eslint/typescript-estree" "5.16.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + "@typescript-eslint/visitor-keys@5.15.0": version "5.15.0" resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz#5669739fbf516df060f978be6a6dce75855a8027" @@ -1603,6 +1680,14 @@ "@typescript-eslint/types" "5.15.0" eslint-visitor-keys "^3.0.0" +"@typescript-eslint/visitor-keys@5.16.0": + version "5.16.0" + resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz#f27dc3b943e6317264c7492e390c6844cd4efbbb" + integrity sha512-jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g== + dependencies: + "@typescript-eslint/types" "5.16.0" + eslint-visitor-keys "^3.0.0" + "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": version "1.2.1" resolved "https://registry.npmmirror.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" @@ -1996,24 +2081,24 @@ resolved "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a" integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA== -"@vueuse/core@^8.1.1": - version "8.1.1" - resolved "https://registry.npmmirror.com/@vueuse/core/-/core-8.1.1.tgz#09dd6def4d5efad81a1a665155fb1959e03d7246" - integrity sha512-NmpizOcQXW0OHV0qa6YwFtw5hQBe0RxMuxQoIIbCa6jRT16MTweFPecIM6VgA1e5vZJtAO7p//TgLSpzi3joZQ== +"@vueuse/core@^8.1.2": + version "8.1.2" + resolved "https://registry.npmmirror.com/@vueuse/core/-/core-8.1.2.tgz#3153d4766b07a648bfbdd01559e8d3b20fda6eb5" + integrity sha512-prI2GzigBUtJNTcwRjJPzUPLFoRZM1RZFR464DFdwgU8TxRFf7dRvuvWFDNbCATzLExHFnGI3zTp9GkXTTZxgQ== dependencies: - "@vueuse/metadata" "8.1.1" - "@vueuse/shared" "8.1.1" + "@vueuse/metadata" "8.1.2" + "@vueuse/shared" "8.1.2" vue-demi "*" -"@vueuse/metadata@8.1.1": - version "8.1.1" - resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.1.1.tgz#6e6ba14cb3225ce4c252e5140da1fe572b1ef2e9" - integrity sha512-TSmA3UaSmBcV8pJ7fnHAL7NjSE1RQZlpJklg6YysFxwxDb0MZlo+Q8j9U1hLBZT1fnAjwZMaoxilanHN8ZwugQ== +"@vueuse/metadata@8.1.2": + version "8.1.2" + resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.1.2.tgz#4e0707de7575ff265484c122f2b85f40f11c43c7" + integrity sha512-LrPtdiYMleygnGmz8mEmYI9h4Eyo+/igxZWNrwuPnqvL9pIO+8eUpBgPLH5GowKv3Nu0LPZSXSIuaWVJBSU1Cg== -"@vueuse/shared@8.1.1": - version "8.1.1" - resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-8.1.1.tgz#beb84b4fd7cc09577d9d30dbedfdabf47740e9d0" - integrity sha512-lWRcK8W9+q1t1XMxW9JIljXFQLIViInTOEF7wUHcISQNAYwHtHgr0z+U5SRM8tA4eJd/dVs/2BV1/z2DG7aKEg== +"@vueuse/shared@8.1.2": + version "8.1.2" + resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-8.1.2.tgz#68564aa81aca334f6252098f02e4e0a9715c0585" + integrity sha512-4Hb9iPUhAz7ghO4hgvB2GV2FOy12qQGdhmQ+9HC6QN/J66DELhmxAvkZAtK5FBqZOSwzKszPqNqoyhRKQrrWGQ== dependencies: vue-demi "*" @@ -2336,10 +2421,10 @@ ansi-styles@^6.0.0: resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3" integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ== -ant-design-vue@3.1.0-rc.1: - version "3.1.0-rc.1" - resolved "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.1.0-rc.1.tgz#97cd336c9db01270e96600492ccec63fbbd99c5b" - integrity sha512-k9vIYBuYetCqJEGn2pZS9cZsrdseu0uYTxzdmtdsRZjjE+m4l+6EZKis/apFEiL3/tO+phe5ZkveSrHTTN0TJA== +ant-design-vue@3.1.0-rc.2: + version "3.1.0-rc.2" + resolved "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.1.0-rc.2.tgz#3b133622fab3bf3c053e417f47484d03585ec452" + integrity sha512-WZIvhgWsKyQnUQ+UTxDxsZZxN+DJCgGGOtfjO3sui6xroOM1YTaJzWXDSm9nvcJ7bWsrfjpZOGVBKG6JseFnGw== dependencies: "@ant-design/colors" "^6.0.0" "@ant-design/icons-vue" "^6.1.0" @@ -8169,10 +8254,10 @@ sockjs@^0.3.21: uuid "^8.3.2" websocket-driver "^0.7.4" -sortablejs@^1.14.0: - version "1.14.0" - resolved "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8" - integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w== +sortablejs@^1.15.0: + version "1.15.0" + resolved "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a" + integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w== source-map-js@^1.0.2: version "1.0.2"