Skip to content

Commit ded7861

Browse files
committed
Merge remote-tracking branch 'origin/main' into features/replay-ui
# Conflicts: # pnpm-lock.yaml # references/v3-catalog/package.json
2 parents a6d6146 + 7268f17 commit ded7861

File tree

10 files changed

+347
-52
lines changed

10 files changed

+347
-52
lines changed

.changeset/few-students-share.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 permissions inside node_modules

.changeset/pre.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"clean-pianos-listen",
5050
"cool-glasses-bake",
5151
"eight-pumas-float",
52+
"few-students-share",
5253
"green-bags-wink",
5354
"khaki-apricots-design",
5455
"late-icons-lie",
@@ -67,6 +68,7 @@
6768
"strange-ghosts-matter",
6869
"stupid-bulldogs-applaud",
6970
"sweet-lizards-press",
70-
"tall-bees-wave"
71+
"tall-bees-wave",
72+
"tame-guests-know"
7173
]
7274
}

.changeset/tame-guests-know.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+
Changed the binary name from trigger.dev to triggerdev to fix a Windows issue

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
"type": "node-terminal",
3434
"request": "launch",
3535
"name": "Debug V3 Dev CLI",
36-
"command": "pnpm exec trigger.dev dev --log-level debug",
36+
"command": "pnpm exec triggerdev dev --log-level debug",
3737
"cwd": "${workspaceFolder}/references/v3-catalog",
3838
"sourceMaps": true
3939
},
4040
{
4141
"type": "node-terminal",
4242
"request": "launch",
4343
"name": "Debug V3 Deploy CLI",
44-
"command": "pnpm exec trigger.dev deploy",
44+
"command": "pnpm exec triggerdev deploy",
4545
"cwd": "${workspaceFolder}/references/v3-catalog",
4646
"sourceMaps": true
4747
},

packages/cli-v3/CHANGELOG.md

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

3+
## 3.0.0-beta.7
4+
5+
### Patch Changes
6+
7+
- 624ddce32: Fix permissions inside node_modules
8+
- 9be1557bb: Changed the binary name from trigger.dev to triggerdev to fix a Windows issue
9+
310
## 3.0.0-beta.6
411

512
### 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.0.0-beta.6",
3+
"version": "3.0.0-beta.7",
44
"description": "A Command-Line Interface for Trigger.dev (v3) projects",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -32,7 +32,7 @@
3232
"type": "module",
3333
"exports": "./dist/index.js",
3434
"bin": {
35-
"trigger.dev": "./dist/index.js"
35+
"triggerdev": "./dist/index.js"
3636
},
3737
"devDependencies": {
3838
"@trigger.dev/core-apps": "workspace:*",
@@ -135,4 +135,4 @@
135135
"engines": {
136136
"node": ">=18.0.0"
137137
}
138-
}
138+
}

packages/cli-v3/src/Containerfile.prod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ WORKDIR /app
1212

1313
# copy all the files just in case anything is needed in postinstall
1414
COPY --chown=node:node . .
15+
16+
USER node
1517
RUN npm ci --no-fund --no-audit && npm cache clean --force
1618

1719
# Development or production stage builds upon the base stage

pnpm-lock.yaml

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

references/v3-catalog/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
"version": "0.1.0",
44
"private": true,
55
"scripts": {
6-
"dev:trigger": "trigger.dev dev",
6+
"dev:trigger": "triggerdev dev",
77
"management": "ts-node ./src/management.ts"
88
},
99
"dependencies": {
10+
"@ffmpeg-installer/ffmpeg": "^1.1.0",
11+
"@ffprobe-installer/ffprobe": "^2.1.2",
1012
"@opentelemetry/api": "^1.8.0",
1113
"@sindresorhus/slugify": "^2.2.1",
1214
"@traceloop/instrumentation-openai": "^0.3.9",
1315
"@trigger.dev/core": "workspace:^3.0.0-beta.0",
1416
"@trigger.dev/sdk": "workspace:^3.0.0-beta.0",
1517
"dotenv": "^16.4.5",
18+
"execa": "^8.0.1",
1619
"msw": "^2.2.1",
1720
"openai": "^4.28.0",
1821
"stripe": "^12.14.0",

0 commit comments

Comments
 (0)