Skip to content

Commit 3a0735d

Browse files
committed
Merge remote-tracking branch 'origin/main' into dashboard/new-sidebar-v2-eol
# Conflicts: # apps/webapp/app/components/run/TriggerDetail.tsx # apps/webapp/app/components/runs/v3/RunIcon.tsx # apps/webapp/app/entry.server.tsx # apps/webapp/app/presenters/HttpEndpointPresenter.server.ts # apps/webapp/app/routes/api.v1.$endpointSlug.schedules.$id.registrations.ts # apps/webapp/app/routes/api.v1.$endpointSlug.sources.$id.ts # apps/webapp/app/routes/api.v1.$endpointSlug.triggers.$id.registrations.$key.ts # apps/webapp/app/routes/api.v1.$endpointSlug.triggers.$id.registrations.ts # apps/webapp/app/routes/api.v1.accounts.$accountId.connections.$clientSlug/route.ts # apps/webapp/app/routes/api.v1.endpointindex.$indexId.ts # apps/webapp/app/routes/api.v1.event-dispatchers.ephemeral.ts # apps/webapp/app/routes/api.v1.events.$eventId.ts # apps/webapp/app/routes/api.v1.events.bulk.ts # apps/webapp/app/routes/api.v1.events.ts # apps/webapp/app/routes/api.v1.http-endpoints.$httpEndpointId.env.$envType.$shortcode.ts # apps/webapp/app/routes/api.v1.jobs.$jobSlug.invoke.ts # apps/webapp/app/routes/api.v1.runs.$runId.logs/route.ts # apps/webapp/app/routes/api.v1.runs.$runId.statuses.$id/route.ts # apps/webapp/app/routes/api.v1.runs.$runId.statuses.ts # apps/webapp/app/routes/api.v1.runs.$runId.tasks.$id.complete/route.ts # apps/webapp/app/routes/api.v1.runs.$runId.tasks.$id.fail/route.ts # apps/webapp/app/routes/api.v1.runs.$runId.tasks/route.ts # apps/webapp/app/routes/api.v1.webhooks.$key.ts # apps/webapp/app/routes/api.v2.$endpointSlug.sources.$id.ts # apps/webapp/app/routes/api.v2.$endpointSlug.triggers.$id.registrations.$key.ts # apps/webapp/app/routes/api.v2.events.$eventId.ts # apps/webapp/app/routes/api.v2.runs.$runId.statuses.ts # apps/webapp/app/services/endpoints/indexEndpoint.server.ts # apps/webapp/app/services/endpoints/performEndpointIndexService.server.ts # apps/webapp/app/services/events/sqsEventConsumer.server.ts # apps/webapp/app/services/httpendpoint/HandleHttpEndpointService.server.ts # apps/webapp/app/services/triggers/registerWebhook.server.ts # apps/webapp/app/services/worker.server.ts # apps/webapp/remix.config.js # apps/webapp/tsconfig.json # packages/cli-v3/src/dev/backgroundWorker.ts # packages/core/package.json # references/hello-world/src/trigger/example.ts
2 parents 4dc7529 + d855d55 commit 3a0735d

File tree

466 files changed

+40642
-7192
lines changed

Some content is hidden

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

466 files changed

+40642
-7192
lines changed

.changeset/breezy-turtles-talk.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"@trigger.dev/react-hooks": patch
3+
"@trigger.dev/sdk": patch
4+
"trigger.dev": patch
5+
"@trigger.dev/build": patch
6+
"@trigger.dev/core": patch
7+
"@trigger.dev/rsc": patch
8+
---
9+
10+
Run Engine 2.0 (alpha)

.changeset/cold-coins-burn.md

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

.changeset/little-trains-begin.md

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

.changeset/ninety-cars-peel.md

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

.changeset/wise-mirrors-hug.md

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

.changeset/witty-jars-approve.md

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

.configs/tsconfig.base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
33
"target": "es2022",
4-
"lib": ["ES2022", "DOM", "DOM.Iterable"],
4+
"lib": ["ES2022", "DOM", "DOM.Iterable", "DOM.AsyncIterable"],
55
"module": "NodeNext",
66
"moduleResolution": "NodeNext",
77
"moduleDetection": "force",

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# dependencies
1111

12-
node_modules
12+
**/node_modules
1313
.pnp
1414
.pnp.js
1515

.eslintrc.js

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

.github/actions/get-image-tag/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ runs:
3131
sha=$(echo ${{ github.sha }} | head -c7)
3232
ts=$(date +%s)
3333
tag=${env}-${sha}-${ts}
34+
elif [[ "${{ github.ref_name }}" == re2-*-* ]]; then
35+
env=$(echo ${{ github.ref_name }} | cut -d- -f2)
36+
sha=$(echo ${{ github.sha }} | head -c7)
37+
ts=$(date +%s)
38+
tag=${env}-${sha}-${ts}
3439
elif [[ "${{ github.ref_name }}" == v.docker.* ]]; then
3540
version="${GITHUB_REF_NAME#v.docker.}"
3641
tag="v${version}"

0 commit comments

Comments
 (0)