diff --git a/.npmrc b/.npmrc index 7bd51097f9..afa99a6905 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ -auto-install-peers = true -ignore-scripts = "postman-code-generators" +ignore-scripts = "postman-code-generators" \ No newline at end of file diff --git a/Makefile b/Makefile index 37c0e9b7a6..61c791ea7b 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ LOGIN_REMOTE_URL ?= https://github.com/zitadel/typescript.git LOGIN_REMOTE_BRANCH ?= main .PHONY: compile -compile: core_build console_build compile_pipeline +compile: core_build console_move compile_pipeline .PHONY: docker_image docker_image: @@ -93,15 +93,7 @@ core_build: core_dependencies core_api core_static core_assets .PHONY: console_move console_move: - cp -r console/dist/console/* internal/api/ui/console/static - -.PHONY: console_dependencies -console_dependencies: - npx pnpm install --frozen-lockfile --filter=./console - -.PHONY: console_build -console_build: console_dependencies - npx pnpm turbo build --filter=./console + cp -r apps/console/dist/console/* internal/api/ui/console/static .PHONY: clean clean: @@ -157,10 +149,6 @@ core_integration_reports: .PHONY: core_integration_test core_integration_test: core_integration_server_start core_integration_test_packages core_integration_server_stop core_integration_reports -.PHONY: console_lint -console_lint: - npx pnpm turbo lint --filter=./console - .PHONY: core_lint core_lint: golangci-lint run \ diff --git a/package.json b/package.json index 57a27902b8..1306938e54 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,20 @@ "private": true, "name": "zitadel", "scripts": { - "build": "make core_build" + "build": "make compile" + }, +"nx": { + "targets": { + "build": { + "outputs": [ + "{workspaceRoot}/zitadel" + ], + "dependsOn": [ + "@zitadel/console:build" + ] + } + } }, - "nx": {}, "pnpm": { "overrides": { "@typescript-eslint/parser": "^8.35.1",