Skip to content

Commit 5ff065b

Browse files
bharathkumar39293bharathkumar39293
authored
Merge branch 'main' into fix/replay-payload-2813-clean
2 parents a288a90 + e536d35 commit 5ff065b

File tree

81 files changed

+3220
-249
lines changed

Some content is hidden

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

81 files changed

+3220
-249
lines changed

‎.changeset/add-debounce-maxdelay.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
"@trigger.dev/core": patch
3+
"@trigger.dev/sdk": patch
4+
---
5+
6+
Add `maxDelay` option to debounce feature. This allows setting a maximum time limit for how long a debounced run can be delayed, ensuring execution happens within a specified window even with continuous triggers.
7+
8+
```typescript
9+
await myTask.trigger(payload, {
10+
debounce: {
11+
key: "my-key",
12+
delay: "5s",
13+
maxDelay: "30m", // Execute within 30 minutes regardless of continuous triggers
14+
},
15+
});
16+
```

‎.changeset/export-start-attempt-hook-type.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@trigger.dev/sdk": patch
3+
---
4+
5+
Export `AnyOnStartAttemptHookFunction` type to allow defining `onStartAttempt` hooks for individual tasks.

‎.changeset/fix-dead-process-execute-hang.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"trigger.dev": patch
3+
---
4+
5+
Fix runner getting stuck indefinitely when `execute()` is called on a dead child process.

‎.changeset/vendor-superjson-esm-fix.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@trigger.dev/core": patch
3+
---
4+
5+
fix: vendor superjson to fix ESM/CJS compatibility
6+
7+
Bundle superjson during build to avoid `ERR_REQUIRE_ESM` errors on Node.js versions that don't support `require(ESM)` by default (< 22.12.0) and AWS Lambda which intentionally disables it.

‎.github/workflows/pr_checks.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ jobs:
2929
with:
3030
package: cli-v3
3131
secrets: inherit
32+
33+
sdk-compat:
34+
uses: ./.github/workflows/sdk-compat.yml
35+
secrets: inherit

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,24 @@ jobs:
122122
package_version=$(echo '${{ steps.changesets.outputs.publishedPackages }}' | jq -r '.[0].version')
123123
echo "package_version=${package_version}" >> "$GITHUB_OUTPUT"
124124
125-
# this triggers the publish workflow for the docker images
126125
- name: Create and push Docker tag
127126
if: steps.changesets.outputs.published == 'true'
128127
run: |
129128
set -e
130129
git tag "v.docker.${{ steps.get_version.outputs.package_version }}"
131130
git push origin "v.docker.${{ steps.get_version.outputs.package_version }}"
132131
132+
# Trigger Docker builds directly via workflow_call since tags pushed with
133+
# GITHUB_TOKEN don't trigger other workflows (GitHub Actions limitation).
134+
publish-docker:
135+
name: 🐳 Publish Docker images
136+
needs: release
137+
if: needs.release.outputs.published == 'true'
138+
uses: ./.github/workflows/publish.yml
139+
secrets: inherit
140+
with:
141+
image_tag: v${{ needs.release.outputs.published_package_version }}
142+
133143
# The prerelease job needs to be on the same workflow file due to a limitation related to how npm verifies OIDC claims.
134144
prerelease:
135145
name: 🧪 Prerelease

