Build packages with unbuild to improve CJS support (#2310)

Author: drwpow

.changeset/itchy-turkeys-cheat.md

@@ -0,0 +1,5 @@
+---
+"openapi-fetch": minor
+---
+
+Build package with unbuild. Also remove the minified version (openapi-fetch is only useful in a TypeScript/bundler environment, so there’s no sense in loading it from a CDN clientside).

.changeset/shy-cars-sin.md

@@ -0,0 +1,7 @@
+---
+"openapi-react-query": minor
+"openapi-typescript": minor
+"swr-openapi": minor
+---
+
+Build package with unbuild to improve CJS support

package.json

@@ -19,22 +19,23 @@
     "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",
     "@playwright/test": "^1.52.0",
     "@size-limit/preset-small-lib": "^11.2.0",
     "@types/node": "^22.15.3",
-    "del-cli": "^6.0.0",
     "prettier": "^3.5.3",
     "size-limit": "^11.2.0",
     "turbo": "^2.5.2",
     "typescript": "^5.8.3",
+    "unbuild": "^3.5.0",
     "vitest": "^3.1.3"
   },
   "size-limit": [
     {
-      "path": "packages/openapi-fetch/dist/index.min.js",
+      "path": "packages/openapi-fetch/dist/index.mjs",
       "limit": "7 kB",
       "brotli": false
     }

packages/openapi-fetch/.npmignore

@@ -1,4 +1,5 @@
 .turbo
+*.config.*
 examples
 test
 test-results

packages/openapi-fetch/build.config.ts

@@ -0,0 +1,12 @@
+import { defineBuildConfig } from "unbuild";
+
+export default defineBuildConfig({
+  entries: ["./src/index.js"],
+  declaration: "compatible",
+  clean: true,
+  sourcemap: true,
+  rollup: {
+    // Ship CommonJS-compatible bundle
+    emitCJS: true,
+  },
+});

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"]

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"
     },
     "./*": "./*"
   },
@@ -47,19 +40,18 @@
     "svelte"
   ],
   "scripts": {
-    "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:js-min && pnpm run build:cjs",
-    "build:clean": "del-cli dist",
-    "build:js": "mkdir -p dist && cp src/* dist",
-    "build:js-min": "esbuild --bundle src/index.js --format=esm --minify --outfile=dist/index.min.js && cp dist/index.d.ts dist/index.min.d.ts",
-    "build:cjs": "esbuild --bundle src/index.js --format=cjs --outfile=dist/cjs/index.cjs && cp dist/index.d.ts dist/cjs/index.d.cts",
+    "build": "unbuild",
     "format": "biome format . --write",
-    "lint": "biome check .",
+    "lint": "pnpm run lint:js && pnpm run lint:ts && pnpm run lint:ts-no-strict",
+    "lint:js": "biome check .",
+    "lint:ts": "tsc --noEmit",
+    "lint:ts-no-strict": "tsc --noEmit -p test/no-strict-null-checks/tsconfig.json",
     "generate-types": "openapi-typescript -c test/redocly.yaml",
+    "prepack": "pnpm run build",
     "pretest": "pnpm run generate-types",
-    "test": "pnpm run \"/^test:/\"",
+    "test": "pnpm run test:js && pnpm run test:exports",
     "test:js": "vitest run",
-    "test:ts": "tsc --noEmit",
-    "test:ts-no-strict": "tsc --noEmit -p test/no-strict-null-checks/tsconfig.json",
+    "test:exports": "pnpm run build && attw --pack .",
     "test-e2e": "playwright test",
     "bench:js": "vitest bench",
     "e2e-vite-build": "vite build test/e2e/app",
@@ -71,8 +63,6 @@
   },
   "devDependencies": {
     "axios": "^1.9.0",
-    "del-cli": "^6.0.0",
-    "esbuild": "^0.25.3",
     "execa": "^9.5.2",
     "express": "^5.0.0",
     "feature-fetch": "^0.0.43",

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";

packages/openapi-metadata/.npmignore

@@ -1,4 +1,5 @@
 .turbo
+*.config.*
 test
 tsconfig*.json
 vitest.config.ts

packages/openapi-metadata/build.config.ts

@@ -0,0 +1,20 @@
+import { defineBuildConfig } from "unbuild";
+
+export default defineBuildConfig({
+  entries: [
+    "./src/index.ts",
+    "./src/decorators/index.ts",
+    "./src/metadata/index.ts",
+    "./src/errors/index.ts",
+    "./src/ui/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 },
+  },
+});