Skip to content

Commit 794e3b9

Browse files
committed
fix(build): update node version in ci
1 parent 3b0e78f commit 794e3b9

8 files changed

Lines changed: 30 additions & 28 deletions

File tree

.github/workflows/build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
strategy:
4949
matrix:
50-
node-version: [22.x]
50+
node-version: [24.x]
5151
provider: [sqlite, postgresql, mysql]
5252

5353
steps:
@@ -57,7 +57,7 @@ jobs:
5757
- name: Install pnpm
5858
uses: pnpm/action-setup@v2
5959
with:
60-
version: 10.12.1
60+
version: 10.33.0
6161

6262
- name: Use Node.js ${{ matrix.node-version }}
6363
uses: actions/setup-node@v4

packages/clients/client-helpers/src/fetch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { lowerCaseFirst } from '@zenstackhq/common-helpers';
2-
import { AnyNull, AnyNullClass, DbNull, DbNullClass, JsonNull, JsonNullClass } from '@zenstackhq/orm/common-types';
2+
import { AnyNull, AnyNullClass, DbNull, DbNullClass, JsonNull, JsonNullClass } from '@zenstackhq/common-helpers';
33
import Decimal from 'decimal.js';
44
import SuperJSON from 'superjson';
55
import type { QueryError } from './types';

packages/clients/client-helpers/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export { AnyNull, DbNull, JsonNull } from '@zenstackhq/orm/common-types';
1+
export { AnyNull, DbNull, JsonNull } from '@zenstackhq/common-helpers';
22
export * from './constants';
33
export * from './invalidation';
44
export * from './logging';

packages/common-helpers/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export * from './clone';
2+
export * from './null-types';
23
export * from './enumerable';
34
export * from './is-plain-object';
45
export * from './lower-case-first';
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
export class DbNullClass {
2+
// @ts-ignore
3+
private __brand = 'DbNull' as const;
4+
}
5+
export const DbNull = new DbNullClass();
6+
export type DbNull = typeof DbNull;
7+
8+
export class JsonNullClass {
9+
// @ts-ignore
10+
private __brand = 'JsonNull' as const;
11+
}
12+
export const JsonNull = new JsonNullClass();
13+
export type JsonNull = typeof JsonNull;
14+
15+
export class AnyNullClass {
16+
// @ts-ignore
17+
private __brand = 'AnyNull' as const;
18+
}
19+
export const AnyNull = new AnyNullClass();
20+
export type AnyNull = typeof AnyNull;

packages/orm/src/common-types.ts

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
1+
import { AnyNull, AnyNullClass, DbNull, DbNullClass, JsonNull, JsonNullClass } from '@zenstackhq/common-helpers';
2+
13
export type JsonValue = string | number | boolean | JsonObject | JsonArray;
24
export type JsonObject = { [key: string]: JsonValue | null };
35
export type JsonArray = Array<JsonValue | null>;
46
export type JsonNullValues = DbNull | JsonNull | AnyNull;
57

6-
export class DbNullClass {
7-
// @ts-ignore
8-
private __brand = 'DbNull' as const;
9-
}
10-
export const DbNull = new DbNullClass();
11-
export type DbNull = typeof DbNull;
12-
13-
export class JsonNullClass {
14-
// @ts-ignore
15-
private __brand = 'JsonNull' as const;
16-
}
17-
export const JsonNull = new JsonNullClass();
18-
export type JsonNull = typeof JsonNull;
19-
20-
export class AnyNullClass {
21-
// @ts-ignore
22-
private __brand = 'AnyNull' as const;
23-
}
24-
export const AnyNull = new AnyNullClass();
25-
export type AnyNull = typeof AnyNull;
8+
export { AnyNull, AnyNullClass, DbNull, DbNullClass, JsonNull, JsonNullClass };

packages/server/src/api/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AnyNull, AnyNullClass, DbNull, DbNullClass, JsonNull, JsonNullClass } from '@zenstackhq/orm/common-types';
1+
import { AnyNull, AnyNullClass, DbNull, DbNullClass, JsonNull, JsonNullClass } from '@zenstackhq/common-helpers';
22
import { Decimal } from 'decimal.js';
33
import SuperJSON from 'superjson';
44
import { match } from 'ts-pattern';

samples/next.js/next.config.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import type { NextConfig } from 'next';
22

33
const nextConfig: NextConfig = {
4-
// @zenstackhq/orm uses node:async_hooks (AsyncLocalStorage).
5-
// Mark it as server-external so Turbopack never tries to analyze it in any bundle context.
6-
serverExternalPackages: ['@zenstackhq/orm', '@zenstackhq/tanstack-query'],
4+
serverExternalPackages: ['@zenstackhq/orm'],
75
};
86

97
export default nextConfig;

0 commit comments

Comments
 (0)