Switching to pnpm

.github/workflows/beta.yml

@@ -22,11 +22,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
+          cache: pnpm
       - uses: fregante/setup-git-user@v2
       - run: |
-          yarn install
-          yarn install_hooks
-      - run: yarn workspace express-zod-api version --pre${{ inputs.kind }} --preid beta
+          pnpm install
+          pnpm install_hooks
+      - run: npx bumpp pre${{ inputs.kind }} --preid beta -y
+        working-directory: express-zod-api

.github/workflows/dependencies.yml

@@ -17,18 +17,21 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version: 20
+          cache: pnpm
 
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
 
       - name: Upgrade dependencies
         run: |
-          yarn workspace express-zod-api upgrade
-          git checkout -- express-zod-api/package.json
-          yarn install
+          pnpm -w upgrade
+          pnpm -F express-zod-api upgrade
+          pnpm dedupe
 
       - name: Branch name
         id: create-branch

.github/workflows/headers.yml

@@ -20,16 +20,18 @@ jobs:
           fetch-depth: 0 # to figure out last change to the json file
 
       - uses: fregante/setup-git-user@v2
+      - uses: pnpm/action-setup@v4
 
       - uses: actions/setup-node@v4
         with:
           node-version: 20
+          cache: pnpm
 
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
 
       - name: Check for new headers on IANA.ORG
-        run: yarn tsx tools/headers.ts
+        run: pnpm tsx tools/headers.ts
 
       - name: Check for changes
         id: git-state

.github/workflows/minor.yml

@@ -10,11 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
+          cache: pnpm
       - uses: fregante/setup-git-user@v2
       - run: |
-          yarn install
-          yarn install_hooks
-      - run: yarn workspace express-zod-api version --minor
+          pnpm install
+          pnpm install_hooks
+      - run: npx bumpp minor -y
+        working-directory: express-zod-api

.github/workflows/node.js.yml

@@ -18,29 +18,20 @@ jobs:
         node-version: [20.9.0, 20.x, 22.0.0, 22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
-    - name: Get yarn cache dir
-      id: yarnCache
-      run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
     - name: Checkout
       uses: actions/checkout@v4
+    - uses: pnpm/action-setup@v4
     - name: Install Node.js ${{ matrix.node-version }}
-      id: setup-node
       uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Cache node modules
-      uses: actions/cache@v4
-      env:
-        cache-name: cache-yarn
-      with:
-        path: ${{ steps.yarnCache.outputs.dir }}
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
+        cache: pnpm
     - name: Install dependencies
-      run: yarn install
+      run: pnpm install
     - name: Lint
-      run: yarn lint
+      run: pnpm lint
     - name: Unit tests
-      run: yarn test
+      run: pnpm test
     - name: Coveralls
       uses: coverallsapp/github-action@v2
       continue-on-error: true
@@ -49,15 +40,15 @@ jobs:
         flag-name: run-${{ matrix.node-version }}
         parallel: true
     - name: Build
-      run: yarn build
+      run: pnpm build
     - name: Example test
-      run: yarn test:example
+      run: pnpm test:example
     - name: CJS test
-      run: yarn test:cjs
+      run: pnpm test:cjs
     - name: ESM test
-      run: yarn test:esm
+      run: pnpm test:esm
     - name: Issue 952 # see https://github.com/RobinTail/express-zod-api/issues/952
-      run: yarn test:952
+      run: pnpm test:952
   report:
     needs: build
     runs-on: ubuntu-latest

.github/workflows/npm-publish.yml

@@ -21,13 +21,16 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
+          cache: pnpm
           registry-url: https://registry.npmjs.org/
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
       - name: Publish with ${{ inputs.tag }}
-        run: npm publish -w express-zod-api --provenance --tag ${{ inputs.tag }}
+        run: npm publish --provenance --tag ${{ inputs.tag }}
+        working-directory: express-zod-api
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_KEY}}

.github/workflows/patch.yml

@@ -10,11 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
+          cache: pnpm
       - uses: fregante/setup-git-user@v2
       - run: |
