Fix dep

drwpow · drwpow · commit cd974c65f9d8 · 2025-05-10T14:00:53.000-06:00
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "version": "pnpm run build && changeset version && pnpm i"
   },
   "devDependencies": {
+    "@arethetypeswrong/cli": "^0.18.1",
     "@biomejs/biome": "^1.9.4",
     "@changesets/changelog-github": "^0.5.1",
     "@changesets/cli": "^2.29.2",
diff --git a/packages/openapi-fetch/.npmignore b/packages/openapi-fetch/.npmignore
@@ -1,4 +1,5 @@
 .turbo
+*.config.*
 examples
 test
 test-results
diff --git a/packages/openapi-fetch/build.config.ts b/packages/openapi-fetch/build.config.ts
@@ -1,11 +1,12 @@
 import { defineBuildConfig } from "unbuild";
 
 export default defineBuildConfig({
-  entries: ["./src/index.ts"],
+  entries: ["./src/index.js"],
   declaration: "compatible",
   clean: true,
   sourcemap: true,
   rollup: {
+    // Ship CommonJS-compatible bundle
     emitCJS: true,
   },
 });
diff --git a/packages/openapi-fetch/examples/vue-3/tsconfig.node.json b/packages/openapi-fetch/examples/vue-3/tsconfig.node.json
@@ -11,7 +11,6 @@
     "composite": true,
     "noEmit": true,
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
-
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "types": ["node"]
diff --git a/packages/openapi-fetch/package.json b/packages/openapi-fetch/package.json
@@ -8,19 +8,12 @@
   },
   "license": "MIT",
   "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/index.d.cts",
-        "default": "./dist/cjs/index.cjs"
-      }
+      "import":  "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.mjs"
     },
     "./*": "./*"
   },
diff --git a/packages/openapi-fetch/test/bench/index.bench.js b/packages/openapi-fetch/test/bench/index.bench.js
@@ -3,7 +3,7 @@ import { Fetcher } from "openapi-typescript-fetch";
 import { createApiFetchClient } from "feature-fetch";
 import superagent from "superagent";
 import { afterAll, bench, describe, vi } from "vitest";
-import createClient, { createPathBasedClient } from "../../dist/index.js";
+import createClient, { createPathBasedClient } from "../../dist/index.mjs";
 import * as openapiTSCodegen from "./openapi-typescript-codegen.min.js";
 
 const BASE_URL = "https://api.test.local";
diff --git a/packages/openapi-fetch/test/examples/schemas/github.d.ts b/packages/openapi-fetch/test/examples/schemas/github.d.ts
diff --git a/packages/openapi-fetch/test/examples/schemas/stripe.d.ts b/packages/openapi-fetch/test/examples/schemas/stripe.d.ts
diff --git a/packages/openapi-metadata/.npmignore b/packages/openapi-metadata/.npmignore
@@ -1,4 +1,5 @@
 .turbo
+*.config.*
 test
 tsconfig*.json
 vitest.config.ts
diff --git a/packages/openapi-react-query/.npmignore b/packages/openapi-react-query/.npmignore
@@ -1,4 +1,5 @@
 .turbo
+*.config.*
 test
 vitest.config.ts
 tsconfig*.json
diff --git a/packages/openapi-react-query/build.config.ts b/packages/openapi-react-query/build.config.ts
@@ -6,6 +6,7 @@ export default defineBuildConfig({
   clean: true,
   sourcemap: true,
   rollup: {
+    // Ship CommonJS-compatible bundle
     emitCJS: true,
   },
 });
diff --git a/packages/openapi-react-query/package.json b/packages/openapi-react-query/package.json
@@ -8,19 +8,12 @@
   },
   "license": "MIT",
   "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.cjs"
-      }
+      "import":  "./dist/index.mjs",
+      "require":  "./dist/index.cjs",
+      "default": "./dist/index.mjs"
     },
     "./*": "./*"
   },
diff --git a/packages/openapi-typescript-helpers/.npmignore b/packages/openapi-typescript-helpers/.npmignore
@@ -1,3 +1,5 @@
 .turbo
+*.config.*
 biome.json
+src
 tsconfig*.json
diff --git a/packages/openapi-typescript-helpers/build.config.ts b/packages/openapi-typescript-helpers/build.config.ts
@@ -0,0 +1,14 @@
+import { defineBuildConfig } from "unbuild";
+
+export default defineBuildConfig({
+  entries: ["./src/index.ts"],
+  declaration: "compatible",
+  clean: true,
+  sourcemap: true,
+  rollup: {
+    // Ship CommonJS-compatible bundle
+    emitCJS: true,
+    // Don’t bundle .js files together to more closely match old exports (can remove in next major)
+    output: { preserveModules: true },
+  },
+});
diff --git a/packages/openapi-typescript-helpers/index.cjs b/packages/openapi-typescript-helpers/index.cjs
diff --git a/packages/openapi-typescript-helpers/index.js b/packages/openapi-typescript-helpers/index.js
diff --git a/packages/openapi-typescript-helpers/package.json b/packages/openapi-typescript-helpers/package.json
@@ -8,27 +8,15 @@
   },
   "license": "MIT",
   "type": "module",
