trigger.dev 0.0.0-v3-canary-20240322112439 → 0.0.0-v3-canary-20240322145829

package/dist/index.js

@@ -793,14 +793,14 @@ import { resolve as importResolve } from "import-meta-resolve";
 import { createHash } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { copyFile, mkdir, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join4 } from "node:path";
+import { dirname, join as join4, relative as relative2 } from "node:path";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
 import terminalLink from "terminal-link";
 import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-canary-20240322112439";
+var version = "0.0.0-v3-canary-20240322145829";
 var dependencies = {
   "@baselime/node-opentelemetry": "^0.4.6",
   "@clack/prompts": "^0.7.0",
@@ -821,7 +821,7 @@ var dependencies = {
   "@opentelemetry/sdk-trace-node": "^1.21.0",
   "@opentelemetry/semantic-conventions": "^1.21.0",
   "@traceloop/instrumentation-openai": "^0.3.9",
-  "@trigger.dev/core": "workspace:0.0.0-v3-canary-20240322112439",
+  "@trigger.dev/core": "workspace:0.0.0-v3-canary-20240322145829",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -833,6 +833,7 @@ var dependencies = {
   evt: "^2.4.13",
   execa: "^8.0.0",
   "find-up": "^7.0.0",
+  glob: "^10.3.10",
   "gradient-string": "^2.0.2",
   "import-meta-resolve": "^4.0.0",
   ink: "^4.4.1",
@@ -2766,6 +2767,7 @@ function getLoaderForFile(file) {
 }
 
 // src/commands/deploy.ts
+import { Glob } from "glob";
 var DeployCommandOptions = CommonCommandOptions.extend({
   skipTypecheck: z4.boolean().default(false),
   skipDeploy: z4.boolean().default(false),
@@ -3413,14 +3415,23 @@ async function compileProject(config, options, configPath) {
       await writeFile2(join4(tempDir, "worker.js.map"), workerSourcemapFile.text);
       await writeFile2(join4(tempDir, "index.js"), entryPointOutputFile.text);
       const allImports = [...metaOutput.imports, ...entryPointMetaOutput.imports];
-      const dependencies2 = await gatherRequiredDependencies(allImports, config);
+      const externalPackageJson = await readJSONFile(join4(config.projectDir, "package.json"));
+      const dependencies2 = await gatherRequiredDependencies(
+        allImports,
+        config,
+        externalPackageJson
+      );
       const packageJsonContents = {
         name: "trigger-worker",
         version: "0.0.0",
         description: "",
-        dependencies: dependencies2
+        dependencies: dependencies2,
+        scripts: {
+          postinstall: externalPackageJson?.scripts?.postinstall
+        }
       };
       await writeJSONFile(join4(tempDir, "package.json"), packageJsonContents);
+      await copyAdditionalFiles(config, tempDir);
       compileSpinner.stop("Project built successfully");
       const resolvingDependenciesResult = await resolveDependencies(
         tempDir,
@@ -3557,8 +3568,7 @@ async function typecheckProject(config, options) {
     }
   });
 }
-async function gatherRequiredDependencies(imports, config) {
-  const externalPackageJson = await readJSONFile(join4(config.projectDir, "package.json"));
+async function gatherRequiredDependencies(imports, config, projectPackageJson) {
   const dependencies2 = {};
   for (const file of imports) {
     if (file.kind !== "require-call" || !file.external) {
@@ -3568,7 +3578,7 @@ async function gatherRequiredDependencies(imports, config) {
     if (dependencies2[packageName]) {
       continue;
     }
-    const externalDependencyVersion = (externalPackageJson?.dependencies ?? {})[packageName];
+    const externalDependencyVersion = (projectPackageJson?.dependencies ?? {})[packageName];
     if (externalDependencyVersion) {
       dependencies2[packageName] = stripWorkspaceFromVersion(externalDependencyVersion);
       continue;
@@ -3589,8 +3599,8 @@ async function gatherRequiredDependencies(imports, config) {
         continue;
       } else {
         const externalDependencyVersion = {
-          ...externalPackageJson?.devDependencies,
-          ...externalPackageJson?.dependencies
+          ...projectPackageJson?.devDependencies,
+          ...projectPackageJson?.dependencies
         }[packageName];
         if (externalDependencyVersion) {
           dependencies2[packageParts.name] = externalDependencyVersion;
@@ -3605,6 +3615,47 @@ async function gatherRequiredDependencies(imports, config) {
   }
   return Object.fromEntries(Object.entries(dependencies2).sort(([a], [b]) => a.localeCompare(b)));
 }
+async function copyAdditionalFiles(config, tempDir) {
+  const additionalFiles = config.additionalFiles ?? [];
+  if (additionalFiles.length === 0) {
+    return;
+  }
+  return await tracer.startActiveSpan(
+    "copyAdditionalFiles",
+    {
+      attributes: {
+        "config.additionalFiles": additionalFiles
+      }
+    },
+    async (span) => {
+      try {
+        logger.debug(`Copying files to ${tempDir}`, {
+          additionalFiles
+        });
+        const glob = new Glob(additionalFiles, {
+          withFileTypes: true,
+          ignore: ["node_modules"],
+          cwd: config.projectDir,
+          nodir: true
+        });
+        for await (const file of glob) {
+          const relativeDestinationPath = join4(
+            tempDir,
+            relative2(config.projectDir, file.fullpath())
+          );
+          logger.debug(`Copying file ${file.fullpath()} to ${relativeDestinationPath}`);
+          await mkdir(dirname(relativeDestinationPath), { recursive: true });
+          await copyFile(file.fullpath(), relativeDestinationPath);
+        }
+        span.end();
+      } catch (error) {
+        recordSpanException4(span, error);
+        span.end();
+        throw error;
+      }
+    }
+  );
+}
 async function ensureLoggedIntoDockerRegistry(registryHost, auth) {
   const tmpDir = await createTempDir();
   const dockerConfigPath = join4(tmpDir, "config.json");
@@ -3653,7 +3704,7 @@ import { resolve as importResolve2 } from "import-meta-resolve";
 import { Box, Text, render, useApp, useInput } from "ink";
 import { createHash as createHash2 } from "node:crypto";
 import fs7, { readFileSync as readFileSync2 } from "node:fs";
-import { basename, dirname as dirname2, join as join5 } from "node:path";
+import { basename, dirname as dirname3, join as join5 } from "node:path";
 import pThrottle from "p-throttle";
 import { WebSocket } from "partysocket";
 import React, { Suspense, useEffect } from "react";
@@ -3684,7 +3735,7 @@ import chalk5 from "chalk";
 import dotenv from "dotenv";
 import { Evt } from "evt";
 import { fork } from "node:child_process";
-import { dirname, resolve as resolve2 } from "node:path";
+import { dirname as dirname2, resolve as resolve2 } from "node:path";
 import terminalLink2 from "terminal-link";
 var BackgroundWorkerCoordinator = class {
   constructor(baseURL) {
@@ -3866,7 +3917,7 @@ var BackgroundWorker = class {
       throw new Error("Worker already initialized");
     }
     if (this.params.dependencies) {
-      await installPackages(this.params.dependencies, { cwd: dirname(this.path) });
+      await installPackages(this.params.dependencies, { cwd: dirname2(this.path) });
     }
     let resolved = false;
     this.tasks = await new Promise((resolve4, reject) => {
@@ -4050,7 +4101,6 @@ var TaskRunProcess = class {
       schema: workerToChildMessages,
       sender: async (message) => {
         if (this._child?.connected && !this._isBeingKilled && !this._child.killed) {
-          logger.debug(`[${this.runId}] sending message to task run process`, { message });
           this._child.send(message);
         }
       }
@@ -4087,7 +4137,7 @@ var TaskRunProcess = class {
         "pipe",
         "ipc"
       ],
-      cwd: dirname(this.path),
+      cwd: dirname2(this.path),
       env: {
         ...this.env,
         OTEL_RESOURCE_ATTRIBUTES: JSON.stringify({
@@ -4512,7 +4562,7 @@ function useDev({
                 const sourceMapPath = `${fullPath}.map`;
                 const outputFileWithSourceMap = `${outputFile.text}
 //# sourceMappingURL=${basename(sourceMapPath)}`;
-                await fs7.promises.mkdir(dirname2(fullPath), { recursive: true });
+                await fs7.promises.mkdir(dirname3(fullPath), { recursive: true });
                 await fs7.promises.writeFile(fullPath, outputFileWithSourceMap);
                 logger.debug(`Wrote background worker to ${fullPath}`);
                 const dependencies2 = await gatherRequiredDependencies2(metaOutput, config);
@@ -4753,7 +4803,7 @@ import chalk7 from "chalk";
 import { execa as execa3 } from "execa";
 import { applyEdits, modify } from "jsonc-parser";
 import { writeFile as writeFile3 } from "node:fs/promises";
-import { join as join6, relative as relative2, resolve as resolve3 } from "node:path";
+import { join as join6, relative as relative3, resolve as resolve3 } from "node:path";
 import terminalLink3 from "terminal-link";
 import { z as z6 } from "zod";
 
@@ -5003,7 +5053,7 @@ async function createTriggerDir(dir, options) {
         outputPath,
         replacements: {}
       });
-      const relativeOutputPath = relative2(process.cwd(), outputPath);
+      const relativeOutputPath = relative3(process.cwd(), outputPath);
       log3.step(`Created example file at ${relativeOutputPath}`);
       span.end();
     } catch (e) {
@@ -5154,7 +5204,7 @@ async function writeConfigFile(dir, project, options) {
         outputPath,
         override: options.overrideConfig
       });
-      const relativePathToOutput = relative2(process.cwd(), outputPath);
+      const relativePathToOutput = relative3(process.cwd(), outputPath);
       spnnr.stop(
         result.success ? `Config file created at ${relativePathToOutput}` : `Failed to create config file: ${result.error}`
       );