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

package/dist/esm/entryPoints/{deploy-index-controller.js → managed-index-controller.js}

@@ -68,8 +68,10 @@ async function indexDeployment({ cliApiClient, projectRef, deploymentId, buildMa
                 packageVersion: buildManifest.packageVersion,
                 cliPackageVersion: buildManifest.cliPackageVersion,
                 tasks: workerManifest.tasks,
+                queues: workerManifest.queues,
                 sourceFiles,
             },
+            engine: "V2",
             supportsLazyAttempts: true,
         };
         await cliApiClient.createDeploymentBackgroundWorker(deploymentId, backgroundWorkerBody);
@@ -83,4 +85,4 @@ async function indexDeployment({ cliApiClient, projectRef, deploymentId, buildMa
 }
 const results = await bootstrap();
 await indexDeployment(results);
-//# sourceMappingURL=deploy-index-controller.js.map
+//# sourceMappingURL=managed-index-controller.js.map

package/dist/esm/entryPoints/managed-index-controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"managed-index-controller.js","sourceRoot":"","sources":["../../../src/entryPoints/managed-index-controller.ts"],"names":[],"mappings":"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"}

package/dist/esm/entryPoints/{deploy-index-worker.js → managed-index-worker.js}

@@ -1,9 +1,9 @@
-import { BuildManifest, indexerToWorkerMessages, taskCatalog, } from "@trigger.dev/core/v3";
-import { StandardTaskCatalog, TracingSDK, } from "@trigger.dev/core/v3/workers";
+import { BuildManifest, indexerToWorkerMessages, resourceCatalog, } from "@trigger.dev/core/v3";
+import { StandardResourceCatalog, TracingSDK, } from "@trigger.dev/core/v3/workers";
 import { sendMessageInCatalog, ZodSchemaParsedError } from "@trigger.dev/core/v3/zodMessageHandler";
 import { readFile } from "node:fs/promises";
 import sourceMapSupport from "source-map-support";
-import { registerTasks } from "../indexing/registerTasks.js";
+import { registerResources } from "../indexing/registerResources.js";
 import { env } from "std-env";
 import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
 sourceMapSupport.install({
@@ -38,9 +38,9 @@ process.on("uncaughtException", function (error, origin) {
             });
     }
 });
-taskCatalog.setGlobalTaskCatalog(new StandardTaskCatalog());
+resourceCatalog.setGlobalResourceCatalog(new StandardResourceCatalog());
 async function importConfig(configPath) {
-    const configModule = await import(configPath);
+    const configModule = await import(normalizeImportPath(configPath));
     const config = configModule?.default ?? configModule?.config;
     return {
         config,
@@ -54,7 +54,7 @@ async function loadBuildManifest() {
 }
 async function bootstrap() {
     const buildManifest = await loadBuildManifest();
-    const { config } = await importConfig(normalizeImportPath(buildManifest.configPath));
+    const { config } = await importConfig(buildManifest.configPath);
     // This needs to run or the PrismaInstrumentation will throw an error
     const tracingSDK = new TracingSDK({
         url: env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318",
@@ -62,7 +62,7 @@ async function bootstrap() {
         diagLogLevel: env.OTEL_LOG_LEVEL ?? "none",
         forceFlushTimeoutMillis: 30_000,
     });
-    const importErrors = await registerTasks(buildManifest);
+    const importErrors = await registerResources(buildManifest);
     return {
         tracingSDK,
         config,
@@ -71,7 +71,7 @@ async function bootstrap() {
     };
 }
 const { buildManifest, importErrors, config } = await bootstrap();
-let tasks = taskCatalog.listTaskManifests();
+let tasks = resourceCatalog.listTaskManifests();
 // If the config has retry defaults, we need to apply them to all tasks that don't have any retry settings
 if (config.retries?.default) {
     tasks = tasks.map((task) => {
@@ -84,20 +84,6 @@ if (config.retries?.default) {
         return task;
     });
 }
-// If the config has a machine preset, we need to apply it to all tasks that don't have a machine preset
-if (typeof config.machine === "string") {
-    tasks = tasks.map((task) => {
-        if (typeof task.machine?.preset !== "string") {
-            return {
-                ...task,
-                machine: {
-                    preset: config.machine,
-                },
-            };
-        }
-        return task;
-    });
-}
 // If the config has a maxDuration, we need to apply it to all tasks that don't have a maxDuration
 if (typeof config.maxDuration === "number") {
     tasks = tasks.map((task) => {
@@ -113,12 +99,14 @@ if (typeof config.maxDuration === "number") {
 await sendMessageInCatalog(indexerToWorkerMessages, "INDEX_COMPLETE", {
     manifest: {
         tasks,
+        queues: resourceCatalog.listQueueManifests(),
         configPath: buildManifest.configPath,
         runtime: buildManifest.runtime,
         workerEntryPoint: buildManifest.runWorkerEntryPoint,
         controllerEntryPoint: buildManifest.runControllerEntryPoint,
         loaderEntryPoint: buildManifest.loaderEntryPoint,
         customConditions: buildManifest.customConditions,
+        initEntryPoint: buildManifest.initEntryPoint,
     },
     importErrors,
 }, async (msg) => {
@@ -126,7 +114,7 @@ await sendMessageInCatalog(indexerToWorkerMessages, "INDEX_COMPLETE", {
 }).catch((err) => {
     if (err instanceof ZodSchemaParsedError) {
         return sendMessageInCatalog(indexerToWorkerMessages, "TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks }, async (msg) => {
-            await process.send?.(msg);
+            process.send?.(msg);
         });
     }
     else {
@@ -139,4 +127,4 @@ await new Promise((resolve) => {
         resolve();
     }, 10);
 });
-//# sourceMappingURL=deploy-index-worker.js.map
+//# sourceMappingURL=managed-index-worker.js.map

package/dist/esm/entryPoints/managed-index-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"managed-index-worker.js","sourceRoot":"","sources":["../../../src/entryPoints/managed-index-worker.ts"],"names":[],"mappings":"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"}