trigger.dev 0.0.0-v3-prerelease-20240502144136 → 0.0.0-v3-deploy-fix-20240506093509

package/dist/index.js

@@ -783,9 +783,9 @@ import { context, trace as trace2 } from "@opentelemetry/api";
 import {
   TaskMetadataFailedToParseData,
   detectDependencyVersion,
-  flattenAttributes as flattenAttributes2
+  flattenAttributes as flattenAttributes3
 } from "@trigger.dev/core/v3";
-import { recordSpanException as recordSpanException4 } from "@trigger.dev/core/v3/workers";
+import { recordSpanException as recordSpanException5 } from "@trigger.dev/core/v3/workers";
 import { Option as CommandOption } from "commander";
 import { build as build2 } from "esbuild";
 import { execa as execa2 } from "execa";
@@ -799,7 +799,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-prerelease-20240502144136";
+var version = "0.0.0-v3-deploy-fix-20240506093509";
 var dependencies = {
   "@anatine/esbuild-decorators": "^0.2.19",
   "@clack/prompts": "^0.7.0",
@@ -816,7 +816,7 @@ var dependencies = {
   "@opentelemetry/sdk-trace-base": "^1.22.0",
   "@opentelemetry/sdk-trace-node": "^1.22.0",
   "@opentelemetry/semantic-conventions": "^1.22.0",
-  "@trigger.dev/core": "workspace:0.0.0-v3-prerelease-20240502144136",
+  "@trigger.dev/core": "workspace:0.0.0-v3-deploy-fix-20240506093509",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -2864,6 +2864,32 @@ import { Glob } from "glob";
 import { readFileSync } from "node:fs";
 import { extname, isAbsolute } from "node:path";
 import tsConfigPaths from "tsconfig-paths";
+function mockServerOnlyPlugin() {
+  return {
+    name: "trigger-mock-server-only",
+    setup(build3) {
+      build3.onResolve({ filter: /server-only/ }, (args) => {
+        if (args.path !== "server-only") {
+          return void 0;
+        }
+        logger.debug(`[trigger-mock-server-only] Bundling ${args.path}`, {
+          ...args
+        });
+        return {
+          path: args.path,
+          external: false,
+          namespace: "server-only-mock"
+        };
+      });
+      build3.onLoad({ filter: /server-only/, namespace: "server-only-mock" }, (args) => {
+        return {
+          contents: `export default true;`,
+          loader: "js"
+        };
+      });
+    }
+  };
+}
 function bundleTriggerDevCore(buildIdentifier, tsconfigPath) {
   return {
     name: "trigger-bundle-core",
@@ -2953,7 +2979,7 @@ function bundleDependenciesPlugin(buildIdentifier, dependenciesToBundle, tsconfi
             return void 0;
           }
         }
-        logger.ignore(`[${buildIdentifier}] Externalizing ${args.path}`, {
+        logger.debug(`[${buildIdentifier}] Externalizing ${args.path}`, {
           ...args
         });
         return {
@@ -3255,6 +3281,8 @@ function assertExhaustive(x) {
 
 // src/utilities/javascriptProject.ts
 import { builtinModules } from "node:module";
+import { recordSpanException as recordSpanException4 } from "@trigger.dev/core/v3/otel";
+import { flattenAttributes as flattenAttributes2 } from "@trigger.dev/core/v3";
 var JavascriptProject = class {
   constructor(projectPath) {
     this.projectPath = projectPath;
@@ -3285,46 +3313,62 @@ var JavascriptProject = class {
     }
   }
   async resolveAll(packageNames, options) {
-    const externalPackages = packageNames.filter((packageName) => !isBuiltInModule(packageName));
-    const opts = { allowDev: false, ...options };
-    const command = await this.#getCommand();
-    try {
-      const versions = await command.resolveDependencyVersions(externalPackages, {
-        cwd: this.projectPath
+    return tracer.startActiveSpan("JavascriptProject.resolveAll", async (span) => {
+      const externalPackages = packageNames.filter((packageName) => !isBuiltInModule(packageName));
+      const opts = { allowDev: false, ...options };
+      const command = await this.#getCommand();
+      span.setAttributes({
+        externalPackages,
+        packageManager: command.name
       });
-      if (versions) {
-        logger.debug(`Resolved [${externalPackages.join(", ")}] version using ${command.name}`, {
-          versions
+      try {
+        const versions = await command.resolveDependencyVersions(externalPackages, {
+          cwd: this.projectPath
         });
-      }
-      const missingPackages = externalPackages.filter((packageName) => !versions[packageName]);
-      const missingPackageVersions = {};
-      for (const packageName of missingPackages) {
-        const packageJsonVersion = this.packageJson.dependencies?.[packageName];
-        if (typeof packageJsonVersion === "string") {
-          logger.debug(`Resolved ${packageName} version using package.json`, {
-            packageJsonVersion
+        if (versions) {
+          logger.debug(`Resolved [${externalPackages.join(", ")}] version using ${command.name}`, {
+            versions
+          });
+          span.setAttributes({
+            ...flattenAttributes2(versions, "versions")
           });
-          missingPackageVersions[packageName] = packageJsonVersion;
         }
-        if (opts.allowDev) {
-          const devPackageJsonVersion = this.packageJson.devDependencies?.[packageName];
-          if (typeof devPackageJsonVersion === "string") {
-            logger.debug(`Resolved ${packageName} version using devDependencies`, {
-              devPackageJsonVersion
+        const missingPackages = externalPackages.filter((packageName) => !versions[packageName]);
+        const missingPackageVersions = {};
+        for (const packageName of missingPackages) {
+          const packageJsonVersion = this.packageJson.dependencies?.[packageName];
+          if (typeof packageJsonVersion === "string") {
+            logger.debug(`Resolved ${packageName} version using package.json`, {
+              packageJsonVersion
             });
-            missingPackageVersions[packageName] = devPackageJsonVersion;
+            missingPackageVersions[packageName] = packageJsonVersion;
+          }
+          if (opts.allowDev) {
+            const devPackageJsonVersion = this.packageJson.devDependencies?.[packageName];
+            if (typeof devPackageJsonVersion === "string") {
+              logger.debug(`Resolved ${packageName} version using devDependencies`, {
+                devPackageJsonVersion
+              });
+              missingPackageVersions[packageName] = devPackageJsonVersion;
+            }
           }
         }
+        span.setAttributes({
+          ...flattenAttributes2(missingPackageVersions, "missingPackageVersions"),
+          missingPackages
+        });
+        span.end();
+        return { ...versions, ...missingPackageVersions };
+      } catch (error) {
+        recordSpanException4(span, error);
+        span.end();
+        logger.debug(`Failed to resolve dependency versions using ${command.name}`, {
+          packageNames,
+          error
+        });
+        return {};
       }
-      return { ...versions, ...missingPackageVersions };
-    } catch (error) {
-      logger.debug(`Failed to resolve dependency versions using ${command.name}`, {
-        packageNames,
-        error
-      });
-      return {};
-    }
+    });
   }
   async resolve(packageName, options) {
     if (isBuiltInModule(packageName)) {
@@ -3853,7 +3897,7 @@ async function _deployCommand(dir, options) {
   });
   if (resolvedConfig.status === "error") {
     logger.error("Failed to read config:", resolvedConfig.error);
-    span && recordSpanException4(span, resolvedConfig.error);
+    span && recordSpanException5(span, resolvedConfig.error);
     throw new SkipLoggingError("Failed to read config");
   }
   logger.debug("Resolved config", { resolvedConfig });
@@ -3864,7 +3908,7 @@ async function _deployCommand(dir, options) {
     "resolvedConfig.config.projectDir": resolvedConfig.config.projectDir,
     "resolvedConfig.config.triggerUrl": resolvedConfig.config.triggerUrl,
     "resolvedConfig.config.triggerDirectories": resolvedConfig.config.triggerDirectories,
-    ...flattenAttributes2(resolvedConfig.config.retries, "resolvedConfig.config.retries")
+    ...flattenAttributes3(resolvedConfig.config.retries, "resolvedConfig.config.retries")
   });
   const apiClient2 = new CliApiClient(authorization.auth.apiUrl, authorization.auth.accessToken);
   const deploymentEnv = await apiClient2.getProjectEnv({
@@ -4223,7 +4267,7 @@ async function waitForDeploymentToFinish(deploymentId, client, timeoutInSeconds
         await setTimeout2(1e3);
       }
     } catch (error) {
-      recordSpanException4(span, error);
+      recordSpanException5(span, error);
       span.end();
       return error instanceof Error ? error.message : JSON.stringify(error);
     }
@@ -4315,7 +4359,7 @@ async function buildAndPushImage(options, updater) {
         digest
       };
     } catch (e) {
-      recordSpanException4(span, e);
+      recordSpanException5(span, e);
       span.end();
       return {
         ok: false,
@@ -4387,7 +4431,7 @@ async function buildAndPushSelfHostedImage(options) {
         "image.digest": digest
       });
     } catch (e) {
-      recordSpanException4(span, e);
+      recordSpanException5(span, e);
       span.end();
       return {
         ok: false,
@@ -4424,7 +4468,7 @@ async function buildAndPushSelfHostedImage(options) {
         }
         span.end();
       } catch (e) {
-        recordSpanException4(span, e);
+        recordSpanException5(span, e);
         span.end();
         return {
           ok: false,
@@ -4517,6 +4561,7 @@ async function compileProject(config, options, configPath) {
           __PROJECT_CONFIG__: JSON.stringify(config)
         },
         plugins: [
+          mockServerOnlyPlugin(),
           bundleDependenciesPlugin(
             "workerFacade",
             config.dependenciesToBundle,
@@ -4621,7 +4666,7 @@ async function compileProject(config, options, configPath) {
       });
       const allImports = [...metaOutput.imports, ...entryPointMetaOutput.imports];
       const javascriptProject = new JavascriptProject(config.projectDir);
-      const dependencies2 = await gatherRequiredDependencies(allImports, config, javascriptProject);
+      const dependencies2 = await resolveRequiredDependencies(allImports, config, javascriptProject);
       logger.debug("gatherRequiredDependencies()", { dependencies: dependencies2 });
       const packageJsonContents = {
         name: "trigger-worker",
@@ -4632,6 +4677,9 @@ async function compileProject(config, options, configPath) {
           ...javascriptProject.scripts
         }
       };
+      span.setAttributes({
+        ...flattenAttributes3(packageJsonContents, "packageJson.contents")
+      });
       await writeJSONFile(join6(tempDir, "package.json"), packageJsonContents);
       const copyResult = await copyAdditionalFiles(config, tempDir);
       if (!copyResult.ok) {
@@ -4680,7 +4728,7 @@ If this is unexpected you should check your ${terminalLink2(
       span.end();
       return { path: tempDir, contentHash };
     } catch (e) {
-      recordSpanException4(span, e);
+      recordSpanException5(span, e);
       span.end();
       throw e;
     }
@@ -4698,7 +4746,7 @@ async function resolveDependencies(projectDir, packageJsonContents, config, opti
     span.setAttributes({
       "packageJson.digest": digest,
       "cache.path": cachePath,
-      ...flattenAttributes2(packageJsonContents, "packageJson.contents")
+      ...flattenAttributes3(packageJsonContents, "packageJson.contents")
     });
     try {
       const cachedPackageLock = await readFile2(cachePath, "utf-8");
@@ -4735,7 +4783,7 @@ async function resolveDependencies(projectDir, packageJsonContents, config, opti
         resolvingDepsSpinner.stop("Dependencies resolved");
         return true;
       } catch (installError) {
-        recordSpanException4(span, installError);
+        recordSpanException5(span, installError);
         span.end();
         const parsedError = parseNpmInstallError(installError);
         if (typeof parsedError === "string") {
@@ -4801,65 +4849,80 @@ async function typecheckProject(config, options) {
       span.end();
       return true;
     } catch (e) {
-      recordSpanException4(span, e);
+      recordSpanException5(span, e);
       span.end();
       return false;
     }
   });
 }
-async function gatherRequiredDependencies(imports, config, project) {
-  const dependencies2 = {};
-  const resolvablePackageNames = /* @__PURE__ */ new Set();
-  for (const file of imports) {
-    if (file.kind !== "require-call" && file.kind !== "dynamic-import" || !file.external) {
-      continue;
-    }
-    const packageName = detectPackageNameFromImportPath(file.path);
-    if (!packageName) {
-      continue;
-    }
-    resolvablePackageNames.add(packageName);
-  }
-  const resolvedPackageVersions = await project.resolveAll(Array.from(resolvablePackageNames));
-  const missingPackages = Array.from(resolvablePackageNames).filter(
-    (packageName) => !resolvedPackageVersions[packageName]
-  );
-  for (const missingPackage of missingPackages) {
-    const internalDependencyVersion = dependencies[missingPackage] ?? detectDependencyVersion(missingPackage);
-    if (internalDependencyVersion) {
-      dependencies2[missingPackage] = stripWorkspaceFromVersion(internalDependencyVersion);
-    }
-  }
-  for (const [packageName, version2] of Object.entries(resolvedPackageVersions)) {
-    dependencies2[packageName] = version2;
-  }
-  if (config.additionalPackages) {
-    for (const packageName of config.additionalPackages) {
-      if (dependencies2[packageName]) {
+async function resolveRequiredDependencies(imports, config, project) {
+  return await tracer.startActiveSpan("resolveRequiredDependencies", async (span) => {
+    const resolvablePackageNames = /* @__PURE__ */ new Set();
+    for (const file of imports) {
+      if (file.kind !== "require-call" && file.kind !== "dynamic-import" || !file.external) {
         continue;
       }
-      const packageParts = parsePackageName(packageName);
-      if (packageParts.version) {
-        dependencies2[packageParts.name] = packageParts.version;
+      const packageName = detectPackageNameFromImportPath(file.path);
+      if (!packageName) {
         continue;
-      } else {
-        const externalDependencyVersion = await project.resolve(packageParts.name, {
-          allowDev: true
-        });
-        if (externalDependencyVersion) {
-          dependencies2[packageParts.name] = externalDependencyVersion;
+      }
+      resolvablePackageNames.add(packageName);
+    }
+    span.setAttribute("resolvablePackageNames", Array.from(resolvablePackageNames));
+    const resolvedPackageVersions = await project.resolveAll(Array.from(resolvablePackageNames));
+    const missingPackages = Array.from(resolvablePackageNames).filter(
+      (packageName) => !resolvedPackageVersions[packageName]
+    );
+    span.setAttributes({
+      ...flattenAttributes3(resolvedPackageVersions, "resolvedPackageVersions")
+    });
+    span.setAttribute("missingPackages", missingPackages);
+    const dependencies2 = {};
+    for (const missingPackage of missingPackages) {
+      const internalDependencyVersion = dependencies[missingPackage] ?? detectDependencyVersion(missingPackage);
+      if (internalDependencyVersion) {
+        dependencies2[missingPackage] = stripWorkspaceFromVersion(internalDependencyVersion);
+      }
+    }
+    for (const [packageName, version2] of Object.entries(resolvedPackageVersions)) {
+      dependencies2[packageName] = version2;
+    }
+    if (config.additionalPackages) {
+      span.setAttribute("additionalPackages", config.additionalPackages);
+      for (const packageName of config.additionalPackages) {
+        if (dependencies2[packageName]) {
+          continue;
+        }
+        const packageParts = parsePackageName(packageName);
+        if (packageParts.version) {
+          dependencies2[packageParts.name] = packageParts.version;
           continue;
         } else {
-          logger.log(
-            `${chalkWarning("X Warning:")} Could not find version for package ${chalkPurple(
-              packageName
-            )}, add a version specifier to the package name (e.g. ${packageParts.name}@latest) or add it to your project's package.json`
-          );
+          const externalDependencyVersion = await project.resolve(packageParts.name, {
+            allowDev: true
+          });
+          if (externalDependencyVersion) {
+            dependencies2[packageParts.name] = externalDependencyVersion;
+            continue;
+          } else {
+            logger.log(
+              `${chalkWarning("X Warning:")} Could not find version for package ${chalkPurple(
+                packageName
+              )}, add a version specifier to the package name (e.g. ${packageParts.name}@latest) or add it to your project's package.json`
+            );
+          }
         }
       }
     }
-  }
-  return Object.fromEntries(Object.entries(dependencies2).sort(([a], [b]) => a.localeCompare(b)));
+    const result = Object.fromEntries(
+      Object.entries(dependencies2).sort(([a], [b]) => a.localeCompare(b))
+    );
+    span.setAttributes({
+      ...flattenAttributes3(result, "dependencies")
+    });
+    span.end();
+    return result;
+  });
 }
 async function copyAdditionalFiles(config, tempDir) {
   const additionalFiles = config.additionalFiles ?? [];
@@ -4929,7 +4992,7 @@ async function copyAdditionalFiles(config, tempDir) {
           ok: true
         };
       } catch (error) {
-        recordSpanException4(span, error);
+        recordSpanException5(span, error);
         span.end();
         throw error;
       }
@@ -5884,6 +5947,7 @@ function useDev({
           __PROJECT_CONFIG__: JSON.stringify(config)
         },
         plugins: [
+          mockServerOnlyPlugin(),
           bundleTriggerDevCore("workerFacade", config.tsconfigPath),
           bundleDependenciesPlugin(
             "workerFacade",
@@ -5939,7 +6003,7 @@ function useDev({
                 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);
+                const dependencies2 = await gatherRequiredDependencies(metaOutput, config);
                 if (sourceMapFile) {
                   const sourceMapPath2 = `${fullPath}.map`;
                   await fs7.promises.writeFile(sourceMapPath2, sourceMapFile.text);
@@ -6130,7 +6194,7 @@ function WebsocketFactory(apiKey) {
     }
   };
 }
-async function gatherRequiredDependencies2(outputMeta, config) {
+async function gatherRequiredDependencies(outputMeta, config) {
   const dependencies2 = {};
   logger.debug("Gathering required dependencies from imports", {
     imports: outputMeta.imports
@@ -6232,8 +6296,8 @@ async function findPnpmNodeModulesPath() {
 // src/commands/init.ts
 import { intro as intro5, isCancel as isCancel2, log as log6, outro as outro6, select as select2, text } from "@clack/prompts";
 import { context as context3, trace as trace3 } from "@opentelemetry/api";
-import { flattenAttributes as flattenAttributes3 } from "@trigger.dev/core/v3";
-import { recordSpanException as recordSpanException5 } from "@trigger.dev/core/v3/workers";
+import { flattenAttributes as flattenAttributes4 } from "@trigger.dev/core/v3";
+import { recordSpanException as recordSpanException6 } from "@trigger.dev/core/v3/workers";
 import chalk5 from "chalk";
 import { execa as execa3 } from "execa";
 import { applyEdits, modify } from "jsonc-parser";
@@ -6352,7 +6416,7 @@ async function _initCommand(dir, options) {
     options.projectRef
   );
   span?.setAttributes({
-    ...flattenAttributes3(selectedProject, "cli.project")
+    ...flattenAttributes4(selectedProject, "cli.project")
   });
   logger.debug("Selected project", selectedProject);
   log6.step(`Configuring project "${selectedProject.name}" (${selectedProject.externalRef})`);
@@ -6448,7 +6512,7 @@ async function createTriggerDir(dir, options) {
       return { location, isCustomValue: location !== defaultValue };
     } catch (e) {
       if (!(e instanceof SkipCommandError)) {
-        recordSpanException5(span, e);
+        recordSpanException6(span, e);
       }
       span.end();
       throw e;
@@ -6482,7 +6546,7 @@ async function gitIgnoreDotTriggerDir(dir, options) {
       span.end();
     } catch (e) {
       if (!(e instanceof SkipCommandError)) {
-        recordSpanException5(span, e);
+        recordSpanException6(span, e);
       }
       span.end();
       throw e;
@@ -6515,7 +6579,7 @@ async function addConfigFileToTsConfig(dir, options) {
       span.end();
     } catch (e) {
       if (!(e instanceof SkipCommandError)) {
-        recordSpanException5(span, e);
+        recordSpanException6(span, e);
       }
       span.end();
       throw e;
@@ -6566,7 +6630,7 @@ async function installPackages2(dir, options) {
         `Failed to install @trigger.dev/sdk@${options.tag}. Rerun command with --log-level debug for more details.`
       );
       if (!(e instanceof SkipCommandError)) {
-        recordSpanException5(span, e);
+        recordSpanException6(span, e);
       }
       span.end();
       throw e;
@@ -6607,7 +6671,7 @@ async function writeConfigFile(dir, project, options, triggerDir) {
       return result.success;
     } catch (e) {
       if (!(e instanceof SkipCommandError)) {
-        recordSpanException5(span, e);
+        recordSpanException6(span, e);
       }
       span.end();
       throw e;
@@ -6626,7 +6690,7 @@ async function selectProject(apiClient2, dashboardUrl, projectRef) {
           throw new SkipCommandError(projectResponse.error);
         }
         span.setAttributes({
-          ...flattenAttributes3(projectResponse.data, "cli.project")
+          ...flattenAttributes4(projectResponse.data, "cli.project")
         });
         span.end();
         return projectResponse.data;
@@ -6661,13 +6725,13 @@ async function selectProject(apiClient2, dashboardUrl, projectRef) {
         throw new Error("Invalid project ref");
       }
       span.setAttributes({
-        ...flattenAttributes3(projectData, "cli.project")
+        ...flattenAttributes4(projectData, "cli.project")
       });
       span.end();
       return projectData;
     } catch (e) {
       if (!(e instanceof SkipCommandError)) {
-        recordSpanException5(span, e);
+        recordSpanException6(span, e);
       }
       span.end();
       throw e;