Skip to content

Commit ef7e976

Browse files
authored
Merge branch 'main' into adds-org-name-to-alert-emails
2 parents 0f16fb4 + 21a4fab commit ef7e976

File tree

20 files changed

+103
-36
lines changed

20 files changed

+103
-36
lines changed

.changeset/fuzzy-coins-cross.md

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

.changeset/kind-plants-tap.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 externals from monorepo packages with scoped package names #1552

.changeset/rude-walls-help.md

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

apps/webapp/app/v3/services/expireEnqueuedRun.server.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ export class ExpireEnqueuedRunService extends BaseService {
4949
return;
5050
}
5151

52+
if (run.lockedAt) {
53+
logger.debug("Run cannot be expired because it's locked", {
54+
run,
55+
});
56+
57+
return;
58+
}
59+
5260
logger.debug("Expiring enqueued run", {
5361
run,
5462
});

docs/guides/examples/scrape-hacker-news.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Scrape the top 3 articles from Hacker News and email yourself a summary every weekday"
3-
sidebarTitle: "Scrape Hacker News"
3+
sidebarTitle: "Browserbase & Puppeteer"
44
description: "This example demonstrates how to scrape the top 3 articles from Hacker News using BrowserBase and Puppeteer, summarize them with ChatGPT and send a nicely formatted email summary to yourself every weekday using Resend."
55
---
66

docs/limits.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ If you're creating schedules for your user you will definitely need to request m
5454
| Limit | Details |
5555
| :--------------------- | :-------------------------------------------- |
5656
| Single trigger payload | Must not exceed 3MB |
57-
| Batch trigger payload | The total of all payloads must not exceed 1MB |
57+
| Batch trigger payload | The total of all payloads must not exceed 5MB |
5858
| Task outputs | Must not exceed 10MB |
5959

6060
Payloads and outputs that exceed 512KB will be offloaded to object storage and a presigned URL will be provided to download the data when calling `runs.retrieve`. You don't need to do anything to handle this in your tasks however, as we will transparently upload/download these during operation.

packages/build/CHANGELOG.md

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

3+
## 3.3.7
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@trigger.dev/[email protected]`
9+
310
## 3.3.6
411

512
### Patch Changes

packages/build/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/build",
3-
"version": "3.3.6",
3+
"version": "3.3.7",
44
"description": "trigger.dev build extensions",
55
"license": "MIT",
66
"publishConfig": {
@@ -65,7 +65,7 @@
6565
"check-exports": "attw --pack ."
6666
},
6767
"dependencies": {
68-
"@trigger.dev/core": "workspace:3.3.6",
68+
"@trigger.dev/core": "workspace:3.3.7",
6969
"pkg-types": "^1.1.3",
7070
"tinyglobby": "^0.2.2",
7171
"tsconfck": "3.1.3"

packages/cli-v3/CHANGELOG.md

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

3+
## 3.3.7
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@trigger.dev/[email protected]`
9+
- `@trigger.dev/[email protected]`
10+
311
## 3.3.6
412

513
### Patch Changes

packages/cli-v3/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",
3-
"version": "3.3.6",
3+
"version": "3.3.7",
44
"description": "A Command-Line Interface for Trigger.dev (v3) projects",
55
"type": "module",
66
"license": "MIT",
@@ -87,8 +87,8 @@
8787
"@opentelemetry/sdk-trace-base": "1.25.1",
8888
"@opentelemetry/sdk-trace-node": "1.25.1",
8989
"@opentelemetry/semantic-conventions": "1.25.1",
90-
"@trigger.dev/build": "workspace:3.3.6",
91-
"@trigger.dev/core": "workspace:3.3.6",
90+
"@trigger.dev/build": "workspace:3.3.7",
91+
"@trigger.dev/core": "workspace:3.3.7",
9292
"c12": "^1.11.1",
9393
"chalk": "^5.2.0",
9494
"cli-table3": "^0.6.3",

packages/cli-v3/src/build/externals.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,27 @@ async function linkExternal(external: CollectedExternal, resolveDir: string, log
4545
external,
4646
});
4747

48+
// For scoped packages, we need to ensure the scope directory exists
49+
if (external.name.startsWith("@")) {
50+
// Get the scope part (e.g., '@huggingface')
51+
const scopeDir = external.name.split("/")[0];
52+
53+
if (scopeDir) {
54+
const scopePath = join(destinationPath, scopeDir);
55+
56+
logger.debug("[externals] Ensure scope directory exists", {
57+
scopeDir,
58+
scopePath,
59+
});
60+
61+
await mkdir(scopePath, { recursive: true });
62+
} else {
63+
logger.debug("[externals] Unable to get the scope directory", {
64+
external,
65+
});
66+
}
67+
}
68+
4869
const symbolicLinkPath = join(destinationPath, external.name);
4970

