From 9b9887468f939c5e3f58bd853ba471664cee5cb6 Mon Sep 17 00:00:00 2001
From: Marco Muser <marco.muser@enpal.de>
Date: Sat, 30 Sep 2023 12:05:49 +0200
Subject: [PATCH 1/3] Fix cjs build for ts

---
 packages/openapi-fetch/package.json              | 13 +++++++++----
 packages/openapi-fetch/scripts/copy-types-cjs.js | 10 ++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 packages/openapi-fetch/scripts/copy-types-cjs.js

diff --git a/packages/openapi-fetch/package.json b/packages/openapi-fetch/package.json
index 6e9a86889..131c61791 100644
--- a/packages/openapi-fetch/package.json
+++ b/packages/openapi-fetch/package.json
@@ -13,9 +13,14 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.cts",
+        "default": "./dist/cjs/index.cjs"
+      }
     },
     "./*": "./*"
   },
@@ -46,7 +51,7 @@
     "build:clean": "del dist",
     "build:ts": "tsc -p tsconfig.build.json",
     "build:ts-min": "esbuild --bundle src/index.ts --format=esm --minify --outfile=dist/index.min.js && cp dist/index.d.ts dist/index.min.d.ts",
-    "build:cjs": "esbuild --bundle src/index.ts --format=cjs --outfile=dist/index.cjs",
+    "build:cjs": "esbuild --bundle src/index.ts --format=cjs --outfile=dist/cjs/index.cjs && node ./scripts/copy-types-cjs.js",
     "lint": "pnpm run lint:js",
     "lint:js": "eslint \"{src,test}/**/*.{js,ts}\"",
     "lint:prettier": "prettier --check \"{src,test}/**/*\"",
diff --git a/packages/openapi-fetch/scripts/copy-types-cjs.js b/packages/openapi-fetch/scripts/copy-types-cjs.js
new file mode 100644
index 000000000..e98baf329
--- /dev/null
+++ b/packages/openapi-fetch/scripts/copy-types-cjs.js
@@ -0,0 +1,10 @@
+import fs from "node:fs/promises";
+
+async function copyTypesForCjs() {
+  const sourceFilePath = "./dist/index.d.ts";
+  const targetFilePath = "./dist/cjs/index.d.cts";
+
+  await fs.copyFile(sourceFilePath, targetFilePath);
+}
+
+copyTypesForCjs();

From 5e3abfb3d80d4382b636eade6c8bfb6b35b4f232 Mon Sep 17 00:00:00 2001
From: Marco Muser <marco.muser@enpal.de>
Date: Sat, 30 Sep 2023 12:22:46 +0200
Subject: [PATCH 2/3] add changeset

---
 .changeset/gold-islands-double.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/gold-islands-double.md

diff --git a/.changeset/gold-islands-double.md b/.changeset/gold-islands-double.md
new file mode 100644
index 000000000..8ff4b1b5a
--- /dev/null
+++ b/.changeset/gold-islands-double.md
@@ -0,0 +1,5 @@
+---
+"openapi-fetch": patch
+---
+
+Fix CJS build for TypeScript

From e7d4620cf72683668eb6889a2b6c96262096842c Mon Sep 17 00:00:00 2001
From: Marco Muser <marco.muser@enpal.de>
Date: Sat, 30 Sep 2023 12:28:04 +0200
Subject: [PATCH 3/3] refactor: copy index.d.ts with cp

---
 packages/openapi-fetch/package.json              |  2 +-
 packages/openapi-fetch/scripts/copy-types-cjs.js | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 packages/openapi-fetch/scripts/copy-types-cjs.js

diff --git a/packages/openapi-fetch/package.json b/packages/openapi-fetch/package.json
index 131c61791..ab201c488 100644
--- a/packages/openapi-fetch/package.json
+++ b/packages/openapi-fetch/package.json
@@ -51,7 +51,7 @@
     "build:clean": "del dist",
     "build:ts": "tsc -p tsconfig.build.json",
     "build:ts-min": "esbuild --bundle src/index.ts --format=esm --minify --outfile=dist/index.min.js && cp dist/index.d.ts dist/index.min.d.ts",
-    "build:cjs": "esbuild --bundle src/index.ts --format=cjs --outfile=dist/cjs/index.cjs && node ./scripts/copy-types-cjs.js",
+    "build:cjs": "esbuild --bundle src/index.ts --format=cjs --outfile=dist/cjs/index.cjs && cp dist/index.d.ts dist/cjs/index.d.cts",
     "lint": "pnpm run lint:js",
     "lint:js": "eslint \"{src,test}/**/*.{js,ts}\"",
     "lint:prettier": "prettier --check \"{src,test}/**/*\"",
diff --git a/packages/openapi-fetch/scripts/copy-types-cjs.js b/packages/openapi-fetch/scripts/copy-types-cjs.js
deleted file mode 100644
index e98baf329..000000000
--- a/packages/openapi-fetch/scripts/copy-types-cjs.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import fs from "node:fs/promises";
-
-async function copyTypesForCjs() {
-  const sourceFilePath = "./dist/index.d.ts";
-  const targetFilePath = "./dist/cjs/index.d.cts";
-
-  await fs.copyFile(sourceFilePath, targetFilePath);
-}
-
-copyTypesForCjs();