Improve the update CLI command and fix missing tsconfig.json error (#1315)

* Fixes for CLI update command, and make the hide the "whoami" command output when running in dev

* Fix an issue where a missing tsconfig.json file would throw an error on dev/deploy

* Don’t show latest CLI warning when using a prerelease

* Only print CLI update required message when update is embedded

* Strip out TRIGGER\_ keys when using syncEnvVars, to prevent deploy errors

Author: ericallam

.changeset/clever-buses-watch.md

@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Fix an issue where a missing tsconfig.json file would throw an error on dev/deploy

.changeset/soft-ladybugs-promise.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fixes for CLI update command, and make the hide the "whoami" command output when running in dev.

.changeset/twelve-onions-decide.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": patch
+---
+
+Strip out TRIGGER\_ keys when using syncEnvVars, to prevent deploy errors

packages/build/src/extensions/core/syncEnvVars.ts

@@ -63,6 +63,8 @@ const UNSYNCABLE_ENV_VARS = [
   "_",
 ];
 
+const UNSYNCABLE_ENV_VARS_PREFIXES = ["TRIGGER_"];
+
 export type SyncEnvVarsFunction = (params: SyncEnvVarsParams) => SyncEnvVarsResult;
 
 export type SyncEnvVarsOptions = {
@@ -98,6 +100,11 @@ export function syncEnvVars(fn: SyncEnvVarsFunction, options?: SyncEnvVarsOption
             return acc;
           }
 
+          // Strip out any TRIGGER_ prefix env vars
+          if (UNSYNCABLE_ENV_VARS_PREFIXES.some((prefix) => key.startsWith(prefix))) {
+            return acc;
+          }
+
           acc[key] = value;
           return acc;
         },

packages/cli-v3/src/commands/dev.ts

@@ -51,6 +51,7 @@ export async function devCommand(options: DevCommandOptions) {
 
   const authorization = await login({
     embedded: true,
+    silent: true,
     defaultApiUrl: options.apiUrl,
     profile: options.profile,
   });

packages/cli-v3/src/commands/login.ts

@@ -59,12 +59,18 @@ export type LoginOptions = {
   defaultApiUrl?: string;
   embedded?: boolean;
   profile?: string;
+  silent?: boolean;
 };
 
 export async function login(options?: LoginOptions): Promise<LoginResult> {
   return await tracer.startActiveSpan("login", async (span) => {
     try {
-      const opts = { defaultApiUrl: "https://api.trigger.dev", embedded: false, ...options };
+      const opts = {
+        defaultApiUrl: "https://api.trigger.dev",
+        embedded: false,
+        silent: false,
+        ...options,
+      };
 
       span.setAttributes({
         "cli.config.apiUrl": opts.defaultApiUrl,
@@ -111,7 +117,8 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
             skipTelemetry: !span.isRecording(),
             logLevel: logger.loggerLevel,
           },
-          true
+          true,
+          opts.silent
         );
 
         if (!whoAmIResult.success) {

packages/cli-v3/src/commands/update.ts

@@ -43,7 +43,7 @@ export function configureUpdateCommand(program: Command) {
 const triggerPackageFilter = /^@trigger\.dev/;
 
 export async function updateCommand(dir: string, options: UpdateCommandOptions) {
-  await updateTriggerPackages(dir, options);
+  await updateTriggerPackages(dir, options, false);
 }
 
 export async function updateTriggerPackages(
@@ -74,7 +74,7 @@ export async function updateTriggerPackages(
 
   const newCliVersion = await updateCheck();
 
-  if (newCliVersion) {
+  if (newCliVersion && !cliVersion.startsWith("0.0.0")) {
     prettyWarning(
       "You're not running the latest CLI version, please consider updating ASAP",
       `Current:     ${cliVersion}\nLatest:      ${newCliVersion}`,
@@ -127,24 +127,30 @@ export async function updateTriggerPackages(
 
   if (mismatches.length === 0) {
     if (!embedded) {
-      outro(`Nothing to do${newCliVersion ? " ..but you should really update your CLI!" : ""}`);
+      outro(`Nothing to update${newCliVersion ? " ..but you should really update your CLI!" : ""}`);
       return hasOutput;
     }
     return hasOutput;
   }
 
-  if (isDowngrade) {
-    prettyError("Some of the installed @trigger.dev packages are newer than your CLI version");
-  } else {
-    prettyWarning(
-      "Mismatch between your CLI version and installed packages",
-      "We recommend pinned versions for guaranteed compatibility"
-    );
+  if (embedded) {
+    if (isDowngrade) {
+      prettyError("Some of the installed @trigger.dev packages are newer than your CLI version");
+    } else {
+      if (embedded) {
+        prettyWarning(
+          "Mismatch between your CLI version and installed packages",
+          "We recommend pinned versions for guaranteed compatibility"
+        );
+      }
+    }
   }
 
   if (!hasTTY) {
     // Running in CI with version mismatch detected
-    outro("Deploy failed");
+    if (embedded) {
+      outro("Deploy failed");
+    }
 
     console.log(
       `ERROR: Version mismatch detected while running in CI. This won't end well. Aborting.
@@ -162,8 +168,7 @@ export async function updateTriggerPackages(
   }
 
   // WARNING: We can only start accepting user input once we know this is a TTY, otherwise, the process will exit with an error in CI
-
-  if (isDowngrade) {
+  if (isDowngrade && embedded) {
     printUpdateTable("Versions", mismatches, cliVersion, "installed", "CLI");
 
     outro("CLI update required!");
@@ -187,14 +192,20 @@ export async function updateTriggerPackages(
 
   if (!userWantsToUpdate) {
     if (requireUpdate) {
-      outro("You shall not pass!");
-
-      logger.log(
-        `${chalkError(
-          "X Error:"
-        )} Update required: Version mismatches are a common source of bugs and errors. Please update or use \`--skip-update-check\` at your own risk.\n`
-      );
-      process.exit(1);
+      if (embedded) {
+        outro("You shall not pass!");
+
+        logger.log(
+          `${chalkError(
+            "X Error:"
+          )} Update required: Version mismatches are a common source of bugs and errors. Please update or use \`--skip-update-check\` at your own risk.\n`
+        );
+        process.exit(1);
+      } else {
+        outro("No updates applied");
+
+        process.exit(0);
+      }
     }
 
     if (!embedded) {
@@ -205,7 +216,7 @@ export async function updateTriggerPackages(
   }
 
   const installSpinner = spinner();
-  installSpinner.start("Writing new package.json file");
+  installSpinner.start("Updating dependencies in package.json");
 
   // Backup package.json
   const packageJsonBackupPath = `${packageJsonPath}.bak`;
@@ -235,12 +246,16 @@ export async function updateTriggerPackages(
   const packageManager = await detectPackageManager(projectPath);
 
   try {
-    installSpinner.message(`Installing new package versions with ${packageManager}`);
+    installSpinner.message(
+      `Installing new package versions${packageManager ? ` with ${packageManager.name}` : ""}`
+    );
 
-    await installDependencies({ cwd: projectPath });
+    await installDependencies({ cwd: projectPath, silent: true });
   } catch (error) {
     installSpinner.stop(
-      `Failed to install new package versions${packageManager ? ` with ${packageManager}` : ""}`
+      `Failed to install new package versions${
+        packageManager ? ` with ${packageManager.name}` : ""
+      }`
     );
 
     // Remove exit handler in case of failure

packages/cli-v3/src/commands/whoami.ts

@@ -51,27 +51,32 @@ export async function whoAmICommand(options: unknown) {
 
 export async function whoAmI(
   options?: WhoamiCommandOptions,
-  embedded: boolean = false
+  embedded: boolean = false,
+  silent: boolean = false
 ): Promise<WhoAmIResult> {
   if (!embedded) {
     intro(`Displaying your account details [${options?.profile ?? "default"}]`);
   }
 
   const loadingSpinner = spinner();
-  loadingSpinner.start("Checking your account details");
+
+  if (!silent) {
+    loadingSpinner.start("Checking your account details");
+  }
 
   const authentication = await isLoggedIn(options?.profile);
 
   if (!authentication.ok) {
     if (authentication.error === "fetch failed") {
-      loadingSpinner.stop("Fetch failed. Platform down?");
+      !silent && loadingSpinner.stop("Fetch failed. Platform down?");
     } else {
       if (embedded) {
-        loadingSpinner.stop(
-          `Failed to check account details. You may want to run \`trigger.dev logout --profile ${
-            options?.profile ?? "default"
-          }\` and try again.`
-        );
+        !silent &&
+          loadingSpinner.stop(
+            `Failed to check account details. You may want to run \`trigger.dev logout --profile ${
+              options?.profile ?? "default"
+            }\` and try again.`
+          );
       } else {
         loadingSpinner.stop(
           `You must login first. Use \`trigger.dev login --profile ${
@@ -110,7 +115,7 @@ URL: ${chalkLink(authentication.auth.apiUrl)}
       `Account details [${authentication.profile}]`
     );
   } else {
-    loadingSpinner.stop(`Retrieved your account details for ${userData.data.email}`);
+    !silent && loadingSpinner.stop(`Retrieved your account details for ${userData.data.email}`);
   }
 
   return userData;

packages/cli-v3/src/config.ts

@@ -138,7 +138,7 @@ async function resolveConfig(
   warn = true
 ): Promise<ResolvedConfig> {
   const packageJsonPath = await resolvePackageJSON(cwd);
-  const tsconfigPath = await resolveTSConfig(cwd);
+  const tsconfigPath = await safeResolveTsConfig(cwd);
   const lockfilePath = await resolveLockfile(cwd);
   const workspaceDir = await findWorkspaceDir(cwd);
 
@@ -179,7 +179,7 @@ async function resolveConfig(
         conditions: [],
       },
     }
-  );
+  ) as ResolvedConfig; // TODO: For some reason, without this, there is a weird type error complaining about tsconfigPath being string | nullish, which can't be assigned to string | undefined
 
   return {
     ...mergedConfig,
@@ -188,6 +188,14 @@ async function resolveConfig(
   };
 }
 
+async function safeResolveTsConfig(cwd: string) {
+  try {
+    return await resolveTSConfig(cwd);
+  } catch {
+    return undefined;
+  }
+}
+
 const IGNORED_DIRS = ["node_modules", ".git", "dist", "out", "build"];
 
 async function autoDetectDirs(workingDir: string): Promise<string[]> {

packages/cli-v3/src/utilities/sourceFiles.ts

@@ -31,7 +31,7 @@ export async function resolveFileSources(
   }
 
   await resolveConfigSource(sources, resolvedConfig.workingDir, resolvedConfig.configFile);
-  await resolveConfigSource(sources, resolvedConfig.workingDir, resolvedConfig.tsconfig);
+  await resolveConfigSource(sources, resolvedConfig.workingDir, resolvedConfig.tsconfigPath);
   await resolveConfigSource(sources, resolvedConfig.workingDir, resolvedConfig.packageJsonPath);
 
   return sources;