From 4fa22c07778b07fe4a19689d3839f1b9be49fc12 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Thu, 6 Feb 2025 11:00:04 +0100 Subject: [PATCH 1/4] fix: grpc web transport export --- .changeset/shiny-islands-sparkle.md | 5 +++++ packages/zitadel-client/package.json | 5 +++++ packages/zitadel-client/src/node.ts | 13 ------------- packages/zitadel-client/src/web.ts | 15 +++++++++++++++ packages/zitadel-client/tsup.config.ts | 2 +- 5 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 .changeset/shiny-islands-sparkle.md create mode 100644 packages/zitadel-client/src/web.ts diff --git a/.changeset/shiny-islands-sparkle.md b/.changeset/shiny-islands-sparkle.md new file mode 100644 index 0000000000..e8a707bc04 --- /dev/null +++ b/.changeset/shiny-islands-sparkle.md @@ -0,0 +1,5 @@ +--- +"@zitadel/client": patch +--- + +fix export for grpcweb transport diff --git a/packages/zitadel-client/package.json b/packages/zitadel-client/package.json index f3e1cbbce9..8442dcfbae 100644 --- a/packages/zitadel-client/package.json +++ b/packages/zitadel-client/package.json @@ -31,6 +31,11 @@ "types": "./dist/node.d.ts", "import": "./dist/node.js", "require": "./dist/node.cjs" + }, + "./web": { + "types": "./dist/web.d.ts", + "import": "./dist/web.js", + "require": "./dist/web.cjs" } }, "files": [ diff --git a/packages/zitadel-client/src/node.ts b/packages/zitadel-client/src/node.ts index db7838ebc3..8a563bee33 100644 --- a/packages/zitadel-client/src/node.ts +++ b/packages/zitadel-client/src/node.ts @@ -1,5 +1,4 @@ import { createGrpcTransport, GrpcTransportOptions } from "@connectrpc/connect-node"; -import { createGrpcWebTransport } from "@connectrpc/connect-web"; import { importPKCS8, SignJWT } from "jose"; import { NewAuthorizationBearerInterceptor } from "./interceptors"; @@ -15,18 +14,6 @@ export function createServerTransport(token: string, opts: GrpcTransportOptions) }); } -/** - * Create a client transport using grpc web with the given token and configuration options. - * @param token - * @param opts - */ -export function createClientTransport(token: string, opts: GrpcTransportOptions) { - return createGrpcWebTransport({ - ...opts, - interceptors: [...(opts.interceptors || []), NewAuthorizationBearerInterceptor(token)], - }); -} - export async function newSystemToken({ audience, subject, diff --git a/packages/zitadel-client/src/web.ts b/packages/zitadel-client/src/web.ts new file mode 100644 index 0000000000..a6007557c1 --- /dev/null +++ b/packages/zitadel-client/src/web.ts @@ -0,0 +1,15 @@ +import { GrpcTransportOptions } from "@connectrpc/connect-node"; +import { createGrpcWebTransport } from "@connectrpc/connect-web"; +import { NewAuthorizationBearerInterceptor } from "./interceptors"; + +/** + * Create a client transport using grpc web with the given token and configuration options. + * @param token + * @param opts + */ +export function createClientTransport(token: string, opts: GrpcTransportOptions) { + return createGrpcWebTransport({ + ...opts, + interceptors: [...(opts.interceptors || []), NewAuthorizationBearerInterceptor(token)], + }); +} diff --git a/packages/zitadel-client/tsup.config.ts b/packages/zitadel-client/tsup.config.ts index bb1644b766..3c9eeb8b83 100644 --- a/packages/zitadel-client/tsup.config.ts +++ b/packages/zitadel-client/tsup.config.ts @@ -1,7 +1,7 @@ import { defineConfig, Options } from "tsup"; export default defineConfig((options: Options) => ({ - entry: ["src/index.ts", "src/v1.ts", "src/v2.ts", "src/v3alpha.ts", "src/node.ts"], + entry: ["src/index.ts", "src/v1.ts", "src/v2.ts", "src/v3alpha.ts", "src/node.ts", "src/web.ts"], format: ["esm", "cjs"], treeshake: false, splitting: true, From 0e970d425c16a9b40ccaeabf4d2b9094573935ff Mon Sep 17 00:00:00 2001 From: LufyCZ Date: Sun, 9 Feb 2025 23:35:14 +0000 Subject: [PATCH 2/4] moduleresolution: node16 for the @zitadel/client package --- .nvmrc | 1 + CONTRIBUTING.md | 2 +- apps/login/package.json | 2 +- package.json | 2 +- packages/zitadel-client/src/index.ts | 4 +- .../zitadel-client/src/interceptors.test.ts | 2 +- packages/zitadel-client/src/node.ts | 2 +- packages/zitadel-client/src/v1.ts | 10 ++-- packages/zitadel-client/src/v2.ts | 18 +++--- packages/zitadel-client/src/v3alpha.ts | 6 +- packages/zitadel-proto/buf.gen.yaml | 1 + packages/zitadel-tsconfig/tsup.json | 6 +- pnpm-lock.yaml | 60 +++++++++---------- 13 files changed, 57 insertions(+), 59 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000000..0a47c855eb --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +lts/iron \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1b4e0b5bd8..560afffbe4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,7 +67,7 @@ export ZITADEL_SERVICE_USER_TOKEN= Date: Mon, 10 Feb 2025 08:14:00 +0000 Subject: [PATCH 3/4] Version Packages --- .changeset/shiny-islands-sparkle.md | 5 ----- packages/zitadel-client/CHANGELOG.md | 6 ++++++ packages/zitadel-client/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/shiny-islands-sparkle.md diff --git a/.changeset/shiny-islands-sparkle.md b/.changeset/shiny-islands-sparkle.md deleted file mode 100644 index e8a707bc04..0000000000 --- a/.changeset/shiny-islands-sparkle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@zitadel/client": patch ---- - -fix export for grpcweb transport diff --git a/packages/zitadel-client/CHANGELOG.md b/packages/zitadel-client/CHANGELOG.md index 0144cbc0dd..cdc9c34fc5 100644 --- a/packages/zitadel-client/CHANGELOG.md +++ b/packages/zitadel-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @zitadel/client +## 1.0.5 + +### Patch Changes + +- 4fa22c0: fix export for grpcweb transport + ## 1.0.4 ### Patch Changes diff --git a/packages/zitadel-client/package.json b/packages/zitadel-client/package.json index 8442dcfbae..222068068f 100644 --- a/packages/zitadel-client/package.json +++ b/packages/zitadel-client/package.json @@ -1,6 +1,6 @@ { "name": "@zitadel/client", - "version": "1.0.4", + "version": "1.0.5", "license": "MIT", "publishConfig": { "access": "public" From 52b3dcb6319825555ac898e74e1fc04ce47a189b Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Mon, 10 Feb 2025 09:16:05 +0100 Subject: [PATCH 4/4] trigger