From 68ea9746177920914c661c90cea90f76bc6b867a Mon Sep 17 00:00:00 2001 From: Soybean Date: Mon, 20 May 2024 00:19:11 +0800 Subject: [PATCH] chore(projects): update eslint-config & fix code --- package.json | 2 +- pnpm-lock.yaml | 213 +++++++++++++++++- .../menu/modules/menu-operate-modal.vue | 6 +- 3 files changed, 213 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index e2af04e96..731f4b456 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@iconify/json": "2.2.211", "@sa/scripts": "workspace:*", "@sa/uno-preset": "workspace:*", - "@soybeanjs/eslint-config": "1.3.4", + "@soybeanjs/eslint-config": "1.3.5", "@types/lodash-es": "4.17.12", "@types/node": "20.12.12", "@types/nprogress": "0.2.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ec142413..6b4b23750 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -79,8 +79,8 @@ importers: specifier: workspace:* version: link:packages/uno-preset '@soybeanjs/eslint-config': - specifier: 1.3.4 - version: 1.3.4(@unocss/eslint-config@0.60.2(eslint@9.3.0)(typescript@5.4.5))(eslint-plugin-vue@9.26.0(eslint@9.3.0))(eslint@9.3.0)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.3.0)) + specifier: 1.3.5 + version: 1.3.5(@unocss/eslint-config@0.60.2(eslint@9.3.0)(typescript@5.4.5))(eslint-plugin-vue@9.26.0(eslint@9.3.0))(eslint@9.3.0)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.3.0)) '@types/lodash-es': specifier: 4.17.12 version: 4.17.12 @@ -971,6 +971,55 @@ packages: vue-eslint-parser: optional: true + '@soybeanjs/eslint-config@1.3.5': + resolution: {integrity: sha512-gGXA/ht1IMJH4TuERn59Sc14ff8NRufe7bZAG3DWbNoSCFGmabqzyy1LPi9vxa4RiShhHVAI57K3C/bU3HM/0w==} + peerDependencies: + '@toml-tools/parser': '*' + '@unocss/eslint-config': '>=0.58.0' + eslint: '>=8.40.0' + eslint-plugin-astro: '>=0.30.0' + eslint-plugin-react: '>=7.0.0' + eslint-plugin-react-hooks: '>=4.0.0' + eslint-plugin-react-native: '>=4.0.0' + eslint-plugin-react-refresh: '>=0.4.0' + eslint-plugin-solid: '>=0.10.0' + eslint-plugin-svelte: '>=2.0.0' + eslint-plugin-vue: '>=9.19.0' + prettier-plugin-astro: '>=0.12.0' + prettier-plugin-svelte: '>=3.0.0' + prettier-plugin-toml: '>=2.0.0' + typescript: '>=5.0.0' + vue-eslint-parser: '>=9.3.2' + peerDependenciesMeta: + '@toml-tools/parser': + optional: true + '@unocss/eslint-config': + optional: true + eslint-plugin-astro: + optional: true + eslint-plugin-react: + optional: true + eslint-plugin-react-hooks: + optional: true + eslint-plugin-react-native: + optional: true + eslint-plugin-react-refresh: + optional: true + eslint-plugin-solid: + optional: true + eslint-plugin-svelte: + optional: true + eslint-plugin-vue: + optional: true + prettier-plugin-astro: + optional: true + prettier-plugin-svelte: + optional: true + prettier-plugin-toml: + optional: true + vue-eslint-parser: + optional: true + '@szmarczak/http-timer@5.0.1': resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==} engines: {node: '>=14.16'} @@ -1065,6 +1114,17 @@ packages: typescript: optional: true + '@typescript-eslint/eslint-plugin@7.9.0': + resolution: {integrity: sha512-6e+X0X3sFe/G/54aC3jt0txuMTURqLyekmEHViqyA2VnxhLMpvA6nqmcjIy+Cr9tLDHPssA74BP5Mx9HQIxBEA==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + '@typescript-eslint/parser': ^7.0.0 + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + '@typescript-eslint/parser@7.8.0': resolution: {integrity: sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==} engines: {node: ^18.18.0 || >=20.0.0} @@ -1075,6 +1135,16 @@ packages: typescript: optional: true + '@typescript-eslint/parser@7.9.0': + resolution: {integrity: sha512-qHMJfkL5qvgQB2aLvhUSXxbK7OLnDkwPzFalg458pxQgfxKDfT1ZDbHQM/I6mDIf/svlMkj21kzKuQ2ixJlatQ==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + '@typescript-eslint/scope-manager@7.8.0': resolution: {integrity: sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==} engines: {node: ^18.18.0 || >=20.0.0} @@ -1093,6 +1163,16 @@ packages: typescript: optional: true + '@typescript-eslint/type-utils@7.9.0': + resolution: {integrity: sha512-6Qy8dfut0PFrFRAZsGzuLoM4hre4gjzWJB6sUvdunCYZsYemTkzZNwF1rnGea326PHPT3zn5Lmg32M/xfJfByA==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + '@typescript-eslint/types@7.8.0': resolution: {integrity: sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==} engines: {node: ^18.18.0 || >=20.0.0} @@ -2078,6 +2158,12 @@ packages: peerDependencies: eslint: '>=8.23.0' + eslint-plugin-n@17.7.0: + resolution: {integrity: sha512-4Jg4ZKVE4VjHig2caBqPHYNW5na84RVufUuipFLJbgM/G57O6FdpUKJbHakCDJb/yjQuyqVzYWRtU3HNYaZUwg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: '>=8.23.0' + eslint-plugin-prettier@5.1.3: resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==} engines: {node: ^14.18.0 || >=16.0.0} @@ -2098,6 +2184,12 @@ packages: peerDependencies: eslint: '>=8.56.0' + eslint-plugin-unicorn@53.0.0: + resolution: {integrity: sha512-kuTcNo9IwwUCfyHGwQFOK/HjJAYzbODHN3wP0PgqbW+jbXqpNWxNVpVhj2tO9SixBwuAdmal8rVcWKBxwFnGuw==} + engines: {node: '>=18.18'} + peerDependencies: + eslint: '>=8.56.0' + eslint-plugin-vue@9.26.0: resolution: {integrity: sha512-eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ==} engines: {node: ^14.17.0 || >=16.0.0} @@ -2412,6 +2504,10 @@ packages: resolution: {integrity: sha512-926gJqg+4mkxwYKiFvoomM4J0kWESfk3qfTvRL2/oc/tK/eTDBbrfcKnSa2KtfdxB5onoL7D3A3qIHQFpd4+UA==} engines: {node: '>=18'} + globals@15.2.0: + resolution: {integrity: sha512-FQ5YwCHZM3nCmtb5FzEWwdUc9K5d3V/w9mzcz8iGD1gC/aOTHc6PouYu0kkKipNJqHAT7m51sqzQjEjIP+cK0A==} + engines: {node: '>=18'} + globalthis@1.0.4: resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==} engines: {node: '>= 0.4'} @@ -5427,6 +5523,36 @@ snapshots: - '@types/eslint' - supports-color + '@soybeanjs/eslint-config@1.3.5(@unocss/eslint-config@0.60.2(eslint@9.3.0)(typescript@5.4.5))(eslint-plugin-vue@9.26.0(eslint@9.3.0))(eslint@9.3.0)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.3.0))': + dependencies: + '@antfu/eslint-define-config': 1.23.0-2 + '@antfu/install-pkg': 0.3.3 + '@eslint/eslintrc': 3.1.0 + '@eslint/js': 9.3.0 + '@typescript-eslint/eslint-plugin': 7.9.0(@typescript-eslint/parser@7.9.0(eslint@9.3.0)(typescript@5.4.5))(eslint@9.3.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.9.0(eslint@9.3.0)(typescript@5.4.5) + eslint: 9.3.0 + eslint-config-prettier: 9.1.0(eslint@9.3.0) + eslint-parser-plain: 0.1.0 + eslint-plugin-import-x: 0.5.0(eslint@9.3.0)(typescript@5.4.5) + eslint-plugin-n: 17.7.0(eslint@9.3.0) + eslint-plugin-prettier: 5.1.3(eslint-config-prettier@9.1.0(eslint@9.3.0))(eslint@9.3.0)(prettier@3.2.5) + eslint-plugin-unicorn: 53.0.0(eslint@9.3.0) + globals: 15.2.0 + local-pkg: 0.5.0 + prettier: 3.2.5 + prettier-plugin-jsdoc: 1.3.0(prettier@3.2.5) + prettier-plugin-json-sort: 0.0.2(prettier@3.2.5) + prompts: 2.4.2 + typescript: 5.4.5 + optionalDependencies: + '@unocss/eslint-config': 0.60.2(eslint@9.3.0)(typescript@5.4.5) + eslint-plugin-vue: 9.26.0(eslint@9.3.0) + vue-eslint-parser: 9.4.2(eslint@9.3.0) + transitivePeerDependencies: + - '@types/eslint' + - supports-color + '@szmarczak/http-timer@5.0.1': dependencies: defer-to-connect: 2.0.1 @@ -5514,6 +5640,24 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/eslint-plugin@7.9.0(@typescript-eslint/parser@7.9.0(eslint@9.3.0)(typescript@5.4.5))(eslint@9.3.0)(typescript@5.4.5)': + dependencies: + '@eslint-community/regexpp': 4.10.0 + '@typescript-eslint/parser': 7.9.0(eslint@9.3.0)(typescript@5.4.5) + '@typescript-eslint/scope-manager': 7.9.0 + '@typescript-eslint/type-utils': 7.9.0(eslint@9.3.0)(typescript@5.4.5) + '@typescript-eslint/utils': 7.9.0(eslint@9.3.0)(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.9.0 + eslint: 9.3.0 + graphemer: 1.4.0 + ignore: 5.3.1 + natural-compare: 1.4.0 + ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: + typescript: 5.4.5 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/parser@7.8.0(eslint@9.3.0)(typescript@5.4.5)': dependencies: '@typescript-eslint/scope-manager': 7.8.0 @@ -5527,6 +5671,19 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/parser@7.9.0(eslint@9.3.0)(typescript@5.4.5)': + dependencies: + '@typescript-eslint/scope-manager': 7.9.0 + '@typescript-eslint/types': 7.9.0 + '@typescript-eslint/typescript-estree': 7.9.0(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.9.0 + debug: 4.3.4 + eslint: 9.3.0 + optionalDependencies: + typescript: 5.4.5 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/scope-manager@7.8.0': dependencies: '@typescript-eslint/types': 7.8.0 @@ -5549,6 +5706,18 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/type-utils@7.9.0(eslint@9.3.0)(typescript@5.4.5)': + dependencies: + '@typescript-eslint/typescript-estree': 7.9.0(typescript@5.4.5) + '@typescript-eslint/utils': 7.9.0(eslint@9.3.0)(typescript@5.4.5) + debug: 4.3.4 + eslint: 9.3.0 + ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: + typescript: 5.4.5 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/types@7.8.0': {} '@typescript-eslint/types@7.9.0': {} @@ -5561,7 +5730,7 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.4 - semver: 7.6.0 + semver: 7.6.2 ts-api-utils: 1.3.0(typescript@5.4.5) optionalDependencies: typescript: 5.4.5 @@ -5592,7 +5761,7 @@ snapshots: '@typescript-eslint/types': 7.8.0 '@typescript-eslint/typescript-estree': 7.8.0(typescript@5.4.5) eslint: 9.3.0 - semver: 7.6.0 + semver: 7.6.2 transitivePeerDependencies: - supports-color - typescript @@ -6796,6 +6965,18 @@ snapshots: minimatch: 9.0.4 semver: 7.6.2 + eslint-plugin-n@17.7.0(eslint@9.3.0): + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@9.3.0) + enhanced-resolve: 5.16.1 + eslint: 9.3.0 + eslint-plugin-es-x: 7.6.0(eslint@9.3.0) + get-tsconfig: 4.7.5 + globals: 15.2.0 + ignore: 5.3.1 + minimatch: 9.0.4 + semver: 7.6.2 + eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@9.3.0))(eslint@9.3.0)(prettier@3.2.5): dependencies: eslint: 9.3.0 @@ -6827,6 +7008,28 @@ snapshots: transitivePeerDependencies: - supports-color + eslint-plugin-unicorn@53.0.0(eslint@9.3.0): + dependencies: + '@babel/helper-validator-identifier': 7.24.5 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.3.0) + '@eslint/eslintrc': 3.1.0 + ci-info: 4.0.0 + clean-regexp: 1.0.0 + core-js-compat: 3.37.1 + eslint: 9.3.0 + esquery: 1.5.0 + indent-string: 4.0.0 + is-builtin-module: 3.2.1 + jsesc: 3.0.2 + pluralize: 8.0.0 + read-pkg-up: 7.0.1 + regexp-tree: 0.1.27 + regjsparser: 0.10.0 + semver: 7.6.2 + strip-indent: 3.0.0 + transitivePeerDependencies: + - supports-color + eslint-plugin-vue@9.26.0(eslint@9.3.0): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.3.0) @@ -7230,6 +7433,8 @@ snapshots: globals@15.1.0: {} + globals@15.2.0: {} + globalthis@1.0.4: dependencies: define-properties: 1.2.1 diff --git a/src/views/manage/menu/modules/menu-operate-modal.vue b/src/views/manage/menu/modules/menu-operate-modal.vue index 9f27f9160..814f5f5a5 100644 --- a/src/views/manage/menu/modules/menu-operate-modal.vue +++ b/src/views/manage/menu/modules/menu-operate-modal.vue @@ -359,13 +359,13 @@ watch( - + - + @@ -394,7 +394,7 @@ watch( - +