trigger.dev 3.3.16 → 4.0.0-v4-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (126) hide show
  1. package/README.md +31 -0
  2. package/dist/esm/apiClient.d.ts +75 -72
  3. package/dist/esm/apiClient.js +207 -31
  4. package/dist/esm/apiClient.js.map +1 -1
  5. package/dist/esm/build/buildWorker.d.ts +7 -6
  6. package/dist/esm/build/buildWorker.js +10 -36
  7. package/dist/esm/build/buildWorker.js.map +1 -1
  8. package/dist/esm/build/bundle.d.ts +12 -1
  9. package/dist/esm/build/bundle.js +61 -19
  10. package/dist/esm/build/bundle.js.map +1 -1
  11. package/dist/esm/build/entryPoints.js +17 -6
  12. package/dist/esm/build/entryPoints.js.map +1 -1
  13. package/dist/esm/build/packageModules.d.ts +14 -5
  14. package/dist/esm/build/packageModules.js +135 -35
  15. package/dist/esm/build/packageModules.js.map +1 -1
  16. package/dist/esm/cli/common.js +5 -3
  17. package/dist/esm/cli/common.js.map +1 -1
  18. package/dist/esm/cli/index.js +6 -0
  19. package/dist/esm/cli/index.js.map +1 -1
  20. package/dist/esm/commands/deploy.js +25 -3
  21. package/dist/esm/commands/deploy.js.map +1 -1
  22. package/dist/esm/commands/dev.d.ts +9 -0
  23. package/dist/esm/commands/dev.js +10 -1
  24. package/dist/esm/commands/dev.js.map +1 -1
  25. package/dist/esm/commands/list-profiles.d.ts +2 -6
  26. package/dist/esm/commands/list-profiles.js +7 -4
  27. package/dist/esm/commands/list-profiles.js.map +1 -1
  28. package/dist/esm/commands/login.js +3 -2
  29. package/dist/esm/commands/login.js.map +1 -1
  30. package/dist/esm/commands/promote.d.ts +3 -0
  31. package/dist/esm/commands/promote.js +75 -0
  32. package/dist/esm/commands/promote.js.map +1 -0
  33. package/dist/esm/commands/switch.d.ts +19 -0
  34. package/dist/esm/commands/switch.js +68 -0
  35. package/dist/esm/commands/switch.js.map +1 -0
  36. package/dist/esm/commands/trigger.d.ts +33 -0
  37. package/dist/esm/commands/trigger.js +88 -0
  38. package/dist/esm/commands/trigger.js.map +1 -0
  39. package/dist/esm/commands/workers/build.d.ts +4 -0
  40. package/dist/esm/commands/workers/build.js +340 -0
  41. package/dist/esm/commands/workers/build.js.map +1 -0
  42. package/dist/esm/commands/workers/create.d.ts +2 -0
  43. package/dist/esm/commands/workers/create.js +91 -0
  44. package/dist/esm/commands/workers/create.js.map +1 -0
  45. package/dist/esm/commands/workers/index.d.ts +2 -0
  46. package/dist/esm/commands/workers/index.js +13 -0
  47. package/dist/esm/commands/workers/index.js.map +1 -0
  48. package/dist/esm/commands/workers/list.d.ts +2 -0
  49. package/dist/esm/commands/workers/list.js +80 -0
  50. package/dist/esm/commands/workers/list.js.map +1 -0
  51. package/dist/esm/commands/workers/run.d.ts +2 -0
  52. package/dist/esm/commands/workers/run.js +105 -0
  53. package/dist/esm/commands/workers/run.js.map +1 -0
  54. package/dist/esm/config.js +11 -1
  55. package/dist/esm/config.js.map +1 -1
  56. package/dist/esm/deploy/buildImage.d.ts +1 -1
  57. package/dist/esm/deploy/buildImage.js +54 -34
  58. package/dist/esm/deploy/buildImage.js.map +1 -1
  59. package/dist/esm/dev/backgroundWorker.d.ts +2 -240
  60. package/dist/esm/dev/backgroundWorker.js +8 -305
  61. package/dist/esm/dev/backgroundWorker.js.map +1 -1
  62. package/dist/esm/dev/devOutput.js +13 -5
  63. package/dist/esm/dev/devOutput.js.map +1 -1
  64. package/dist/esm/dev/devSession.js +25 -48
  65. package/dist/esm/dev/devSession.js.map +1 -1
  66. package/dist/esm/dev/devSupervisor.d.ts +12 -0
  67. package/dist/esm/dev/devSupervisor.js +515 -0
  68. package/dist/esm/dev/devSupervisor.js.map +1 -0
  69. package/dist/esm/dev/lock.d.ts +1 -0
  70. package/dist/esm/dev/lock.js +80 -0
  71. package/dist/esm/dev/lock.js.map +1 -0
  72. package/dist/esm/dev/mcpServer.d.ts +10 -0
  73. package/dist/esm/dev/mcpServer.js +201 -0
  74. package/dist/esm/dev/mcpServer.js.map +1 -0
  75. package/dist/esm/dev/workerRuntime.d.ts +0 -1
  76. package/dist/esm/dev/workerRuntime.js +1 -322
  77. package/dist/esm/dev/workerRuntime.js.map +1 -1
  78. package/dist/esm/entryPoints/dev-index-worker.js +9 -7
  79. package/dist/esm/entryPoints/dev-index-worker.js.map +1 -1
  80. package/dist/esm/entryPoints/dev-run-controller.d.ts +53 -0
  81. package/dist/esm/entryPoints/dev-run-controller.js +615 -0
  82. package/dist/esm/entryPoints/dev-run-controller.js.map +1 -0
  83. package/dist/esm/entryPoints/dev-run-worker.js +252 -169
  84. package/dist/esm/entryPoints/dev-run-worker.js.map +1 -1
  85. package/dist/esm/entryPoints/{deploy-index-controller.js → managed-index-controller.js} +3 -1
  86. package/dist/esm/entryPoints/managed-index-controller.js.map +1 -0
  87. package/dist/esm/entryPoints/{deploy-index-worker.js → managed-index-worker.js} +12 -24
  88. package/dist/esm/entryPoints/managed-index-worker.js.map +1 -0
  89. package/dist/esm/entryPoints/managed-run-controller.js +1350 -0
  90. package/dist/esm/entryPoints/managed-run-controller.js.map +1 -0
  91. package/dist/esm/entryPoints/{deploy-run-worker.js → managed-run-worker.js} +113 -68
  92. package/dist/esm/entryPoints/managed-run-worker.js.map +1 -0
  93. package/dist/esm/executions/taskRunProcess.d.ts +18 -73
  94. package/dist/esm/executions/taskRunProcess.js +76 -28
  95. package/dist/esm/executions/taskRunProcess.js.map +1 -1
  96. package/dist/esm/indexing/indexWorkerManifest.d.ts +9 -2
  97. package/dist/esm/indexing/registerResources.d.ts +2 -0
  98. package/dist/esm/indexing/registerResources.js +40 -0
  99. package/dist/esm/indexing/registerResources.js.map +1 -0
  100. package/dist/esm/utilities/configFiles.d.ts +36 -15
  101. package/dist/esm/utilities/configFiles.js +73 -26
  102. package/dist/esm/utilities/configFiles.js.map +1 -1
  103. package/dist/esm/utilities/eventBus.d.ts +6 -3
  104. package/dist/esm/utilities/eventBus.js.map +1 -1
  105. package/dist/esm/utilities/githubActions.d.ts +4 -0
  106. package/dist/esm/utilities/githubActions.js +18 -0
  107. package/dist/esm/utilities/githubActions.js.map +1 -0
  108. package/dist/esm/utilities/initialBanner.js +18 -6
  109. package/dist/esm/utilities/initialBanner.js.map +1 -1
  110. package/dist/esm/utilities/sanitizeEnvVars.d.ts +16 -3
  111. package/dist/esm/utilities/sanitizeEnvVars.js +15 -0
  112. package/dist/esm/utilities/sanitizeEnvVars.js.map +1 -1
  113. package/dist/esm/version.js +1 -1
  114. package/package.json +12 -6
  115. package/dist/esm/entryPoints/deploy-index-controller.js.map +0 -1
  116. package/dist/esm/entryPoints/deploy-index-worker.js.map +0 -1
  117. package/dist/esm/entryPoints/deploy-run-controller.js +0 -1099
  118. package/dist/esm/entryPoints/deploy-run-controller.js.map +0 -1
  119. package/dist/esm/entryPoints/deploy-run-worker.js.map +0 -1
  120. package/dist/esm/indexing/registerTasks.d.ts +0 -2
  121. package/dist/esm/indexing/registerTasks.js +0 -62
  122. package/dist/esm/indexing/registerTasks.js.map +0 -1
  123. /package/dist/esm/entryPoints/{deploy-index-controller.d.ts → managed-index-controller.d.ts} +0 -0
  124. /package/dist/esm/entryPoints/{deploy-index-worker.d.ts → managed-index-worker.d.ts} +0 -0
  125. /package/dist/esm/entryPoints/{deploy-run-controller.d.ts → managed-run-controller.d.ts} +0 -0
  126. /package/dist/esm/entryPoints/{deploy-run-worker.d.ts → managed-run-worker.d.ts} +0 -0
