Skip to content

Commit 93dde5f

Browse files
nicktrnnicktrn
authored
Merge branch 'main' into v3/improve-non-zero-exit-errors
2 parents f6726b8 + 8a5076a commit 93dde5f

Some content is hidden

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

70 files changed

+541
-115
lines changed

‎.changeset/polite-pears-grow.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+
Use global setTimeout to ensure cross-runtime support

‎.changeset/pre.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
"pink-pumas-rhyme",
100100
"plenty-ducks-beam",
101101
"polite-ducks-switch",
102+
"polite-pears-grow",
102103
"polite-rockets-matter",
103104
"poor-flowers-cross",
104105
"purple-garlics-shop",
@@ -135,6 +136,7 @@
135136
"strong-phones-smoke",
136137
"stupid-adults-sniff",
137138
"stupid-bulldogs-applaud",
139+
"sweet-ducks-remember",
138140
"sweet-lizards-press",
139141
"swift-dragons-peel",
140142
"tall-bees-wave",
@@ -153,6 +155,7 @@
153155
"tricky-keys-attack",
154156
"tricky-ladybugs-unite",
155157
"two-pumas-wait",
158+
"violet-clocks-notice",
156159
"warm-olives-provide",
157160
"warm-planes-taste",
158161
"young-snails-sell"

‎.changeset/violet-clocks-notice.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 jsonc-parser import

‎apps/webapp/app/v3/services/triggerTask.server.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,12 @@ export class TriggerTaskService extends BaseService {
176176
}
177177

