Skip to content

Commit 0e10f11

Browse files
authored
Merge pull request #5223 from drizzle-team/beelink
Sync branches `effect3` <- `beelink`
2 parents 5a93194 + c26fd2f commit 0e10f11

172 files changed

Lines changed: 5880 additions & 5266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release-feature-branch-beelink.yaml

Lines changed: 424 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/release-feature-branch.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
3737
TURBO_TEAM: 'team_KbvYUtAn1Tqytsj8HbNcYDqV'
3838
steps:
39+
- uses: oven-sh/setup-bun@v2
3940
- uses: actions/checkout@v5
4041
- uses: pnpm/action-setup@v4
4142
with: { run_install: false }
@@ -94,12 +95,12 @@ jobs:
9495
include:
9596
- shard: int:gel
9697
dbs: [gel]
97-
- shard: int:singlestore
98-
dbs: [singlestore]
99-
- shard: int:singlestore-core
100-
dbs: [singlestore-many]
101-
- shard: int:singlestore-proxy
102-
dbs: [singlestore-many]
98+
# - shard: int:singlestore
99+
# dbs: [singlestore]
100+
# - shard: int:singlestore-core
101+
# dbs: [singlestore-many]
102+
# - shard: int:singlestore-proxy
103+
# dbs: [singlestore-many]
103104
- shard: int:mysql
104105
dbs: [mysql]
105106
- shard: int:postgres

.github/workflows/release-latest.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ on:
2121
required: true
2222
SQLITE_CLOUD_CONNECTION_STRING:
2323
required: true
24+
SQLITE_MANY_CLOUD_CONNECTION_STRING:
25+
required: true
26+
27+
env:
28+
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
29+
TURBO_TEAM: 'team_KbvYUtAn1Tqytsj8HbNcYDqV'
2430

2531
jobs:
2632
test:
@@ -146,6 +152,12 @@ jobs:
146152
restore-keys: |
147153
${{ runner.os }}-pnpm-store-
148154
155+
- uses: actions/cache@v4
156+
name: Cache node_modules
157+
with:
158+
path: node_modules
159+
key: ${{ runner.os }}-node-modules
160+
149161
- name: Install dependencies
150162
run: pnpm install
151163

@@ -309,6 +321,12 @@ jobs:
309321
restore-keys: |
310322
${{ runner.os }}-pnpm-store-
311323
324+
- uses: actions/cache@v4
325+
name: Cache node_modules
326+
with:
327+
path: node_modules
328+
key: ${{ runner.os }}-node-modules
329+
312330
- name: Install dependencies
313331
run: pnpm install
314332

@@ -390,6 +408,12 @@ jobs:
390408
restore-keys: |
391409
${{ runner.os }}-pnpm-store-
392410
411+
- uses: actions/cache@v4
412+
name: Cache node_modules
413+
with:
414+
path: node_modules
415+
key: ${{ runner.os }}-node-modules
416+
393417
- name: Install dependencies
394418
run: pnpm install
395419

@@ -486,6 +510,12 @@ jobs:
486510
restore-keys: |
487511
${{ runner.os }}-pnpm-store-
488512
513+
- uses: actions/cache@v4
514+
name: Cache node_modules
515+
with:
516+
path: node_modules
517+
key: ${{ runner.os }}-node-modules
518+
489519
- name: Install dependencies
490520
run: pnpm install
491521

.github/workflows/router.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ on:
99

1010
jobs:
1111
switch:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-24.04
1313
outputs:
1414
target: ${{ steps.route.outputs.target }}
1515
steps:
1616
- name: Route release
1717
id: route
18+
shell: bash
1819
run: |
1920
HEAD_REPO="${{ github.event.pull_request.head.repo.full_name }}"
2021
if [[ "$GITHUB_EVENT_NAME" == "workflow_dispatch" && "${GITHUB_REF##*/}" == "main" ]]; then
@@ -55,4 +56,5 @@ jobs:
5556
XATA_BRANCH: ${{ secrets.XATA_BRANCH }}
5657
LIBSQL_REMOTE_URL: ${{ secrets.LIBSQL_REMOTE_URL }}
5758
LIBSQL_REMOTE_TOKEN: ${{ secrets.LIBSQL_REMOTE_TOKEN }}
58-
SQLITE_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_CLOUD_CONNECTION_STRING }}
59+
SQLITE_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_CLOUD_CONNECTION_STRING }}
60+
SQLITE_MANY_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_MANY_CLOUD_CONNECTION_STRING }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ drizzle-orm/types-bench.ts
1717
typeperf-test/tmp.tsconfig.json
1818
typeperf-test/trace
1919
typeperf-test/lib/big-schema.ts
20-
typeperf-test/lib/big-schema-rels.ts
20+
typeperf-test/lib/big-schema-rels.ts
21+
typeperf-test/.attest