@@ -4,8 +4,19 @@ import { VERSION } from "../version.js";
4
4
  import { chalkGrey, chalkRun, chalkTask, chalkWorker, logo } from "./cliOutput.js";
5
5
  import { logger } from "./logger.js";
6
6
  import { spinner } from "./windows.js";
7
+ import { DEFFAULT_PROFILE, readAuthConfigCurrentProfileName, readAuthConfigProfile, } from "./configFiles.js";
8
+ import { CLOUD_API_URL } from "../consts.js";
9
+ function getProfileInfo() {
10
+ const currentProfile = readAuthConfigCurrentProfileName();
11
+ const profile = readAuthConfigProfile(currentProfile);
12
+ if (currentProfile === DEFFAULT_PROFILE || !profile) {
13
+ return;
14
+ }
15
+ return `Profile: ${currentProfile}${profile.apiUrl === CLOUD_API_URL ? "" : ` - ${profile.apiUrl}`}`;
16
+ }
7
17
  export async function printInitialBanner(performUpdateCheck = true) {
8
- const text = `\n${logo()} ${chalkGrey(`(${VERSION})`)}\n`;
18
+ const profileInfo = getProfileInfo();
19
+ const text = `\n${logo()} ${chalkGrey(`(${VERSION})`)}${profileInfo ? chalkGrey(` | ${profileInfo}`) : ""}\n`;
9
20
  logger.info(text);
10
21
  let maybeNewVersion;
11
22
  if (performUpdateCheck) {
@@ -32,19 +43,20 @@ After installation, run Trigger.dev with \`npx trigger.dev\`.`);
32
43
  }
