From 53bbbf1189b0666b676c85410334bb2a8220ccea Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Fri, 3 Jan 2025 13:03:56 +0100 Subject: [PATCH] cleanup eslint config --- .eslintrc.cjs | 2 +- packages/zitadel-client/package.json | 2 +- .../index.js | 0 .../package.json | 0 pnpm-lock.yaml | 80 ++++++------------- 5 files changed, 28 insertions(+), 56 deletions(-) rename packages/{eslint-config-zitadel => zitadel-eslint-config}/index.js (100%) rename packages/{eslint-config-zitadel => zitadel-eslint-config}/package.json (100%) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index c57c48e6f5..4739a79847 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,6 +1,6 @@ module.exports = { root: true, - // This tells ESLint to load the config from the package `eslint-config-zitadel` + // This tells ESLint to load the config from the package `@zitadel/eslint-config` extends: ["zitadel"], settings: { next: { diff --git a/packages/zitadel-client/package.json b/packages/zitadel-client/package.json index 8865cf3739..0daa88fab9 100644 --- a/packages/zitadel-client/package.json +++ b/packages/zitadel-client/package.json @@ -59,6 +59,6 @@ "devDependencies": { "@bufbuild/protocompile": "^0.0.1", "@zitadel/tsconfig": "workspace:*", - "eslint-config-zitadel": "workspace:*" + "@zitadel/eslint-config": "workspace:*" } } diff --git a/packages/eslint-config-zitadel/index.js b/packages/zitadel-eslint-config/index.js similarity index 100% rename from packages/eslint-config-zitadel/index.js rename to packages/zitadel-eslint-config/index.js diff --git a/packages/eslint-config-zitadel/package.json b/packages/zitadel-eslint-config/package.json similarity index 100% rename from packages/eslint-config-zitadel/package.json rename to packages/zitadel-eslint-config/package.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 15a20ce08e..3cc9b94bc6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,7 +39,7 @@ importers: version: 4.3.3(vite@5.4.11(@types/node@22.9.0)(sass@1.80.7)) '@zitadel/eslint-config': specifier: workspace:* - version: link:packages/eslint-config-zitadel + version: link:packages/zitadel-eslint-config '@zitadel/prettier-config': specifier: workspace:* version: link:packages/zitadel-prettier-config @@ -169,7 +169,7 @@ importers: version: 1.0.0 '@zitadel/eslint-config': specifier: workspace:* - version: link:../../packages/eslint-config-zitadel + version: link:../../packages/zitadel-eslint-config '@zitadel/prettier-config': specifier: workspace:* version: link:../../packages/zitadel-prettier-config @@ -231,27 +231,6 @@ importers: specifier: workspace:* version: link:../../packages/zitadel-tailwind-config - packages/eslint-config-zitadel: - dependencies: - '@babel/eslint-parser': - specifier: ^7.25.9 - version: 7.25.9(@babel/core@7.26.0)(eslint@8.57.1) - '@typescript-eslint/parser': - specifier: ^7.9.0 - version: 7.18.0(eslint@8.57.1)(typescript@5.6.3) - eslint-config-next: - specifier: ^14.2.18 - version: 14.2.18(eslint@8.57.1)(typescript@5.6.3) - eslint-config-prettier: - specifier: ^9.1.0 - version: 9.1.0(eslint@8.57.1) - eslint-config-turbo: - specifier: ^2.0.9 - version: 2.1.0(eslint@8.57.1) - eslint-plugin-react: - specifier: ^7.34.1 - version: 7.35.0(eslint@8.57.1) - packages/zitadel-client: dependencies: '@bufbuild/protobuf': @@ -278,11 +257,32 @@ importers: version: 0.0.1(@bufbuild/buf@1.47.2) '@zitadel/eslint-config': specifier: workspace:* - version: link:../eslint-config-zitadel + version: link:../zitadel-eslint-config '@zitadel/tsconfig': specifier: workspace:* version: link:../zitadel-tsconfig + packages/zitadel-eslint-config: + dependencies: + '@babel/eslint-parser': + specifier: ^7.25.9 + version: 7.25.9(@babel/core@7.26.0)(eslint@8.57.1) + '@typescript-eslint/parser': + specifier: ^7.9.0 + version: 7.18.0(eslint@8.57.1)(typescript@5.6.3) + eslint-config-next: + specifier: ^14.2.18 + version: 14.2.18(eslint@8.57.1)(typescript@5.6.3) + eslint-config-prettier: + specifier: ^9.1.0 + version: 9.1.0(eslint@8.57.1) + eslint-config-turbo: + specifier: ^2.0.9 + version: 2.1.0(eslint@8.57.1) + eslint-plugin-react: + specifier: ^7.34.1 + version: 7.35.0(eslint@8.57.1) + packages/zitadel-prettier-config: {} packages/zitadel-proto: @@ -2204,15 +2204,6 @@ packages: supports-color: optional: true - debug@4.3.6: - resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.3.7: resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} engines: {node: '>=6.0'} @@ -3443,9 +3434,6 @@ packages: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} - ms@2.1.2: - resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} @@ -4458,12 +4446,6 @@ packages: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true - ts-api-utils@1.3.0: - resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} - engines: {node: '>=16'} - peerDependencies: - typescript: '>=4.2.0' - ts-api-utils@1.4.1: resolution: {integrity: sha512-5RU2/lxTA3YUZxju61HO2U6EoZLvBLtmV2mbTvqyu4a/7s7RmJPT+1YekhMVsQhznRWk/czIwDUg+V8Q9ZuG4w==} engines: {node: '>=16'} @@ -6073,7 +6055,7 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.3) '@typescript-eslint/visitor-keys': 7.18.0 - debug: 4.3.6 + debug: 4.3.7(supports-color@5.5.0) eslint: 8.57.1 optionalDependencies: typescript: 5.6.3 @@ -6115,7 +6097,7 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.6.3) + ts-api-utils: 1.4.1(typescript@5.6.3) optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: @@ -6765,10 +6747,6 @@ snapshots: optionalDependencies: supports-color: 8.1.1 - debug@4.3.6: - dependencies: - ms: 2.1.2 - debug@4.3.7(supports-color@5.5.0): dependencies: ms: 2.1.3 @@ -8220,8 +8198,6 @@ snapshots: mri@1.2.0: {} - ms@2.1.2: {} - ms@2.1.3: {} mz@2.7.0: @@ -9215,10 +9191,6 @@ snapshots: tree-kill@1.2.2: {} - ts-api-utils@1.3.0(typescript@5.6.3): - dependencies: - typescript: 5.6.3 - ts-api-utils@1.4.1(typescript@5.6.3): dependencies: typescript: 5.6.3