trigger.dev 0.0.0-v3-prerelease-20240916204007 → 0.0.0-v3-prerelease-20241008084610
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.
- package/dist/esm/apiClient.d.ts +10 -8
- package/dist/esm/build/buildWorker.d.ts +4 -4
- package/dist/esm/build/buildWorker.js +4 -1
- package/dist/esm/build/buildWorker.js.map +1 -1
- package/dist/esm/build/externals.js +11 -6
- package/dist/esm/build/externals.js.map +1 -1
- package/dist/esm/cli/common.d.ts +2 -2
- package/dist/esm/commands/deploy.js +3 -0
- package/dist/esm/commands/deploy.js.map +1 -1
- package/dist/esm/commands/dev.d.ts +3 -3
- package/dist/esm/commands/dev.js +1 -0
- package/dist/esm/commands/dev.js.map +1 -1
- package/dist/esm/commands/init.js +1 -2
- package/dist/esm/commands/init.js.map +1 -1
- package/dist/esm/commands/list-profiles.d.ts +2 -2
- package/dist/esm/commands/login.d.ts +3 -2
- package/dist/esm/commands/login.js +7 -2
- package/dist/esm/commands/login.js.map +1 -1
- package/dist/esm/commands/logout.d.ts +2 -2
- package/dist/esm/commands/update.d.ts +2 -2
- package/dist/esm/commands/update.js +31 -18
- package/dist/esm/commands/update.js.map +1 -1
- package/dist/esm/commands/whoami.d.ts +3 -3
- package/dist/esm/commands/whoami.js +8 -5
- package/dist/esm/commands/whoami.js.map +1 -1
- package/dist/esm/config.js +13 -5
- package/dist/esm/config.js.map +1 -1
- package/dist/esm/deploy/buildImage.d.ts +1 -0
- package/dist/esm/deploy/buildImage.js +7 -4
- package/dist/esm/deploy/buildImage.js.map +1 -1
- package/dist/esm/dev/backgroundWorker.d.ts +9 -9
- package/dist/esm/dev/backgroundWorker.js +1 -1
- package/dist/esm/dev/backgroundWorker.js.map +1 -1
- package/dist/esm/dev/workerRuntime.js +1 -0
- package/dist/esm/dev/workerRuntime.js.map +1 -1
- package/dist/esm/entryPoints/deploy-index-controller.js +1 -0
- package/dist/esm/entryPoints/deploy-index-controller.js.map +1 -1
- package/dist/esm/entryPoints/deploy-index-worker.js +28 -2
- package/dist/esm/entryPoints/deploy-index-worker.js.map +1 -1
- package/dist/esm/entryPoints/deploy-run-worker.js +47 -12
- package/dist/esm/entryPoints/deploy-run-worker.js.map +1 -1
- package/dist/esm/entryPoints/dev-index-worker.js +14 -2
- package/dist/esm/entryPoints/dev-index-worker.js.map +1 -1
- package/dist/esm/entryPoints/dev-run-worker.js +44 -12
- package/dist/esm/entryPoints/dev-run-worker.js.map +1 -1
- package/dist/esm/executions/taskRunProcess.d.ts +4 -2
- package/dist/esm/indexing/indexWorkerManifest.d.ts +5 -4
- package/dist/esm/indexing/indexWorkerManifest.js +1 -0
- package/dist/esm/indexing/indexWorkerManifest.js.map +1 -1
- package/dist/esm/utilities/dotEnv.js +2 -1
- package/dist/esm/utilities/dotEnv.js.map +1 -1
- package/dist/esm/utilities/logger.d.ts +1 -1
- package/dist/esm/utilities/sourceFiles.js +1 -1
- package/dist/esm/utilities/sourceFiles.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +5 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,MAAM,EACN,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAE9B,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,MAAM,CAAC;IAC7D,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;CACnB,CAAC,CAAC;AAIH,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,OAAO,aAAa,CAClB,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,iEAAiE,CAAC,CAClF;SACE,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,4BAA4B,CAAC;SAC/D,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,eAAe,CAAC,KAAK,IAAI,EAAE;YAC/B,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAChC,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAgB;IACjD,OAAO,MAAM,iBAAiB,CAAC,cAAc,EAAE,mBAAmB,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1F,OAAO,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,OAA4B;IACvD,OAAO,KAAK,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAC7F,CAAC;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,13 @@ declare const LogoutCommandOptions: z.ZodObject<{
|
|
|
6
6
|
skipTelemetry: z.ZodDefault<z.ZodBoolean>;
|
|
7
7
|
profile: z.ZodDefault<z.ZodString>;
|
|
8
8
|
}, "strip", z.ZodTypeAny, {
|
|
9
|
-
logLevel: "error" | "
|
|
9
|
+
logLevel: "error" | "none" | "warn" | "info" | "log" | "debug";
|
|
10
10
|
skipTelemetry: boolean;
|
|
11
11
|
profile: string;
|
|
12
12
|
apiUrl?: string | undefined;
|
|
13
13
|
}, {
|
|
14
14
|
apiUrl?: string | undefined;
|
|
15
|
-
logLevel?: "error" | "
|
|
15
|
+
logLevel?: "error" | "none" | "warn" | "info" | "log" | "debug" | undefined;
|
|
16
16
|
skipTelemetry?: boolean | undefined;
|
|
17
17
|
profile?: string | undefined;
|
|
18
18
|
}>;
|
|
@@ -7,10 +7,10 @@ export declare const UpdateCommandOptions: z.ZodObject<Pick<{
|
|
|
7
7
|
skipTelemetry: z.ZodDefault<z.ZodBoolean>;
|
|
8
8
|
profile: z.ZodDefault<z.ZodString>;
|
|
9
9
|
}, "logLevel" | "skipTelemetry">, "strip", z.ZodTypeAny, {
|
|
10
|
-
logLevel: "
|
|
10
|
+
logLevel: "error" | "none" | "warn" | "info" | "log" | "debug";
|
|
11
11
|
skipTelemetry: boolean;
|
|
12
12
|
}, {
|
|
13
|
-
logLevel?: "
|
|
13
|
+
logLevel?: "error" | "none" | "warn" | "info" | "log" | "debug" | undefined;
|
|
14
14
|
skipTelemetry?: boolean | undefined;
|
|
15
15
|
}>;
|
|
16
16
|
export type UpdateCommandOptions = z.infer<typeof UpdateCommandOptions>;
|
|
@@ -11,6 +11,7 @@ import { spinner } from "../utilities/windows.js";
|
|
|
11
11
|
import { VERSION } from "../version.js";
|
|
12
12
|
import { hasTTY } from "std-env";
|
|
13
13
|
import nodeResolve from "resolve";
|
|
14
|
+
import * as semver from "semver";
|
|
14
15
|
export const UpdateCommandOptions = CommonCommandOptions.pick({
|
|
15
16
|
logLevel: true,
|
|
16
17
|
skipTelemetry: true,
|
|
@@ -31,7 +32,7 @@ export function configureUpdateCommand(program) {
|
|
|
31
32
|
}
|
|
32
33
|
const triggerPackageFilter = /^@trigger\.dev/;
|
|
33
34
|
export async function updateCommand(dir, options) {
|
|
34
|
-
await updateTriggerPackages(dir, options);
|
|
35
|
+
await updateTriggerPackages(dir, options, false);
|
|
35
36
|
}
|
|
36
37
|
export async function updateTriggerPackages(dir, options, embedded, requireUpdate) {
|
|
37
38
|
let hasOutput = false;
|
|
@@ -49,7 +50,7 @@ export async function updateTriggerPackages(dir, options, embedded, requireUpdat
|
|
|
49
50
|
return false;
|
|
50
51
|
}
|
|
51
52
|
const newCliVersion = await updateCheck();
|
|
52
|
-
if (newCliVersion) {
|
|
53
|
+
if (newCliVersion && !cliVersion.startsWith("0.0.0")) {
|
|
53
54
|
prettyWarning("You're not running the latest CLI version, please consider updating ASAP", `Current: ${cliVersion}\nLatest: ${newCliVersion}`, "Run latest: npx trigger.dev@latest");
|
|
54
55
|
hasOutput = true;
|
|
55
56
|
}
|
|
@@ -67,7 +68,7 @@ export async function updateTriggerPackages(dir, options, embedded, requireUpdat
|
|
|
67
68
|
mismatches.push(dep);
|
|
68
69
|
}
|
|
69
70
|
const isDowngrade = mismatches.some((dep) => {
|
|
70
|
-
return dep.version
|
|
71
|
+
return semver.gt(dep.version, targetVersion);
|
|
71
72
|
});
|
|
72
73
|
return {
|
|
73
74
|
mismatches,
|
|
@@ -78,20 +79,26 @@ export async function updateTriggerPackages(dir, options, embedded, requireUpdat
|
|
|
78
79
|
logger.debug("Version mismatches", { mismatches, isDowngrade });
|
|
79
80
|
if (mismatches.length === 0) {
|
|
80
81
|
if (!embedded) {
|
|
81
|
-
outro(`Nothing to
|
|
82
|
+
outro(`Nothing to update${newCliVersion ? " ..but you should really update your CLI!" : ""}`);
|
|
82
83
|
return hasOutput;
|
|
83
84
|
}
|
|
84
85
|
return hasOutput;
|
|
85
86
|
}
|
|
86
|
-
if (
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
87
|
+
if (embedded) {
|
|
88
|
+
if (isDowngrade) {
|
|
89
|
+
prettyError("Some of the installed @trigger.dev packages are newer than your CLI version");
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
if (embedded) {
|
|
93
|
+
prettyWarning("Mismatch between your CLI version and installed packages", "We recommend pinned versions for guaranteed compatibility");
|
|
94
|
+
}
|
|
95
|
+
}
|
|
91
96
|
}
|
|
92
97
|
if (!hasTTY) {
|
|
93
98
|
// Running in CI with version mismatch detected
|
|
94
|
-
|
|
99
|
+
if (embedded) {
|
|
100
|
+
outro("Deploy failed");
|
|
101
|
+
}
|
|
95
102
|
console.log(`ERROR: Version mismatch detected while running in CI. This won't end well. Aborting.
|
|
96
103
|
|
|
97
104
|
Please run the dev command locally and check that your CLI version matches the one printed below. Additionally, all \`@trigger.dev/*\` packages also need to match this version.
|
|
@@ -105,7 +112,7 @@ export async function updateTriggerPackages(dir, options, embedded, requireUpdat
|
|
|
105
112
|
process.exit(1);
|
|
106
113
|
}
|
|
107
114
|
// WARNING: We can only start accepting user input once we know this is a TTY, otherwise, the process will exit with an error in CI
|
|
108
|
-
if (isDowngrade) {
|
|
115
|
+
if (isDowngrade && embedded) {
|
|
109
116
|
printUpdateTable("Versions", mismatches, cliVersion, "installed", "CLI");
|
|
110
117
|
outro("CLI update required!");
|
|
111
118
|
logger.log(`${chalkError("X Error:")} Please update your CLI. Alternatively, use \`--skip-update-check\` at your own risk.\n`);
|
|
@@ -119,9 +126,15 @@ export async function updateTriggerPackages(dir, options, embedded, requireUpdat
|
|
|
119
126
|
}
|
|
120
127
|
if (!userWantsToUpdate) {
|
|
121
128
|
if (requireUpdate) {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
129
|
+
if (embedded) {
|
|
130
|
+
outro("You shall not pass!");
|
|
131
|
+
logger.log(`${chalkError("X Error:")} Update required: Version mismatches are a common source of bugs and errors. Please update or use \`--skip-update-check\` at your own risk.\n`);
|
|
132
|
+
process.exit(1);
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
outro("No updates applied");
|
|
136
|
+
process.exit(0);
|
|
137
|
+
}
|
|
125
138
|
}
|
|
126
139
|
if (!embedded) {
|
|
127
140
|
outro("You've been warned!");
|
|
@@ -129,7 +142,7 @@ export async function updateTriggerPackages(dir, options, embedded, requireUpdat
|
|
|
129
142
|
return hasOutput;
|
|
130
143
|
}
|
|
131
144
|
const installSpinner = spinner();
|
|
132
|
-
installSpinner.start("
|
|
145
|
+
installSpinner.start("Updating dependencies in package.json");
|
|
133
146
|
// Backup package.json
|
|
134
147
|
const packageJsonBackupPath = `${packageJsonPath}.bak`;
|
|
135
148
|
await writeJSONFile(packageJsonBackupPath, readonlyPackageJson, true);
|
|
@@ -149,11 +162,11 @@ export async function updateTriggerPackages(dir, options, embedded, requireUpdat
|
|
|
149
162
|
installSpinner.message("Installing new package versions");
|
|
150
163
|
const packageManager = await detectPackageManager(projectPath);
|
|
151
164
|
try {
|
|
152
|
-
installSpinner.message(`Installing new package versions with ${packageManager}`);
|
|
153
|
-
await installDependencies({ cwd: projectPath });
|
|
165
|
+
installSpinner.message(`Installing new package versions${packageManager ? ` with ${packageManager.name}` : ""}`);
|
|
166
|
+
await installDependencies({ cwd: projectPath, silent: true });
|
|
154
167
|
}
|
|
155
168
|
catch (error) {
|
|
156
|
-
installSpinner.stop(`Failed to install new package versions${packageManager ? ` with ${packageManager}` : ""}`);
|
|
169
|
+
installSpinner.stop(`Failed to install new package versions${packageManager ? ` with ${packageManager.name}` : ""}`);
|
|
157
170
|
// Remove exit handler in case of failure
|
|
158
171
|
process.removeListener("exit", exitHandler);
|
|
159
172
|
await revertPackageJsonChanges();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEtE,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AACjE,OAAO,EAAY,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAe,eAAe,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE7E,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC9F,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,2BAA2B,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,WAAW,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,18 +17,18 @@ declare const WhoamiCommandOptions: z.ZodObject<{
|
|
|
17
17
|
skipTelemetry: z.ZodDefault<z.ZodBoolean>;
|
|
18
18
|
profile: z.ZodDefault<z.ZodString>;
|
|
19
19
|
}, "strip", z.ZodTypeAny, {
|
|
20
|
-
logLevel: "error" | "
|
|
20
|
+
logLevel: "error" | "none" | "warn" | "info" | "log" | "debug";
|
|
21
21
|
skipTelemetry: boolean;
|
|
22
22
|
profile: string;
|
|
23
23
|
apiUrl?: string | undefined;
|
|
24
24
|
}, {
|
|
25
25
|
apiUrl?: string | undefined;
|
|
26
|
-
logLevel?: "error" | "
|
|
26
|
+
logLevel?: "error" | "none" | "warn" | "info" | "log" | "debug" | undefined;
|
|
27
27
|
skipTelemetry?: boolean | undefined;
|
|
28
28
|
profile?: string | undefined;
|
|
29
29
|
}>;
|
|
30
30
|
type WhoamiCommandOptions = z.infer<typeof WhoamiCommandOptions>;
|
|
31
31
|
export declare function configureWhoamiCommand(program: Command): Command;
|
|
32
32
|
export declare function whoAmICommand(options: unknown): Promise<WhoAmIResult>;
|
|
33
|
-
export declare function whoAmI(options?: WhoamiCommandOptions, embedded?: boolean): Promise<WhoAmIResult>;
|
|
33
|
+
export declare function whoAmI(options?: WhoamiCommandOptions, embedded?: boolean, silent?: boolean): Promise<WhoAmIResult>;
|
|
34
34
|
export {};
|
|
@@ -20,20 +20,23 @@ export async function whoAmICommand(options) {
|
|
|
20
20
|
return await whoAmI(opts);
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
|
-
export async function whoAmI(options, embedded = false) {
|
|
23
|
+
export async function whoAmI(options, embedded = false, silent = false) {
|
|
24
24
|
if (!embedded) {
|
|
25
25
|
intro(`Displaying your account details [${options?.profile ?? "default"}]`);
|
|
26
26
|
}
|
|
27
27
|
const loadingSpinner = spinner();
|
|
28
|
-
|
|
28
|
+
if (!silent) {
|
|
29
|
+
loadingSpinner.start("Checking your account details");
|
|
30
|
+
}
|
|
29
31
|
const authentication = await isLoggedIn(options?.profile);
|
|
30
32
|
if (!authentication.ok) {
|
|
31
33
|
if (authentication.error === "fetch failed") {
|
|
32
|
-
loadingSpinner.stop("Fetch failed. Platform down?");
|
|
34
|
+
!silent && loadingSpinner.stop("Fetch failed. Platform down?");
|
|
33
35
|
}
|
|
34
36
|
else {
|
|
35
37
|
if (embedded) {
|
|
36
|
-
|
|
38
|
+
!silent &&
|
|
39
|
+
loadingSpinner.stop(`Failed to check account details. You may want to run \`trigger.dev logout --profile ${options?.profile ?? "default"}\` and try again.`);
|
|
37
40
|
}
|
|
38
41
|
else {
|
|
39
42
|
loadingSpinner.stop(`You must login first. Use \`trigger.dev login --profile ${options?.profile ?? "default"}\` to login.`);
|
|
@@ -63,7 +66,7 @@ URL: ${chalkLink(authentication.auth.apiUrl)}
|
|
|
63
66
|
`, `Account details [${authentication.profile}]`);
|
|
64
67
|
}
|
|
65
68
|
else {
|
|
66
|
-
loadingSpinner.stop(`Retrieved your account details for ${userData.data.email}`);
|
|
69
|
+
!silent && loadingSpinner.stop(`Retrieved your account details for ${userData.data.email}`);
|
|
67
70
|
}
|
|
68
71
|
return userData;
|
|
69
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../src/commands/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,eAAe,EACf,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAgBlD,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAIlD,MAAM,UAAU,sBAAsB,CAAC,OAAgB;IACrD,OAAO,aAAa,CAClB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,wDAAwD,CAAC,CAChG,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACzB,MAAM,eAAe,CAAC,KAAK,IAAI,EAAE;YAC/B,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAChC,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAgB;IAClD,OAAO,MAAM,iBAAiB,CAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC5F,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,OAA8B,EAC9B,WAAoB,KAAK;
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../src/commands/whoami.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/config.js
CHANGED
|
@@ -78,7 +78,7 @@ export function configPlugin(resolvedConfig) {
|
|
|
78
78
|
}
|
|
79
79
|
async function resolveConfig(cwd, result, overrides, warn = true) {
|
|
80
80
|
const packageJsonPath = await resolvePackageJSON(cwd);
|
|
81
|
-
const tsconfigPath = await
|
|
81
|
+
const tsconfigPath = await safeResolveTsConfig(cwd);
|
|
82
82
|
const lockfilePath = await resolveLockfile(cwd);
|
|
83
83
|
const workspaceDir = await findWorkspaceDir(cwd);
|
|
84
84
|
const workingDir = packageJsonPath ? dirname(packageJsonPath) : cwd;
|
|
@@ -107,13 +107,21 @@ async function resolveConfig(cwd, result, overrides, warn = true) {
|
|
|
107
107
|
external: [],
|
|
108
108
|
conditions: [],
|
|
109
109
|
},
|
|
110
|
-
});
|
|
110
|
+
}); // TODO: For some reason, without this, there is a weird type error complaining about tsconfigPath being string | nullish, which can't be assigned to string | undefined
|
|
111
111
|
return {
|
|
112
112
|
...mergedConfig,
|
|
113
113
|
dirs: Array.from(new Set(mergedConfig.dirs)),
|
|
114
114
|
instrumentedPackageNames: getInstrumentedPackageNames(mergedConfig),
|
|
115
115
|
};
|
|
116
116
|
}
|
|
117
|
+
async function safeResolveTsConfig(cwd) {
|
|
118
|
+
try {
|
|
119
|
+
return await resolveTSConfig(cwd);
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
return undefined;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
117
125
|
const IGNORED_DIRS = ["node_modules", ".git", "dist", "out", "build"];
|
|
118
126
|
async function autoDetectDirs(workingDir) {
|
|
119
127
|
const entries = await readdir(workingDir, { withFileTypes: true });
|
|
@@ -136,14 +144,14 @@ async function autoDetectDirs(workingDir) {
|
|
|
136
144
|
function validateConfig(config, warn = true) {
|
|
137
145
|
if (config.additionalFiles && config.additionalFiles.length > 0) {
|
|
138
146
|
warn &&
|
|
139
|
-
prettyWarning(`The "additionalFiles" option is deprecated and will be removed. Use the "additionalFiles" build extension instead. See https://trigger.dev/docs/
|
|
147
|
+
prettyWarning(`The "additionalFiles" option is deprecated and will be removed. Use the "additionalFiles" build extension instead. See https://trigger.dev/docs/config/config-file#additionalfiles for more information.`);
|
|
140
148
|
config.build ??= {};
|
|
141
149
|
config.build.extensions ??= [];
|
|
142
150
|
config.build.extensions.push(additionalFiles({ files: config.additionalFiles }));
|
|
143
151
|
}
|
|
144
152
|
if (config.additionalPackages && config.additionalPackages.length > 0) {
|
|
145
153
|
warn &&
|
|
146
|
-
prettyWarning(`The "additionalPackages" option is deprecated and will be removed. Use the "additionalPackages" build extension instead. See https://trigger.dev/docs/
|
|
154
|
+
prettyWarning(`The "additionalPackages" option is deprecated and will be removed. Use the "additionalPackages" build extension instead. See https://trigger.dev/docs/config/config-file#additionalpackages for more information.`);
|
|
147
155
|
config.build ??= {};
|
|
148
156
|
config.build.extensions ??= [];
|
|
149
157
|
config.build.extensions.push(additionalPackages({ packages: config.additionalPackages }));
|
|
@@ -164,7 +172,7 @@ function validateConfig(config, warn = true) {
|
|
|
164
172
|
}
|
|
165
173
|
if ("resolveEnvVars" in config && typeof config.resolveEnvVars === "function") {
|
|
166
174
|
warn &&
|
|
167
|
-
prettyWarning(`The "resolveEnvVars" option is deprecated and will be removed. Use the "syncEnvVars" build extension instead. See https://trigger.dev/docs/
|
|
175
|
+
prettyWarning(`The "resolveEnvVars" option is deprecated and will be removed. Use the "syncEnvVars" build extension instead. See https://trigger.dev/docs/config/config-file#syncenvvars for more information.`);
|
|
168
176
|
const resolveEnvVarsFn = config.resolveEnvVars;
|
|
169
177
|
config.build ??= {};
|
|
170
178
|
config.build.extensions ??= [];
|
package/dist/esm/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ export async function buildImage(options) {
|
|
|
23
23
|
apiUrl,
|
|
24
24
|
apiKey,
|
|
25
25
|
buildEnvVars,
|
|
26
|
+
network: options.network,
|
|
26
27
|
});
|
|
27
28
|
}
|
|
28
29
|
if (!externalBuildId || !externalBuildToken || !externalBuildProjectId) {
|
|
@@ -156,6 +157,7 @@ async function selfHostedBuildImage(options) {
|
|
|
156
157
|
options.noCache ? "--no-cache" : undefined,
|
|
157
158
|
"--platform",
|
|
158
159
|
options.buildPlatform,
|
|
160
|
+
...(options.network ? ["--network", options.network] : []),
|
|
159
161
|
"--build-arg",
|
|
160
162
|
`TRIGGER_PROJECT_ID=${options.projectId}`,
|
|
161
163
|
"--build-arg",
|
|
@@ -209,6 +211,7 @@ async function selfHostedBuildImage(options) {
|
|
|
209
211
|
});
|
|
210
212
|
for await (const line of pushProcess) {
|
|
211
213
|
logger.debug(line);
|
|
214
|
+
errors.push(line);
|
|
212
215
|
}
|
|
213
216
|
if (pushProcess.exitCode !== 0) {
|
|
214
217
|
return {
|
|
@@ -276,7 +279,7 @@ async function generateBunContainerfile(options) {
|
|
|
276
279
|
const postInstallCommands = (options.build.commands || []).map((cmd) => `RUN ${cmd}`).join("\n");
|
|
277
280
|
const baseInstructions = (options.image?.instructions || []).join("\n");
|
|
278
281
|
const packages = Array.from(new Set(DEFAULT_PACKAGES.concat(options.image?.pkgs || []))).join(" ");
|
|
279
|
-
return
|
|
282
|
+
return `# syntax=docker/dockerfile:1
|
|
280
283
|
FROM imbios/bun-node:22-debian AS base
|
|
281
284
|
|
|
282
285
|
${baseInstructions}
|
|
@@ -306,7 +309,7 @@ COPY --chown=bun:bun . .
|
|
|
306
309
|
|
|
307
310
|
${postInstallCommands}
|
|
308
311
|
|
|
309
|
-
|
|
312
|
+
FROM build AS indexer
|
|
310
313
|
|
|
311
314
|
USER bun
|
|
312
315
|
WORKDIR /app
|
|
@@ -374,7 +377,7 @@ async function generateNodeContainerfile(options) {
|
|
|
374
377
|
const postInstallCommands = (options.build.commands || []).map((cmd) => `RUN ${cmd}`).join("\n");
|
|
375
378
|
const baseInstructions = (options.image?.instructions || []).join("\n");
|
|
376
379
|
const packages = Array.from(new Set(DEFAULT_PACKAGES.concat(options.image?.pkgs || []))).join(" ");
|
|
377
|
-
return
|
|
380
|
+
return `# syntax=docker/dockerfile:1
|
|
378
381
|
FROM node:21-bookworm-slim@sha256:99afef5df7400a8d118e0504576d32ca700de5034c4f9271d2ff7c91cc12d170 AS base
|
|
379
382
|
|
|
380
383
|
${baseInstructions}
|
|
@@ -408,7 +411,7 @@ COPY --chown=node:node . .
|
|
|
408
411
|
|
|
409
412
|
${postInstallCommands}
|
|
410
413
|
|
|
411
|
-
|
|
414
|
+
FROM build AS indexer
|
|
412
415
|
|
|
413
416
|
USER node
|
|
414
417
|
WORKDIR /app
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildImage.js","sourceRoot":"","sources":["../../../src/deploy/buildImage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC;AAsC7B,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAA0B;IACzD,MAAM,EACJ,UAAU,EACV,aAAa,EACb,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,SAAS,EACT,UAAU,EACV,YAAY,EACZ,MAAM,EACN,MAAM,EACN,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,oBAAoB,CAAC;YAC1B,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,QAAQ;YAClB,GAAG,EAAE,eAAe;YACpB,SAAS,EAAE,SAAS;YACpB,YAAY,EAAE,YAAY;YAC1B,iBAAiB,EAAE,iBAAiB;YACpC,WAAW,EAAE,WAAW;YACxB,UAAU,EAAE,UAAU;YACtB,aAAa,EAAE,aAAa;YAC5B,SAAS,EAAE,IAAI;YACf,kBAAkB,EAAE,CAAC,CAAC,QAAQ;YAC9B,OAAO,EAAE,OAAO;YAChB,YAAY,EAAE,YAAY;YAC1B,MAAM;YACN,MAAM;YACN,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,eAAe,IAAI,CAAC,kBAAkB,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CACb,0LAA0L,CAC3L,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;QACrB,YAAY;QACZ,IAAI,EAAE,eAAe;QACrB,QAAQ;QACR,OAAO,EAAE,eAAe;QACxB,UAAU,EAAE,kBAAkB;QAC9B,cAAc,EAAE,sBAAsB;QACtC,GAAG,EAAE,eAAe;QACpB,SAAS;QACT,YAAY;QACZ,iBAAiB;QACjB,WAAW;QACX,UAAU;QACV,SAAS;QACT,aAAa;QACb,OAAO;QACP,YAAY;QACZ,MAAM;QACN,MAAM;QACN,YAAY;KACb,CAAC,CAAC;AACL,CAAC;AAuCD,KAAK,UAAU,eAAe,CAAC,OAA+B;IAC5D,4FAA4F;IAC5F,wCAAwC;IACxC,MAAM,eAAe,GAAG,MAAM,8BAA8B,CAAC,OAAO,CAAC,YAAY,EAAE;QACjF,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,OAAO,CAAC,IAAI;KACvB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;SACzD,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;SAC/B,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,EAAE,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjE,MAAM,IAAI,GAAG;QACX,OAAO;QACP,IAAI;QACJ,eAAe;QACf,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;QAC1C,YAAY;QACZ,OAAO,CAAC,aAAa;QACrB,cAAc;QACd,OAAO;QACP,aAAa;QACb,sBAAsB,OAAO,CAAC,SAAS,EAAE;QACzC,aAAa;QACb,yBAAyB,OAAO,CAAC,YAAY,EAAE;QAC/C,aAAa;QACb,8BAA8B,OAAO,CAAC,iBAAiB,EAAE;QACzD,aAAa;QACb,wBAAwB,OAAO,CAAC,WAAW,EAAE;QAC7C,aAAa;QACb,uBAAuB,OAAO,CAAC,UAAU,EAAE;QAC3C,aAAa;QACb,mBAAmB,OAAO,CAAC,MAAM,EAAE;QACnC,aAAa;QACb,sBAAsB,OAAO,CAAC,MAAM,EAAE;QACtC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC;QACpB,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,uBAAuB,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/F,YAAY;QACZ,OAAO;QACP,IAAI;QACJ,GAAG,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,QAAQ,EAAE;QAC7C,GAAG;QACH,QAAQ;QACR,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;KACzC,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;IAE9B,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAExC,mCAAmC;IACnC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE;QAC/B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE;YACH,cAAc,EAAE,OAAO,CAAC,OAAO;YAC/B,WAAW,EAAE,OAAO,CAAC,UAAU;YAC/B,gBAAgB,EAAE,OAAO,CAAC,cAAc;YACxC,qBAAqB,EAAE,GAAG;YAC1B,wBAAwB,EAAE,GAAG;YAC7B,aAAa,EAAE,eAAe;SAC/B;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,IAAI,OAAO,CAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAChE,6DAA6D;YAC7D,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAE7B,sEAAsE;gBACtE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAE/C,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;gBACtB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QAEjC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO;gBACL,EAAE,EAAE,KAAc;gBAClB,KAAK,EAAE,sBAAsB;gBAC7B,IAAI;aACL,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE1C,OAAO;YACL,EAAE,EAAE,IAAa;YACjB,KAAK,EAAE,OAAO,CAAC,QAAQ;YACvB,IAAI;YACJ,MAAM;SACP,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO;YACL,EAAE,EAAE,KAAc;YAClB,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YACzD,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC;SAC1B,CAAC;IACJ,CAAC;AACH,CAAC;AAqBD,KAAK,UAAU,oBAAoB,CACjC,OAAoC;IAEpC,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEhG,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;SACzD,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;SAC/B,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,EAAE,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjE,MAAM,IAAI,GAAG;QACX,OAAO;QACP,IAAI;QACJ,eAAe;QACf,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;QAC1C,YAAY;QACZ,OAAO,CAAC,aAAa;QACrB,aAAa;QACb,sBAAsB,OAAO,CAAC,SAAS,EAAE;QACzC,aAAa;QACb,yBAAyB,OAAO,CAAC,YAAY,EAAE;QAC/C,aAAa;QACb,8BAA8B,OAAO,CAAC,iBAAiB,EAAE;QACzD,aAAa;QACb,wBAAwB,OAAO,CAAC,WAAW,EAAE;QAC7C,aAAa;QACb,uBAAuB,OAAO,CAAC,UAAU,EAAE;QAC3C,aAAa;QACb,mBAAmB,OAAO,CAAC,MAAM,EAAE;QACnC,aAAa;QACb,sBAAsB,OAAO,CAAC,MAAM,EAAE;QACtC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC;QACpB,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,uBAAuB,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/F,YAAY;QACZ,OAAO;QACP,IAAI;QACJ,QAAQ;QACR,GAAG,EAAE,oBAAoB;KAC1B,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;IAE9B,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACvC,GAAG,EAAE,OAAO,CAAC,GAAG;KACjB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,MAA0B,CAAC;IAE/B,kBAAkB;IAClB,MAAM,YAAY,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE;QACrC,WAAW,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;KAClC,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QACtC,sEAAsE;QACtE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,YAAY,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO;YACL,EAAE,EAAE,KAAc;YAClB,KAAK,EAAE,sBAAsB;YAC7B,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC;SAC1B,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEpC,IAAI,OAAO,CAAC,kBAAkB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;QAEhE,MAAM,CAAC,KAAK,CAAC,UAAU,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE7C,iBAAiB;QACjB,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE;YACxC,WAAW,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SAClC,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QAED,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO;gBACL,EAAE,EAAE,KAAc;gBAClB,KAAK,EAAE,qBAAqB;gBAC5B,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC;aAC1B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,EAAE,EAAE,IAAa;QACjB,KAAK,EAAE,OAAO,CAAC,QAAQ;QACvB,MAAM;QACN,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC;KAC1B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,8BAA8B,CAC3C,YAAoB,EACpB,IAA4C;IAE5C,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;IACrC,iCAAiC;IACjC,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAErD,MAAM,aAAa,CAAC,gBAAgB,EAAE;QACpC,KAAK,EAAE;YACL,CAAC,YAAY,CAAC,EAAE;gBACd,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;aAC1E;SACF;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,4BAA4B,gBAAgB,EAAE,CAAC,CAAC;IAE7D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,WAAW,CAAC,OAAiB;IACpC,qBAAqB;IACrB,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAExF,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAiB;IAC3C,MAAM,gBAAgB,GAAG,uDAAuD,CAAC;IAEjF,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAEtD,MAAM,MAAM,GAAG,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC;QAEhD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,OAAO;AACT,CAAC;AAUD,MAAM,gBAAgB,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AAEvF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAqC;IAC/E,QAAQ,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,OAAO,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,OAAO,MAAM,wBAAwB,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,OAAqC;IAC3E,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;SACtD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;SAChC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;SACzD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,GAAG,EAAE,CAAC;SACxC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,mBAAmB,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjG,MAAM,gBAAgB,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAC3F,GAAG,CACJ,CAAC;IAEF,OAAO;;;EAGP,gBAAgB;;;sGAGoF,QAAQ;;;;;;;;;;;EAW5G,SAAS;;EAET,YAAY;;;;;;;;;EASZ,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;cA2BP,OAAO,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCA6BI,OAAO,CAAC,UAAU;;GAEpD,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,OAAqC;IAC5E,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;SACtD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;SAChC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;SACzD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,GAAG,EAAE,CAAC;SACxC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,mBAAmB,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjG,MAAM,gBAAgB,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAC3F,GAAG,CACJ,CAAC;IAEF,OAAO;;;EAGP,gBAAgB;;;sGAGoF,QAAQ;;;;;;;;;;;;EAY5G,SAAS;;EAET,YAAY;;;;;;;;;;;;EAYZ,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WA6BV,OAAO,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCA8BO,OAAO,CAAC,UAAU;;GAEpD,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"buildImage.js","sourceRoot":"","sources":["../../../src/deploy/buildImage.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,13 @@ export declare class BackgroundWorkerCoordinator {
|
|
|
48
48
|
close(): void;
|
|
49
49
|
executeTaskRun(id: string, payload: TaskRunExecutionPayload, messageId: string): Promise<{
|
|
50
50
|
id: string;
|
|
51
|
+
ok: true;
|
|
52
|
+
outputType: string;
|
|
53
|
+
output?: string | undefined;
|
|
54
|
+
usage?: {
|
|
55
|
+
durationMs: number;
|
|
56
|
+
} | undefined;
|
|
57
|
+
} | {
|
|
51
58
|
error: {
|
|
52
59
|
message: string;
|
|
53
60
|
type: "BUILT_IN_ERROR";
|
|
@@ -60,11 +67,12 @@ export declare class BackgroundWorkerCoordinator {
|
|
|
60
67
|
type: "STRING_ERROR";
|
|
61
68
|
raw: string;
|
|
62
69
|
} | {
|
|
63
|
-
code: "COULD_NOT_FIND_EXECUTOR" | "COULD_NOT_FIND_TASK" | "COULD_NOT_IMPORT_TASK" | "CONFIGURED_INCORRECTLY" | "TASK_ALREADY_RUNNING" | "TASK_EXECUTION_FAILED" | "TASK_EXECUTION_ABORTED" | "TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE" | "TASK_PROCESS_SIGKILL_TIMEOUT" | "TASK_RUN_CANCELLED" | "TASK_OUTPUT_ERROR" | "HANDLE_ERROR_ERROR" | "GRACEFUL_EXIT_TIMEOUT" | "TASK_RUN_CRASHED" | "TASK_RUN_HEARTBEAT_TIMEOUT";
|
|
64
70
|
type: "INTERNAL_ERROR";
|
|
71
|
+
code: "COULD_NOT_FIND_EXECUTOR" | "COULD_NOT_FIND_TASK" | "COULD_NOT_IMPORT_TASK" | "CONFIGURED_INCORRECTLY" | "TASK_ALREADY_RUNNING" | "TASK_EXECUTION_FAILED" | "TASK_EXECUTION_ABORTED" | "TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE" | "TASK_PROCESS_SIGKILL_TIMEOUT" | "TASK_RUN_CANCELLED" | "TASK_OUTPUT_ERROR" | "HANDLE_ERROR_ERROR" | "GRACEFUL_EXIT_TIMEOUT" | "TASK_RUN_HEARTBEAT_TIMEOUT" | "TASK_RUN_CRASHED" | "MAX_DURATION_EXCEEDED";
|
|
65
72
|
message?: string | undefined;
|
|
66
73
|
stackTrace?: string | undefined;
|
|
67
74
|
};
|
|
75
|
+
id: string;
|
|
68
76
|
ok: false;
|
|
69
77
|
retry?: {
|
|
70
78
|
timestamp: number;
|
|
@@ -75,14 +83,6 @@ export declare class BackgroundWorkerCoordinator {
|
|
|
75
83
|
usage?: {
|
|
76
84
|
durationMs: number;
|
|
77
85
|
} | undefined;
|
|
78
|
-
} | {
|
|
79
|
-
id: string;
|
|
80
|
-
ok: true;
|
|
81
|
-
outputType: string;
|
|
82
|
-
output?: string | undefined;
|
|
83
|
-
usage?: {
|
|
84
|
-
durationMs: number;
|
|
85
|
-
} | undefined;
|
|
86
86
|
} | undefined>;
|
|
87
87
|
}
|
|
88
88
|
export type BackgroundWorkerOptions = {
|
|
@@ -219,9 +219,9 @@ export class BackgroundWorker {
|
|
|
219
219
|
const processOptions = {
|
|
220
220
|
payload,
|
|
221
221
|
env: {
|
|
222
|
-
...sanitizeEnvVars(this.params.env),
|
|
223
222
|
// TODO: this needs the stripEmptyValues stuff too
|
|
224
223
|
...sanitizeEnvVars(payload.environment ?? {}),
|
|
224
|
+
...sanitizeEnvVars(this.params.env),
|
|
225
225
|
TRIGGER_WORKER_MANIFEST_PATH: this.workerManifestPath,
|
|
226
226
|
},
|
|
227
227
|
serverWorker: this.serverWorker,
|