Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"changelog": [
"@remix-run/changelog-github",
{
"repo": "triggerdotdev/trigger.dev"
"repo": "BasicBlock/trigger.dev"
}
],
"commit": false,
"fixed": [["@trigger.dev/*", "trigger.dev"]],
"fixed": [["@trigger.dev/*", "@basicblock/trigger-cli"]],
"linked": [],
"access": "public",
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [
Expand Down
2 changes: 1 addition & 1 deletion .changeset/fix-dead-process-execute-hang.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"trigger.dev": patch
"/trigger-cli": patch
---

Fix runner getting stuck indefinitely when `execute()` is called on a dead child process.
2 changes: 1 addition & 1 deletion .changeset/mcp-wait-timeout.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"trigger.dev": patch
"/trigger-cli": patch
---

Add optional `timeoutInSeconds` parameter to the `wait_for_run_to_complete` MCP tool. Defaults to 60 seconds. If the run doesn't complete within the timeout, the current state of the run is returned instead of waiting indefinitely.
2 changes: 1 addition & 1 deletion .github/workflows/changesets-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
permissions:
contents: write
pull-requests: write
if: github.repository == 'triggerdotdev/trigger.dev'
if: github.repository == 'BasicBlock/trigger.dev'
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@ jobs:
node-version: 20.20.0

- name: 📥 Download deps
run: pnpm install --frozen-lockfile --filter trigger.dev...
run: pnpm install --frozen-lockfile --filter @basicblock/trigger-cli...

- name: 📀 Generate Prisma Client
run: pnpm run generate

- name: 🔧 Build v3 cli monorepo dependencies
run: pnpm run build --filter trigger.dev^...
run: pnpm run build --filter @basicblock/trigger-cli^...

- name: 🔧 Build worker template files
run: pnpm --filter trigger.dev run build:workers
run: pnpm --filter @basicblock/trigger-cli run build:workers

- name: Enable corepack
run: corepack enable

- name: Run E2E Tests
shell: bash
run: |
LOG=debug PM=${{ matrix.package-manager }} pnpm --filter trigger.dev run test:e2e
LOG=debug PM=${{ matrix.package-manager }} pnpm --filter @basicblock/trigger-cli run test:e2e
45 changes: 28 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
name: 📋 Release Summary
runs-on: ubuntu-latest
if: |
github.repository == 'triggerdotdev/trigger.dev' &&
github.repository == 'BasicBlock/trigger.dev' &&
github.event_name == 'pull_request' &&
github.event.pull_request.merged == true &&
github.event.pull_request.head.ref == 'changeset-release/main'
Expand All @@ -52,9 +52,8 @@ jobs:
permissions:
contents: write
packages: write
id-token: write
if: |
github.repository == 'triggerdotdev/trigger.dev' &&
github.repository == 'BasicBlock/trigger.dev' &&
(
(github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'release') ||
(github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'changeset-release/main')
Expand Down Expand Up @@ -89,10 +88,15 @@ jobs:
node-version: 20.20.0
cache: "pnpm"

# npm v11.5.1 or newer is required for OIDC support
# https://github.blog/changelog/2025-07-31-npm-trusted-publishing-with-oidc-is-generally-available/#whats-new
- name: Setup npm 11.x for OIDC
run: npm install -g npm@11.6.4
- name: Configure npm for GitHub Packages
run: |
cat <<EOF > ~/.npmrc
@trigger.dev:registry=https://npm.pkg.github.com
@basicblock:registry=https://npm.pkg.github.com
//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}
EOF
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand All @@ -101,10 +105,10 @@ jobs:
run: pnpm run generate

- name: Build
run: pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
run: pnpm run build --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"

- name: Type check
run: pnpm run typecheck --filter "@trigger.dev/*" --filter "trigger.dev"
run: pnpm run typecheck --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"

- name: Publish
id: changesets
Expand All @@ -114,6 +118,7 @@ jobs:
createGithubReleases: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Show package version
if: steps.changesets.outputs.published == 'true'
Expand Down Expand Up @@ -147,8 +152,8 @@ jobs:
environment: npm-publish
permissions:
contents: read
id-token: write
if: github.repository == 'triggerdotdev/trigger.dev' && github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'prerelease'
packages: write
if: github.repository == 'BasicBlock/trigger.dev' && github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'prerelease'
steps:
- name: Checkout repo
uses: actions/checkout@v4
Expand All @@ -167,10 +172,15 @@ jobs:
node-version: 20.20.0
cache: "pnpm"

# npm v11.5.1 or newer is required for OIDC support
# https://github.blog/changelog/2025-07-31-npm-trusted-publishing-with-oidc-is-generally-available/#whats-new
- name: Setup npm 11.x for OIDC
run: npm install -g npm@11.6.4
- name: Configure npm for GitHub Packages
run: |
cat <<EOF > ~/.npmrc
@trigger.dev:registry=https://npm.pkg.github.com
@basicblock:registry=https://npm.pkg.github.com
//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}
EOF
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download deps
run: pnpm install --frozen-lockfile
Expand All @@ -184,12 +194,13 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Clean
run: pnpm run clean --filter "@trigger.dev/*" --filter "trigger.dev"
run: pnpm run clean --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"

- name: Build
run: pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
run: pnpm run build --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"

- name: Publish prerelease
run: pnpm exec changeset publish --no-git-tag --snapshot --tag ${{ github.event.inputs.prerelease_tag }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"env:pull": "turbo run env:pull",
"changeset:add": "changeset",
"changeset:version": "changeset version",
"changeset:release": "pnpm run build --filter \"@trigger.dev/*\" --filter \"trigger.dev\" && changeset publish",
"changeset:release": "pnpm run build --filter \"@trigger.dev/*\" --filter \"@basicblock/trigger-cli\" && changeset publish",
"changeset:v4": "changeset pre enter v4",
"changeset:normal": "changeset pre exit",
"clean:sourcemaps": "turbo run clean:sourcemaps",
Expand Down Expand Up @@ -118,4 +118,4 @@
"turbo"
]
}
}
}
5 changes: 3 additions & 2 deletions packages/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"description": "trigger.dev build extensions",
"license": "MIT",
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/build"
},
"type": "module",
Expand Down
11 changes: 6 additions & 5 deletions packages/cli-v3/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"name": "trigger.dev",
"name": "@basicblock/trigger-cli",
"version": "4.3.3",
"description": "A Command-Line Interface for Trigger.dev projects",
"type": "module",
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/cli-v3"
},
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"mcpName": "io.github.triggerdotdev/trigger.dev",
"mcpName": "io.github.basicblock/trigger-cli",
"keywords": [
"typescript",
"trigger.dev",
"@basicblock/trigger-cli",
"workflows",
"orchestration",
"events",
Expand Down
5 changes: 3 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"description": "Core code used across the Trigger.dev SDK and platform",
"license": "MIT",
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/core"
},
"files": [
Expand Down
5 changes: 3 additions & 2 deletions packages/python/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"description": "Python runtime and build extension for Trigger.dev",
"license": "MIT",
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/python"
},
"type": "module",
Expand Down
5 changes: 3 additions & 2 deletions packages/react-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"description": "trigger.dev react hooks",
"license": "MIT",
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/react-hooks"
},
"type": "module",
Expand Down
5 changes: 3 additions & 2 deletions packages/redis-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"description": "Redis worker for trigger.dev",
"license": "MIT",
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/redis-worker"
},
"type": "module",
Expand Down
5 changes: 3 additions & 2 deletions packages/rsc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"description": "trigger.dev rsc",
"license": "MIT",
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/rsc"
},
"type": "module",
Expand Down
5 changes: 3 additions & 2 deletions packages/schema-to-json/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"description": "Convert various schema validation libraries to JSON Schema",
"license": "MIT",
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/schema-to-json"
},
"type": "module",
Expand Down
5 changes: 3 additions & 2 deletions packages/trigger-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"description": "trigger.dev Node.JS SDK",
"license": "MIT",
"publishConfig": {
"access": "public"
"access": "restricted",
"registry": "https://npm.pkg.github.com"
},
"repository": {
"type": "git",
"url": "https://github.com/triggerdotdev/trigger.dev",
"url": "https://github.com/BasicBlock/trigger.dev",
"directory": "packages/trigger-sdk"
},
"type": "module",
Expand Down
8 changes: 4 additions & 4 deletions scripts/publish-prerelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ fi

read -e -p "Pausing for manual changes, press Enter when ready to continue..."

echo "Running: pnpm run clean --filter \"@trigger.dev/*\" --filter \"trigger.dev\""
pnpm run clean --filter "@trigger.dev/*" --filter "trigger.dev"
echo "Running: pnpm run clean --filter \"@trigger.dev/*\" --filter \"@basicblock/trigger-cli\""
pnpm run clean --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"

echo "Running: pnpm run build --filter \"@trigger.dev/*\" --filter \"trigger.dev\""
pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
echo "Running: pnpm run build --filter \"@trigger.dev/*\" --filter \"@basicblock/trigger-cli\""
pnpm run build --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"

echo "Going to run: pnpm exec changeset publish --no-git-tag --snapshot --tag $version"
read -p "Do you wish to continue? (y/N): " prompt
Expand Down