5071
// Make sure the symbolic link does not exist

packages/core/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# internal-platform
22

3+
## 3.3.7
4+
35
## 3.3.6
46

57
### Patch Changes

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/core",
3-
"version": "3.3.6",
3+
"version": "3.3.7",
44
"description": "Core code used across the Trigger.dev SDK and platform",
55
"license": "MIT",
66
"publishConfig": {

packages/react-hooks/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# @trigger.dev/react-hooks
22

3+
## 3.3.7
4+
5+
### Patch Changes
6+
7+
- Now compatible with React 19 ([#1559](https://github.com/triggerdotdev/trigger.dev/pull/1559))
8+
- - Fixes an issue in streams where "chunks" could get split across multiple reads ([#1549](https://github.com/triggerdotdev/trigger.dev/pull/1549))
9+
- Fixed stopping the run subscription after a run is finished, when using useRealtimeRun or useRealtimeRunWithStreams
10+
- Added an `onComplete` callback to `useRealtimeRun` and `useRealtimeRunWithStreams`
11+
- Optimized the run subscription to reduce unnecessary updates
12+
- Updated dependencies:
13+
- `@trigger.dev/[email protected]`
14+
315
## 3.3.6
416

517
### Patch Changes

packages/react-hooks/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/react-hooks",
3-
"version": "3.3.6",
3+
"version": "3.3.7",
44
"description": "trigger.dev react hooks",
55
"license": "MIT",
66
"publishConfig": {
@@ -37,7 +37,7 @@
3737
"check-exports": "attw --pack ."
3838
},
3939
"dependencies": {
40-
"@trigger.dev/core": "workspace:^3.3.6",
40+
"@trigger.dev/core": "workspace:^3.3.7",
4141
"swr": "^2.2.5"
4242
},
4343
"devDependencies": {

packages/rsc/CHANGELOG.md

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

3+
## 3.3.7
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@trigger.dev/[email protected]`
9+
310
## 3.3.6
411

512
### Patch Changes

packages/rsc/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/rsc",
3-
"version": "3.3.6",
3+
"version": "3.3.7",
44
"description": "trigger.dev rsc",
55
"license": "MIT",
66
"publishConfig": {
@@ -37,14 +37,14 @@
3737
"check-exports": "attw --pack ."
3838
},
3939
"dependencies": {
40-
"@trigger.dev/core": "workspace:^3.3.6",
40+
"@trigger.dev/core": "workspace:^3.3.7",
4141
"mlly": "^1.7.1",
4242
"react": "19.0.0-rc.1",
4343
"react-dom": "19.0.0-rc.1"
4444
},
4545
"devDependencies": {
4646
"@arethetypeswrong/cli": "^0.15.4",
47-
"@trigger.dev/build": "workspace:^3.3.6",
47+
"@trigger.dev/build": "workspace:^3.3.7",
4848
"@types/node": "^20.14.14",
4949
"@types/react": "*",
5050
"@types/react-dom": "*",

packages/trigger-sdk/CHANGELOG.md

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

3+
## 3.3.7
4+
5+
### Patch Changes
6+
7+
- - Fixes an issue in streams where "chunks" could get split across multiple reads ([#1549](https://github.com/triggerdotdev/trigger.dev/pull/1549))
8+
- Fixed stopping the run subscription after a run is finished, when using useRealtimeRun or useRealtimeRunWithStreams
9+
- Added an `onComplete` callback to `useRealtimeRun` and `useRealtimeRunWithStreams`
10+
- Optimized the run subscription to reduce unnecessary updates
11+
- Updated dependencies:
12+
- `@trigger.dev/[email protected]`
13+
314
## 3.3.6
415

516
### Patch Changes

packages/trigger-sdk/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/sdk",
3-
"version": "3.3.6",
3+
"version": "3.3.7",
44
"description": "trigger.dev Node.JS SDK",
55
"license": "MIT",
66
"publishConfig": {
@@ -48,7 +48,7 @@
4848
"@opentelemetry/api": "1.9.0",
4949
"@opentelemetry/api-logs": "0.52.1",
5050
"@opentelemetry/semantic-conventions": "1.25.1",
51-
"@trigger.dev/core": "workspace:3.3.6",
51+
"@trigger.dev/core": "workspace:3.3.7",
5252
"chalk": "^5.2.0",
5353
"cronstrue": "^2.21.0",
5454
"debug": "^4.3.4",

pnpm-lock.yaml

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)