-  "main": "./index.js",
-  "types": "./index.d.ts",
+  "main": "./dist/index.mjs",
   "exports": {
     ".": {
-      "import": {
-        "types": "./index.d.ts",
-        "default": "./index.js"
-      },
-      "require": {
-        "types": "./index.d.cts",
-        "default": "./index.cjs"
-      }
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.mjs"
     },
     "./*": "./*"
   },
-  "files": [
-    "index.js",
-    "index.cjs",
-    "index.d.ts",
-    "index.d.cts"
-  ],
   "homepage": "https://openapi-ts.dev",
   "repository": {
     "type": "git",
@@ -39,10 +27,11 @@
     "url": "https://github.com/openapi-ts/openapi-typescript/issues"
   },
   "scripts": {
-    "build": "cp index.d.ts index.d.cts",
-    "format": "biome format . --write",
-    "lint": "biome check .",
-    "test": "tsc --noEmit"
+    "build": "unbuild",
+    "format": "biome format src --write",
+    "lint": "pnpm run lint:js && pnpm run lint:ts",
+    "lint:js": "biome check src",
+    "lint:ts": "tsc --noEmit"
   },
   "devDependencies": {
     "typescript": "^5.8.3"
diff --git a/packages/openapi-typescript-helpers/src/index.ts b/packages/openapi-typescript-helpers/src/index.ts
@@ -122,7 +122,7 @@ export type SuccessResponse<
   Media extends MediaType = MediaType,
 > = GetResponseContent<T, Media, OkStatus>;
 
-type GetResponseContent<
+export type GetResponseContent<
   T extends Record<string | number, any>,
   Media extends MediaType = MediaType,
   ResponseCode extends keyof T = keyof T,
diff --git a/packages/openapi-typescript-helpers/tsconfig.json b/packages/openapi-typescript-helpers/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "rootDir": ".",
     "skipLibCheck": false
   },
-  "include": ["."]
+  "include": ["src"]
 }
diff --git a/packages/openapi-typescript/.npmignore b/packages/openapi-typescript/.npmignore
@@ -1,4 +1,5 @@
 .turbo
+*.config.*
 examples/
 scripts/
 test/
diff --git a/packages/openapi-typescript/bin/cli.js b/packages/openapi-typescript/bin/cli.js
@@ -5,7 +5,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { performance } from "node:perf_hooks";
 import parser from "yargs-parser";
-import openapiTS, { COMMENT_HEADER, astToString, c, error, formatTime, warn } from "../dist/index.js";
+import openapiTS, { COMMENT_HEADER, astToString, c, error, formatTime, warn } from "../dist/index.mjs";
 
 const HELP = `Usage
   $ openapi-typescript [input] [options]
diff --git a/packages/openapi-typescript/build.config.ts b/packages/openapi-typescript/build.config.ts
@@ -6,6 +6,9 @@ export default defineBuildConfig({
   clean: true,
   sourcemap: true,
   rollup: {
+    // Ship CommonJS-compatible bundle
     emitCJS: true,
+    // Don’t bundle .js files together to more closely match old exports (can remove in next major)
+    output: { preserveModules: true },
   },
 });
diff --git a/packages/openapi-typescript/package.json b/packages/openapi-typescript/package.json
@@ -14,9 +14,11 @@
   "main": "./dist/index.mjs",
   "exports": {
     ".": {
+      "import":  "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
+    "./*.js": "./*.mjs",
     "./*": "./*"
   },
   "homepage": "https://openapi-ts.dev",
diff --git a/packages/swr-openapi/.npmignore b/packages/swr-openapi/.npmignore
@@ -0,0 +1,4 @@
+.turbo
+*.config.*
+biome.json
+tsconfig*.json
diff --git a/packages/swr-openapi/build.config.ts b/packages/swr-openapi/build.config.ts
@@ -6,6 +6,7 @@ export default defineBuildConfig({
   clean: true,
   sourcemap: true,
   rollup: {
+    // Ship CommonJS-compatible bundle
     emitCJS: true,
   },
 });
diff --git a/packages/swr-openapi/package.json b/packages/swr-openapi/package.json
@@ -8,10 +8,14 @@
   },
   "license": "MIT",
   "type": "module",
-  "main": "dist/index.js",
+  "main": "./dist/index.mjs",
   "exports": {
-    "import": "./dist/index.js",
-    "types": "./dist/index.d.ts"
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.mjs"
+    },
+    "./package.json": "./package.json"
   },
   "sideEffects": false,
   "repository": {
@@ -72,7 +76,6 @@
     "type-fest": "^4.40.1"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.18.0",
     "@types/lodash": "^4.17.16",
     "@types/react": "^18.3.20",
     "husky": "^9.1.7",
diff --git a/packages/swr-openapi/tsconfig.build.json b/packages/swr-openapi/tsconfig.build.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src",
     "noEmit": false
   },
   "include": ["src"],
diff --git a/packages/swr-openapi/tsconfig.json b/packages/swr-openapi/tsconfig.json
@@ -20,7 +20,6 @@
     "module": "NodeNext",
     "moduleResolution": "nodenext",
     // "outDir": "dist",
-    // "rootDir": "src",
     "sourceMap": true,
 
     /* AND if you're building for a library: */
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`.turbo`
	`2`	`+.config.`
`2`	`3`	`examples`
`3`	`4`	`test`
`4`	`5`	`test-results`