Build packages with unbuild to improve CJS support

drwpow · drwpow · commit 965d82cd2688 · 2025-05-10T10:30:59.000-06:00
diff --git a/.changeset/itchy-turkeys-cheat.md b/.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).
diff --git a/.changeset/shy-cars-sin.md b/.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
diff --git a/package.json b/package.json
@@ -25,11 +25,11 @@
     "@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": [
diff --git a/packages/openapi-fetch/build.config.ts b/packages/openapi-fetch/build.config.ts
@@ -0,0 +1,11 @@
+import { defineBuildConfig } from "unbuild";
+
+export default defineBuildConfig({
+  entries: ["./src/index.ts"],
+  declaration: "compatible",
+  clean: true,
+  sourcemap: true,
+  rollup: {
+    emitCJS: true,
+  },
+});
diff --git a/packages/openapi-fetch/package.json b/packages/openapi-fetch/package.json
@@ -47,19 +47,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 . --ignore-rules=cjs-resolves-to-esm",
     "test-e2e": "playwright test",
     "bench:js": "vitest bench",
     "e2e-vite-build": "vite build test/e2e/app",
@@ -71,8 +70,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",
diff --git a/packages/openapi-react-query/build.config.ts b/packages/openapi-react-query/build.config.ts
@@ -0,0 +1,11 @@
+import { defineBuildConfig } from "unbuild";
+
+export default defineBuildConfig({
+  entries: ["./src/index.ts"],
+  declaration: "compatible",
+  clean: true,
+  sourcemap: true,
+  rollup: {
+    emitCJS: true,
+  },
+});
diff --git a/packages/openapi-react-query/package.json b/packages/openapi-react-query/package.json
@@ -47,18 +47,17 @@
     "tanstack"
   ],
   "scripts": {
-    "build": "pnpm run build:clean && pnpm run build:esm && pnpm run build:cjs",
-    "build:clean": "del-cli dist",
-    "build:esm": "tsc -p tsconfig.build.json",
-    "build:cjs": "esbuild --bundle --platform=node --target=es2019 --outfile=dist/index.cjs --external:typescript src/index.ts",
+    "build": "unbuild",
     "dev": "tsc -p tsconfig.build.json --watch",
     "format": "biome format . --write",
-    "lint": "biome check .",
+    "lint": "pnpm run lint:js && pnpm run lint:ts",
+    "lint:js": "biome check .",
+    "lint:ts": "tsc --noEmit",
     "generate-types": "openapi-typescript test/fixtures/api.yaml -o test/fixtures/api.d.ts",
-    "pretest": "pnpm run generate-types",
-    "test": "pnpm run \"/^test:/\"",
+    "prepack": "pnpm run build",
+    "test": "pnpm run generate-types && pnpm run test:js && pnpm run test:exports",
     "test:js": "vitest run",
-    "test:ts": "tsc --noEmit",
+    "test:exports": "pnpm run build && attw --pack . --ignore-rules=cjs-resolves-to-esm",
     "version": "pnpm run prepare && pnpm run build"
   },
   "dependencies": {
@@ -69,8 +68,6 @@
     "@testing-library/react": "^16.3.0",
     "@types/react": "18.3.21",
     "@vitejs/plugin-react": "^4.4.1",
-    "del-cli": "^6.0.0",
-    "esbuild": "^0.25.0",
     "execa": "^9.0.0",
     "msw": "^2.7.5",
     "openapi-fetch": "workspace:^",
diff --git a/packages/openapi-typescript/build.config.ts b/packages/openapi-typescript/build.config.ts
@@ -0,0 +1,11 @@
+import { defineBuildConfig } from "unbuild";
+
+export default defineBuildConfig({
+  entries: ["./src/index.ts"],
+  declaration: "compatible",
+  clean: true,
+  sourcemap: true,
+  rollup: {
+    emitCJS: true,
+  },
+});
diff --git a/packages/openapi-typescript/package.json b/packages/openapi-typescript/package.json
@@ -11,11 +11,11 @@
     "openapi-typescript": "bin/cli.js"
   },
   "type": "module",
-  "main": "./dist/index.js",
+  "main": "./dist/index.mjs",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.mjs"
     },
     "./*": "./*"
   },
