From 0a51d8ab4cfa4954d5f3ed8a4da32f61bf1ff91c Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 3 Aug 2025 21:59:31 -0700 Subject: [PATCH] test --- Makefile | 8 ++++---- internal/api/ui/login/static/resources/generate.go | 2 +- package.json | 3 ++- pnpm-lock.yaml | 3 +++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ad561ab725..37c0e9b7a6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -go_bin := "$$(go env GOPATH)/bin" -gen_authopt_path := "$(go_bin)/protoc-gen-authoption" -gen_zitadel_path := "$(go_bin)/protoc-gen-zitadel" +go_bin := $(shell go env GOPATH)/bin +gen_authopt_path := $(go_bin)/protoc-gen-authoption +gen_zitadel_path := $(go_bin)/protoc-gen-zitadel now := $(shell date '+%Y-%m-%dT%T%z' | sed -E 's/.([0-9]{2})([0-9]{2})$$/-\1:\2/') VERSION ?= development-$(now) @@ -82,7 +82,7 @@ core_grpc_dependencies: .PHONY: core_api core_api: core_api_generator core_grpc_dependencies - buf generate + npx buf generate mkdir -p pkg/grpc cp -r .artifacts/grpc/github.com/zitadel/zitadel/pkg/grpc/** pkg/grpc/ mkdir -p openapi/v2/zitadel diff --git a/internal/api/ui/login/static/resources/generate.go b/internal/api/ui/login/static/resources/generate.go index df529f451c..a3458b5779 100644 --- a/internal/api/ui/login/static/resources/generate.go +++ b/internal/api/ui/login/static/resources/generate.go @@ -3,4 +3,4 @@ package resources // TODO whitelabeling go:generate sass themes/scss/zitadel-alternative.scss themes/zitadel/css/zitadel.css // scss -//go:generate sass themes/scss/zitadel.scss themes/zitadel/css/zitadel.css +//go:generate npx sass themes/scss/zitadel.scss themes/zitadel/css/zitadel.css diff --git a/package.json b/package.json index a448c0acd5..57a27902b8 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "@changesets/cli": "^2.29.5", "@devcontainers/cli": "^0.80.0", "nx":"21.3.10", - "@bufbuild/buf": "^1.55.1" + "@bufbuild/buf": "^1.55.1", + "sass": "1.64.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 848026a38a..49d348e7e9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,6 +25,9 @@ importers: nx: specifier: 21.3.10 version: 21.3.10(@swc/core@1.13.3) + sass: + specifier: 1.64.1 + version: 1.64.1 apps/console: dependencies: