trigger.dev 0.0.0-v3-canary-20240321171119 → 0.0.0-v3-canary-20240321210113

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 join5 } from "node:path";
+import { join as join4 } 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-20240321171119";
+var version = "0.0.0-v3-canary-20240321210113";
 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-20240321171119",
+  "@trigger.dev/core": "workspace:0.0.0-v3-canary-20240321210113",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -856,6 +856,7 @@ var dependencies = {
   "supports-color": "^9.4.0",
   "terminal-link": "^3.0.0",
   "tiny-invariant": "^1.2.0",
+  "tsconfig-paths": "^4.2.0",
   "update-check": "^1.5.4",
   url: "^0.11.1",
   ws: "^8.12.0",
@@ -1588,6 +1589,9 @@ async function resolveConfig(path6, config) {
   if (!config.projectDir) {
     config.projectDir = path6;
   }
+  if (!config.tsconfigPath) {
+    config.tsconfigPath = await getConfigPath(path6, "tsconfig.json");
+  }
   return config;
 }
 async function normalizeConfig(config) {
@@ -2626,55 +2630,139 @@ ${authorizationCodeResult.error}`
 }
 
 // src/utilities/build.ts
-import { join as join4 } from "node:path";
-import { createRequire } from "node:module";
+import { extname, isAbsolute } from "node:path";
+import tsConfigPaths from "tsconfig-paths";
 function bundleDependenciesPlugin(config) {
+  const matchPath = config.tsconfigPath ? createMatchPath(config.tsconfigPath) : void 0;
+  function resolvePath(id) {
+    if (!matchPath) {
+      return id;
+    }
+    return matchPath(id, void 0, void 0, [".ts", ".tsx", ".js", ".jsx"]) || id;
+  }
   return {
     name: "bundle-dependencies",
     setup(build3) {
       build3.onResolve({ filter: /.*/ }, (args) => {
-        if (args.kind !== "import-statement") {
+        const resolvedPath = resolvePath(args.path);
+        logger.debug(`Checking if ${args.path} should be bundled or external`, {
+          ...args,
+          resolvedPath
+        });
+        if (!isBareModuleId(resolvedPath)) {
+          logger.debug(`Bundling ${args.path} because its not a bareModuleId`, {
+            ...args
+          });
+          return void 0;
+        }
+        if (args.path.startsWith("@trigger.dev/")) {
+          logger.debug(`Bundling ${args.path} because its a trigger.dev package`, {
+            ...args
+          });
+          return void 0;
+        }
+        let loader;
+        try {
+          loader = getLoaderForFile(args.path);
+        } catch (e) {
+          if (!(e instanceof Error && e.message.startsWith("Cannot get loader for file"))) {
+            throw e;
+          }
+        }
+        if (loader === "file") {
           return void 0;
         }
         for (let pattern of config.dependenciesToBundle ?? []) {
           if (typeof pattern === "string" ? args.path === pattern : pattern.test(args.path)) {
-            try {
-              const resolvedPath = resolvePath(args.path, config);
-              logger.debug(`Bundling ${args.path} as ${resolvedPath}`);
-              return {
-                path: resolvedPath,
-                external: false
-              };
-            } catch (error) {
-              logger.error(`Failed to resolve path ${args.path}`, error);
-              return void 0;
-            }
+            return void 0;
           }
         }
-        return void 0;
+        logger.debug(`Externalizing ${args.path}`, {
+          ...args
+        });
+        return {
+          path: args.path,
+          external: true
+        };
       });
     }
   };
 }
-function resolvePath(path6, config) {
-  const requireUrl = join4(config.projectDir, "index.js");
-  try {
-    const tmpRequire = createRequire(requireUrl);
-    logger.debug("[bundle-dependencies] Attempting to resolve path using require.resolve", {
-      path: path6,
-      requireUrl
-    });
-    return tmpRequire.resolve(path6);
-  } catch (e) {
-    logger.debug(
-      "[bundle-dependencies] Attempting to resolve path using ESM import.meta.url resolver",
-      {
-        path: path6,
-        importMetaUrl: import.meta.url
-      }
-    );
-    return __require.resolve(path6);
+function isBareModuleId(id) {
+  return !id.startsWith("node:") && !id.startsWith(".") && !isAbsolute(id);
+}
+function createMatchPath(tsconfigPath) {
+  if (!tsconfigPath) {
+    return void 0;
   }
+  let configLoaderResult = tsConfigPaths.loadConfig(tsconfigPath);
+  if (configLoaderResult.resultType === "failed") {
+    if (configLoaderResult.message === "Missing baseUrl in compilerOptions") {
+      throw new Error(
+        `\u{1F6A8} Oops! No baseUrl found, please set compilerOptions.baseUrl in your tsconfig or jsconfig`
+      );
+    }
+    return void 0;
+  }
+  return tsConfigPaths.createMatchPath(
+    configLoaderResult.absoluteBaseUrl,
+    configLoaderResult.paths,
+    configLoaderResult.mainFields,
+    configLoaderResult.addMatchAll
+  );
+}
+var loaders = {
+  ".aac": "file",
+  ".avif": "file",
+  ".css": "file",
+  ".csv": "file",
+  ".eot": "file",
+  ".fbx": "file",
+  ".flac": "file",
+  ".gif": "file",
+  ".glb": "file",
+  ".gltf": "file",
+  ".gql": "text",
+  ".graphql": "text",
+  ".hdr": "file",
+  ".ico": "file",
+  ".jpeg": "file",
+  ".jpg": "file",
+  ".js": "jsx",
+  ".jsx": "jsx",
+  ".json": "json",
+  // We preprocess md and mdx files using @mdx-js/mdx and send through
+  // the JSX for esbuild to handle
+  ".md": "jsx",
+  ".mdx": "jsx",
+  ".mov": "file",
+  ".mp3": "file",
+  ".mp4": "file",
+  ".node": "copy",
+  ".ogg": "file",
+  ".otf": "file",
+  ".png": "file",
+  ".psd": "file",
+  ".sql": "text",
+  ".svg": "file",
+  ".ts": "ts",
+  ".tsx": "tsx",
+  ".ttf": "file",
+  ".wasm": "file",
+  ".wav": "file",
+  ".webm": "file",
+  ".webmanifest": "file",
+  ".webp": "file",
+  ".woff": "file",
+  ".woff2": "file",
+  ".zip": "file"
+};
+function getLoaderForFile(file) {
+  const ext = extname(file);
+  const loader = loaders[ext];
+  if (loader)
+    return loader;
+  throw new Error(`Cannot get loader for file ${file}`);
 }
 
 // src/commands/deploy.ts
@@ -3230,8 +3318,6 @@ async function compileProject(config, options, configPath) {
         minify: false,
         sourcemap: "external",
         // does not set the //# sourceMappingURL= comment in the file, we handle it ourselves
-        packages: "external",
-        // https://esbuild.github.io/api/#packages
         logLevel: "error",
         platform: "node",
         format: "cjs",
@@ -3254,7 +3340,7 @@ async function compileProject(config, options, configPath) {
         throw new Error("Build failed, aborting deployment");
       }
       if (options.outputMetafile) {
-        await writeJSONFile(join5(options.outputMetafile, "worker.json"), result.metafile);
+        await writeJSONFile(join4(options.outputMetafile, "worker.json"), result.metafile);
       }
       const entryPointContents = readFileSync(
         new URL(importResolve("./workers/prod/entry-point.js", import.meta.url)).href.replace(
@@ -3297,35 +3383,35 @@ async function compileProject(config, options, configPath) {
       }
       if (options.outputMetafile) {
         await writeJSONFile(
-          join5(options.outputMetafile, "entry-point.json"),
+          join4(options.outputMetafile, "entry-point.json"),
           entryPointResult.metafile
         );
       }
       const tempDir = await createTempDir();
       logger.debug(`Writing compiled files to ${tempDir}`);
-      const metaOutput = result.metafile.outputs[join5("out", "stdin.js")];
+      const metaOutput = result.metafile.outputs[join4("out", "stdin.js")];
       invariant(metaOutput, "Meta output for the result build is missing");
-      const entryPointMetaOutput = entryPointResult.metafile.outputs[join5("out", "stdin.js")];
+      const entryPointMetaOutput = entryPointResult.metafile.outputs[join4("out", "stdin.js")];
       invariant(entryPointMetaOutput, "Meta output for the entryPoint build is missing");
       const workerOutputFile = result.outputFiles.find(
-        (file) => file.path === join5(config.projectDir, "out", "stdin.js")
+        (file) => file.path === join4(config.projectDir, "out", "stdin.js")
       );
       invariant(workerOutputFile, "Output file for the result build is missing");
       const workerSourcemapFile = result.outputFiles.find(
-        (file) => file.path === join5(config.projectDir, "out", "stdin.js.map")
+        (file) => file.path === join4(config.projectDir, "out", "stdin.js.map")
       );
       invariant(workerSourcemapFile, "Sourcemap file for the result build is missing");
       const entryPointOutputFile = entryPointResult.outputFiles.find(
-        (file) => file.path === join5(config.projectDir, "out", "stdin.js")
+        (file) => file.path === join4(config.projectDir, "out", "stdin.js")
       );
       invariant(entryPointOutputFile, "Output file for the entryPoint build is missing");
       await writeFile2(
-        join5(tempDir, "worker.js"),
+        join4(tempDir, "worker.js"),
         `${workerOutputFile.text}
 //# sourceMappingURL=worker.js.map`
       );
-      await writeFile2(join5(tempDir, "worker.js.map"), workerSourcemapFile.text);
-      await writeFile2(join5(tempDir, "index.js"), entryPointOutputFile.text);
+      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 packageJsonContents = {
@@ -3334,7 +3420,7 @@ async function compileProject(config, options, configPath) {
         description: "",
         dependencies: dependencies2
       };
-      await writeJSONFile(join5(tempDir, "package.json"), packageJsonContents);
+      await writeJSONFile(join4(tempDir, "package.json"), packageJsonContents);
       compileSpinner.stop("Project built successfully");
       const resolvingDependenciesResult = await resolveDependencies(
         tempDir,
@@ -3348,7 +3434,7 @@ async function compileProject(config, options, configPath) {
       const containerFilePath = new URL(
         importResolve("./Containerfile.prod", import.meta.url)
       ).href.replace("file://", "");
-      await copyFile(containerFilePath, join5(tempDir, "Containerfile"));
+      await copyFile(containerFilePath, join4(tempDir, "Containerfile"));
       const contentHasher = createHash("sha256");
       contentHasher.update(Buffer.from(entryPointOutputFile.text));
       contentHasher.update(Buffer.from(workerOutputFile.text));
@@ -3380,8 +3466,8 @@ async function resolveDependencies(projectDir, packageJsonContents, config, opti
     const hasher = createHash("sha256");
     hasher.update(JSON.stringify(packageJsonContents));
     const digest = hasher.digest("hex").slice(0, 16);
-    const cacheDir = join5(config.projectDir, ".trigger", "cache");
-    const cachePath = join5(cacheDir, `${digest}.json`);
+    const cacheDir = join4(config.projectDir, ".trigger", "cache");
+    const cachePath = join4(cacheDir, `${digest}.json`);
     span.setAttributes({
       "packageJson.digest": digest,
       "cache.path": cachePath,
@@ -3390,7 +3476,7 @@ async function resolveDependencies(projectDir, packageJsonContents, config, opti
     try {
       const cachedPackageLock = await readFile2(cachePath, "utf-8");
       logger.debug(`Using cached package-lock.json for ${digest}`);
-      await writeFile2(join5(projectDir, "package-lock.json"), cachedPackageLock);
+      await writeFile2(join4(projectDir, "package-lock.json"), cachedPackageLock);
       span.setAttributes({
         "cache.hit": true
       });
@@ -3413,11 +3499,11 @@ async function resolveDependencies(projectDir, packageJsonContents, config, opti
           cwd: projectDir,
           stdio: logger.loggerLevel === "debug" ? "inherit" : "pipe"
         });
-        const packageLockContents = await readFile2(join5(projectDir, "package-lock.json"), "utf-8");
+        const packageLockContents = await readFile2(join4(projectDir, "package-lock.json"), "utf-8");
         logger.debug(`Writing package-lock.json to cache for ${digest}`);
         await mkdir(cacheDir, { recursive: true });
         await writeFile2(cachePath, packageLockContents);
-        await writeFile2(join5(projectDir, "package-lock.json"), packageLockContents);
+        await writeFile2(join4(projectDir, "package-lock.json"), packageLockContents);
         span.end();
         resolvingDepsSpinner.stop("Dependencies resolved");
         return true;
@@ -3472,7 +3558,7 @@ async function typecheckProject(config, options) {
   });
 }
 async function gatherRequiredDependencies(imports, config) {
-  const externalPackageJson = await readJSONFile(join5(config.projectDir, "package.json"));
+  const externalPackageJson = await readJSONFile(join4(config.projectDir, "package.json"));
   const dependencies2 = {};
   for (const file of imports) {
     if (file.kind !== "require-call" || !file.external) {
@@ -3521,7 +3607,7 @@ async function gatherRequiredDependencies(imports, config) {
 }
 async function ensureLoggedIntoDockerRegistry(registryHost, auth) {
   const tmpDir = await createTempDir();
-  const dockerConfigPath = join5(tmpDir, "config.json");
+  const dockerConfigPath = join4(tmpDir, "config.json");
   await writeJSONFile(dockerConfigPath, {
     auths: {
       [registryHost]: {
@@ -3567,7 +3653,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 join6 } from "node:path";
+import { basename, dirname as dirname2, join as join5 } from "node:path";
 import pThrottle from "p-throttle";
 import { WebSocket } from "partysocket";
 import React, { Suspense, useEffect } from "react";
@@ -4365,8 +4451,6 @@ function useDev({
         minify: false,
         sourcemap: "external",
         // does not set the //# sourceMappingURL= comment in the file, we handle it ourselves
-        packages: "external",
-        // https://esbuild.github.io/api/#packages
         logLevel: "error",
         platform: "node",
         format: "cjs",
@@ -4392,19 +4476,19 @@ function useDev({
                 if (!firstBuild) {
                   logger.log(chalk6.dim("\u2394 Rebuilding background worker..."));
                 }
-                const metaOutputKey = join6("out", `stdin.js`);
+                const metaOutputKey = join5("out", `stdin.js`);
                 const metaOutput = result.metafile.outputs[metaOutputKey];
                 if (!metaOutput) {
                   throw new Error(`Could not find metafile`);
                 }
-                const outputFileKey = join6(config.projectDir, metaOutputKey);
+                const outputFileKey = join5(config.projectDir, metaOutputKey);
                 const outputFile = result.outputFiles.find((file) => file.path === outputFileKey);
                 if (!outputFile) {
                   throw new Error(
                     `Could not find output file for entry point ${metaOutput.entryPoint}`
                   );
                 }
-                const sourceMapFileKey = join6(config.projectDir, `${metaOutputKey}.map`);
+                const sourceMapFileKey = join5(config.projectDir, `${metaOutputKey}.map`);
                 const sourceMapFile = result.outputFiles.find(
                   (file) => file.path === sourceMapFileKey
                 );
@@ -4416,7 +4500,7 @@ function useDev({
                   logger.debug(`No changes detected, skipping build`);
                   return;
                 }
-                const fullPath = join6(config.projectDir, ".trigger", `${contentHash}.js`);
+                const fullPath = join5(config.projectDir, ".trigger", `${contentHash}.js`);
                 const sourceMapPath = `${fullPath}.map`;
                 const outputFileWithSourceMap = `${outputFile.text}
 //# sourceMappingURL=${basename(sourceMapPath)}`;
@@ -4605,7 +4689,7 @@ async function gatherRequiredDependencies2(outputMeta, config) {
     }
   }
   if (config.additionalPackages) {
-    const projectPackageJson = await readJSONFile(join6(config.projectDir, "package.json"));
+    const projectPackageJson = await readJSONFile(join5(config.projectDir, "package.json"));
     for (const packageName of config.additionalPackages) {
       if (dependencies2[packageName]) {
         continue;
@@ -4661,7 +4745,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 join7, relative as relative2, resolve as resolve3 } from "node:path";
+import { join as join6, relative as relative2, resolve as resolve3 } from "node:path";
 import terminalLink3 from "terminal-link";
 import { z as z6 } from "zod";
 
@@ -4899,13 +4983,13 @@ async function createTriggerDir(dir, options) {
         "cli.example": example
       });
       if (example === "none") {
-        await createFile(join7(triggerDir, ".gitkeep"), "");
+        await createFile(join6(triggerDir, ".gitkeep"), "");
         log3.step(`Created directory at ${location}`);
         span.end();
         return;
       }
       const exampleFile = resolveInternalFilePath(`./templates/examples/${example}.ts.template`);
-      const outputPath = join7(triggerDir, "example.ts");
+      const outputPath = join6(triggerDir, "example.ts");
       await createFileFromTemplate({
         templatePath: exampleFile,
         outputPath,
@@ -4927,7 +5011,7 @@ async function gitIgnoreDotTriggerDir(dir, options) {
   return await tracer.startActiveSpan("gitIgnoreDotTriggerDir", async (span) => {
     try {
       const projectDir = resolve3(process.cwd(), dir);
-      const gitIgnorePath = join7(projectDir, ".gitignore");
+      const gitIgnorePath = join6(projectDir, ".gitignore");
       span.setAttributes({
         "cli.projectDir": projectDir,
         "cli.gitIgnorePath": gitIgnorePath
@@ -4961,7 +5045,7 @@ async function addConfigFileToTsConfig(dir, options) {
   return await tracer.startActiveSpan("createTriggerDir", async (span) => {
     try {
       const projectDir = resolve3(process.cwd(), dir);
-      const tsconfigPath = join7(projectDir, "tsconfig.json");
+      const tsconfigPath = join6(projectDir, "tsconfig.json");
       span.setAttributes({
         "cli.projectDir": projectDir,
         "cli.tsconfigPath": tsconfigPath
@@ -5048,7 +5132,7 @@ async function writeConfigFile(dir, project, options) {
       spnnr.start("Creating config file");
       const projectDir = resolve3(process.cwd(), dir);
       const templatePath = resolveInternalFilePath("./templates/trigger.config.ts.template");
-      const outputPath = join7(projectDir, "trigger.config.ts");
+      const outputPath = join6(projectDir, "trigger.config.ts");
       span.setAttributes({
         "cli.projectDir": projectDir,
         "cli.templatePath": templatePath,