From db3e3784db92e500bce9bb97d44649714bda556a Mon Sep 17 00:00:00 2001 From: sushi-chaaaan Date: Sat, 27 Apr 2024 23:34:12 +0900 Subject: [PATCH 1/2] build: use eslint-plugin-astro v1 --- packages/eslint-config/package.json | 2 +- packages/eslint-config/src/base/astro.ts | 3 - pnpm-lock.yaml | 105 +++++++---------------- 3 files changed, 30 insertions(+), 80 deletions(-) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 2e602ce5..870fc4ad 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -34,7 +34,7 @@ "eslint": "^8.57.0", "eslint-config-flat-gitignore": "^0.1.5", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-astro": "^0.34.0", + "eslint-plugin-astro": "^1.0.3", "eslint-plugin-jsx-a11y": "^6.8.0", "eslint-plugin-perfectionist": "^2.10.0", "eslint-plugin-react": "^7.34.1", diff --git a/packages/eslint-config/src/base/astro.ts b/packages/eslint-config/src/base/astro.ts index 1d7ab642..9077226e 100644 --- a/packages/eslint-config/src/base/astro.ts +++ b/packages/eslint-config/src/base/astro.ts @@ -2,13 +2,10 @@ import type { Linter } from "eslint" import eslintPluginAstro from "eslint-plugin-astro" -// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment const astroConfig: Linter.FlatConfig[] = [ ...eslintPluginAstro.configs["flat/recommended"], // flat/jsx-a11y-strictは、eslint-plugin-jsx-a11yの設定をベースにしているので、 // インストールされていないとエラーになるが、このパッケージはdependenciesに含まれているので問題ない - // @ts-expect-error no types - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment ...eslintPluginAstro.configs["flat/jsx-a11y-strict"], ] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 172fe98a..4e73e138 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,8 +57,8 @@ importers: specifier: ^9.1.0 version: 9.1.0(eslint@8.57.0) eslint-plugin-astro: - specifier: ^0.34.0 - version: 0.34.0(eslint@8.57.0)(typescript@5.4.5) + specifier: ^1.0.3 + version: 1.0.3(eslint@8.57.0)(typescript@5.4.5) eslint-plugin-jsx-a11y: specifier: ^6.8.0 version: 6.8.0(eslint@8.57.0) @@ -1167,14 +1167,6 @@ packages: - supports-color dev: false - /@typescript-eslint/scope-manager@5.62.0: - resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/visitor-keys': 5.62.0 - dev: false - /@typescript-eslint/scope-manager@7.7.1: resolution: {integrity: sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==} engines: {node: ^18.18.0 || >=20.0.0} @@ -1202,36 +1194,10 @@ packages: - supports-color dev: false - /@typescript-eslint/types@5.62.0: - resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dev: false - /@typescript-eslint/types@7.7.1: resolution: {integrity: sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==} engines: {node: ^18.18.0 || >=20.0.0} - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.4.5): - resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/visitor-keys': 5.62.0 - debug: 4.3.4 - globby: 11.1.0 - is-glob: 4.0.3 - semver: 7.6.0 - tsutils: 3.21.0(typescript@5.4.5) - typescript: 5.4.5 - transitivePeerDependencies: - - supports-color - dev: false - /@typescript-eslint/typescript-estree@7.7.1(typescript@5.4.5): resolution: {integrity: sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==} engines: {node: ^18.18.0 || >=20.0.0} @@ -1271,14 +1237,6 @@ packages: - supports-color - typescript - /@typescript-eslint/visitor-keys@5.62.0: - resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - '@typescript-eslint/types': 5.62.0 - eslint-visitor-keys: 3.4.3 - dev: false - /@typescript-eslint/visitor-keys@7.7.1: resolution: {integrity: sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==} engines: {node: ^18.18.0 || >=20.0.0} @@ -1474,19 +1432,20 @@ packages: resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==} engines: {node: '>=8'} - /astro-eslint-parser@0.17.0(typescript@5.4.5): - resolution: {integrity: sha512-yTgzioUI9MKgBF4LxP7YI+uuZLrnXgHDeW4dpa3VqCNbDmPzL7ix93tc0JJIwWGcskoSAAHZZVaBSp8bHyZZZA==} - engines: {node: ^14.18.0 || >=16.0.0} + /astro-eslint-parser@1.0.1(typescript@5.4.5): + resolution: {integrity: sha512-dbBnHjxLjX4G6mFo9GCl8VcHIM8xwtxfqzqefUjOU1PwRJ48qWrVeIl2/mz4Usl3YyT+BFO2AP3it17oLjdqtQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} dependencies: '@astrojs/compiler': 2.7.1 - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.5) - astrojs-compiler-sync: 0.3.5(@astrojs/compiler@2.7.1) + '@typescript-eslint/scope-manager': 7.7.1 + '@typescript-eslint/types': 7.7.1 + '@typescript-eslint/typescript-estree': 7.7.1(typescript@5.4.5) + astrojs-compiler-sync: 1.0.0(@astrojs/compiler@2.7.1) debug: 4.3.4 entities: 4.5.0 - eslint-visitor-keys: 3.4.3 - espree: 9.6.1 + eslint-scope: 8.0.1 + eslint-visitor-keys: 4.0.0 + espree: 10.0.1 globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 @@ -1495,9 +1454,9 @@ packages: - typescript dev: false - /astrojs-compiler-sync@0.3.5(@astrojs/compiler@2.7.1): - resolution: {integrity: sha512-y420rhIIJ2HHDkYeqKArBHSdJNIIGMztLH90KGIX3zjcJyt/cr9Z2wYA8CP5J1w6KE7xqMh0DAkhfjhNDpQb2Q==} - engines: {node: ^14.18.0 || >=16.0.0} + /astrojs-compiler-sync@1.0.0(@astrojs/compiler@2.7.1): + resolution: {integrity: sha512-IM6FxpMoBxkGGdKppkFHNQIC9Wge7jspG2MIJff8DOhG41USNJLxJfxRm7wnkTKWlYK5Y1YFFNYr2vUUKkI8sw==} + engines: {node: ^18.18.0 || >=20.9.0} peerDependencies: '@astrojs/compiler': '>=0.27.0' dependencies: @@ -2132,16 +2091,16 @@ packages: eslint: 8.57.0 dev: false - /eslint-plugin-astro@0.34.0(eslint@8.57.0)(typescript@5.4.5): - resolution: {integrity: sha512-nzw2H4g7HPXPLsWVpGUxuJ/ViVPLI8lM/AaUCJ51qTLTWtaMhvlvoe2d7yIPMFc+7xeCzQdo1POK8eR7NFsdKQ==} - engines: {node: ^14.18.0 || >=16.0.0} + /eslint-plugin-astro@1.0.3(eslint@8.57.0)(typescript@5.4.5): + resolution: {integrity: sha512-+Nna5I9ypbYftyhmF6I9QbyK3o6m3PGfjgcgRzSF1TbHEXG5VI8z+nzsLywcvyVtGhcwmOpnB71iE7XDKnB94Q==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: '>=7.0.0' + eslint: '>=8.57.0' dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@jridgewell/sourcemap-codec': 1.4.15 - '@typescript-eslint/types': 5.62.0 - astro-eslint-parser: 0.17.0(typescript@5.4.5) + '@typescript-eslint/types': 7.7.1 + astro-eslint-parser: 1.0.1(typescript@5.4.5) eslint: 8.57.0 eslint-compat-utils: 0.5.0(eslint@8.57.0) globals: 13.24.0 @@ -2258,6 +2217,14 @@ packages: esrecurse: 4.3.0 estraverse: 5.3.0 + /eslint-scope@8.0.1: + resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + dependencies: + esrecurse: 4.3.0 + estraverse: 5.3.0 + dev: false + /eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -4559,10 +4526,6 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tslib@1.14.1: - resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - dev: false - /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: false @@ -4608,16 +4571,6 @@ packages: - ts-node dev: true - /tsutils@3.21.0(typescript@5.4.5): - resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} - engines: {node: '>= 6'} - peerDependencies: - typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' - dependencies: - tslib: 1.14.1 - typescript: 5.4.5 - dev: false - /tty-table@4.2.3: resolution: {integrity: sha512-Fs15mu0vGzCrj8fmJNP7Ynxt5J7praPXqFN0leZeZBXJwkMxv9cb2D454k1ltrtUSJbZ4yH4e0CynsHLxmUfFA==} engines: {node: '>=8.0.0'} From 5842a174d6f9fd71b9a54786f2d05c55a71f1cac Mon Sep 17 00:00:00 2001 From: sushi-chaaaan Date: Sat, 27 Apr 2024 23:34:51 +0900 Subject: [PATCH 2/2] chore: changeset --- .changeset/unlucky-mugs-glow.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/unlucky-mugs-glow.md diff --git a/.changeset/unlucky-mugs-glow.md b/.changeset/unlucky-mugs-glow.md new file mode 100644 index 00000000..3bd23b8d --- /dev/null +++ b/.changeset/unlucky-mugs-glow.md @@ -0,0 +1,5 @@ +--- +"@virtual-live-lab/eslint-config": patch +--- + +use `eslint-plugin-astro` v1