Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master, v23, v24, v25, v26 ]
branches: [ master, v24, v25, v26, v27, make-v28 ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, v23, v24, v25, v26 ]
branches: [ master, v24, v25, v26, v27, make-v28 ]
schedule:
- cron: '26 8 * * 1'

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ name: Node.js CI

on:
push:
branches: [ master, v23, v24, v25, v26 ]
branches: [ master, v24, v25, v26, v27, make-v28 ]
pull_request:
branches: [ master, v23, v24, v25, v26 ]
branches: [ master, v24, v25, v26, v27, make-v28 ]

jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node-version: [20.19.0, 20.x, 22.12.0, 22.x, 24.0.0, 24.x]
node-version: [22.18.0, 22.x, 24.0.0, 24.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- name: Checkout
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Version 28

### v28.0.0

- Supported Node.js versions: `^22.18.0 || ^24.0.0`;

## Version 27

### v27.1.0
Expand Down
2 changes: 1 addition & 1 deletion cjs-test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "@tsconfig/node20/tsconfig.json",
"extends": "@tsconfig/node22/tsconfig.json",
"include": ["quick-start.ts"]
}
4 changes: 2 additions & 2 deletions compat-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
},
"devDependencies": {
"@express-zod-api/migration": "workspace:*",
"eslint": "npm:eslint@9.0.0",
"eslint": "npm:eslint@10.0.0",
"express": "npm:express@5.1.0",
"express-zod-api": "workspace:*",
"http-errors": "npm:http-errors@2.0.1",
"typescript": "npm:typescript@5.1.3",
"typescript-eslint": "npm:typescript-eslint@8.0.0",
"typescript-eslint": "npm:typescript-eslint@8.56.0",
"zod": "npm:zod@4.1.13"
}
}
2 changes: 1 addition & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export default tsPlugin.config(
prettierRules,
{
name: "globally/ignored",
ignores: ["**/dist/", "**/coverage/", "compat-test/sample.ts"],
ignores: ["**/dist/", "**/coverage/", "compat-test"],
},
{
name: "globally/disabled",
Expand Down
2 changes: 1 addition & 1 deletion express-zod-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"*.md"
],
"engines": {
"node": "^20.19.0 || ^22.12.0 || ^24.0.0"
"node": "^22.18.0 || ^24.0.0"
},
"dependencies": {
"@express-zod-api/zod-plugin": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion express-zod-api/src/endpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export class Endpoint<
}) {
const method = getActualMethod(request);
const ctx: Partial<CTX> = {};
let result: DiscriminatedResult = { output: {}, error: null };
let result: DiscriminatedResult;
const input = getInput(request, config.inputSources);
try {
await this.#runMiddlewares({
Expand Down
6 changes: 3 additions & 3 deletions migration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ ESLint plugin for migrating Express Zod API to its next major version.

## Requirements

- `eslint` v9;
- `typescript-eslint` v8.
- `eslint@^10.0.0`;
- `typescript-eslint@^8.56.0`

## Usage

Expand All @@ -18,6 +18,6 @@ import migration from "@express-zod-api/migration";

export default [
{ languageOptions: { parser }, plugins: { migration } },
{ files: ["**/*.ts"], rules: { "migration/v27": "error" } },
{ files: ["**/*.ts"], rules: { "migration/v28": "error" } },
];
```
6 changes: 3 additions & 3 deletions migration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"*.md"
],
"engines": {
"node": "^20.19.0 || ^22.12.0 || ^24.0.0"
"node": "^22.18.0 || ^24.0.0"
},
"peerDependencies": {
"eslint": "^9.0.0",
"typescript-eslint": "^8.0.0"
"eslint": "^10.0.0",
"typescript-eslint": "^8.56.0"
},
"devDependencies": {
"@typescript-eslint/rule-tester": "catalog:dev",
Expand Down
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
},
"devDependencies": {
"@arethetypeswrong/core": "^0.18.2",
"@tsconfig/node20": "^20.1.8",
"@eslint/js": "^10.0.0",
"@tsconfig/node22": "^22.0.5",
"@types/node": "^24.10.9",
"@vitest/coverage-v8": "^4.0.16",
"eslint": "^9.39.2",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-allowed-dependencies": "^2.0.1",
"eslint-plugin-allowed-dependencies": "^2.1.0",
"eslint-plugin-prettier": "^5.5.4",
"globals": "^17.3.0",
"husky": "^9.1.7",
"prettier": "3.8.1",
"tsdown": "^0.21.2",
Expand Down
Loading