Merge branch 'next' into nexxel/add-timestamps-to-example-model

Author: nexxeln

.changeset/four-files-end.md

@@ -0,0 +1,5 @@
+---
+"create-t3-app": minor
+---
+
+consistent cli text color

.changeset/wise-toys-fry.md

@@ -0,0 +1,5 @@
+---
+"create-t3-app": patch
+---
+
+fix git spinner

cli/src/helpers/git.ts

@@ -22,13 +22,16 @@ const isRootGitRepo = (dir: string): boolean => {
 };
 
 /** If dir is inside a git worktree, meaning a parent directory has `.git` */
-const isInsideGitRepo = (dir: string): boolean => {
+const isInsideGitRepo = async (dir: string): Promise<boolean> => {
   try {
-    const stdout = execSync("git rev-parse --is-inside-work-tree", {
+    // If this command succeeds, we're inside a git repo
+    await execa("git", ["rev-parse", "--is-inside-work-tree"], {
       cwd: dir,
-    }).toString();
-    return stdout.trim() === "true";
+      stdout: "ignore",
+    });
+    return true;
   } catch (_e) {
+    // Else, it will throw a git-error and we return false
     return false;
   }
 };
@@ -53,12 +56,12 @@ export const initializeGit = async (projectDir: string) => {
   const spinner = ora("Creating a new git repo...\n").start();
 
   const isRoot = isRootGitRepo(projectDir);
-  const isInside = isInsideGitRepo(projectDir);
+  const isInside = await isInsideGitRepo(projectDir);
   const dirName = path.parse(projectDir).name; // skip full path for logging
 
   if (isInside && isRoot) {
     // Dir is a root git repo
-    spinner.stopAndPersist();
+    spinner.stop();
     const { overwriteGit } = await inquirer.prompt<{
       overwriteGit: boolean;
     }>({
@@ -77,7 +80,7 @@ export const initializeGit = async (projectDir: string) => {
     fs.removeSync(path.join(projectDir, ".git"));
   } else if (isInside && !isRoot) {
     // Dir is inside a git worktree
-    spinner.stopAndPersist();
+    spinner.stop();
     const { initializeChildGitRepo } = await inquirer.prompt<{
       initializeChildGitRepo: boolean;
     }>({

cli/src/helpers/installDependencies.ts

@@ -1,3 +1,4 @@
+import chalk from "chalk";
 import { execa } from "execa";
 import ora from "ora";
 import { getUserPkgManager } from "~/utils/getUserPkgManager.js";
@@ -10,5 +11,5 @@ export const installDependencies = async (projectDir: string) => {
 
   await execa(pkgManager, ["install"], { cwd: projectDir });
 
-  spinner.succeed("Successfully installed dependencies!\n");
+  spinner.succeed(chalk.green("Successfully installed dependencies!\n"));
 };

cli/src/helpers/scaffoldProject.ts

@@ -102,5 +102,7 @@ export const scaffoldProject = async ({
   const scaffoldedName =
     projectName === "." ? "App" : chalk.cyan.bold(projectName);
 
-  spinner.succeed(`${scaffoldedName} scaffolded successfully!\n`);
+  spinner.succeed(
+    `${scaffoldedName} ${chalk.green("scaffolded successfully!")}\n`,
+  );
 };