diff --git a/package.json b/package.json index cb7543c..bda72db 100644 --- a/package.json +++ b/package.json @@ -31,18 +31,18 @@ "@babel/core": "^7.22.5", "@babel/preset-env": "^7.22.5", "@rollup/plugin-babel": "^6.0.3", - "@rollup/plugin-commonjs": "^25.0.1", + "@rollup/plugin-commonjs": "^25.0.2", "@rollup/plugin-node-resolve": "^15.1.0", "@rollup/plugin-replace": "^5.0.2", "@rollup/plugin-terser": "^0.4.3", - "@rollup/plugin-typescript": "^11.1.1", + "@rollup/plugin-typescript": "^11.1.2", "@types/babel__core": "^7.20.1", "@types/fontmin": "^0.9.0", "@types/fs-extra": "^9.0.13", "@types/lodash-es": "^4.17.7", - "@types/node": "^18.16.18", + "@types/node": "^18.16.19", "@types/ws": "^8.5.5", - "@vitejs/plugin-legacy": "^4.0.4", + "@vitejs/plugin-legacy": "^4.0.5", "@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue-jsx": "^3.0.1", "chokidar": "^3.5.3", @@ -51,13 +51,13 @@ "form-data": "^4.0.0", "fs-extra": "^10.1.0", "less": "^4.1.3", - "rollup": "^3.25.1", - "terser": "^5.18.0", + "rollup": "^3.26.0", + "terser": "^5.18.2", "ts-node": "^10.9.1", - "typescript": "^5.1.3", + "typescript": "^5.1.6", "unplugin-vue-components": "^0.22.12", "vite": "^4.3.9", - "vue-tsc": "^1.6.5", + "vue-tsc": "^1.8.3", "ws": "^8.13.0" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 16e5df9..a4b5a7d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,22 +48,22 @@ devDependencies: version: 7.22.5(@babel/core@7.22.5) '@rollup/plugin-babel': specifier: ^6.0.3 - version: 6.0.3(@babel/core@7.22.5)(@types/babel__core@7.20.1)(rollup@3.25.1) + version: 6.0.3(@babel/core@7.22.5)(@types/babel__core@7.20.1)(rollup@3.26.0) '@rollup/plugin-commonjs': - specifier: ^25.0.1 - version: 25.0.1(rollup@3.25.1) + specifier: ^25.0.2 + version: 25.0.2(rollup@3.26.0) '@rollup/plugin-node-resolve': specifier: ^15.1.0 - version: 15.1.0(rollup@3.25.1) + version: 15.1.0(rollup@3.26.0) '@rollup/plugin-replace': specifier: ^5.0.2 - version: 5.0.2(rollup@3.25.1) + version: 5.0.2(rollup@3.26.0) '@rollup/plugin-terser': specifier: ^0.4.3 - version: 0.4.3(rollup@3.25.1) + version: 0.4.3(rollup@3.26.0) '@rollup/plugin-typescript': - specifier: ^11.1.1 - version: 11.1.1(rollup@3.25.1)(typescript@5.1.3) + specifier: ^11.1.2 + version: 11.1.2(rollup@3.26.0)(typescript@5.1.6) '@types/babel__core': specifier: ^7.20.1 version: 7.20.1 @@ -77,14 +77,14 @@ devDependencies: specifier: ^4.17.7 version: 4.17.7 '@types/node': - specifier: ^18.16.18 - version: 18.16.18 + specifier: ^18.16.19 + version: 18.16.19 '@types/ws': specifier: ^8.5.5 version: 8.5.5 '@vitejs/plugin-legacy': - specifier: ^4.0.4 - version: 4.0.4(terser@5.18.0)(vite@4.3.9) + specifier: ^4.0.5 + version: 4.0.5(terser@5.18.2)(vite@4.3.9) '@vitejs/plugin-vue': specifier: ^4.2.3 version: 4.2.3(vite@4.3.9)(vue@3.3.4) @@ -110,26 +110,26 @@ devDependencies: specifier: ^4.1.3 version: 4.1.3 rollup: - specifier: ^3.25.1 - version: 3.25.1 + specifier: ^3.26.0 + version: 3.26.0 terser: - specifier: ^5.18.0 - version: 5.18.0 + specifier: ^5.18.2 + version: 5.18.2 ts-node: specifier: ^10.9.1 - version: 10.9.1(@types/node@18.16.18)(typescript@5.1.3) + version: 10.9.1(@types/node@18.16.19)(typescript@5.1.6) typescript: - specifier: ^5.1.3 - version: 5.1.3 + specifier: ^5.1.6 + version: 5.1.6 unplugin-vue-components: specifier: ^0.22.12 - version: 0.22.12(rollup@3.25.1)(vue@3.3.4) + version: 0.22.12(rollup@3.26.0)(vue@3.3.4) vite: specifier: ^4.3.9 - version: 4.3.9(@types/node@18.16.18)(less@4.1.3)(terser@5.18.0) + version: 4.3.9(@types/node@18.16.19)(less@4.1.3)(terser@5.18.2) vue-tsc: - specifier: ^1.6.5 - version: 1.6.5(typescript@5.1.3) + specifier: ^1.8.3 + version: 1.8.3(typescript@5.1.6) ws: specifier: ^8.13.0 version: 8.13.0 @@ -1677,11 +1677,8 @@ packages: engines: {node: '>=6.0.0'} dev: true - /@jridgewell/source-map@0.3.3: - resolution: {integrity: sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==} - dependencies: - '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.18 + /@jridgewell/source-map@0.3.4: + resolution: {integrity: sha512-KE/SxsDqNs3rrWwFHcRh15ZLVFrI0YoZtgAdIyIq9k5hUNmiWRXXThPomIxHuL20sLdgzbDFyvkUMna14bvtrw==} dev: true /@jridgewell/sourcemap-codec@1.4.14: @@ -1740,7 +1737,7 @@ packages: resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - semver: 7.5.2 + semver: 7.5.3 dev: true /@pkgjs/parseargs@0.11.0: @@ -1750,7 +1747,7 @@ packages: dev: true optional: true - /@rollup/plugin-babel@6.0.3(@babel/core@7.22.5)(@types/babel__core@7.20.1)(rollup@3.25.1): + /@rollup/plugin-babel@6.0.3(@babel/core@7.22.5)(@types/babel__core@7.20.1)(rollup@3.26.0): resolution: {integrity: sha512-fKImZKppa1A/gX73eg4JGo+8kQr/q1HBQaCGKECZ0v4YBBv3lFqi14+7xyApECzvkLTHCifx+7ntcrvtBIRcpg==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1765,13 +1762,13 @@ packages: dependencies: '@babel/core': 7.22.5 '@babel/helper-module-imports': 7.22.5 - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@rollup/pluginutils': 5.0.2(rollup@3.26.0) '@types/babel__core': 7.20.1 - rollup: 3.25.1 + rollup: 3.26.0 dev: true - /@rollup/plugin-commonjs@25.0.1(rollup@3.25.1): - resolution: {integrity: sha512-2DJ4kv4b1xfTJopWhu61ANdNRHvzQZ2fpaIrlgaP2jOfUv1wDJ0Ucqy8AZlbFmn/iUjiwKoqki9j55Y6L8kyNQ==} + /@rollup/plugin-commonjs@25.0.2(rollup@3.26.0): + resolution: {integrity: sha512-NGTwaJxIO0klMs+WSFFtBP7b9TdTJ3K76HZkewT8/+yHzMiUGVQgaPtLQxNVYIgT5F7lxkEyVID+yS3K7bhCow==} engines: {node: '>=14.0.0'} peerDependencies: rollup: ^2.68.0||^3.0.0 @@ -1779,16 +1776,16 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@rollup/pluginutils': 5.0.2(rollup@3.26.0) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.27.0 - rollup: 3.25.1 + rollup: 3.26.0 dev: true - /@rollup/plugin-node-resolve@15.1.0(rollup@3.25.1): + /@rollup/plugin-node-resolve@15.1.0(rollup@3.26.0): resolution: {integrity: sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1797,16 +1794,16 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@rollup/pluginutils': 5.0.2(rollup@3.26.0) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.2 - rollup: 3.25.1 + rollup: 3.26.0 dev: true - /@rollup/plugin-replace@5.0.2(rollup@3.25.1): + /@rollup/plugin-replace@5.0.2(rollup@3.26.0): resolution: {integrity: sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1815,12 +1812,12 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@rollup/pluginutils': 5.0.2(rollup@3.26.0) magic-string: 0.27.0 - rollup: 3.25.1 + rollup: 3.26.0 dev: true - /@rollup/plugin-terser@0.4.3(rollup@3.25.1): + /@rollup/plugin-terser@0.4.3(rollup@3.26.0): resolution: {integrity: sha512-EF0oejTMtkyhrkwCdg0HJ0IpkcaVg1MMSf2olHb2Jp+1mnLM04OhjpJWGma4HobiDTF0WCyViWuvadyE9ch2XA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1829,14 +1826,14 @@ packages: rollup: optional: true dependencies: - rollup: 3.25.1 + rollup: 3.26.0 serialize-javascript: 6.0.1 smob: 1.4.0 - terser: 5.18.0 + terser: 5.18.2 dev: true - /@rollup/plugin-typescript@11.1.1(rollup@3.25.1)(typescript@5.1.3): - resolution: {integrity: sha512-Ioir+x5Bejv72Lx2Zbz3/qGg7tvGbxQZALCLoJaGrkNXak/19+vKgKYJYM3i/fJxvsb23I9FuFQ8CUBEfsmBRg==} + /@rollup/plugin-typescript@11.1.2(rollup@3.26.0)(typescript@5.1.6): + resolution: {integrity: sha512-0ghSOCMcA7fl1JM+0gYRf+Q/HWyg+zg7/gDSc+fRLmlJWcW5K1I+CLRzaRhXf4Y3DRyPnnDo4M2ktw+a6JcDEg==} engines: {node: '>=14.0.0'} peerDependencies: rollup: ^2.14.0||^3.0.0 @@ -1848,13 +1845,13 @@ packages: tslib: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@rollup/pluginutils': 5.0.2(rollup@3.26.0) resolve: 1.22.2 - rollup: 3.25.1 - typescript: 5.1.3 + rollup: 3.26.0 + typescript: 5.1.6 dev: true - /@rollup/pluginutils@5.0.2(rollup@3.25.1): + /@rollup/pluginutils@5.0.2(rollup@3.26.0): resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1866,7 +1863,7 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.25.1 + rollup: 3.26.0 dev: true /@simonwep/pickr@1.8.2: @@ -1933,13 +1930,13 @@ packages: /@types/fontmin@0.9.0: resolution: {integrity: sha512-nWUcpO53EPPKUnkcQJRYyEbiojO/WXHFHOuo6GHWptaoVhFg036eB9z0OoecnhPj/1TWue0Ls5TlqSJLbRJRvg==} dependencies: - '@types/node': 18.16.18 + '@types/node': 18.16.19 dev: true /@types/fs-extra@9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 18.16.18 + '@types/node': 18.16.19 dev: true /@types/lodash-es@4.17.7: @@ -1956,8 +1953,8 @@ packages: resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} dev: true - /@types/node@18.16.18: - resolution: {integrity: sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==} + /@types/node@18.16.19: + resolution: {integrity: sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==} dev: true /@types/normalize-package-data@2.4.1: @@ -1971,11 +1968,11 @@ packages: /@types/ws@8.5.5: resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} dependencies: - '@types/node': 18.16.18 + '@types/node': 18.16.19 dev: true - /@vitejs/plugin-legacy@4.0.4(terser@5.18.0)(vite@4.3.9): - resolution: {integrity: sha512-UwVfkMfUEszbQ2vs3RDfiDxxvYnIjmtIrGxTnxRev5Sh8ZoDpieV2dwvTUB7zXKJpfRsOgimM6MxQ65VDHJeQw==} + /@vitejs/plugin-legacy@4.0.5(terser@5.18.2)(vite@4.3.9): + resolution: {integrity: sha512-0N1CSAHjFTaxcKC9IcKDWMapmAfGn2mNdbROMf6UW0kypYLzDK8vAAbJIFW0jWvkv2aZfTgNs4KmQxoQDupUuQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: terser: ^5.4.0 @@ -1988,8 +1985,8 @@ packages: magic-string: 0.30.0 regenerator-runtime: 0.13.11 systemjs: 6.14.1 - terser: 5.18.0 - vite: 4.3.9(@types/node@18.16.18)(less@4.1.3)(terser@5.18.0) + terser: 5.18.2 + vite: 4.3.9(@types/node@18.16.19)(less@4.1.3)(terser@5.18.2) transitivePeerDependencies: - supports-color dev: true @@ -2003,8 +2000,8 @@ packages: dependencies: '@babel/core': 7.22.5 '@babel/plugin-transform-typescript': 7.22.5(@babel/core@7.22.5) - '@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.22.5) - vite: 4.3.9(@types/node@18.16.18)(less@4.1.3)(terser@5.18.0) + '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.22.5) + vite: 4.3.9(@types/node@18.16.19)(less@4.1.3)(terser@5.18.2) vue: 3.3.4 transitivePeerDependencies: - supports-color @@ -2017,73 +2014,48 @@ packages: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.3.9(@types/node@18.16.18)(less@4.1.3)(terser@5.18.0) + vite: 4.3.9(@types/node@18.16.19)(less@4.1.3)(terser@5.18.2) vue: 3.3.4 dev: true - /@volar/language-core@1.4.1: - resolution: {integrity: sha512-EIY+Swv+TjsWpxOxujjMf1ZXqOjg9MT2VMXZ+1dKva0wD8W0L6EtptFFcCJdBbcKmGMFkr57Qzz9VNMWhs3jXQ==} + /@volar/language-core@1.7.10: + resolution: {integrity: sha512-18Gmth5M0UI3hDDqhZngjMnb6WCslcfglkOdepRIhGxRYe7xR7DRRzciisYDMZsvOQxDYme+uaohg0dKUxLV2Q==} dependencies: - '@volar/source-map': 1.4.1 + '@volar/source-map': 1.7.10 dev: true - /@volar/source-map@1.4.1: - resolution: {integrity: sha512-bZ46ad72dsbzuOWPUtJjBXkzSQzzSejuR3CT81+GvTEI2E994D8JPXzM3tl98zyCNnjgs4OkRyliImL1dvJ5BA==} + /@volar/source-map@1.7.10: + resolution: {integrity: sha512-FBpLEOKJpRxeh2nYbw1mTI5sZOPXYU8LlsCz6xuBY3yNtAizDTTIZtBHe1V8BaMpoSMgRysZe4gVxMEi3rDGVA==} dependencies: - muggle-string: 0.2.2 + muggle-string: 0.3.1 dev: true - /@volar/typescript@1.4.1-patch.2(typescript@5.1.3): - resolution: {integrity: sha512-lPFYaGt8OdMEzNGJJChF40uYqMO4Z/7Q9fHPQC/NRVtht43KotSXLrkPandVVMf9aPbiJ059eAT+fwHGX16k4w==} + /@volar/typescript@1.7.10: + resolution: {integrity: sha512-yqIov4wndLU3GE1iE25bU5W6T+P+exPePcE1dFPPBKzQIBki1KvmdQN5jBlJp3Wo+wp7UIxa/RsdNkXT+iFBjg==} + dependencies: + '@volar/language-core': 1.7.10 + dev: true + + /@vue/babel-helper-vue-transform-on@1.1.5: + resolution: {integrity: sha512-SgUymFpMoAyWeYWLAY+MkCK3QEROsiUnfaw5zxOVD/M64KQs8D/4oK6Q5omVA2hnvEOE0SCkH2TZxs/jnnUj7w==} + dev: true + + /@vue/babel-plugin-jsx@1.1.5(@babel/core@7.22.5): + resolution: {integrity: sha512-nKs1/Bg9U1n3qSWnsHhCVQtAzI6aQXqua8j/bZrau8ywT1ilXQbK4FwEJGmU8fV7tcpuFvWmmN7TMmV1OBma1g==} peerDependencies: - typescript: '*' - dependencies: - '@volar/language-core': 1.4.1 - typescript: 5.1.3 - dev: true - - /@volar/vue-language-core@1.6.5: - resolution: {integrity: sha512-IF2b6hW4QAxfsLd5mePmLgtkXzNi+YnH6ltCd80gb7+cbdpFMjM1I+w+nSg2kfBTyfu+W8useCZvW89kPTBpzg==} - dependencies: - '@volar/language-core': 1.4.1 - '@volar/source-map': 1.4.1 - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-sfc': 3.3.4 - '@vue/reactivity': 3.3.4 - '@vue/shared': 3.3.4 - minimatch: 9.0.1 - muggle-string: 0.2.2 - vue-template-compiler: 2.7.14 - dev: true - - /@volar/vue-typescript@1.6.5(typescript@5.1.3): - resolution: {integrity: sha512-er9rVClS4PHztMUmtPMDTl+7c7JyrxweKSAEe/o/Noeq2bQx6v3/jZHVHBe8ZNUti5ubJL/+Tg8L3bzmlalV8A==} - peerDependencies: - typescript: '*' - dependencies: - '@volar/typescript': 1.4.1-patch.2(typescript@5.1.3) - '@volar/vue-language-core': 1.6.5 - typescript: 5.1.3 - dev: true - - /@vue/babel-helper-vue-transform-on@1.0.2: - resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} - dev: true - - /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.22.5): - resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} + '@babel/core': ^7.0.0-0 dependencies: + '@babel/core': 7.22.5 '@babel/helper-module-imports': 7.22.5 '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.5) '@babel/template': 7.22.5 '@babel/traverse': 7.22.5 '@babel/types': 7.22.5 - '@vue/babel-helper-vue-transform-on': 1.0.2 + '@vue/babel-helper-vue-transform-on': 1.1.5 camelcase: 6.3.0 html-tags: 3.3.1 svg-tags: 1.0.0 transitivePeerDependencies: - - '@babel/core' - supports-color dev: true @@ -2121,6 +2093,25 @@ packages: '@vue/compiler-dom': 3.3.4 '@vue/shared': 3.3.4 + /@vue/language-core@1.8.3(typescript@5.1.6): + resolution: {integrity: sha512-AzhvMYoQkK/tg8CpAAttO19kx1zjS3+weYIr2AhlH/M5HebVzfftQoq4jZNFifjq+hyLKi8j9FiDMS8oqA89+A==} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@volar/language-core': 1.7.10 + '@volar/source-map': 1.7.10 + '@vue/compiler-dom': 3.3.4 + '@vue/reactivity': 3.3.4 + '@vue/shared': 3.3.4 + minimatch: 9.0.2 + muggle-string: 0.3.1 + typescript: 5.1.6 + vue-template-compiler: 2.7.14 + dev: true + /@vue/reactivity-transform@3.3.4: resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==} dependencies: @@ -2160,6 +2151,15 @@ packages: /@vue/shared@3.3.4: resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} + /@vue/typescript@1.8.3(typescript@5.1.6): + resolution: {integrity: sha512-6bdgSnIFpRYHlt70pHmnmNksPU00bfXgqAISeaNz3W6d2cH0OTfH8h/IhligQ82sJIhsuyfftQJ5518ZuKIhtA==} + dependencies: + '@volar/typescript': 1.7.10 + '@vue/language-core': 1.8.3(typescript@5.1.6) + transitivePeerDependencies: + - typescript + dev: true + /@xmldom/xmldom@0.8.8: resolution: {integrity: sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q==} engines: {node: '>=10.0.0'} @@ -2250,7 +2250,7 @@ packages: '@simonwep/pickr': 1.8.2 array-tree-filter: 2.1.0 async-validator: 4.2.5 - dayjs: 1.11.8 + dayjs: 1.11.9 dom-align: 1.12.4 dom-scroll-into-view: 2.0.1 lodash: 4.17.21 @@ -2407,8 +2407,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001503 - electron-to-chromium: 1.4.432 + caniuse-lite: 1.0.30001509 + electron-to-chromium: 1.4.447 node-releases: 2.0.12 update-browserslist-db: 1.0.11(browserslist@4.21.9) dev: true @@ -2469,7 +2469,7 @@ packages: dependencies: '@npmcli/fs': 3.1.0 fs-minipass: 3.0.2 - glob: 10.2.7 + glob: 10.3.1 lru-cache: 7.18.3 minipass: 5.0.0 minipass-collect: 1.0.2 @@ -2503,8 +2503,8 @@ packages: engines: {node: '>=10'} dev: true - /caniuse-lite@1.0.30001503: - resolution: {integrity: sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw==} + /caniuse-lite@1.0.30001509: + resolution: {integrity: sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==} dev: true /chalk@2.4.2: @@ -2710,8 +2710,8 @@ packages: /csstype@3.1.2: resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} - /dayjs@1.11.8: - resolution: {integrity: sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ==} + /dayjs@1.11.9: + resolution: {integrity: sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==} dev: false /de-indent@1.0.2: @@ -2816,8 +2816,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: true - /electron-to-chromium@1.4.432: - resolution: {integrity: sha512-yz3U/khQgAFT2HURJA3/F4fKIyO2r5eK09BQzBZFd6BvBSSaRuzKc2ZNBHtJcO75/EKiRYbVYJZ2RB0P4BuD2g==} + /electron-to-chromium@1.4.447: + resolution: {integrity: sha512-sxX0LXh+uL41hSJsujAN86PjhrV/6c79XmpY0TvjZStV6VxIgarf8SRkUoUTuYmFcZQTemsoqo8qXOGw5npWfw==} dev: true /emoji-regex@8.0.0: @@ -2922,8 +2922,8 @@ packages: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} dev: true - /fast-glob@3.2.12: - resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} + /fast-glob@3.3.0: + resolution: {integrity: sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==} engines: {node: '>=8.6.0'} dependencies: '@nodelib/fs.stat': 2.0.5 @@ -2933,8 +2933,8 @@ packages: micromatch: 4.0.5 dev: true - /fast-xml-parser@4.2.4: - resolution: {integrity: sha512-fbfMDvgBNIdDJLdLOwacjFAPYt67tr31H9ZhWSm45CDAxvd0I6WTlSOUo7K2P/K5sA5JgMKG64PI3DMcaFdWpQ==} + /fast-xml-parser@4.2.5: + resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==} hasBin: true dependencies: strnum: 1.0.5 @@ -3167,16 +3167,16 @@ packages: unique-stream: 2.3.1 dev: true - /glob@10.2.7: - resolution: {integrity: sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==} + /glob@10.3.1: + resolution: {integrity: sha512-9BKYcEeIs7QwlCYs+Y3GBvqAMISufUS0i2ELd11zpZjxI5V9iyRj0HgzB5/cLf2NY4vcYBTYzJ7GIui7j/4DOw==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true dependencies: foreground-child: 3.1.1 jackspeak: 2.2.1 - minimatch: 9.0.1 + minimatch: 9.0.2 minipass: 5.0.0 - path-scurry: 1.9.2 + path-scurry: 1.10.0 dev: true /glob@7.2.3: @@ -3463,7 +3463,7 @@ packages: resolution: {integrity: sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==} engines: {node: '>=6'} dependencies: - fast-xml-parser: 4.2.4 + fast-xml-parser: 4.2.5 dev: true /is-ttf@0.2.2: @@ -3585,7 +3585,7 @@ packages: dependencies: copy-anything: 2.0.6 parse-node-version: 1.0.1 - tslib: 2.5.3 + tslib: 2.6.0 optionalDependencies: errno: 0.1.8 graceful-fs: 4.2.11 @@ -3638,6 +3638,11 @@ packages: js-tokens: 4.0.0 dev: false + /lru-cache@10.0.0: + resolution: {integrity: sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==} + engines: {node: 14 || >=16.14} + dev: true + /lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} dependencies: @@ -3656,11 +3661,6 @@ packages: engines: {node: '>=12'} dev: true - /lru-cache@9.1.2: - resolution: {integrity: sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==} - engines: {node: 14 || >=16.14} - dev: true - /lz-string@1.5.0: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} hasBin: true @@ -3792,8 +3792,8 @@ packages: brace-expansion: 2.0.1 dev: true - /minimatch@9.0.1: - resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==} + /minimatch@9.0.2: + resolution: {integrity: sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==} engines: {node: '>=16 || 14 >=14.17'} dependencies: brace-expansion: 2.0.1 @@ -3892,8 +3892,8 @@ packages: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} dev: true - /muggle-string@0.2.2: - resolution: {integrity: sha512-YVE1mIJ4VpUMqZObFndk9CJu6DBJR/GB13p3tXuNbwD4XExaI5EOuRl6BHeIDxIqXZVxSfAC+y6U1Z/IxCfKUg==} + /muggle-string@0.3.1: + resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==} dev: true /mutate-animate@1.1.3: @@ -3945,7 +3945,7 @@ packages: nopt: 6.0.0 npmlog: 6.0.2 rimraf: 3.0.2 - semver: 7.5.2 + semver: 7.5.3 tar: 6.1.15 which: 2.0.2 transitivePeerDependencies: @@ -3970,7 +3970,7 @@ packages: dependencies: hosted-git-info: 4.1.0 is-core-module: 2.12.1 - semver: 7.5.2 + semver: 7.5.3 validate-npm-package-license: 3.0.4 dev: true @@ -4097,11 +4097,11 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true - /path-scurry@1.9.2: - resolution: {integrity: sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==} + /path-scurry@1.10.0: + resolution: {integrity: sha512-tZFEaRQbMLjwrsmidsGJ6wDMv0iazJWk6SfIKnY4Xru8auXgmJkOBa5DUbYFcFD2Rzk2+KDlIiF0GVXNCbgC7g==} engines: {node: '>=16 || 14 >=14.17'} dependencies: - lru-cache: 9.1.2 + lru-cache: 10.0.0 minipass: 5.0.0 dev: true @@ -4353,8 +4353,8 @@ packages: glob: 7.2.3 dev: true - /rollup@3.25.1: - resolution: {integrity: sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==} + /rollup@3.26.0: + resolution: {integrity: sha512-YzJH0eunH2hr3knvF3i6IkLO/jTjAEwU4HoMUbQl4//Tnl3ou0e7P5SjxdDr8HQJdeUJShlbEHXrrnEHy1l7Yg==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -4399,8 +4399,8 @@ packages: hasBin: true dev: true - /semver@7.5.2: - resolution: {integrity: sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==} + /semver@7.5.3: + resolution: {integrity: sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==} engines: {node: '>=10'} hasBin: true dependencies: @@ -4639,12 +4639,12 @@ packages: yallist: 4.0.0 dev: true - /terser@5.18.0: - resolution: {integrity: sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==} + /terser@5.18.2: + resolution: {integrity: sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w==} engines: {node: '>=10'} hasBin: true dependencies: - '@jridgewell/source-map': 0.3.3 + '@jridgewell/source-map': 0.3.4 acorn: 8.9.0 commander: 2.20.3 source-map-support: 0.5.21 @@ -4713,7 +4713,7 @@ packages: engines: {node: '>=12'} dev: true - /ts-node@10.9.1(@types/node@18.16.18)(typescript@5.1.3): + /ts-node@10.9.1(@types/node@18.16.19)(typescript@5.1.6): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -4732,20 +4732,20 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 18.16.18 + '@types/node': 18.16.19 acorn: 8.9.0 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.1.3 + typescript: 5.1.6 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true - /tslib@2.5.3: - resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==} + /tslib@2.6.0: + resolution: {integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==} dev: true /ttf2woff2@4.0.5: @@ -4771,8 +4771,8 @@ packages: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} dev: true - /typescript@5.1.3: - resolution: {integrity: sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==} + /typescript@5.1.6: + resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -4831,7 +4831,7 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unplugin-vue-components@0.22.12(rollup@3.25.1)(vue@3.3.4): + /unplugin-vue-components@0.22.12(rollup@3.26.0)(vue@3.3.4): resolution: {integrity: sha512-FxyzsuBvMCYPIk+8cgscGBQ345tvwVu+qY5IhE++eorkyvA4Z1TiD/HCiim+Kbqozl10i4K+z+NCa2WO2jexRA==} engines: {node: '>=14'} peerDependencies: @@ -4842,10 +4842,10 @@ packages: optional: true dependencies: '@antfu/utils': 0.7.4 - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@rollup/pluginutils': 5.0.2(rollup@3.26.0) chokidar: 3.5.3 debug: 4.3.4 - fast-glob: 3.2.12 + fast-glob: 3.3.0 local-pkg: 0.4.3 magic-string: 0.27.0 minimatch: 5.1.6 @@ -4958,7 +4958,7 @@ packages: replace-ext: 1.0.1 dev: true - /vite@4.3.9(@types/node@18.16.18)(less@4.1.3)(terser@5.18.0): + /vite@4.3.9(@types/node@18.16.19)(less@4.1.3)(terser@5.18.2): resolution: {integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -4983,12 +4983,12 @@ packages: terser: optional: true dependencies: - '@types/node': 18.16.18 + '@types/node': 18.16.19 esbuild: 0.17.19 less: 4.1.3 postcss: 8.4.24 - rollup: 3.25.1 - terser: 5.18.0 + rollup: 3.26.0 + terser: 5.18.2 optionalDependencies: fsevents: 2.3.2 dev: true @@ -5000,16 +5000,16 @@ packages: he: 1.2.0 dev: true - /vue-tsc@1.6.5(typescript@5.1.3): - resolution: {integrity: sha512-Wtw3J7CC+JM2OR56huRd5iKlvFWpvDiU+fO1+rqyu4V2nMTotShz4zbOZpW5g9fUOcjnyZYfBo5q5q+D/q27JA==} + /vue-tsc@1.8.3(typescript@5.1.6): + resolution: {integrity: sha512-Ua4DHuYxjudlhCW2nRZtaXbhIDVncRGIbDjZhHpF8Z8vklct/G/35/kAPuGNSOmq0JcvhPAe28Oa7LWaUerZVA==} hasBin: true peerDependencies: typescript: '*' dependencies: - '@volar/vue-language-core': 1.6.5 - '@volar/vue-typescript': 1.6.5(typescript@5.1.3) - semver: 7.5.2 - typescript: 5.1.3 + '@vue/language-core': 1.8.3(typescript@5.1.6) + '@vue/typescript': 1.8.3(typescript@5.1.6) + semver: 7.5.3 + typescript: 5.1.6 dev: true /vue-types@3.0.2(vue@3.3.4): diff --git a/public/libs/control.js b/public/libs/control.js index cf25044..f534556 100644 --- a/public/libs/control.js +++ b/public/libs/control.js @@ -1554,74 +1554,7 @@ control.prototype._updateDamage_damage = function (floorId, onMap) { }; control.prototype._updateDamage_extraDamage = function (floorId, onMap) { - // todo: 不使用 core.status.checkBlock - core.status.damage.extraData = []; - if (!core.flags.displayExtraDamage) return; - - var width = core.floors[floorId].width, - height = core.floors[floorId].height; - var startX = - onMap && core.bigmap.v2 - ? Math.max(0, core.bigmap.posX - core.bigmap.extend) - : 0; - var endX = - onMap && core.bigmap.v2 - ? Math.min( - width, - core.bigmap.posX + core._WIDTH_ + core.bigmap.extend + 1 - ) - : width; - var startY = - onMap && core.bigmap.v2 - ? Math.max(0, core.bigmap.posY - core.bigmap.extend) - : 0; - var endY = - onMap && core.bigmap.v2 - ? Math.min( - height, - core.bigmap.posY + core._HEIGHT_ + core.bigmap.extend + 1 - ) - : height; - - for (var x = startX; x < endX; x++) { - for (var y = startY; y < endY; y++) { - var alpha = 1; - if (core.noPass(x, y, floorId)) { - if (core.flags.extraDamageType == 2) alpha = 0; - else if (core.flags.extraDamageType == 1) alpha = 0.6; - } - var damage = core.status.checkBlock.damage[x + ',' + y] || 0; - if (damage > 0) { - // 该点伤害 - damage = core.formatBigNumber(damage, true); - core.status.damage.extraData.push({ - text: damage, - px: 32 * x + 16, - py: 32 * (y + 1) - 14, - color: '#fa3', - alpha: alpha - }); - } else { - // 电摇嘲讽 - const mockery = core.status.checkBlock.mockery[x + ',' + y]; - if (mockery) { - mockery.sort((a, b) => - a[0] === b[0] ? a[1] - b[1] : a[0] - b[0] - ); - const [tx, ty] = mockery[0]; - const dir = - x > tx ? '←' : x < tx ? '→' : y > ty ? '↑' : '↓'; - core.status.damage.extraData.push({ - text: '嘲' + dir, - px: 32 * x + 16, - py: 32 * (y + 1) - 14, - color: '#fd4', - alpha: alpha - }); - } - } - } - } + // Deprecated. See src/plugin/game/damage.ts EnemyCollection.render. }; ////// 重绘地图显伤 ////// diff --git a/public/project/functions.js b/public/project/functions.js index b33f74a..7f4c69e 100644 --- a/public/project/functions.js +++ b/public/project/functions.js @@ -263,41 +263,10 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { return true; }, beforeBattle: function (enemyId, x, y) { - // todo: 不使用 core.status.checkBlock // 战斗前触发的事件,可以加上一些战前特效(详见下面支援的例子) // 此函数在“检测能否战斗和自动存档”【之后】执行。如果需要更早的战前事件,请在插件中覆重写 core.events.doSystemEvent 函数。 // 返回true则将继续战斗,返回false将不再战斗。 - // ------ 支援技能 ------ // - if (x != null && y != null) { - var index = x + ',' + y, - cache = core.status.checkBlock.cache[index] || {}, - guards = cache.guards || []; - // 如果存在支援怪 - if (guards.length > 0) { - // 记录flag,当前要参与支援的怪物 - core.setFlag('__guards__' + x + '_' + y, guards); - var actions = [{ type: 'playSound', name: 'jump.mp3' }]; - // 增加支援的特效动画(图块跳跃) - guards.forEach(function (g) { - core.push(actions, { - type: 'jump', - from: [g[0], g[1]], - to: [x, y], - time: 300, - keep: false, - async: true - }); - }); - core.push(actions, [ - { type: 'waitAsync' }, // 等待所有异步事件执行完毕 - { type: 'trigger', loc: [x, y] } // 重要!重新触发本点事件(即重新触发战斗) - ]); - core.insertAction(actions); - return false; - } - } - return true; }, afterBattle: function (enemyId, x, y) { diff --git a/src/plugin/game/damage.ts b/src/plugin/game/damage.ts index 5afeec0..2ebb0fe 100644 --- a/src/plugin/game/damage.ts +++ b/src/plugin/game/damage.ts @@ -113,6 +113,7 @@ export class EnemyCollection implements RangeCollection { * @param noCache 是否不使用缓存 */ calMapDamage(noCache: boolean = false) { + if (!noCache) return; if (noCache) this.mapDamage = {}; const hero = getHeroStatusOn( realStatus,