From 0dffb27fcfd5665a057dc5b74cf4e9a61ea5b790 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Wed, 13 Aug 2025 21:09:12 +0200 Subject: [PATCH] chore: fix make console_dependencies (#10452) # Which Problems Are Solved The PR ensures that the `console_dependencies` Make recipe installs all dependencies needed to build the console. This makes for example `make compile` work again. # How the Problems Are Solved - For the current pnpm version 10, dependency overrides must be moved from the package.json to the pnpm-workspace.yaml. - The syntax for selecting a pnpm package and its workspace dependencies is fixed. # Additional Context - Closes https://github.com/zitadel/zitadel/issues/10435 --------- Co-authored-by: Marco A. --- Makefile | 2 +- package.json | 7 ------- pnpm-workspace.yaml | 5 +++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ad561ab725..ab2df018f6 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ console_move: .PHONY: console_dependencies console_dependencies: - npx pnpm install --frozen-lockfile --filter=./console + npx pnpm install --frozen-lockfile --filter=console... .PHONY: console_build console_build: console_dependencies diff --git a/package.json b/package.json index e04aa6f535..7062f002dc 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,6 @@ "clean": "turbo run clean", "clean:all": "pnpm run clean && rm -rf .turbo node_modules" }, - "pnpm": { - "overrides": { - "@typescript-eslint/parser": "^8.35.1", - "@zitadel/client": "workspace:*", - "@zitadel/proto": "workspace:*" - } - }, "devDependencies": { "@changesets/cli": "^2.29.5", "@devcontainers/cli": "^0.80.0", diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index ea2e2ec1f9..1b11d31ef0 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -4,3 +4,8 @@ packages: - "e2e" - "packages/*" - "apps/*" + +overrides: + "@typescript-eslint/parser": "^8.35.1" + "@zitadel/client": "workspace:*" + "@zitadel/proto": "workspace:*"