compose/cockroach-many.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
services:
2+
cockroach0:
3+
image: cockroachdb/cockroach:latest
4+
command: start-single-node --insecure --store=type=mem,size=2GiB
5+
ports:
6+
- "26260:26257"
7+
- "8081:8080"
8+
healthcheck:
9+
test: ["CMD", "bash", "-lc", "nc -z 127.0.0.1 26257"]
10+
interval: 2s
11+
timeout: 3s
12+
retries: 60
13+
14+
cockroach1:
15+
image: cockroachdb/cockroach:latest
16+
command: start-single-node --insecure --store=type=mem,size=2GiB
17+
ports:
18+
- "26261:26257"
19+
- "8082:8080"
20+
healthcheck:
21+
test: ["CMD", "bash", "-lc", "nc -z 127.0.0.1 26257"]
22+
interval: 2s
23+
timeout: 3s
24+
retries: 60
25+
26+
cockroach2:
27+
image: cockroachdb/cockroach:latest
28+
command: start-single-node --insecure --store=type=mem,size=2GiB
29+
ports:
30+
- "26262:26257"
31+
- "8083:8080"
32+
healthcheck:
33+
test: ["CMD", "bash", "-lc", "nc -z 127.0.0.1 26257"]
34+
interval: 2s
35+
timeout: 3s
36+
retries: 60

compose/wait.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ for db in "$@"; do
2828
;;
2929
mssql) wait_tcp 127.0.0.1 1433 "mssql" ;;
3030
cockroach) wait_tcp 127.0.0.1 26257 "cockroach" ;;
31+
cockroach-many)
32+
for i in $(seq 26260 26262); do
33+
wait_tcp 127.0.0.1 "$i" "cockroach-$((i-26260))"
34+
done
35+
;;
3136
neon) wait_tcp 127.0.0.1 5446 "neon-serverless" ;;
3237
*) echo "Unknown db '$db'";;
3338
esac

drizzle-arktype/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,13 @@
6363
},
6464
"devDependencies": {
6565
"@ark/attest": "^0.45.8",
66-
"@rollup/plugin-typescript": "^11.1.0",
6766
"@types/node": "^18.15.10",
6867
"arktype": "^2.1.10",
6968
"cpy": "^10.1.0",
7069
"drizzle-orm": "link:../drizzle-orm/dist",
7170
"json-rules-engine": "7.3.1",
7271
"rimraf": "^5.0.0",
73-
"rollup": "^3.29.5",
72+
"tsdown": "^0.18.3",
7473
"tsx": "^4.19.3",
7574
"zx": "^7.2.2"
7675
}

drizzle-arktype/rollup.config.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

drizzle-arktype/scripts/build.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ import 'zx/globals';
33
import cpy from 'cpy';
44

55
await fs.remove('dist');
6-
await $`rollup --config rollup.config.ts --configPlugin typescript`;
7-
await $`resolve-tspaths`;
8-
await fs.copy('README.md', 'dist/README.md');
9-
await cpy('dist/**/*.d.ts', 'dist', {
10-
rename: (basename) => basename.replace(/\.d\.ts$/, '.d.mts'),
11-
});
12-
await cpy('dist/**/*.d.ts', 'dist', {
13-
rename: (basename) => basename.replace(/\.d\.ts$/, '.d.cts'),
6+
await $`tsdown`;
7+
// Create .d.ts fallback for the `types` field in exports
8+
await cpy('dist/**/*.d.mts', 'dist', {
9+
rename: (basename) => basename.replace(/\.d\.mts$/, '.d.ts'),
1410
});
11+
await fs.copy('README.md', 'dist/README.md');
1512
await fs.copy('package.json', 'dist/package.json');
16-
await $`scripts/fix-imports.ts`;

0 commit comments

Comments
 (0)