Remove prepare scripts, improve CI

Author: drwpow

.changeset/friendly-turtles-count.md

@@ -0,0 +1,5 @@
+---
+"openapi-fetch": patch
+---
+
+Remove prepare script

package.json

@@ -8,14 +8,15 @@
     "email": "[email protected]"
   },
   "scripts": {
-    "build": "run-p -s build:*",
+    "build": "run-s -s build:*",
     "build:openapi-typescript": "cd packages/openapi-typescript && pnpm run build",
-    "build:openapi-fetch": "cd packages/openapi-typescript-helpers && pnpm run build && cd ../openapi-fetch && 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",
     "lint:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm run lint",
     "lint:openapi-fetch": "cd packages/openapi-fetch && pnpm run lint",
-    "test": "run-p -s test:*",
+    "test": "pnpm run build && run-p test:*",
     "test:openapi-typescript": "cd packages/openapi-typescript && pnpm test",
     "test:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm test",
     "test:openapi-fetch": "cd packages/openapi-fetch && pnpm test",

packages/openapi-fetch/examples/nextjs/package.json

@@ -3,8 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "next dev",
-    "prepare": "openapi-typescript lib/api/v1.json -o lib/api/v1.d.ts"
+    "dev": "next dev"
   },
   "dependencies": {
     "next": "14.0.1",

packages/openapi-fetch/examples/react-query/package.json

@@ -3,8 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite dev",
-    "prepare": "openapi-typescript src/lib/api/v1.json -o src/lib/api/v1.d.ts"
+    "dev": "vite dev"
   },
   "dependencies": {
     "@tanstack/react-query": "^5.13.4",

packages/openapi-fetch/examples/sveltekit/package.json

@@ -5,8 +5,7 @@
   "scripts": {
     "dev": "vite dev",
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-    "prepare": "openapi-typescript src/lib/api/v1.json -o src/lib/api/v1.d.ts"
+    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
   },
   "dependencies": {
     "openapi-fetch": "workspace:^",

packages/openapi-fetch/package.json

@@ -55,11 +55,11 @@
     "lint": "pnpm run lint:js",
     "lint:js": "eslint \"{src,test}/**/*.{js,ts}\"",
     "lint:prettier": "prettier --check \"{src,test}/**/*\"",
-    "test": "pnpm run test:ts && npm run test:js",
+    "generate-types": "cd ../openapi-typescript && pnpm run build && cd ../openapi-fetch ../openapi-typescript/bin/cli.js ./test/fixtures/api.yaml -o ./test/fixtures/v7-beta.test.ts && npx openapi-typescript ./test/fixtures/api.yaml -o ./test/fixtures/api.d.ts",
+    "pretest": "pnpm run generate-types",
+    "test": "run-p -s test:*",
     "test:js": "vitest run",
     "test:ts": "tsc --noEmit",
-    "prepare": "openapi-typescript test/fixtures/api.yaml -o test/fixtures/api.d.ts",
-    "prepublish": "pnpm run prepare && pnpm run build",
     "version": "pnpm run prepare && pnpm run build"
   },
   "dependencies": {
@@ -70,6 +70,7 @@
     "del-cli": "^5.1.0",
     "esbuild": "^0.19.9",
     "nanostores": "^0.9.5",
+    "npm-run-all": "^4.1.5",
     "openapi-typescript": "^6.7.2",
     "openapi-typescript-codegen": "^0.25.0",
     "openapi-typescript-fetch": "^1.1.3",

packages/openapi-typescript-helpers/package.json

@@ -33,10 +33,9 @@
     "url": "https://github.com/drwpow/openapi-typescript/issues"
   },
   "scripts": {
-    "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:cjs",
+    "build": "pnpm run build:clean && pnpm run build:js",
     "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",
+    "build:js": "node ./scripts/build.js",
     "lint": "pnpm run lint:js",
     "lint:js": "eslint \"*.{js,ts}\"",
     "lint:prettier": "prettier --check \"{src,test}/**/*\"",

packages/openapi-typescript-helpers/scripts/build.js

@@ -0,0 +1,32 @@
+/**
+ * Build
+ * Only copies files & makes folders, but works on Windows too
+ */
+import fs from "node:fs";
+
+const cwd = new URL("../", import.meta.url);
+
+fs.mkdirSync(new URL("./dist/cjs/", cwd), { recursive: true });
+
+const files = [
+  {
+    in: new URL("./index.js", cwd),
+    out: new URL("./dist/index.js", cwd),
+  },
+  {
+    in: new URL("./index.d.ts", cwd),
+    out: new URL("./dist/index.d.ts", cwd),
+  },
+  {
+    in: new URL("./index.js", cwd),
+    out: new URL("./dist/cjs/index.cjs", cwd),
+  },
+  {
+    in: new URL("./index.d.ts", cwd),
+    out: new URL("./dist/cjs/index.d.cts", cwd),
+  },
+];
+
+for (const f of files) {
+  fs.copyFileSync(f.in, f.out);
+}

packages/openapi-typescript/package.json

@@ -50,7 +50,6 @@
     "lint": "run-p -s lint:*",
     "lint:js": "eslint \"{src,test}/**/*.{js,ts}\"",
     "lint:prettier": "prettier --check \"src/**/*\"",
-    "prepare": "pnpm run build",
     "test": "run-p -s test:*",
     "test:examples": "tsc -p tsconfig.examples.json --noEmit",
     "test:js": "vitest run",