Merge branch 'staging' into nate/dashboard-links

This commit is contained in:
Nate Kelley 2025-07-07 10:22:37 -06:00
commit 584bbbaefe
No known key found for this signature in database
GPG Key ID: FD90372AB8D98B4F
15 changed files with 61 additions and 86 deletions

View File

@ -1,47 +0,0 @@
name: Deploy Trigger.dev Tasks - Staging
on:
push:
branches:
- staging
jobs:
deploy-staging:
runs-on: blacksmith-8vcpu-ubuntu-2204
environment: staging
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22.x'
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 9.15.0
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Setup pnpm cache
uses: actions/cache@v3
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: 🚀 Deploy to Staging
env:
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
run: |
cd apps/trigger
pnpm dlx trigger.dev@v4-beta deploy --env staging

View File

@ -1,14 +1,13 @@
name: Deploy Trigger.dev Tasks - Production
name: Deploy Trigger.dev Tasks
on:
push:
branches:
- main
branches: [main, staging]
jobs:
deploy-production:
deploy:
runs-on: blacksmith-8vcpu-ubuntu-2204
environment: production
environment: ${{ github.ref_name }}
steps:
- name: Checkout code
uses: actions/checkout@v4
@ -39,9 +38,9 @@ jobs:
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: 🚀 Deploy to Production
- name: 🚀 Deploy to ${{ github.ref_name == 'main' && 'Production' || 'Staging' }}
env:
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
run: |
cd apps/trigger
pnpm dlx trigger.dev@v4-beta deploy --env production
pnpm dlx trigger.dev@v4-beta.22 deploy --env ${{ github.ref_name == 'main' && 'production' || 'staging' }}

View File

@ -5,6 +5,10 @@
"start": {
"dependsOn": ["@buster/database#dev"],
"outputs": []
},
"dev": {
"dependsOn": ["@buster/database#dev"],
"outputs": []
}
}
}

View File

@ -37,7 +37,7 @@
"zod": "catalog:"
},
"devDependencies": {
"@vercel/node": "^5.3.0",
"@vercel/node": "^5.3.3",
"tsup": "^8.5.0"
}
}

View File

@ -24,13 +24,13 @@
"@buster/typescript-config": "workspace:*",
"@buster/vitest-config": "workspace:*",
"@mastra/core": "catalog:",
"@trigger.dev/sdk": "4.0.0-v4-beta.21",
"@trigger.dev/sdk": "4.0.0-v4-beta.22",
"ai": "catalog:",
"braintrust": "^0.0.206",
"braintrust": "^0.0.209",
"vitest": "catalog:",
"zod": "catalog:"
},
"devDependencies": {
"@trigger.dev/build": "4.0.0-v4-beta.21"
"@trigger.dev/build": "4.0.0-v4-beta.22"
}
}

View File

@ -32,9 +32,9 @@
"@dnd-kit/modifiers": "^9.0.0",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@electric-sql/client": "^1.0.5",
"@electric-sql/client": "^1.0.6",
"@electric-sql/react": "^1.0.5",
"@faker-js/faker": "^9.8.0",
"@faker-js/faker": "^9.9.0",
"@llm-ui/code": "^0.13.3",
"@llm-ui/markdown": "^0.13.3",
"@llm-ui/react": "^0.13.3",
@ -57,11 +57,11 @@
"@radix-ui/react-tabs": "^1.1.12",
"@radix-ui/react-tooltip": "^1.2.7",
"@radix-ui/react-visually-hidden": "^1.2.3",
"@storybook/addon-actions": "^8.6.12",
"@storybook/addon-actions": "^8.6.14",
"@supabase/ssr": "^0.6.1",
"@supabase/supabase-js": "catalog:",
"@tanstack/query-sync-storage-persister": "^5.81.5",
"@tanstack/react-form": "^1.12.4",
"@tanstack/react-form": "^1.14.0",
"@tanstack/react-query": "^5.81.5",
"@tanstack/react-query-devtools": "^5.81.5",
"@tanstack/react-query-persist-client": "^5.81.5",
@ -96,7 +96,7 @@
"monaco-editor": "^0.52.2",
"monaco-sql-languages": "^0.15.1",
"monaco-yaml": "^5.4.0",
"msw": "^2.10.2",
"msw": "^2.10.3",
"mutative": "^1.2.0",
"next": "14.2.30",
"next-themes": "^0.4.6",
@ -105,11 +105,11 @@
"posthog-js": "^1.256.2",
"prettier": "^3.6.2",
"prettier-plugin-tailwindcss": "^0.6.13",
"react": "^18",
"react": "^18.3.1",
"react-color": "^2.19.3",
"react-colorful": "^5.6.1",
"react-day-picker": "8.10.1",
"react-dom": "^18",
"react-dom": "^18.3.1",
"react-hotkeys-hook": "^5.1.0",
"react-markdown": "^10.1.0",
"react-syntax-highlighter": "^15.6.1",
@ -139,8 +139,8 @@
"@storybook/addon-essentials": "^8.6.14",
"@storybook/addon-interactions": "^8.6.14",
"@storybook/blocks": "^8.6.14",
"@storybook/nextjs": "^8.6.12",
"@storybook/react": "^8.6.12",
"@storybook/nextjs": "^8.6.14",
"@storybook/react": "^8.6.14",
"@storybook/test": "^8.6.14",
"@tailwindcss/postcss": "4.1.11",
"@testing-library/react": "^16.3.0",
@ -151,12 +151,12 @@
"@types/node": "^20",
"@types/papaparse": "^5.3.16",
"@types/pluralize": "^0.0.33",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react": "^18.3.23",
"@types/react-dom": "^18.3.7",
"@types/react-scroll-to-bottom": "^4.2.5",
"@types/react-syntax-highlighter": "^15.5.13",
"@vitest/ui": "^3.2.4",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-next": "15.3.4",
"eslint-config-prettier": "^10.1.5",
"eslint-plugin-storybook": "^0.12.0",