33
44
  }
34
45
  export async function printStandloneInitialBanner(performUpdateCheck = true) {
46
+ const profileInfo = getProfileInfo();
47
+ const profileText = profileInfo ? chalkGrey(` | ${profileInfo}`) : "";
48
+ let versionText = `\n${logo()} ${chalkGrey(`(${VERSION})`)}`;
35
49
  if (performUpdateCheck) {
36
50
  const maybeNewVersion = await updateCheck();
37
51
  // Log a slightly more noticeable message if this is a major bump
38
52
  if (maybeNewVersion !== undefined) {
39
- logger.log(`\n${logo()} ${chalkGrey(`(${VERSION} -> ${chalk.green(maybeNewVersion)})`)}`);
53
+ versionText = `\n${logo()} ${chalkGrey(`(${VERSION} -> ${chalk.green(maybeNewVersion)})`)}`;
40
54
  }
41
55
  else {
42
- logger.log(`\n${logo()} ${chalkGrey(`(${VERSION})`)}`);
56
+ versionText = `\n${logo()} ${chalkGrey(`(${VERSION})`)}`;
43
57
  }
44
58
  }
45
- else {
46
- logger.log(`\n${logo()} ${chalkGrey(`(${VERSION})`)}`);
47
- }
59
+ logger.log(`${versionText}${profileText}`);
48
60
  logger.log(`${chalkGrey("-".repeat(54))}`);
49
61
  }
