From a053ee802d28202ef2eb4686ad228d76bc6146c5 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Thu, 17 Jul 2025 20:07:53 +0200 Subject: [PATCH] fix package scripts --- apps/login/acceptance/turbo.json | 8 +-- apps/login/integration/turbo.json | 9 +--- packages/zitadel-client/.eslintrc.cjs | 7 ++- packages/zitadel-client/package.json | 5 +- .../zitadel-client/src/interceptors.test.ts | 4 +- packages/zitadel-client/turbo.json | 3 -- packages/zitadel-proto/package.json | 2 +- pnpm-lock.yaml | 53 +++++++++++++++++++ turbo.json | 8 --- 9 files changed, 66 insertions(+), 33 deletions(-) diff --git a/apps/login/acceptance/turbo.json b/apps/login/acceptance/turbo.json index 3be0539d0f..f6933572ba 100644 --- a/apps/login/acceptance/turbo.json +++ b/apps/login/acceptance/turbo.json @@ -1,10 +1,4 @@ { "extends": ["//"], - "tasks": { - "test:acceptance:setup:dev": { - "interactive": true, - "cache": false, - "persistent": true - } - } + "tasks": {} } diff --git a/apps/login/integration/turbo.json b/apps/login/integration/turbo.json index 267739dcb0..f6933572ba 100644 --- a/apps/login/integration/turbo.json +++ b/apps/login/integration/turbo.json @@ -1,11 +1,4 @@ { "extends": ["//"], - "tasks": { - "test:integration": {}, - "test:integration:setup": { - "interactive": true, - "cache": false, - "persistent": true - } - } + "tasks": {} } diff --git a/packages/zitadel-client/.eslintrc.cjs b/packages/zitadel-client/.eslintrc.cjs index 2aa38a6ac4..7a5a2cd40d 100644 --- a/packages/zitadel-client/.eslintrc.cjs +++ b/packages/zitadel-client/.eslintrc.cjs @@ -1,6 +1,6 @@ module.exports = { root: true, - extends: ["eslint:recommended", "@typescript-eslint/recommended"], + extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"], parser: "@typescript-eslint/parser", plugins: ["@typescript-eslint"], env: { @@ -11,4 +11,9 @@ module.exports = { ecmaVersion: 2022, sourceType: "module", }, + rules: { + "@typescript-eslint/no-unused-vars": ["error", { + "argsIgnorePattern": "^_" + }] + } }; diff --git a/packages/zitadel-client/package.json b/packages/zitadel-client/package.json index 9868c84cb7..0d10e1def4 100644 --- a/packages/zitadel-client/package.json +++ b/packages/zitadel-client/package.json @@ -44,10 +44,7 @@ "sideEffects": false, "scripts": { "build": "pnpm exec tsup", - "build:client:standalone": "pnpm build", - "test": "pnpm test:unit", "test:unit": "pnpm exec vitest --run", - "test:unit:standalone": "pnpm test:unit", "lint": "eslint \"src/**/*.ts*\"", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist" }, @@ -62,6 +59,8 @@ "devDependencies": { "@bufbuild/buf": "^1.53.0", "@bufbuild/protocompile": "^0.0.1", + "@eslint/compat": "^1.3.1", + "@eslint/eslintrc": "^3.3.1", "@typescript-eslint/eslint-plugin": "^8.15.0", "@typescript-eslint/parser": "^8.15.0", "eslint": "^8.57.0", diff --git a/packages/zitadel-client/src/interceptors.test.ts b/packages/zitadel-client/src/interceptors.test.ts index a5100f866a..b43368ff19 100644 --- a/packages/zitadel-client/src/interceptors.test.ts +++ b/packages/zitadel-client/src/interceptors.test.ts @@ -24,7 +24,7 @@ describe("NewAuthorizationBearerInterceptor", () => { }; test("injects the authorization token", async () => { - const handler = vitest.fn((request: Int32Value, context: HandlerContext) => { + const handler = vitest.fn((request: Int32Value, _context: HandlerContext) => { return { value: request.value.toString() }; }); @@ -42,7 +42,7 @@ describe("NewAuthorizationBearerInterceptor", () => { }); test("do not overwrite the previous authorization token", async () => { - const handler = vitest.fn((request: Int32Value, context: HandlerContext) => { + const handler = vitest.fn((request: Int32Value, _context: HandlerContext) => { return { value: request.value.toString() }; }); diff --git a/packages/zitadel-client/turbo.json b/packages/zitadel-client/turbo.json index b54d25e2ba..9085c5194e 100644 --- a/packages/zitadel-client/turbo.json +++ b/packages/zitadel-client/turbo.json @@ -4,9 +4,6 @@ "build": { "outputs": ["dist/**"], "dependsOn": ["@zitadel/proto#generate"] - }, - "build:client:standalone": { - "outputs": ["dist/**"] } } } diff --git a/packages/zitadel-proto/package.json b/packages/zitadel-proto/package.json index db0aca7035..582cc644aa 100644 --- a/packages/zitadel-proto/package.json +++ b/packages/zitadel-proto/package.json @@ -14,7 +14,7 @@ ], "sideEffects": false, "scripts": { - "generate": "pnpm exec buf generate ../../../proto --path ../../../proto/zitadel", + "generate": "pnpm exec buf generate ../../proto --path ../../proto/zitadel", "clean": "rm -rf zitadel .turbo node_modules google protoc-gen-openapiv2 validate" }, "dependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05f267d5b9..7aa28ba825 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -609,6 +609,12 @@ importers: '@bufbuild/protocompile': specifier: ^0.0.1 version: 0.0.1(@bufbuild/buf@1.55.1) + '@eslint/compat': + specifier: ^1.3.1 + version: 1.3.1(eslint@8.57.1) + '@eslint/eslintrc': + specifier: ^3.3.1 + version: 3.3.1 '@typescript-eslint/eslint-plugin': specifier: ^8.15.0 version: 8.37.0(@typescript-eslint/parser@8.37.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3) @@ -2785,10 +2791,23 @@ packages: resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + '@eslint/compat@1.3.1': + resolution: {integrity: sha512-k8MHony59I5EPic6EQTCNOuPoVBnoYXkP+20xvwFjN7t0qI3ImyvyBgg+hIVPwC8JaxVjjUZld+cLfBLFDLucg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.40 || 9 + peerDependenciesMeta: + eslint: + optional: true + '@eslint/eslintrc@2.1.4': resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + '@eslint/eslintrc@3.3.1': + resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/js@8.57.1': resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -7685,6 +7704,10 @@ packages: deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true + espree@10.4.0: + resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8216,6 +8239,10 @@ packages: resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} engines: {node: '>=8'} + globals@14.0.0: + resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} + engines: {node: '>=18'} + globals@15.15.0: resolution: {integrity: sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==} engines: {node: '>=18'} @@ -17661,6 +17688,10 @@ snapshots: '@eslint-community/regexpp@4.12.1': {} + '@eslint/compat@1.3.1(eslint@8.57.1)': + optionalDependencies: + eslint: 8.57.1 + '@eslint/eslintrc@2.1.4': dependencies: ajv: 6.12.6 @@ -17675,6 +17706,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@eslint/eslintrc@3.3.1': + dependencies: + ajv: 6.12.6 + debug: 4.4.1(supports-color@5.5.0) + espree: 10.4.0 + globals: 14.0.0 + ignore: 5.3.2 + import-fresh: 3.3.1 + js-yaml: 4.1.0 + minimatch: 3.1.2 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - supports-color + '@eslint/js@8.57.1': {} '@exodus/schemasafe@1.3.0': {} @@ -23748,6 +23793,12 @@ snapshots: transitivePeerDependencies: - supports-color + espree@10.4.0: + dependencies: + acorn: 8.15.0 + acorn-jsx: 5.3.2(acorn@8.15.0) + eslint-visitor-keys: 4.2.1 + espree@9.6.1: dependencies: acorn: 8.15.0 @@ -24412,6 +24463,8 @@ snapshots: dependencies: type-fest: 0.20.2 + globals@14.0.0: {} + globals@15.15.0: {} globalthis@1.0.4: diff --git a/turbo.json b/turbo.json index 349e8d2440..301d602e9d 100644 --- a/turbo.json +++ b/turbo.json @@ -28,14 +28,6 @@ "start:built": {}, "test:unit": {}, "test:unit:standalone": {}, - "test:integration": {}, - "test:integration:setup": { - "with": ["dev"] - }, - "test:acceptance:setup": {}, - "test:acceptance:setup:dev": { - "with": ["dev"] - }, "test:watch": { "persistent": true },