View File

@ -28,6 +28,10 @@
"lint": "turbo lint",
"new:package": "bun run scripts/new-package.ts",
"test": "dotenv -e .env -- turbo test",
"test:unit": "dotenv -e .env -- turbo run test:unit",
"test:integration": "dotenv -e .env -- turbo run test:integration",
"test:unit:watch": "dotenv -e .env -- turbo run test:unit:watch",
"test:integration:watch": "dotenv -e .env -- turbo run test:integration:watch",
"test:coverage": "turbo test:coverage",
"test:ui": "vitest --ui",
"test:watch": "turbo test:watch",
@ -39,12 +43,12 @@
"typescript": "^5.8.3"
},
"dependencies": {
"dotenv": "^16.5.0",
"dotenv": "^16.6.1",
"dotenv-cli": "^8.0.0"
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@types/node": "^20.17.57",
"@types/node": "^20.19.4",
"turbo": "^2.5.4",
"vitest": "catalog:"
},

View File

@ -37,7 +37,7 @@
"@buster/typescript-config": "workspace:*",
"@buster/vitest-config": "workspace:*",
"@mastra/core": "catalog:",
"@mastra/loggers": "^0.10.2",
"@mastra/loggers": "^0.10.3",
"ai": "catalog:",
"braintrust": "^0.0.206",
"drizzle-orm": "catalog:",

View File

@ -35,8 +35,8 @@
"mssql": "^11.0.1",
"mysql2": "^3.14.1",
"pg": "catalog:",
"pg-cursor": "^2.15.2",
"snowflake-sdk": "^2.1.0"
"pg-cursor": "^2.15.3",
"snowflake-sdk": "^2.1.1"
},
"devDependencies": {
"@types/mssql": "^9.1.7",

View File

@ -81,7 +81,7 @@ describe('Adapter Timeout Tests', () => {
() =>
new Promise((resolve) => {
// Never resolve to simulate timeout
setTimeout(() => resolve({ rows: [], fields: [] }), 60000);
setTimeout(() => resolve({ rows: [], fields: [] }), 5000);
})
),
end: vi.fn().mockResolvedValue(undefined),
@ -161,7 +161,7 @@ describe('Adapter Timeout Tests', () => {
() =>
new Promise((resolve) => {
// Never resolve to simulate timeout
setTimeout(() => resolve([[], []]), 60000);
setTimeout(() => resolve([[], []]), 5000);
})
),
end: vi.fn().mockResolvedValue(undefined),
@ -238,7 +238,7 @@ describe('Adapter Timeout Tests', () => {
() =>
new Promise((resolve) => {
// Never resolve to simulate timeout
setTimeout(() => resolve({ recordset: [] }), 60000);
setTimeout(() => resolve({ recordset: [] }), 5000);
})
),
input: vi.fn(),
@ -282,7 +282,7 @@ describe('Adapter Timeout Tests', () => {
() =>
new Promise((resolve) => {
// Never resolve to simulate timeout
setTimeout(() => resolve([[], []]), 60000);
setTimeout(() => resolve([[], []]), 5000);
})
),
end: vi.fn().mockResolvedValue(undefined),

View File

@ -26,12 +26,12 @@
"test:integration": "vitest run src/**/*.int.test.ts"
},
"dependencies": {
"@slack/web-api": "^6.10.0",
"@slack/web-api": "^6.13.0",
"zod": "catalog:"
},
"devDependencies": {
"@buster/typescript-config": "workspace:*",
"@buster/vitest-config": "workspace:*",
"tsx": "^4.0.0"
"tsx": "^4.20.3"
}
}

View File

@ -30,7 +30,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@ai-sdk/openai": "^1.3.22",
"@ai-sdk/openai": "^1.3.23",
"@buster/database": "workspace:*",
"@buster/typescript-config": "workspace:*",
"@buster/vitest-config": "workspace:*",

View File

@ -16,6 +16,6 @@
"dependencies": {
"@buster/typescript-config": "workspace:*",
"@buster/vitest-config": "workspace:*",
"@mendable/firecrawl-js": "^1.26.0"
"@mendable/firecrawl-js": "^1.29.1"
}
}

View File

@ -11,8 +11,8 @@ packages:
catalog:
"@supabase/supabase-js": "^2.50.0"
"@trigger.dev/build": "^4.0.0-v4-beta.21"
"@trigger.dev/sdk": "^4.0.0-v4-beta.21"
"@trigger.dev/build": "^4.0.0-v4-beta.22"
"@trigger.dev/sdk": "^4.0.0-v4-beta.22"
ai: "^4.0.0"
axios: "^1.10.0"
drizzle-orm: "^0.44.2"

View File

@ -8,7 +8,8 @@
},
"dev": {
"cache": false,
"persistent": true
"persistent": true,
"dependsOn": ["@buster/database#dev"]
},
"lint": {
"dependsOn": ["^build", "^lint"]
@ -19,10 +20,24 @@
"test": {
"dependsOn": ["^build"]
},
"test:unit": {
"dependsOn": ["^build"]
},
"test:integration": {
"dependsOn": ["^build"]
},
"test:watch": {
"cache": false,
"persistent": true
},
"test:unit:watch": {
"cache": false,
"persistent": true
},
"test:integration:watch": {
"cache": false,
"persistent": true
},
"test:coverage": {
"dependsOn": ["^build"],
"outputs": ["coverage/**"]