‎.github/workflows/sdk-compat.yml‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
name: "🔌 SDK Compatibility Tests"
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
workflow_call:
8+
9+
jobs:
10+
node-compat:
11+
name: "Node.js ${{ matrix.node }} (${{ matrix.os }})"
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
os: [ubuntu-latest]
17+
node: ["20.20", "22.12"]
18+
19+
steps:
20+
- name: ⬇️ Checkout repo
21+
uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 0
24+
25+
- name: ⎔ Setup pnpm
26+
uses: pnpm/action-setup@v4
27+
with:
28+
version: 10.23.0
29+
30+
- name: ⎔ Setup node
31+
uses: buildjet/setup-node@v4
32+
with:
33+
node-version: ${{ matrix.node }}
34+
cache: "pnpm"
35+
36+
- name: 📥 Download deps
37+
run: pnpm install --frozen-lockfile
38+
39+
- name: 📀 Generate Prisma Client
40+
run: pnpm run generate
41+
42+
- name: 🔨 Build SDK dependencies
43+
shell: bash
44+
run: pnpm run build --filter '@trigger.dev/sdk^...'
45+
46+
- name: 🔨 Build SDK
47+
shell: bash
48+
run: pnpm run build --filter '@trigger.dev/sdk'
49+
50+
- name: 🧪 Run SDK Compatibility Tests
51+
shell: bash
52+
run: pnpm --filter @internal/sdk-compat-tests test
53+
54+
bun-compat:
55+
name: "Bun Runtime"
56+
runs-on: ubuntu-latest
57+
steps:
58+
- name: ⬇️ Checkout repo
59+
uses: actions/checkout@v4
60+
with:
61+
fetch-depth: 0
62+
63+
- name: ⎔ Setup pnpm
64+
uses: pnpm/action-setup@v4
65+
with:
66+
version: 10.23.0
67+
68+
- name: ⎔ Setup node
69+
uses: buildjet/setup-node@v4
70+
with:
71+
node-version: 20.20.0
72+
cache: "pnpm"
73+
74+
- name: 🥟 Setup Bun
75+
uses: oven-sh/setup-bun@v2
76+
with:
77+
bun-version: latest
78+
79+
- name: 📥 Download deps
80+
run: pnpm install --frozen-lockfile
81+
82+
- name: 📀 Generate Prisma Client
83+
run: pnpm run generate
84+
85+
- name: 🔨 Build SDK dependencies
86+
run: pnpm run build --filter @trigger.dev/sdk^...
87+
88+
- name: 🔨 Build SDK
89+
run: pnpm run build --filter @trigger.dev/sdk
90+
91+
- name: 🧪 Run Bun Compatibility Test
92+
working-directory: internal-packages/sdk-compat-tests/src/fixtures/bun
93+
run: bun run test.ts
94+
95+
deno-compat:
96+
name: "Deno Runtime"
97+
runs-on: ubuntu-latest
98+
steps:
99+
- name: ⬇️ Checkout repo
100+
uses: actions/checkout@v4
101+
with:
102+
fetch-depth: 0
103+
104+
- name: ⎔ Setup pnpm
105+
uses: pnpm/action-setup@v4
106+
with:
107+
version: 10.23.0
108+
109+
- name: ⎔ Setup node
110+
uses: buildjet/setup-node@v4
111+
with:
112+
node-version: 20.20.0
113+
cache: "pnpm"
114+
115+
- name: 🦕 Setup Deno
116+
uses: denoland/setup-deno@v2
117+
with:
118+
deno-version: v2.x
119+
120+
- name: 📥 Download deps
121+
run: pnpm install --frozen-lockfile
122+
123+
- name: 📀 Generate Prisma Client
124+
run: pnpm run generate
125+
126+
- name: 🔨 Build SDK dependencies
127+
run: pnpm run build --filter @trigger.dev/sdk^...
128+
129+
- name: 🔨 Build SDK
130+
run: pnpm run build --filter @trigger.dev/sdk
131+
132+
- name: 🔗 Link node_modules for Deno fixture
133+
working-directory: internal-packages/sdk-compat-tests/src/fixtures/deno
134+
run: ln -s ../../../../../node_modules node_modules
135+
136+
- name: 🧪 Run Deno Compatibility Test
137+
working-directory: internal-packages/sdk-compat-tests/src/fixtures/deno
138+
run: deno run --allow-read --allow-env --allow-sys test.ts
139+
140+
cloudflare-compat:
141+
name: "Cloudflare Workers"
142+
runs-on: ubuntu-latest
143+
steps:
144+
- name: ⬇️ Checkout repo
145+
uses: actions/checkout@v4
146+
with:
147+
fetch-depth: 0
148+
149+
- name: ⎔ Setup pnpm
150+
uses: pnpm/action-setup@v4
151+
with:
152+
version: 10.23.0
153+
154+
- name: ⎔ Setup node
155+
uses: buildjet/setup-node@v4
156+
with:
157+
node-version: 20.20.0
158+
cache: "pnpm"
159+
160+
- name: 📥 Download deps
161+
run: pnpm install --frozen-lockfile
162+
163+
- name: 📀 Generate Prisma Client
164+
run: pnpm run generate
165+
166+
- name: 🔨 Build SDK dependencies
167+
run: pnpm run build --filter @trigger.dev/sdk^...
168+
169+
- name: 🔨 Build SDK
170+
run: pnpm run build --filter @trigger.dev/sdk
171+
172+
- name: 📥 Install Cloudflare fixture deps
173+
working-directory: internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker
174+
run: pnpm install
175+
176+
- name: 🧪 Run Cloudflare Workers Compatibility Test (dry-run)
177+
working-directory: internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker
178+
run: npx wrangler deploy --dry-run --outdir dist

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ out/
1515
dist
1616
packages/**/dist
1717

18+
# vendored bundles (generated during build)
19+
packages/**/src/**/vendor
20+
1821
# Tailwind
1922
apps/**/styles/tailwind.css
2023
packages/**/styles/tailwind.css

‎apps/coordinator/Containerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ COPY --from=pruner --chown=node:node /app/out/full/ .
3535
COPY --from=dev-deps --chown=node:node /app/ .
3636
COPY --chown=node:node turbo.json turbo.json
3737

38-
RUN pnpm run -r --filter coordinator build:bundle
38+
RUN pnpm run -r --filter @trigger.dev/core bundle-vendor && pnpm run -r --filter coordinator build:bundle
3939

4040
FROM alpine AS cri-tools
4141

‎apps/docker-provider/Containerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ COPY --from=pruner --chown=node:node /app/out/full/ .
3131
COPY --from=dev-deps --chown=node:node /app/ .
3232
COPY --chown=node:node turbo.json turbo.json
3333

34-
RUN pnpm run -r --filter docker-provider build:bundle
34+
RUN pnpm run -r --filter @trigger.dev/core bundle-vendor && pnpm run -r --filter docker-provider build:bundle
3535

3636
FROM base AS runner
3737

0 commit comments

Comments
 (0)