@@ -40,17 +40,18 @@
     "url": "https://github.com/openapi-ts/openapi-typescript/issues"
   },
   "scripts": {
-    "build": "pnpm run build:clean && pnpm run build:esm && pnpm run build:cjs",
-    "build:clean": "del-cli dist",
-    "build:esm": "tsc -p tsconfig.build.json",
-    "build:cjs": "esbuild --bundle --platform=node --target=es2019 --outfile=dist/index.cjs --external:@redocly/ajv --external:@redocly/openapi-core --external:typescript src/index.ts",
+    "build": "unbuild",
     "dev": "tsc -p tsconfig.build.json --watch",
     "download:schemas": "vite-node ./scripts/download-schemas.ts",
     "format": "biome format . --write",
-    "lint": "biome check .",
-    "test": "pnpm run \"/^test:/\"",
-    "test:examples": "tsc -p tsconfig.examples.json --noEmit",
+    "lint": "pnpm run lint:js && pnpm run lint:ts",
+    "lint:js": "biome check .",
+    "lint:ts": "tsc --noEmit",
+    "prepack": "pnpm run build",
+    "test": "pnpm run test:js && pnpm run test:examples && pnpm run test:exports",
     "test:js": "vitest run",
+    "test:exports": "pnpm run build && attw --pack . --ignore-rules=cjs-resolves-to-esm",
+    "test:examples": "tsc -p tsconfig.examples.json --noEmit",
     "test:ts": "tsc --noEmit",
     "update:examples": "pnpm run build && pnpm run download:schemas && vite-node ./scripts/update-examples.ts",
     "prepublish": "pnpm run build",
@@ -60,7 +61,7 @@
     "typescript": "^5.x"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^1.34.2",
+    "@redocly/openapi-core": "^1.34.3",
     "ansi-colors": "^4.1.3",
     "change-case": "^5.4.4",
     "parse-json": "^8.3.0",
@@ -71,11 +72,9 @@
     "@types/degit": "^2.8.6",
     "@types/js-yaml": "^4.0.9",
     "degit": "^2.8.4",
-    "del-cli": "^6.0.0",
-    "esbuild": "^0.25.0",
-    "execa": "^9.0.0",
+    "execa": "^9.5.3",
     "strip-ansi": "^7.1.0",
     "typescript": "^5.8.3",
-    "vite-node": "^3.0.0"
+    "vite-node": "^3.1.3"
   }
 }
diff --git a/packages/swr-openapi/build.config.ts b/packages/swr-openapi/build.config.ts
@@ -0,0 +1,11 @@
+import { defineBuildConfig } from "unbuild";
+
+export default defineBuildConfig({
+  entries: ["./src/index.ts"],
+  declaration: "compatible",
+  clean: true,
+  sourcemap: true,
+  rollup: {
+    emitCJS: true,
+  },
+});
diff --git a/packages/swr-openapi/package.json b/packages/swr-openapi/package.json
@@ -42,15 +42,15 @@
     "README.md"
   ],
   "scripts": {
-    "build": "pnpm run build:clean && pnpm run build:esm",
-    "build:clean": "del-cli dist",
-    "build:esm": "tsc -p tsconfig.build.json",
+    "build": "unbuild",
     "dev": "vitest --typecheck",
     "format": "biome format . --write",
-    "lint": "biome check .",
-    "test": "pnpm run --sequential \"/^test:/\"",
+    "lint": "pnpm run lint:js && pnpm run lint:ts",
+    "lint:js": "biome check .",
+    "lint:ts": "tsc --noEmit",
+    "prepack": "pnpm run build",
+    "test": "pnpm run test:js && pnpm run test:exports",
     "test:js": "vitest run --typecheck",
-    "test:ts": "tsc --noEmit",
     "test:exports": "pnpm run build && attw --pack . --ignore-rules=cjs-resolves-to-esm",
     "prepublish": "pnpm run build",
     "version": "pnpm run build"
@@ -75,7 +75,6 @@
     "@arethetypeswrong/cli": "^0.18.0",
     "@types/lodash": "^4.17.16",
     "@types/react": "^18.3.20",
-    "del-cli": "^6.0.0",
     "husky": "^9.1.7",
     "lint-staged": "15.5.2",
     "lodash": "^4.17.21",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json

-Original file line number
+Diff line change
@@ @@ -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).