diff --git a/package.json b/package.json index 3cc6daf3c1..d9a14b07b2 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@vue/test-utils": "^2.4.6", "autoprefixer": "^10.4.19", "codesandbox": "^2.2.3", - "eslint": "^8.57.0", + "eslint": "^9.2.0", "eslint-config-flat-gitignore": "^0.1.5", "fs-extra": "^11.2.0", "happy-dom": "^14.10.1", @@ -127,5 +127,8 @@ "repository": { "type": "git", "url": "https://github.com/jdf2e/nutui.git" + }, + "resolutions": { + "@typescript-eslint/utils": "^8.0.0-alpha.10" } } \ No newline at end of file diff --git a/packages/nutui-eslint-config/index.js b/packages/nutui-eslint-config/index.js index 4663e43adf..6f541247fe 100644 --- a/packages/nutui-eslint-config/index.js +++ b/packages/nutui-eslint-config/index.js @@ -22,7 +22,9 @@ export default [ '@typescript-eslint/ban-types': 'off', '@typescript-eslint/no-var-requires': 'off', 'no-unused-vars': 'off', - '@typescript-eslint/no-unused-vars': 'error', + '@typescript-eslint/no-unused-vars': ['error', { + caughtErrors: 'none' + }], '@typescript-eslint/ban-ts-comment': 'off', // eslint-plugin-vue 'vue/v-on-event-hyphenation': [ @@ -37,6 +39,9 @@ export default [ 'vue/first-attribute-linebreak': 'off', 'vue/multi-word-component-names': 'off', 'vue/no-v-text-v-html-on-component': 'off', + 'vue/block-order': ['error', { + order: [['script', 'template'], 'style'] + }], // TODO: will be removed 'vue/html-self-closing': 'off', 'vue/html-closing-bracket-newline': 'off', diff --git a/packages/nutui-eslint-config/package.json b/packages/nutui-eslint-config/package.json index 4ff4c9b3f0..e88d474191 100644 --- a/packages/nutui-eslint-config/package.json +++ b/packages/nutui-eslint-config/package.json @@ -26,17 +26,17 @@ }, "dependencies": { "@stylistic/eslint-plugin": "^2.1.0", - "@typescript-eslint/eslint-plugin": "^7.8.0", - "@typescript-eslint/parser": "^7.8.0", + "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.10", + "@typescript-eslint/parser": "^8.0.0-alpha.10", "eslint-plugin-vue": "^9.26.0", - "typescript-eslint": "^7.8.0", + "typescript-eslint": "^8.0.0-alpha.10", "vue-eslint-parser": "^9.4.2", - "@eslint/js": "^8.57.0" + "@eslint/js": "^9.2.0" }, "devDependencies": { - "eslint": "^8.57.0" + "eslint": "^9.2.0" }, "peerDependencies": { - "eslint": "^7.32.0 || ^8.44.0" + "eslint": "^8.44.0 || ^9.0.0" } } \ No newline at end of file diff --git a/packages/nutui-touch-emulator/src/index.js b/packages/nutui-touch-emulator/src/index.js index 18eca46495..11ea9417fb 100644 --- a/packages/nutui-touch-emulator/src/index.js +++ b/packages/nutui-touch-emulator/src/index.js @@ -1,4 +1,3 @@ -/* eslint-disable */ /** * Emulate touch event * Source:https://github.com/hammerjs/touchemulator diff --git a/packages/nutui-vite-plugins/src/markdown.ts b/packages/nutui-vite-plugins/src/markdown.ts index 668d1b6b37..92f8c638b0 100644 --- a/packages/nutui-vite-plugins/src/markdown.ts +++ b/packages/nutui-vite-plugins/src/markdown.ts @@ -54,7 +54,6 @@ ${code} } } -// eslint-disable-next-line @typescript-eslint/no-unused-vars export default function markdown(options: MarkdownOptions) { return [ TransformMarkdownDemo(options), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 277d2cebbb..bc1c153be7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + '@typescript-eslint/utils': ^8.0.0-alpha.10 + importers: .: @@ -32,7 +35,7 @@ importers: version: 19.2.2 '@eslint/config-inspector': specifier: ^0.4.8 - version: 0.4.8(eslint@8.57.0) + version: 0.4.8(eslint@9.2.0) '@eslint/eslintrc': specifier: ^3.0.2 version: 3.0.2 @@ -76,8 +79,8 @@ importers: specifier: ^2.2.3 version: 2.2.3 eslint: - specifier: ^8.57.0 - version: 8.57.0 + specifier: ^9.2.0 + version: 9.2.0 eslint-config-flat-gitignore: specifier: ^0.1.5 version: 0.1.5 @@ -148,30 +151,30 @@ importers: packages/nutui-eslint-config: dependencies: '@eslint/js': - specifier: ^8.57.0 - version: 8.57.0 + specifier: ^9.2.0 + version: 9.2.0 '@stylistic/eslint-plugin': specifier: ^2.1.0 - version: 2.1.0(eslint@8.57.0)(typescript@5.4.5) + version: 2.1.0(eslint@9.2.0)(typescript@5.4.5) '@typescript-eslint/eslint-plugin': - specifier: ^7.8.0 - version: 7.8.0(@typescript-eslint/parser@7.8.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) + specifier: ^8.0.0-alpha.10 + version: 8.0.0-alpha.10(@typescript-eslint/parser@8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5))(eslint@9.2.0)(typescript@5.4.5) '@typescript-eslint/parser': - specifier: ^7.8.0 - version: 7.8.0(eslint@8.57.0)(typescript@5.4.5) + specifier: ^8.0.0-alpha.10 + version: 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) eslint-plugin-vue: specifier: ^9.26.0 - version: 9.26.0(eslint@8.57.0) + version: 9.26.0(eslint@9.2.0) typescript-eslint: - specifier: ^7.8.0 - version: 7.8.0(eslint@8.57.0)(typescript@5.4.5) + specifier: ^8.0.0-alpha.10 + version: 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) vue-eslint-parser: specifier: ^9.4.2 - version: 9.4.2(eslint@8.57.0) + version: 9.4.2(eslint@9.2.0) devDependencies: eslint: - specifier: ^8.57.0 - version: 8.57.0 + specifier: ^9.2.0 + version: 9.2.0 packages/nutui-playground: dependencies: @@ -1587,6 +1590,10 @@ packages: resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + '@eslint/js@9.2.0': + resolution: {integrity: sha512-ESiIudvhoYni+MdsI8oD7skpprZ89qKocwRM2KEvhhBJ9nl5MRh7BXU5GTod7Mdygq+AUl+QzId6iWJKR/wABA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@hapi/hoek@9.3.0': resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} @@ -1597,6 +1604,10 @@ packages: resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} engines: {node: '>=10.10.0'} + '@humanwhocodes/config-array@0.13.0': + resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==} + engines: {node: '>=10.10.0'} + '@humanwhocodes/module-importer@1.0.1': resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} @@ -1604,6 +1615,10 @@ packages: '@humanwhocodes/object-schema@2.0.3': resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} + '@humanwhocodes/retry@0.2.4': + resolution: {integrity: sha512-Ttl/jHpxfS3st5sxwICYfk4pOH0WrLI1SpW283GgQL7sCWU7EHIOhX4b4fkIxr3tkfzwg8+FNojtzsIEE7Ecgg==} + engines: {node: '>=18.18'} + '@inquirer/figures@1.0.1': resolution: {integrity: sha512-mtup3wVKia3ZwULPHcbs4Mor8Voi+iIXEWD7wCNbIO6lYR62oPCTQyrddi5OMYVXHzeCSoneZwJuS8sBvlEwDw==} engines: {node: '>=18'} @@ -2380,12 +2395,12 @@ packages: '@types/yargs@15.0.19': resolution: {integrity: sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==} - '@typescript-eslint/eslint-plugin@7.8.0': - resolution: {integrity: sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/eslint-plugin@8.0.0-alpha.10': + resolution: {integrity: sha512-jsNKqn41nIS8jz5Li5xsueGEBBmRYLaflUKlclEkj8cWrO1tMK1/7xITeiVz7ZlNFZF2nop2NlXrbLtRpLEzhg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^7.0.0 - eslint: ^8.56.0 + eslint: ^8.57.0 || ^9.0.0 typescript: '*' peerDependenciesMeta: typescript: @@ -2401,11 +2416,11 @@ packages: typescript: optional: true - '@typescript-eslint/parser@7.8.0': - resolution: {integrity: sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/parser@8.0.0-alpha.10': + resolution: {integrity: sha512-4EerPviLfBKgExHARehJgWrCtX2a7+PXBc0LBPlH93ypSgj0LU1ejMgjrB0gcfd6bJ7LN/UGNAAy3B7/Y785sA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.56.0 + eslint: ^8.57.0 || ^9.0.0 typescript: '*' peerDependenciesMeta: typescript: @@ -2415,15 +2430,14 @@ packages: resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==} engines: {node: ^16.0.0 || >=18.0.0} - '@typescript-eslint/scope-manager@7.8.0': - resolution: {integrity: sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/scope-manager@8.0.0-alpha.10': + resolution: {integrity: sha512-SUU0yhqehjuWilWRJWfhcxf6eMKVrZ3bpV2w6NF6GmBHR3FJo6oWZYLVXP04s6//INxpC2ynvKSglo4LRzWVTw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@7.8.0': - resolution: {integrity: sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/type-utils@8.0.0-alpha.10': + resolution: {integrity: sha512-6aTcbnDZWKgKr3gquECJSFyvXWLSKtUHrk2ZXDP4DEzmzTDjrkY7tIQpqv4SczPQJ+3/aky3ArPhtnQYJbAMzg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.56.0 typescript: '*' peerDependenciesMeta: typescript: @@ -2433,9 +2447,9 @@ packages: resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==} engines: {node: ^16.0.0 || >=18.0.0} - '@typescript-eslint/types@7.8.0': - resolution: {integrity: sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/types@8.0.0-alpha.10': + resolution: {integrity: sha512-prbN+b/I4yH6H43WmyenMz8K5e34Hs73BQuWXR4wwij3Cg2xNGLPcpjr2cKWKlH4dZQPTz6R6oBeC+LfaoKi8g==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@typescript-eslint/typescript-estree@6.21.0': resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} @@ -2446,28 +2460,28 @@ packages: typescript: optional: true - '@typescript-eslint/typescript-estree@7.8.0': - resolution: {integrity: sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/typescript-estree@8.0.0-alpha.10': + resolution: {integrity: sha512-8wBUIhu6IRa440hv5/0ZEnb5JLp/UsfzIXYKRwICUOMTVj2ss1n+w3m1CtT5ghVWy5Z05qkscsbhlKFmZguU8w==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true - '@typescript-eslint/utils@7.8.0': - resolution: {integrity: sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/utils@8.0.0-alpha.10': + resolution: {integrity: sha512-WZyNf49CuvaW/whz/B8XjYwXE/wm/EQAXq+Vqgp6BrJb8SC3bMCwGuUxReNDN1o+dNdOC96ofVSvqa8NUQ65Jg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.56.0 + eslint: ^8.57.0 || ^9.0.0 '@typescript-eslint/visitor-keys@6.21.0': resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==} engines: {node: ^16.0.0 || >=18.0.0} - '@typescript-eslint/visitor-keys@7.8.0': - resolution: {integrity: sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/visitor-keys@8.0.0-alpha.10': + resolution: {integrity: sha512-UohTNnT7S29uQgXsGZY489nWmoBBSJucNdRvog62R1QX9pQQb2pKVV1kHepUxoY2vd+M4tb9SQwZQ3gPNgqQ6w==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@ungap/promise-all-settled@1.1.2': resolution: {integrity: sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==} @@ -4458,6 +4472,10 @@ packages: resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + eslint-scope@8.0.1: + resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint-visitor-keys@2.1.0: resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} engines: {node: '>=10'} @@ -4480,6 +4498,11 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true + eslint@9.2.0: + resolution: {integrity: sha512-0n/I88vZpCOzO+PQpt0lbsqmn9AsnsJAQseIqhZFI8ibQT0U1AkEKRxA3EVMos0BoHSXDQvCXY25TUjB5tr8Og==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + hasBin: true + espree@10.0.1: resolution: {integrity: sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -8255,11 +8278,10 @@ packages: typedarray@0.0.6: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} - typescript-eslint@7.8.0: - resolution: {integrity: sha512-sheFG+/D8N/L7gC3WT0Q8sB97Nm573Yfr+vZFzl/4nBdYcmviBPtwGSX9TJ7wpVg28ocerKVOt+k2eGmHzcgVA==} - engines: {node: ^18.18.0 || >=20.0.0} + typescript-eslint@8.0.0-alpha.10: + resolution: {integrity: sha512-iMbN7boDtUmcSDor/J022+H4G018W3r3RSUUr7yoghMTmFuKVIkI89xJHDg82DBGYkA0xOoDNPBr7XfRFbEXKQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.56.0 typescript: '*' peerDependenciesMeta: typescript: @@ -10189,15 +10211,20 @@ snapshots: eslint: 8.57.0 eslint-visitor-keys: 3.4.3 + '@eslint-community/eslint-utils@4.4.0(eslint@9.2.0)': + dependencies: + eslint: 9.2.0 + eslint-visitor-keys: 3.4.3 + '@eslint-community/regexpp@4.10.0': {} - '@eslint/config-inspector@0.4.8(eslint@8.57.0)': + '@eslint/config-inspector@0.4.8(eslint@9.2.0)': dependencies: bundle-require: 4.1.0(esbuild@0.20.2) cac: 6.7.14 chokidar: 3.6.0 esbuild: 0.20.2 - eslint: 8.57.0 + eslint: 9.2.0 fast-glob: 3.3.2 find-up: 7.0.0 get-port-please: 3.1.2 @@ -10244,6 +10271,8 @@ snapshots: '@eslint/js@8.57.0': {} + '@eslint/js@9.2.0': {} + '@hapi/hoek@9.3.0': {} '@hapi/topo@5.1.0': @@ -10258,10 +10287,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@humanwhocodes/config-array@0.13.0': + dependencies: + '@humanwhocodes/object-schema': 2.0.3 + debug: 4.3.4 + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + '@humanwhocodes/module-importer@1.0.1': {} '@humanwhocodes/object-schema@2.0.3': {} + '@humanwhocodes/retry@0.2.4': {} + '@inquirer/figures@1.0.1': {} '@isaacs/cliui@8.0.2': @@ -10446,49 +10485,49 @@ snapshots: '@stencil/core@2.22.3': {} - '@stylistic/eslint-plugin-js@2.1.0(eslint@8.57.0)': + '@stylistic/eslint-plugin-js@2.1.0(eslint@9.2.0)': dependencies: '@types/eslint': 8.56.10 acorn: 8.11.3 - eslint: 8.57.0 + eslint: 9.2.0 eslint-visitor-keys: 4.0.0 espree: 10.0.1 - '@stylistic/eslint-plugin-jsx@2.1.0(eslint@8.57.0)': + '@stylistic/eslint-plugin-jsx@2.1.0(eslint@9.2.0)': dependencies: - '@stylistic/eslint-plugin-js': 2.1.0(eslint@8.57.0) + '@stylistic/eslint-plugin-js': 2.1.0(eslint@9.2.0) '@types/eslint': 8.56.10 - eslint: 8.57.0 + eslint: 9.2.0 estraverse: 5.3.0 picomatch: 4.0.2 - '@stylistic/eslint-plugin-plus@2.1.0(eslint@8.57.0)(typescript@5.4.5)': + '@stylistic/eslint-plugin-plus@2.1.0(eslint@9.2.0)(typescript@5.4.5)': dependencies: '@types/eslint': 8.56.10 - '@typescript-eslint/utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - eslint: 8.57.0 + '@typescript-eslint/utils': 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) + eslint: 9.2.0 transitivePeerDependencies: - supports-color - typescript - '@stylistic/eslint-plugin-ts@2.1.0(eslint@8.57.0)(typescript@5.4.5)': + '@stylistic/eslint-plugin-ts@2.1.0(eslint@9.2.0)(typescript@5.4.5)': dependencies: - '@stylistic/eslint-plugin-js': 2.1.0(eslint@8.57.0) + '@stylistic/eslint-plugin-js': 2.1.0(eslint@9.2.0) '@types/eslint': 8.56.10 - '@typescript-eslint/utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - eslint: 8.57.0 + '@typescript-eslint/utils': 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) + eslint: 9.2.0 transitivePeerDependencies: - supports-color - typescript - '@stylistic/eslint-plugin@2.1.0(eslint@8.57.0)(typescript@5.4.5)': + '@stylistic/eslint-plugin@2.1.0(eslint@9.2.0)(typescript@5.4.5)': dependencies: - '@stylistic/eslint-plugin-js': 2.1.0(eslint@8.57.0) - '@stylistic/eslint-plugin-jsx': 2.1.0(eslint@8.57.0) - '@stylistic/eslint-plugin-plus': 2.1.0(eslint@8.57.0)(typescript@5.4.5) - '@stylistic/eslint-plugin-ts': 2.1.0(eslint@8.57.0)(typescript@5.4.5) + '@stylistic/eslint-plugin-js': 2.1.0(eslint@9.2.0) + '@stylistic/eslint-plugin-jsx': 2.1.0(eslint@9.2.0) + '@stylistic/eslint-plugin-plus': 2.1.0(eslint@9.2.0)(typescript@5.4.5) + '@stylistic/eslint-plugin-ts': 2.1.0(eslint@9.2.0)(typescript@5.4.5) '@types/eslint': 8.56.10 - eslint: 8.57.0 + eslint: 9.2.0 transitivePeerDependencies: - supports-color - typescript @@ -11316,16 +11355,16 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 - '@typescript-eslint/eslint-plugin@7.8.0(@typescript-eslint/parser@7.8.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/eslint-plugin@8.0.0-alpha.10(@typescript-eslint/parser@8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5))(eslint@9.2.0)(typescript@5.4.5)': dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/scope-manager': 7.8.0 - '@typescript-eslint/type-utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/visitor-keys': 7.8.0 + '@typescript-eslint/parser': 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) + '@typescript-eslint/scope-manager': 8.0.0-alpha.10 + '@typescript-eslint/type-utils': 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) + '@typescript-eslint/utils': 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 8.0.0-alpha.10 debug: 4.3.4 - eslint: 8.57.0 + eslint: 9.2.0 graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 @@ -11349,14 +11388,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.8.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/parser@8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5)': dependencies: - '@typescript-eslint/scope-manager': 7.8.0 - '@typescript-eslint/types': 7.8.0 - '@typescript-eslint/typescript-estree': 7.8.0(typescript@5.4.5) - '@typescript-eslint/visitor-keys': 7.8.0 + '@typescript-eslint/scope-manager': 8.0.0-alpha.10 + '@typescript-eslint/types': 8.0.0-alpha.10 + '@typescript-eslint/typescript-estree': 8.0.0-alpha.10(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 8.0.0-alpha.10 debug: 4.3.4 - eslint: 8.57.0 + eslint: 9.2.0 optionalDependencies: typescript: 5.4.5 transitivePeerDependencies: @@ -11367,26 +11406,26 @@ snapshots: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 - '@typescript-eslint/scope-manager@7.8.0': + '@typescript-eslint/scope-manager@8.0.0-alpha.10': dependencies: - '@typescript-eslint/types': 7.8.0 - '@typescript-eslint/visitor-keys': 7.8.0 + '@typescript-eslint/types': 8.0.0-alpha.10 + '@typescript-eslint/visitor-keys': 8.0.0-alpha.10 - '@typescript-eslint/type-utils@7.8.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/type-utils@8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5)': dependencies: - '@typescript-eslint/typescript-estree': 7.8.0(typescript@5.4.5) - '@typescript-eslint/utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/typescript-estree': 8.0.0-alpha.10(typescript@5.4.5) + '@typescript-eslint/utils': 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) debug: 4.3.4 - eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.4.5) optionalDependencies: typescript: 5.4.5 transitivePeerDependencies: + - eslint - supports-color '@typescript-eslint/types@6.21.0': {} - '@typescript-eslint/types@7.8.0': {} + '@typescript-eslint/types@8.0.0-alpha.10': {} '@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.5)': dependencies: @@ -11403,10 +11442,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@7.8.0(typescript@5.4.5)': + '@typescript-eslint/typescript-estree@8.0.0-alpha.10(typescript@5.4.5)': dependencies: - '@typescript-eslint/types': 7.8.0 - '@typescript-eslint/visitor-keys': 7.8.0 + '@typescript-eslint/types': 8.0.0-alpha.10 + '@typescript-eslint/visitor-keys': 8.0.0-alpha.10 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -11418,15 +11457,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.8.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/utils@8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.2.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 - '@typescript-eslint/scope-manager': 7.8.0 - '@typescript-eslint/types': 7.8.0 - '@typescript-eslint/typescript-estree': 7.8.0(typescript@5.4.5) - eslint: 8.57.0 + '@typescript-eslint/scope-manager': 8.0.0-alpha.10 + '@typescript-eslint/types': 8.0.0-alpha.10 + '@typescript-eslint/typescript-estree': 8.0.0-alpha.10(typescript@5.4.5) + eslint: 9.2.0 semver: 7.6.0 transitivePeerDependencies: - supports-color @@ -11437,9 +11476,9 @@ snapshots: '@typescript-eslint/types': 6.21.0 eslint-visitor-keys: 3.4.3 - '@typescript-eslint/visitor-keys@7.8.0': + '@typescript-eslint/visitor-keys@8.0.0-alpha.10': dependencies: - '@typescript-eslint/types': 7.8.0 + '@typescript-eslint/types': 8.0.0-alpha.10 eslint-visitor-keys: 3.4.3 '@ungap/promise-all-settled@1.1.2': {} @@ -13664,16 +13703,16 @@ snapshots: - supports-color - typescript - eslint-plugin-vue@9.26.0(eslint@8.57.0): + eslint-plugin-vue@9.26.0(eslint@9.2.0): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - eslint: 8.57.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.2.0) + eslint: 9.2.0 globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.0.16 semver: 7.6.0 - vue-eslint-parser: 9.4.2(eslint@8.57.0) + vue-eslint-parser: 9.4.2(eslint@9.2.0) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -13688,6 +13727,11 @@ snapshots: esrecurse: 4.3.0 estraverse: 5.3.0 + eslint-scope@8.0.1: + dependencies: + esrecurse: 4.3.0 + estraverse: 5.3.0 + eslint-visitor-keys@2.1.0: {} eslint-visitor-keys@3.4.3: {} @@ -13781,6 +13825,45 @@ snapshots: transitivePeerDependencies: - supports-color + eslint@9.2.0: + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@9.2.0) + '@eslint-community/regexpp': 4.10.0 + '@eslint/eslintrc': 3.0.2 + '@eslint/js': 9.2.0 + '@humanwhocodes/config-array': 0.13.0 + '@humanwhocodes/module-importer': 1.0.1 + '@humanwhocodes/retry': 0.2.4 + '@nodelib/fs.walk': 1.2.8 + ajv: 6.12.6 + chalk: 4.1.2 + cross-spawn: 7.0.3 + debug: 4.3.4 + escape-string-regexp: 4.0.0 + eslint-scope: 8.0.1 + eslint-visitor-keys: 4.0.0 + espree: 10.0.1 + esquery: 1.5.0 + esutils: 2.0.3 + fast-deep-equal: 3.1.3 + file-entry-cache: 8.0.0 + find-up: 5.0.0 + glob-parent: 6.0.2 + ignore: 5.3.1 + imurmurhash: 0.1.4 + is-glob: 4.0.3 + is-path-inside: 3.0.3 + json-stable-stringify-without-jsonify: 1.0.1 + levn: 0.4.1 + lodash.merge: 4.6.2 + minimatch: 3.1.2 + natural-compare: 1.4.0 + optionator: 0.9.3 + strip-ansi: 6.0.1 + text-table: 0.2.0 + transitivePeerDependencies: + - supports-color + espree@10.0.1: dependencies: acorn: 8.11.3 @@ -17929,15 +18012,15 @@ snapshots: typedarray@0.0.6: {} - typescript-eslint@7.8.0(eslint@8.57.0)(typescript@5.4.5): + typescript-eslint@8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5): dependencies: - '@typescript-eslint/eslint-plugin': 7.8.0(@typescript-eslint/parser@7.8.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/parser': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - eslint: 8.57.0 + '@typescript-eslint/eslint-plugin': 8.0.0-alpha.10(@typescript-eslint/parser@8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5))(eslint@9.2.0)(typescript@5.4.5) + '@typescript-eslint/parser': 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) + '@typescript-eslint/utils': 8.0.0-alpha.10(eslint@9.2.0)(typescript@5.4.5) optionalDependencies: typescript: 5.4.5 transitivePeerDependencies: + - eslint - supports-color typescript@5.4.5: {} @@ -18292,10 +18375,10 @@ snapshots: vue-component-type-helpers@2.0.13: {} - vue-eslint-parser@9.4.2(eslint@8.57.0): + vue-eslint-parser@9.4.2(eslint@9.2.0): dependencies: debug: 4.3.4 - eslint: 8.57.0 + eslint: 9.2.0 eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 diff --git a/src/packages/__VUE/noticebar/index.taro.vue b/src/packages/__VUE/noticebar/index.taro.vue index fec3426f62..e061df3378 100644 --- a/src/packages/__VUE/noticebar/index.taro.vue +++ b/src/packages/__VUE/noticebar/index.taro.vue @@ -208,7 +208,7 @@ export default create({ const isEllipsis = computed(() => { if (state.isCanScroll == null) { - return false && !props.wrapable + return false } else { return !state.isCanScroll && !props.wrapable } diff --git a/src/packages/__VUE/sticky/__tests__/index.spec.ts b/src/packages/__VUE/sticky/__tests__/index.spec.ts index cdc67f3c7b..46a1e6a86b 100644 --- a/src/packages/__VUE/sticky/__tests__/index.spec.ts +++ b/src/packages/__VUE/sticky/__tests__/index.spec.ts @@ -7,7 +7,7 @@ Object.defineProperty(window.HTMLElement.prototype, 'clientHeight', { value: 667 }) -function mockStickyRect(wrapper: VueWrapper>, rect: Partial) { +function mockStickyRect(wrapper: VueWrapper>, rect: Partial) { const mocked = vi.spyOn(wrapper.element, 'getBoundingClientRect').mockReturnValue(rect as DOMRect) return () => mocked.mockRestore() diff --git a/src/packages/utils/touchEmulator.js b/src/packages/utils/touchEmulator.js index 18eca46495..11ea9417fb 100644 --- a/src/packages/utils/touchEmulator.js +++ b/src/packages/utils/touchEmulator.js @@ -1,4 +1,3 @@ -/* eslint-disable */ /** * Emulate touch event * Source:https://github.com/hammerjs/touchemulator