-          yarn install
-          yarn install_hooks
-      - run: yarn workspace express-zod-api version --patch
+          pnpm install
+          pnpm install_hooks
+      - run: npx bumpp patch -y
+        working-directory: express-zod-api

.github/workflows/validations.yml

@@ -16,17 +16,21 @@ jobs:
       #   uses: char0n/apidom-validate@v1
       #   with:
       #     definition-file: example/example.documentation.yaml
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-      - run: yarn install
-      - run: yarn test:oas
-      - name: Build distribution
-        run: yarn workspace express-zod-api build
+          cache: pnpm
+      - name: Install dependencies
+        run: pnpm install
+      - run: pnpm test:oas
       - name: Build tests
-        run: yarn postbuild # builds the tests
+        run: pnpm postbuild # builds the tests
+      - name: Build distribution
+        run: pnpm -F express-zod-api build
       - name: Pack artifact
-        run: yarn workspace express-zod-api pack --filename ../compat-test/dist.tgz
+        working-directory: express-zod-api # https://github.com/pnpm/pnpm/issues/4351
+        run: pnpm pack --out ../compat-test/dist.tgz
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

.gitignore

@@ -2,9 +2,7 @@ node_modules
 dist
 *.tgz
 migration
-yarn-error.log
 .idea
-.npmrc
 coverage
 *-test/quick-start.ts
 issue952-test/*.d.ts

.husky/pre-commit

@@ -1 +1 @@
-yarn precommit
+pnpm precommit

.npmrc

@@ -0,0 +1,6 @@
+public-hoist-pattern[]=@typescript-eslint/*
+public-hoist-pattern[]=@vitest/*
+public-hoist-pattern[]=@eslint/*
+public-hoist-pattern[]=globals
+public-hoist-pattern[]=@types/qs
+public-hoist-pattern[]=@types/express-serve-static-core

CONTRIBUTING.md

@@ -20,11 +20,11 @@ Which is highly appreciated as well. Consider these steps:
 
 - Fork the repo,
 - Create a new branch in your fork of the repo (don't change `master`),
-- Install the dependencies using `yarn`,
-- Install the pre-commit hooks using `yarn install_hooks`,
+- Install the dependencies using `pnpm i`,
+- Install the pre-commit hooks using `pnpm install_hooks`,
 - Make changes,
-- Run the tests using `yarn test`,
-  - In case you wanna run tests from `example` and `*-test` workspaces, run `yarn build` first.
+- Run the tests using `pnpm test`,
+  - In case you wanna run tests from `example` and `*-test` workspaces, run `pnpm build` first.
 - Commit everything,
 - Push your branch into your fork,
 - Create a PR between the forks:

cjs-test/package.json

@@ -4,5 +4,8 @@
   "version": "0.0.0",
   "scripts": {
     "test": "vitest run --globals"
+  },
+  "dependencies": {
+    "express-zod-api": "workspace:*"
   }
 }

esm-test/package.json

@@ -5,5 +5,8 @@
   "type": "module",
   "scripts": {
     "test": "vitest run --globals"
+  },
+  "dependencies": {
+    "express-zod-api": "workspace:*"
   }
 }

example/package.json

@@ -5,16 +5,18 @@
   "type": "module",
   "scripts": {
     "start": "tsx index.ts",
-    "build": "yarn build:docs && yarn build:client",
+    "build": "pnpm build:docs && pnpm build:client",
     "build:docs": "tsx generate-documentation.ts",
     "build:client": "tsx generate-client.ts",
     "test": "vitest run --globals index.spec.ts",
     "validate": "vitest run --globals validate.spec.ts"
   },
   "dependencies": {
+    "express-zod-api": "workspace:*",
     "swagger-ui-express": "^5.0.0"
   },
   "devDependencies": {
-    "@types/swagger-ui-express": "^4.1.8"
+    "@types/swagger-ui-express": "^4.1.8",
+    "undici": "^6.19.8"
   }
 }

express-zod-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-zod-api",
-  "version": "22.11.2",
+  "version": "22.12.0-beta.1",
   "description": "A Typescript framework to help you get an API server up and running with I/O schema validation and custom middlewares in minutes.",
   "license": "MIT",
   "repository": {
@@ -17,13 +17,12 @@
   "funding": "https://github.com/sponsors/RobinTail",
   "scripts": {
     "build": "tsup",
-    "postbuild": "yarn pack --filename release.tgz && attw release.tgz && rm release.tgz",
+    "postbuild": "attw --pack",
     "pretest": "tsc --noEmit",
     "test": "vitest run --coverage",
     "bench": "vitest bench --run ./bench",
-    "prepublishOnly": "eslint && yarn test && yarn build",
-    "prepack": "cp ../*.md ../LICENSE ./",
-    "postversion": "git push && git push --tags"
+    "prepublishOnly": "eslint && pnpm test && pnpm build",
+    "prepack": "cp ../*.md ../LICENSE ./"
   },
   "type": "module",
   "sideEffects": true,
@@ -135,6 +134,5 @@
     "swagger-documentation",
     "zod",
     "validation"
-  ],
-  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
+  ]
 }

express-zod-api/src/index.ts

@@ -41,6 +41,7 @@ export type { LoggerOverrides } from "./logger-helpers";
 export type { TagOverrides } from "./common-helpers";
 
 // Issues 952, 1182, 1269: Insufficient exports for consumer's declaration
+import type {} from "qs"; // fixes TS2742 for attachRouting
 export type { Routing } from "./routing";
 export type { FlatObject } from "./common-helpers";
 export type { Method } from "./method";

issue952-test/package.json

@@ -5,5 +5,10 @@
   "scripts": {
     "test": "tsc -p tsconfig.json",
     "posttest": "rm *.d.ts"
+  },
+  "dependencies": {
+    "express-zod-api": "workspace:*",
+    "express": "^5.0.1",
+    "express-fileupload": "^1.5.1"
   }
 }

package.json

@@ -1,28 +1,21 @@
 {
   "private": true,
   "type": "module",
-  "workspaces": [
-    "express-zod-api",
-    "example",
-    "cjs-test",
-    "esm-test",
-    "issue952-test"
-  ],
   "scripts": {
-    "start": "yarn workspace example start",
+    "start": "pnpm -F example start",
     "prebuild": "tsx tools/contributors.ts && tsx tools/license.ts",
-    "build": "yarn workspace express-zod-api build && yarn workspace example build",
+    "build": "pnpm -F express-zod-api build && pnpm -F example build",
     "postbuild": "tsx tools/make-tests.ts",
-    "test": "yarn workspace express-zod-api test",
-    "test:example": "yarn workspace example test",
-    "test:oas": "yarn workspace example validate",
-    "test:cjs": "yarn workspace cjs-test test",
-    "test:esm": "yarn workspace esm-test test",
-    "test:952": "yarn workspace issue952-test test",
-    "bench": "yarn workspace express-zod-api bench",
+    "test": "pnpm -F express-zod-api test",
+    "test:example": "pnpm -F example test",
+    "test:oas": "pnpm -F example validate",
+    "test:cjs": "pnpm -F cjs-test test",
+    "test:esm": "pnpm -F esm-test test",
+    "test:952": "pnpm -F issue952-test test",
+    "bench": "pnpm -F express-zod-api bench",
     "lint": "eslint && prettier *.md --check",
     "mdfix": "prettier *.md --write",
-    "precommit": "yarn lint && yarn test && yarn build && git add *.md example/example.* LICENSE",
+    "precommit": "pnpm lint && pnpm test && pnpm build && git add *.md example/example.* LICENSE",
     "install_hooks": "husky"
   },
   "devDependencies": {
@@ -51,7 +44,8 @@
     "zod": "^3.23.0"
   },
   "resolutions": {
-    "**/@scarf/scarf": "npm:empty-npm-package@1.0.0"
+    "@scarf/scarf": "npm:empty-npm-package@1.0.0",
+    "express": "^5.0.1"
   },
-  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
+  "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af"
 }