50
62
  export function printDevBanner(printTopBorder = true) {
@@ -1 +1 @@
1
- {"version":3,"file":"initialBanner.js","sourceRoot":"","sources":["../../../src/utilities/initialBanner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"initialBanner.js","sourceRoot":"","sources":["../../../src/utilities/initialBanner.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,16 @@
1
- export declare const sanitizeEnvVars: (obj: Record<string, string | undefined>) => {
2
- [k: string]: string | undefined;
3
- };
1
+ /**
2
+ * Sanitizes environment variables by removing entries with empty or undefined values.
3
+ *
4
+ * @param obj - An object containing environment variables as key-value pairs
5
+ * @returns A new object containing only non-empty string values
6
+ *
7
+ * @example
8
+ * const envVars = {
9
+ * API_KEY: "123",
10
+ * EMPTY_VAR: "",
11
+ * UNDEFINED_VAR: undefined,
12
+ * WHITESPACE: " "
13
+ * };
14
+ * sanitizeEnvVars(envVars); // Returns { API_KEY: "123" }
15
+ */
16
+ export declare const sanitizeEnvVars: (obj: Record<string, string | undefined>) => Record<string, string>;
@@ -1,3 +1,18 @@
1
+ /**
2
+ * Sanitizes environment variables by removing entries with empty or undefined values.
3
+ *
4
+ * @param obj - An object containing environment variables as key-value pairs
5
+ * @returns A new object containing only non-empty string values
6
+ *
7
+ * @example
8
+ * const envVars = {
9
+ * API_KEY: "123",
10
+ * EMPTY_VAR: "",
11
+ * UNDEFINED_VAR: undefined,
12
+ * WHITESPACE: " "
13
+ * };
14
+ * sanitizeEnvVars(envVars); // Returns { API_KEY: "123" }
15
+ */
1
16
  export const sanitizeEnvVars = (obj) => {
2
17
  return Object.fromEntries(Object.entries(obj).filter(([, value]) => typeof value === "string" ? !!value.trim() : !!value));
3
18
  };
@@ -1 +1 @@
1
- {"version":3,"file":"sanitizeEnvVars.js","sourceRoot":"","sources":["../../../src/utilities/sanitizeEnvVars.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAuC,EAAE,EAAE;IACzE,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CACvC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CACrD,CACF,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"sanitizeEnvVars.js","sourceRoot":"","sources":["../../../src/utilities/sanitizeEnvVars.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,GAAuC,EACf,EAAE;IAC1B,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CACvC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CACrD,CACwB,CAAC;AAC9B,CAAC,CAAC"}
@@ -1,2 +1,2 @@
1
- export const VERSION = "3.3.16";
1
+ export const VERSION = "4.0.0-v4-beta.0";
2
2
  //# sourceMappingURL=version.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "trigger.dev",
3
- "version": "3.3.16",
3
+ "version": "4.0.0-v4-beta.0",
4
4
  "description": "A Command-Line Interface for Trigger.dev (v3) projects",
5
5
  "type": "module",
6
6
  "license": "MIT",
@@ -46,9 +46,10 @@
46
46
  },
47
47
  "devDependencies": {
48
48
  "@epic-web/test-server": "^0.1.0",
49
+ "@types/eventsource": "^1.1.15",
49
50
  "@types/gradient-string": "^1.1.2",
50
- "@types/node": "20.14.14",
51
51
  "@types/object-hash": "3.0.6",
52
+ "@types/polka": "^0.5.7",
52
53
  "@types/react": "^18.2.48",
53
54
  "@types/resolve": "^1.20.6",
54
55
  "@types/rimraf": "^4.0.5",
@@ -62,12 +63,12 @@
62
63
  "ts-essentials": "10.0.1",
63
64
  "tshy": "^3.0.2",
64
65
  "tsx": "4.17.0",
65
- "typescript": "^5.5.4",
66
66
  "vitest": "^2.0.5"
67
67
  },
68
68
  "dependencies": {
69
- "@clack/prompts": "^0.7.0",
69
+ "@clack/prompts": "^0.10.0",
70
70
  "@depot/cli": "0.0.1-cli.2.80.0",
71
+ "@modelcontextprotocol/sdk": "^1.6.1",
71
72
  "@opentelemetry/api": "1.9.0",
72
73
  "@opentelemetry/api-logs": "0.52.1",
73
74
  "@opentelemetry/exporter-logs-otlp-http": "0.52.1",
@@ -80,8 +81,8 @@
80
81
  "@opentelemetry/sdk-trace-base": "1.25.1",
81
82
  "@opentelemetry/sdk-trace-node": "1.25.1",
82
83
  "@opentelemetry/semantic-conventions": "1.25.1",
83
- "@trigger.dev/build": "3.3.16",
84
- "@trigger.dev/core": "3.3.16",
84
+ "@trigger.dev/build": "4.0.0-v4-beta.0",
85
+ "@trigger.dev/core": "4.0.0-v4-beta.0",
85
86
  "c12": "^1.11.1",
86
87
  "chalk": "^5.2.0",
87
88
  "chokidar": "^3.6.0",
@@ -90,6 +91,7 @@
90
91
  "defu": "^6.1.4",
91
92
  "dotenv": "^16.4.5",
92
93
  "esbuild": "^0.23.0",
94
+ "eventsource": "^3.0.2",
93
95
  "evt": "^2.4.13",
94
96
  "fast-npm-meta": "^0.2.2",
95
97
  "gradient-string": "^2.0.2",
@@ -102,12 +104,15 @@
102
104
  "nypm": "^0.3.9",
103
105
  "object-hash": "^3.0.0",
104
106
  "open": "^10.0.3",
107
+ "p-limit": "^6.2.0",
105
108
  "p-retry": "^6.1.0",
106
109
  "partysocket": "^1.0.2",
107
110
  "pkg-types": "^1.1.3",
111
+ "polka": "^0.5.2",
108
112
  "resolve": "^1.22.8",
109
113
  "semver": "^7.5.0",
110
114
  "signal-exit": "^4.1.0",
115
+ "socket.io-client": "4.7.5",
111
116
  "source-map-support": "0.5.21",
112
117
  "std-env": "^3.7.0",
113
118
  "terminal-link": "^3.0.0",
@@ -132,6 +137,7 @@
132
137
  }
133
138
  },
134
139
  "scripts": {
140
+ "clean": "rimraf dist .tshy .tshy-build .turbo",
135
141
  "typecheck": "tsc -p tsconfig.src.json --noEmit",
136
142
  "build": "tshy && pnpm run update-version",
137
143
  "dev": "tshy --watch",
@@ -1 +0,0 @@
1
- {"version":3,"file":"deploy-index-controller.js","sourceRoot":"","sources":["../../../src/entryPoints/deploy-index-controller.ts"],"names":[],"mappings":"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"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"deploy-index-worker.js","sourceRoot":"","sources":["../../../src/entryPoints/deploy-index-worker.ts"],"names":[],"mappings":"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"}