From bcd3ab0f59424daefb1eb9d037cda8fb40dbd603 Mon Sep 17 00:00:00 2001
From: reluc <relu.cri@gmail.com>
Date: Tue, 24 Jun 2025 09:43:40 +0200
Subject: [PATCH] chore: generate the right cjs files for proto and export
 correctly

---
 login/packages/zitadel-client/package.json | 30 ++++++++++---
 login/packages/zitadel-proto/.gitignore    |  3 ++
 login/packages/zitadel-proto/buf.gen.yaml  | 18 +++++++-
 login/packages/zitadel-proto/package.json  | 50 +++++++++++++++++++---
 4 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/login/packages/zitadel-client/package.json b/login/packages/zitadel-client/package.json
index 3f140ad31a..17b1e4a609 100644
--- a/login/packages/zitadel-client/package.json
+++ b/login/packages/zitadel-client/package.json
@@ -13,27 +13,47 @@
       "require": "./dist/index.cjs"
     },
     "./v1": {
-      "types": "./dist/v1.d.ts",
+      "types": {
+        "import": "./dist/v1.d.ts",
+        "require": "./dist/v1.d.cts",
+        "default": "./dist/v1.d.ts"
+      },
       "import": "./dist/v1.js",
       "require": "./dist/v1.cjs"
     },
     "./v2": {
-      "types": "./dist/v2.d.ts",
+      "types": {
+        "import": "./dist/v2.d.ts",
+        "require": "./dist/v2.d.cts",
+        "default": "./dist/v2.d.ts"
+      },
       "import": "./dist/v2.js",
       "require": "./dist/v2.cjs"
     },
     "./v3alpha": {
-      "types": "./dist/v3alpha.d.ts",
+      "types": {
+        "import": "./dist/v3alpha.d.ts",
+        "require": "./dist/v3alpha.d.cts",
+        "default": "./dist/v3alpha.d.ts"
+      },
       "import": "./dist/v3alpha.js",
       "require": "./dist/v3alpha.cjs"
     },
     "./node": {
-      "types": "./dist/node.d.ts",
+      "types": {
+        "import": "./dist/node.d.ts",
+        "require": "./dist/node.d.cts",
+        "default": "./dist/node.d.ts"
+      },
       "import": "./dist/node.js",
       "require": "./dist/node.cjs"
     },
     "./web": {
-      "types": "./dist/web.d.ts",
+      "types": {
+        "import": "./dist/web.d.ts",
+        "require": "./dist/web.d.cts",
+        "default": "./dist/web.d.ts"
+      },
       "import": "./dist/web.js",
       "require": "./dist/web.cjs"
     }
diff --git a/login/packages/zitadel-proto/.gitignore b/login/packages/zitadel-proto/.gitignore
index 20bdea6767..0a725b8969 100644
--- a/login/packages/zitadel-proto/.gitignore
+++ b/login/packages/zitadel-proto/.gitignore
@@ -3,3 +3,6 @@ google
 protoc-gen-openapiv2
 validate
 node_modules
+cjs
+es
+types
diff --git a/login/packages/zitadel-proto/buf.gen.yaml b/login/packages/zitadel-proto/buf.gen.yaml
index 84ecfaea9d..9601096d5b 100644
--- a/login/packages/zitadel-proto/buf.gen.yaml
+++ b/login/packages/zitadel-proto/buf.gen.yaml
@@ -3,8 +3,24 @@ managed:
   enabled: true
 plugins:
   - remote: buf.build/bufbuild/es:v2.2.0
-    out: .
+    out: es
     include_imports: true
     opt:
+      - target=js
+      - json_types=true
+      - import_extension=js
+  - remote: buf.build/bufbuild/es:v2.2.0
+    out: cjs
+    include_imports: true
+    opt:
+      - target=js
+      - json_types=true
+      - import_extension=js
+      - js_import_style=legacy_commonjs 
+  - remote: buf.build/bufbuild/es:v2.2.0
+    out: types
+    include_imports: true
+    opt:
+      - target=dts
       - json_types=true
       - import_extension=js
diff --git a/login/packages/zitadel-proto/package.json b/login/packages/zitadel-proto/package.json
index db0aca7035..c12e6eeb29 100644
--- a/login/packages/zitadel-proto/package.json
+++ b/login/packages/zitadel-proto/package.json
@@ -6,16 +6,52 @@
     "access": "public"
   },
   "type": "module",
-  "files": [
-    "zitadel/**",
-    "validate/**",
-    "google/**",
-    "protoc-gen-openapiv2/**"
-  ],
+  "exports": {
+    "./zitadel/*": {
+      "types": "./types/zitadel/*.d.ts",
+      "import": "./es/zitadel/*.js",
+      "require": "./cjs/zitadel/*.cjs"
+    },
+    "./zitadel/*.js": {
+      "types": "./types/zitadel/*.d.ts",
+      "import": "./es/zitadel/*.js",
+      "require": "./cjs/zitadel/*.js"
+    },
+    "./validate/*": {
+      "types": "./types/validate/*.d.ts",
+      "import": "./es/validate/*.js",
+      "require": "./cjs/validate/*.cjs"
+    },
+    "./validate/*.js": {
+      "types": "./types/validate/*.d.ts",
+      "import": "./es/validate/*.js",
+      "require": "./cjs/validate/*.js"
+    },
+    "./google/*": {
+      "types": "./types/google/*.d.ts",
+      "import": "./es/google/*.js",
+      "require": "./cjs/google/*.cjs"
+    },
+    "./google/*.js": {
+      "types": "./types/google/*.d.ts",
+      "import": "./es/google/*.js",
+      "require": "./cjs/google/*.js"
+    },
+    "./protoc-gen-openapiv2/*": {
+      "types": "./types/protoc-gen-openapiv2/*.d.ts",
+      "import": "./es/protoc-gen-openapiv2/*.js",
+      "require": "./cjs/protoc-gen-openapiv2/*.cjs"
+    },
+    "./protoc-gen-openapiv2/*.js": {
+      "types": "./types/protoc-gen-openapiv2/*.d.ts",
+      "import": "./es/protoc-gen-openapiv2/*.js",
+      "require": "./cjs/protoc-gen-openapiv2/*.js"
+    }
+  },
   "sideEffects": false,
   "scripts": {
     "generate": "pnpm exec buf generate ../../../proto --path ../../../proto/zitadel",
-    "clean": "rm -rf zitadel .turbo node_modules google protoc-gen-openapiv2 validate"
+    "clean": "rm -rf zitadel .turbo node_modules google protoc-gen-openapiv2 validate cjs types es"
   },
   "dependencies": {
     "@bufbuild/protobuf": "^2.2.2"