fix text inputs on windows

Author: nicktrn

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

@@ -1,4 +1,4 @@
-import { intro, log, outro, spinner } from "@clack/prompts";
+import { intro, log, outro } from "@clack/prompts";
 import { depot } from "@depot/cli";
 import { context, trace } from "@opentelemetry/api";
 import {
@@ -56,7 +56,7 @@ import {
 import { safeJsonParse } from "../utilities/safeJsonParse";
 import { JavascriptProject } from "../utilities/javascriptProject";
 import { cliRootPath } from "../utilities/resolveInternalFilePath";
-import { escapeImportPath } from "../utilities/windows";
+import { escapeImportPath, spinner } from "../utilities/windows";
 
 const DeployCommandOptions = CommonCommandOptions.extend({
   skipTypecheck: z.boolean().default(false),

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

@@ -1,4 +1,4 @@
-import { intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
+import { intro, isCancel, log, outro, select, text } from "@clack/prompts";
 import { context, trace } from "@opentelemetry/api";
 import {
   GetProjectResponseBody,
@@ -32,6 +32,7 @@ import { printStandloneInitialBanner } from "../utilities/initialBanner.js";
 import { logger } from "../utilities/logger";
 import { cliRootPath } from "../utilities/resolveInternalFilePath";
 import { login } from "./login";
+import { spinner } from "../utilities/windows";
 
 const InitCommandOptions = CommonCommandOptions.extend({
   projectRef: z.string().optional(),
@@ -185,9 +186,8 @@ async function _initCommand(dir: string, options: InitCommandOptions) {
 async function createTriggerDir(dir: string, options: InitCommandOptions) {
   return await tracer.startActiveSpan("createTriggerDir", async (span) => {
     try {
-      const defaultValue = join(dir, "src", "trigger-2");
+      const defaultValue = join(dir, "src", "trigger");
 
-      // FIXME: (windows) Text prompts do not accept any user input
       const location = await text({
         message: "Where would you like to create the Trigger.dev directory?",
         defaultValue: defaultValue,

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

@@ -1,4 +1,4 @@
-import { intro, log, outro, select, spinner } from "@clack/prompts";
+import { intro, log, outro, select } from "@clack/prompts";
 import { recordSpanException } from "@trigger.dev/core/v3";
 import { Command } from "commander";
 import open from "open";
@@ -20,6 +20,7 @@ import { printInitialBanner } from "../utilities/initialBanner.js";
 import { LoginResult } from "../utilities/session.js";
 import { whoAmI } from "./whoami.js";
 import { logger } from "../utilities/logger.js";
+import { spinner } from "../utilities/windows.js";
 
 export const LoginCommandOptions = CommonCommandOptions.extend({
   apiUrl: z.string(),

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

@@ -1,10 +1,11 @@
-import { confirm, spinner } from "@clack/prompts";
+import { confirm } from "@clack/prompts";
 import { RunOptions, run } from "npm-check-updates";
 import path from "path";
 import { z } from "zod";
 import { chalkError, chalkSuccess } from "../utilities/cliOutput.js";
 import { readJSONFileSync, writeJSONFile } from "../utilities/fileSystem.js";
 import { installDependencies } from "../utilities/installDependencies.js";
+import { spinner } from "../utilities/windows.js";
 
 export const UpdateCommandOptionsSchema = z.object({
   to: z.string().optional(),

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

@@ -1,4 +1,4 @@
-import { intro, note, spinner } from "@clack/prompts";
+import { intro, note } from "@clack/prompts";
 import { chalkLink } from "../utilities/cliOutput.js";
 import { logger } from "../utilities/logger.js";
 import { isLoggedIn } from "../utilities/session.js";
@@ -12,6 +12,7 @@ import {
 } from "../cli/common.js";
 import { z } from "zod";
 import { CliApiClient } from "../apiClient.js";
+import { spinner } from "../utilities/windows.js";
 
 type WhoAmIResult =
   | {

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

@@ -1,11 +1,11 @@
-import { spinner } from "@clack/prompts";
 import chalk from "chalk";
 import type { Result } from "update-check";
 import checkForUpdate from "update-check";
 import pkg from "../../package.json";
 import { chalkGrey, chalkRun, chalkTask, chalkWorker, green, logo } from "./cliOutput.js";
 import { getVersion } from "./getVersion.js";
 import { logger } from "./logger.js";
+import { spinner } from "./windows";
 
 export async function printInitialBanner(performUpdateCheck = true) {
   const packageVersion = getVersion();

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

@@ -1,8 +1,8 @@
-import { spinner } from "@clack/prompts";
 import chalk from "chalk";
 import { execa } from "execa";
 import { getUserPackageManager, type PackageManager } from "./getUserPackageManager.js";
 import { logger } from "./logger.js";
+import { spinner } from "./windows.js";
 
 export async function installDependencies(projectDir: string) {
   logger.info("Installing dependencies...");

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

@@ -1,5 +1,23 @@
+import { log, spinner as clackSpinner } from "@clack/prompts";
+
 export const isWindows = process.platform === "win32";
 
 export function escapeImportPath(path: string) {
   return isWindows ? path.replaceAll("\\", "\\\\") : path;
 }
+
+const ballmerSpinner = () => ({
+  start: (msg?: string): void => {
+    log.step(msg ?? "");
+  },
+  stop: (msg?: string, code?: number): void => {
+    log.message(msg ?? "");
+  },
+  message: (msg?: string): void => {
+    log.message(msg ?? "");
+  },
+});
+
+// This will become unecessary with the next clack release, the bug was fixed here:
+// https://github.com/natemoo-re/clack/pull/182
+export const spinner = () => (isWindows ? ballmerSpinner() : clackSpinner());