From 51c197a037d569a970eb1379e76a444f395ed449 Mon Sep 17 00:00:00 2001 From: Michael Darwish Date: Mon, 4 Dec 2023 16:33:17 -0500 Subject: [PATCH 1/4] Separate outputs for CommonJS and ESM when building openapi-typescript-helpers --- packages/openapi-typescript-helpers/package.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/openapi-typescript-helpers/package.json b/packages/openapi-typescript-helpers/package.json index 1cdbe0f74..4fa20115a 100644 --- a/packages/openapi-typescript-helpers/package.json +++ b/packages/openapi-typescript-helpers/package.json @@ -12,8 +12,14 @@ "types": "./index.d.ts", "exports": { ".": { - "default": "./index.js", - "types": "./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" + } }, "./*": "./*" }, @@ -27,6 +33,10 @@ "url": "https://github.com/drwpow/openapi-typescript/issues" }, "scripts": { + "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:cjs", + "build:clean": "del dist", + "build:js": "mkdir -p dist && cp index.js index.d.ts dist", + "build:cjs": "mkdir -p dist/cjs && cp index.js dist/cjs/index.js && cp index.d.ts dist/cjs/index.d.cts", "lint": "pnpm run lint:js", "lint:js": "eslint \"*.{js,ts}\"", "lint:prettier": "prettier --check \"{src,test}/**/*\"", From a6ee072f370fe6c126c0b76326cb7fe0f0c94f6d Mon Sep 17 00:00:00 2001 From: Michael Darwish Date: Mon, 4 Dec 2023 17:34:35 -0500 Subject: [PATCH 2/4] Add top-level build --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 790fd8946..6b9ff0720 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "scripts": { "build": "run-p -s build:*", "build:openapi-typescript": "cd packages/openapi-typescript && pnpm run build", + "build:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm run build", "build:openapi-fetch": "cd packages/openapi-fetch && pnpm run build", "lint": "run-p -s lint:*", "lint:openapi-typescript": "cd packages/openapi-typescript && pnpm run lint", From fabd85b36591d009d08312d8eeecf1800e3a308f Mon Sep 17 00:00:00 2001 From: Michael Darwish Date: Tue, 5 Dec 2023 09:48:51 -0500 Subject: [PATCH 3/4] Add changeset --- .changeset/hot-terms-vanish.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/hot-terms-vanish.md diff --git a/.changeset/hot-terms-vanish.md b/.changeset/hot-terms-vanish.md new file mode 100644 index 000000000..7e9012f6d --- /dev/null +++ b/.changeset/hot-terms-vanish.md @@ -0,0 +1,6 @@ +--- +"openapi-fetch": patch +"openapi-typescript-helpers": patch +--- + +Fixed build of openapi-typescript-helpers for CommonJS environments From 935d4e701b93959953082f659cda61ce682ef990 Mon Sep 17 00:00:00 2001 From: Michael Darwish Date: Wed, 6 Dec 2023 13:02:56 -0500 Subject: [PATCH 4/4] Build TS helpers before building fetch --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 6b9ff0720..23e9dfa80 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,7 @@ "scripts": { "build": "run-p -s build:*", "build:openapi-typescript": "cd packages/openapi-typescript && pnpm run build", - "build:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm run build", - "build:openapi-fetch": "cd packages/openapi-fetch && pnpm run build", + "build:openapi-fetch": "cd packages/openapi-typescript-helpers && pnpm run build && cd ../openapi-fetch && pnpm run build", "lint": "run-p -s lint:*", "lint:openapi-typescript": "cd packages/openapi-typescript && pnpm run lint", "lint:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm run lint",