trigger.dev 0.0.0-v3-prerelease-20240628145956 → 0.0.0-v3-prerelease-20240629184757

package/dist/index.js

@@ -798,7 +798,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-prerelease-20240628145956";
+var version = "0.0.0-v3-prerelease-20240629184757";
 var dependencies = {
   "@anatine/esbuild-decorators": "^0.2.19",
   "@clack/prompts": "^0.7.0",
@@ -815,7 +815,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-20240628145956",
+  "@trigger.dev/core": "workspace:0.0.0-v3-prerelease-20240629184757",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -3348,6 +3348,7 @@ async function detectPackageManagerFromArtifacts(path7) {
     case LOCKFILES.npm:
     case LOCKFILES.npmShrinkwrap:
       logger.debug("Found npm artifact", { foundPath });
+      return "npm";
     case LOCKFILES.bun:
       logger.debug("Found bun artifact", { foundPath });
       return "npm";
@@ -3377,10 +3378,53 @@ var JavascriptProject = class {
     }
     return this._packageJson;
   }
+  get allowedPackageJson() {
+    const disallowedKeys = [
+      "scripts",
+      "devDependencies",
+      "dependencies",
+      "peerDependencies",
+      "author",
+      "contributors",
+      "funding",
+      "bugs",
+      "files",
+      "keywords",
+      "main",
+      "module",
+      "type",
+      "bin",
+      "browser",
+      "man",
+      "directories",
+      "repository",
+      "peerDependenciesMeta",
+      "optionalDependencies",
+      "engines",
+      "os",
+      "cpu",
+      "private",
+      "publishConfig",
+      "workspaces"
+    ];
+    return Object.keys(this.packageJson).reduce(
+      (acc, key) => {
+        if (!disallowedKeys.includes(key)) {
+          acc[key] = this.packageJson[key];
+        }
+        return acc;
+      },
+      {}
+    );
+  }
   get scripts() {
-    return {
-      postinstall: this.packageJson.scripts?.postinstall ?? ""
-    };
+    return this.#filterScripts();
+  }
+  #filterScripts() {
+    if (!this.packageJson.scripts || typeof this.packageJson.scripts !== "object") {
+      return {};
+    }
+    return this.packageJson.scripts;
   }
   async install() {
     const command = await this.#getCommand();
@@ -4263,6 +4307,10 @@ ${authorization.error}`
     "View deployment",
     `${authorization.dashboardUrl}/projects/v3/${resolvedConfig.config.project}/deployments/${finishedDeployment.shortCode}`
   );
+  const testLink = cliLink(
+    "Test tasks",
+    `${authorization.dashboardUrl}/projects/v3/${resolvedConfig.config.project}/test?environment=${options.env === "prod" ? "prod" : "stg"}`
+  );
   switch (finishedDeployment.status) {
     case "DEPLOYED": {
       if (warnings.warnings.length > 0) {
@@ -4278,7 +4326,7 @@ ${authorization.error}`
         );
       } else {
         outro5(
-          `Version ${version2} deployed with ${taskCount} detected task${taskCount === 1 ? "" : "s"} ${deploymentLink}`
+          `Version ${version2} deployed with ${taskCount} detected task${taskCount === 1 ? "" : "s"} | ${deploymentLink} | ${testLink}`
         );
       }
       break;
@@ -4882,9 +4930,7 @@ async function compileProject(config, options, configPath) {
       const dependencies2 = await resolveRequiredDependencies(allImports, config, javascriptProject);
       logger.debug("gatherRequiredDependencies()", { dependencies: dependencies2 });
       const packageJsonContents = {
-        name: "trigger-worker",
-        version: "0.0.0",
-        description: "",
+        ...javascriptProject.allowedPackageJson,
         dependencies: dependencies2,
         scripts: {
           ...javascriptProject.scripts,
@@ -5379,7 +5425,7 @@ var SigKillTimeoutProcessError = class extends Error {
     this.name = "SigKillTimeoutProcessError";
   }
 };
-function getFriendlyErrorMessage(code, signal, stderr) {
+function getFriendlyErrorMessage(code, signal, stderr, dockerMode = true) {
   const message = (text3) => {
     if (signal) {
       return `[${signal}] ${text3}`;
@@ -5387,7 +5433,18 @@ function getFriendlyErrorMessage(code, signal, stderr) {
       return text3;
     }
   };
-  if (code === 137 || stderr?.includes("OOMErrorHandler")) {
+  if (code === 137) {
+    if (dockerMode) {
+      return message(
+        "Process ran out of memory! Try choosing a machine preset with more memory for this task."
+      );
+    } else {
+      return message(
+        "Process most likely ran out of memory, but we can't be certain. Try choosing a machine preset with more memory for this task."
+      );
+    }
+  }
+  if (stderr?.includes("OOMErrorHandler")) {
     return message(
       "Process ran out of memory! Try choosing a machine preset with more memory for this task."
     );
@@ -6782,13 +6839,18 @@ ${stderr}`);
       logger.error(error);
     });
     return () => {
-      logger.debug(`Shutting down dev session for ${config.project}`);
-      taskFileWatcher.close();
-      websocket?.close();
-      backgroundWorkerCoordinator.close();
-      ctx?.dispose().catch((error) => {
-        console.error(error);
-      });
+      const cleanup = async () => {
+        logger.debug(`Shutting down dev session for ${config.project}`);
+        const start = Date.now();
+        await taskFileWatcher.close();
+        websocket?.close();
+        backgroundWorkerCoordinator.close();
+        ctx?.dispose().catch((error) => {
+          console.error(error);
+        });
+        logger.debug(`Shutdown completed in ${Date.now() - start}ms`);
+      };
+      cleanup();
     };
   }, [config, apiUrl, apiKey, environmentClient]);
 }