178178
if (body.options?.queue) {
179-
const concurrencyLimit = body.options.queue.concurrencyLimit
180-
? Math.max(0, body.options.queue.concurrencyLimit)
181-
: null;
182-
const taskQueue = await prisma.taskQueue.upsert({
179+
const concurrencyLimit =
180+
typeof body.options.queue.concurrencyLimit === "number"
181+
? Math.max(0, body.options.queue.concurrencyLimit)
182+
: undefined;
183+
184+
const taskQueue = await tx.taskQueue.upsert({
183185
where: {
184186
runtimeEnvironmentId_name: {
185187
runtimeEnvironmentId: environment.id,

‎integrations/airtable/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @trigger.dev/airtable
22

3+
## 3.0.0-beta.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [ecef19966]
8+
- @trigger.dev/[email protected]
9+
- @trigger.dev/[email protected]
10+
11+
## 3.0.0-beta.41
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [7c36a1a4b]
16+
- @trigger.dev/[email protected]
17+
- @trigger.dev/[email protected]
18+
319
## 3.0.0-beta.40
420

521
### Patch Changes

‎integrations/airtable/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/airtable",
3-
"version": "3.0.0-beta.40",
3+
"version": "3.0.0-beta.42",
44
"description": "Trigger.dev integration for airtable",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -25,8 +25,8 @@
2525
"typecheck": "tsc --noEmit"
2626
},
2727
"dependencies": {
28-
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.40",
29-
"@trigger.dev/sdk": "workspace:^3.0.0-beta.40",
28+
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.42",
29+
"@trigger.dev/sdk": "workspace:^3.0.0-beta.42",
3030
"airtable": "^0.12.1",
3131
"zod": "3.22.3"
3232
},

‎integrations/github/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @trigger.dev/github
22

3+
## 3.0.0-beta.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [ecef19966]
8+
- @trigger.dev/[email protected]
9+
- @trigger.dev/[email protected]
10+
11+
## 3.0.0-beta.41
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [7c36a1a4b]
16+
- @trigger.dev/[email protected]
17+
- @trigger.dev/[email protected]
18+
319
## 3.0.0-beta.40
420

521
### Patch Changes

‎integrations/github/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/github",
3-
"version": "3.0.0-beta.40",
3+
"version": "3.0.0-beta.42",
44
"description": "The official GitHub integration for Trigger.dev",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -30,8 +30,8 @@
3030
"@octokit/request-error": "^5.0.1",
3131
"@octokit/webhooks": "^12.0.10",
3232
"octokit": "^3.1.2",
33-
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.40",
34-
"@trigger.dev/sdk": "workspace:^3.0.0-beta.40",
33+
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.42",
34+
"@trigger.dev/sdk": "workspace:^3.0.0-beta.42",
3535
"zod": "3.22.3"
3636
},
3737
"engines": {

‎integrations/linear/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @trigger.dev/linear
22

3+
## 3.0.0-beta.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [ecef19966]
8+
- @trigger.dev/[email protected]
9+
- @trigger.dev/[email protected]
10+
11+
## 3.0.0-beta.41
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [7c36a1a4b]
16+
- @trigger.dev/[email protected]
17+
- @trigger.dev/[email protected]
18+
319
## 3.0.0-beta.40
420

521
### Patch Changes

‎integrations/linear/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/linear",
3-
"version": "3.0.0-beta.40",
3+
"version": "3.0.0-beta.42",
44
"description": "Trigger.dev integration for @linear/sdk",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -26,8 +26,8 @@
2626
},
2727
"dependencies": {
2828
"@linear/sdk": "^8.0.0",
29-
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.40",
30-
"@trigger.dev/sdk": "workspace:^3.0.0-beta.40",
29+
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.42",
30+
"@trigger.dev/sdk": "workspace:^3.0.0-beta.42",
3131
"zod": "3.22.3"
3232
},
3333
"engines": {

‎integrations/openai/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @trigger.dev/slack
22

3+
## 3.0.0-beta.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [ecef19966]
8+
- @trigger.dev/[email protected]
9+
- @trigger.dev/[email protected]
10+
11+
## 3.0.0-beta.41
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [7c36a1a4b]
16+
- @trigger.dev/[email protected]
17+
- @trigger.dev/[email protected]
18+
319
## 3.0.0-beta.40
420

521
### Patch Changes

‎integrations/openai/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/openai",
3-
"version": "3.0.0-beta.40",
3+
"version": "3.0.0-beta.42",
44
"description": "The official OpenAI integration for Trigger.dev",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -42,8 +42,8 @@
4242
},
4343
"dependencies": {
4444
"openai": "^4.16.1",
45-
"@trigger.dev/sdk": "workspace:^3.0.0-beta.40",
46-
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.40"
45+
"@trigger.dev/sdk": "workspace:^3.0.0-beta.42",
46+
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.42"
4747
},
4848
"engines": {
4949
"node": ">=18.0.0"

‎integrations/plain/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @trigger.dev/plain
22

3+
## 3.0.0-beta.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [ecef19966]
8+
- @trigger.dev/[email protected]
9+
- @trigger.dev/[email protected]
10+
11+
## 3.0.0-beta.41
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [7c36a1a4b]
16+
- @trigger.dev/[email protected]
17+
- @trigger.dev/[email protected]
18+
319
## 3.0.0-beta.40
420

521
### Patch Changes

‎integrations/plain/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/plain",
3-
"version": "3.0.0-beta.40",
3+
"version": "3.0.0-beta.42",
44
"description": "The official Plain.com integration for Trigger.dev",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -24,8 +24,8 @@
2424
"build:tsup": "tsup"
2525
},
2626
"dependencies": {
27-
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.40",
28-
"@trigger.dev/sdk": "workspace:^3.0.0-beta.40",
27+
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.42",
28+
"@trigger.dev/sdk": "workspace:^3.0.0-beta.42",
2929
"@team-plain/typescript-sdk": "^2.7.0"
3030
},
3131
"engines": {

‎integrations/replicate/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @trigger.dev/replicate
22

3+
## 3.0.0-beta.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [ecef19966]
8+
- @trigger.dev/[email protected]
9+
- @trigger.dev/[email protected]
10+
11+
## 3.0.0-beta.41
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [7c36a1a4b]
16+
- @trigger.dev/[email protected]
17+
- @trigger.dev/[email protected]
18+
319
## 3.0.0-beta.40
420

521
### Patch Changes

‎integrations/replicate/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/replicate",
3-
"version": "3.0.0-beta.40",
3+
"version": "3.0.0-beta.42",
44
"description": "Trigger.dev integration for replicate",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -25,8 +25,8 @@
2525
"typecheck": "tsc --noEmit"
2626
},
2727
"dependencies": {
28-
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.40",
29-
"@trigger.dev/sdk": "workspace:^3.0.0-beta.40",
28+
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.42",
29+
"@trigger.dev/sdk": "workspace:^3.0.0-beta.42",
3030
"replicate": "^0.18.1",
3131
"zod": "3.22.3"
3232
},

‎integrations/resend/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @trigger.dev/resend
22

3+
## 3.0.0-beta.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [ecef19966]
8+
- @trigger.dev/[email protected]
9+
- @trigger.dev/[email protected]
10+
11+
## 3.0.0-beta.41
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [7c36a1a4b]
16+
- @trigger.dev/[email protected]
17+
- @trigger.dev/[email protected]
18+
319
## 3.0.0-beta.40
420

521
### Patch Changes

‎integrations/resend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/resend",
3-
"version": "3.0.0-beta.40",
3+
"version": "3.0.0-beta.42",
44
"description": "The official Resend.com integration for Trigger.dev",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -24,8 +24,8 @@
2424
"build:tsup": "tsup"
2525
},
2626
"dependencies": {
27-
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.40",
28-
"@trigger.dev/sdk": "workspace:^3.0.0-beta.40",
27+
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.42",
28+
"@trigger.dev/sdk": "workspace:^3.0.0-beta.42",
2929
"resend": "^2.1.0"
3030
},
3131
"engines": {

‎integrations/sendgrid/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @trigger.dev/sendgrid
22

3+
## 3.0.0-beta.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [ecef19966]
8+
- @trigger.dev/[email protected]
9+
- @trigger.dev/[email protected]
10+
11+
## 3.0.0-beta.41
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [7c36a1a4b]
16+
- @trigger.dev/[email protected]
17+
- @trigger.dev/[email protected]
18+
319
## 3.0.0-beta.40
420

521
### Patch Changes

‎integrations/sendgrid/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/sendgrid",
3-
"version": "3.0.0-beta.40",
3+
"version": "3.0.0-beta.42",
44
"description": "Trigger.dev integration for @sendgrid/mail",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -26,8 +26,8 @@
2626
},
2727
"dependencies": {
2828
"@sendgrid/mail": "^7.7.0",
29-
"@trigger.dev/sdk": "workspace:^3.0.0-beta.40",
30-
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.40"
29+
"@trigger.dev/sdk": "workspace:^3.0.0-beta.42",
30+
"@trigger.dev/integration-kit": "workspace:^3.0.0-beta.42"
3131
},
3232
"engines": {
3333
"node": ">=16.8.0"

0 commit comments

Comments
 (0)