trigger.dev 0.0.0-v3-prerelease-20240424094958 → 0.0.0-v3-decorators-20240424152300

package/dist/index.js

@@ -792,15 +792,16 @@ import { execa as execa2 } from "execa";
 import { createHash } from "node:crypto";
 import { readFileSync as readFileSync2 } from "node:fs";
 import { copyFile, mkdir, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname, join as join6, relative as relative3, posix } from "node:path";
+import { dirname, join as join6, posix, relative as relative3 } from "node:path";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
 import terminalLink2 from "terminal-link";
 import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-prerelease-20240424094958";
+var version = "0.0.0-v3-decorators-20240424152300";
 var dependencies = {
+  "@anatine/esbuild-decorators": "^0.2.19",
   "@clack/prompts": "^0.7.0",
   "@depot/cli": "0.0.1-cli.2.55.0",
   "@opentelemetry/api": "^1.8.0",
@@ -815,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-20240424094958",
+  "@trigger.dev/core": "workspace:0.0.0-v3-decorators-20240424152300",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -1596,6 +1597,7 @@ async function getTriggerDirectories(dirPath) {
 
 // src/utilities/configFiles.ts
 import { build } from "esbuild";
+import { esbuildDecorators } from "@anatine/esbuild-decorators";
 function getGlobalConfigFolderPath() {
   const configDir = mod_esm_default("trigger").config();
   return configDir;
@@ -1701,7 +1703,14 @@ async function readConfig(dir, options) {
     platform: "node",
     target: ["es2018", "node18"],
     outfile: builtConfigFilePath,
-    logLevel: "silent"
+    logLevel: "silent",
+    plugins: [
+      esbuildDecorators({
+        cwd: absoluteDir,
+        tsx: false,
+        force: false
+      })
+    ]
   });
   const userConfigModule = await import(builtConfigFileHref);
   const rawConfig = await normalizeConfig(
@@ -1802,14 +1811,18 @@ After installation, run Trigger.dev with \`npx trigger.dev\`.`
 }
 async function printStandloneInitialBanner(performUpdateCheck = true) {
   const cliVersion = getVersion();
-  logger.log(`
-${logo()} ${chalkGrey(`(${cliVersion})`)}
-`);
   if (performUpdateCheck) {
     const maybeNewVersion = await updateCheck();
     if (maybeNewVersion !== void 0) {
-      logger.log(`Update available ${chalk3.green(maybeNewVersion)}`);
+      logger.log(`
+${logo()} ${chalkGrey(`(${cliVersion} -> ${chalk3.green(maybeNewVersion)})`)}`);
+    } else {
+      logger.log(`
+${logo()} ${chalkGrey(`(${cliVersion})`)}`);
     }
+  } else {
+    logger.log(`
+${logo()} ${chalkGrey(`(${cliVersion})`)}`);
   }
   logger.log(`${chalkGrey("-".repeat(54))}`);
 }
@@ -2638,11 +2651,15 @@ async function login(options) {
           true
         );
         if (!whoAmIResult.success) {
-          prettyError("Whoami failed", whoAmIResult.error);
+          prettyError("Unable to validate existing personal access token", whoAmIResult.error);
           if (!opts.embedded) {
-            outro3("Login failed");
+            outro3(
+              `Login failed using stored token. To fix, first logout using \`trigger.dev logout${options?.profile ? ` --profile ${options.profile}` : ""}\` and then try again.`
+            );
+            throw new SkipLoggingError(whoAmIResult.error);
+          } else {
+            throw new Error(whoAmIResult.error);
           }
-          throw new Error(whoAmIResult.error);
         } else {
           if (!opts.embedded) {
             const continueOption = await select({
@@ -2832,6 +2849,7 @@ ${authorizationCodeResult.error}`
 }
 
 // src/commands/deploy.ts
+import { esbuildDecorators as esbuildDecorators2 } from "@anatine/esbuild-decorators";
 import { Glob } from "glob";
 
 // src/utilities/build.ts
@@ -3164,18 +3182,6 @@ ${chalkError("X Error:")} Failed to start. The following ${zodIssues.length ===
   }
 }
 
-// src/utilities/safeJsonParse.ts
-function safeJsonParse(json) {
-  if (!json) {
-    return void 0;
-  }
-  try {
-    return JSON.parse(json);
-  } catch {
-    return void 0;
-  }
-}
-
 // src/utilities/javascriptProject.ts
 import { $ } from "execa";
 import { join as join4 } from "node:path";
@@ -3447,6 +3453,18 @@ function cliRootPath() {
   return __dirname2;
 }
 
+// src/utilities/safeJsonParse.ts
+function safeJsonParse(json) {
+  if (!json) {
+    return void 0;
+  }
+  try {
+    return JSON.parse(json);
+  } catch {
+    return void 0;
+  }
+}
+
 // src/commands/update.ts
 import { confirm, intro as intro3, isCancel, log as log4, outro as outro4 } from "@clack/prompts";
 import { join as join5, resolve as resolve2 } from "path";
@@ -3471,6 +3489,7 @@ async function updateCommand(dir, options) {
   await updateTriggerPackages(dir, options);
 }
 async function updateTriggerPackages(dir, options, embedded, requireUpdate) {
+  let hasOutput = false;
   if (!embedded) {
     intro3("Updating packages");
   }
@@ -3478,7 +3497,7 @@ async function updateTriggerPackages(dir, options, embedded, requireUpdate) {
   const { packageJson, readonlyPackageJson, packageJsonPath } = await getPackageJson(projectPath);
   if (!packageJson) {
     log4.error("Failed to load package.json. Try to re-run with `-l debug` to see what's going on.");
-    return;
+    return false;
   }
   const cliVersion = getVersion();
   const newCliVersion = await updateCheck();
@@ -3489,6 +3508,7 @@ async function updateTriggerPackages(dir, options, embedded, requireUpdate) {
 Latest:      ${newCliVersion}`,
       "Run latest:  npx trigger.dev@beta"
     );
+    hasOutput = true;
   }
   const triggerDependencies = getTriggerDependencies(packageJson);
   function getVersionMismatches(deps, targetVersion) {
@@ -3505,8 +3525,9 @@ Latest:      ${newCliVersion}`,
   if (versionMismatches.length === 0) {
     if (!embedded) {
       outro4(`Nothing to do${newCliVersion ? " ..but you should really update your CLI!" : ""}`);
+      return hasOutput;
     }
-    return;
+    return hasOutput;
   }
   prettyWarning(
     "Mismatch between your CLI version and installed packages",
@@ -3516,15 +3537,15 @@ Latest:      ${newCliVersion}`,
     outro4("Deploy failed");
     console.log(
       `ERROR: Version mismatch detected while running in CI. This won't end well. Aborting.
-
-Please run the dev command locally and check that your CLI version matches the one printed below. Additionally, all \`@trigger.dev/*\` packages also need to match this version.
-
-If your local CLI version doesn't match the one below, you may want to add the \`trigger.dev\` package to your dependencies. You will also have to update your workflow deploy command to \`npx trigger.dev deploy\` to ensure your pinned CLI version is used.
-
-CLI version: ${cliVersion}
-
-Current package versions that don't match the CLI:
-${versionMismatches.map((dep) => `- ${dep.name}@${dep.version}`).join("\n")}
+  
+  Please run the dev command locally and check that your CLI version matches the one printed below. Additionally, all \`@trigger.dev/*\` packages also need to match this version.
+  
+  If your local CLI version doesn't match the one below, you may want to pin the CLI version in this CI step. To do that, just replace \`trigger.dev@beta\` with \`trigger.dev@<FULL_VERSION>\`, for example: \`npx trigger.dev@3.0.0-beta.17 deploy\`
+  
+  CLI version: ${cliVersion}
+  
+  Current package versions that don't match the CLI:
+  ${versionMismatches.map((dep) => `- ${dep.name}@${dep.version}`).join("\n")}
 `
     );
     process.exit(1);
@@ -3548,7 +3569,7 @@ ${versionMismatches.map((dep) => `- ${dep.name}@${dep.version}`).join("\n")}
     if (!embedded) {
       outro4("You've been warned!");
     }
-    return;
+    return hasOutput;
   }
   const installSpinner = spinner();
   installSpinner.start("Writing new package.json file");
@@ -3589,6 +3610,7 @@ ${versionMismatches.map((dep) => `- ${dep.name}@${dep.version}`).join("\n")}
       `Packages updated${newCliVersion ? " ..but you should really update your CLI too!" : ""}`
     );
   }
+  return hasOutput;
 }
 function getTriggerDependencies(packageJson) {
   const deps = [];
@@ -4418,7 +4440,12 @@ async function compileProject(config, options, configPath) {
             config.dependenciesToBundle,
             config.tsconfigPath
           ),
-          workerSetupImportConfigPlugin(configPath)
+          workerSetupImportConfigPlugin(configPath),
+          esbuildDecorators2({
+            tsconfig: config.tsconfigPath,
+            tsx: true,
+            force: false
+          })
         ]
       });
       if (result.errors.length > 0) {
@@ -5480,6 +5507,7 @@ function runtimeCheck(minimumMajor, minimumMinor) {
 
 // src/commands/dev.tsx
 import { findUp as findUp3, pathExists as pathExists2 } from "find-up";
+import { esbuildDecorators as esbuildDecorators3 } from "@anatine/esbuild-decorators";
 var apiClient;
 var DevCommandOptions = CommonCommandOptions.extend({
   debugger: z5.boolean().default(false),
@@ -5535,11 +5563,11 @@ async function startDev(dir, options, authorization, dashboardUrl) {
       logger.loggerLevel = options.logLevel;
     }
     await printStandloneInitialBanner(true);
+    let displayedUpdateMessage = false;
     if (!options.skipUpdateCheck) {
-      console.log();
-      await updateTriggerPackages(dir, { ...options }, false, true);
+      displayedUpdateMessage = await updateTriggerPackages(dir, { ...options }, true, true);
     }
-    printDevBanner(!options.skipUpdateCheck);
+    printDevBanner(displayedUpdateMessage);
     logger.debug("Starting dev session", { dir, options, authorization });
     let config = await readConfig(dir, {
       projectRef: options.projectRef,
@@ -5758,6 +5786,11 @@ function useDev({
             config.tsconfigPath
           ),
           workerSetupImportConfigPlugin(configPath),
+          esbuildDecorators3({
+            tsconfig: config.tsconfigPath,
+            tsx: true,
+            force: false
+          }),
           {
             name: "trigger.dev v3",
             setup(build3) {