From 7ca1efa105120c63b24507979efaaee24590300b Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Mon, 19 Feb 2024 15:04:35 +0100
Subject: [PATCH 1/3] add a line ignoring the storybook generated log files to
 git ignore

---
 code/lib/cli/src/initiate.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
index 703002ec7cca..1f968cc1347c 100644
--- a/code/lib/cli/src/initiate.ts
+++ b/code/lib/cli/src/initiate.ts
@@ -10,6 +10,7 @@ import {
   JsPackageManagerFactory,
   commandLog,
   paddedLog,
+  getProjectRoot,
 } from '@storybook/core-common';
 import type { JsPackageManager } from '@storybook/core-common';
 
@@ -38,6 +39,8 @@ import serverGenerator from './generators/SERVER';
 import type { NpmOptions } from './NpmOptions';
 import type { CommandOptions, GeneratorOptions } from './generators/types';
 import { currentDirectoryIsEmpty, scaffoldNewProject } from './scaffold-new-project';
+import findUp from 'find-up';
+import { appendFile } from 'fs/promises';
 
 const logger = console;
 
@@ -369,6 +372,12 @@ export async function doInitiate(
     return { shouldRunDev: false };
   }
 
+  const foundGitIgnoreFile = await findUp('.gitignore', { cwd: process.cwd() });
+  const rootDirectory = getProjectRoot();
+  if (foundGitIgnoreFile && foundGitIgnoreFile.includes(rootDirectory)) {
+    await appendFile(foundGitIgnoreFile, '\n*storybook.log');
+  }
+
   const storybookCommand =
     projectType === ProjectType.ANGULAR
       ? `ng run ${installResult.projectName}:storybook`

From 3029661df76ca8b56700ade38ce6827b9e5d69a9 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Mon, 19 Feb 2024 15:19:01 +0100
Subject: [PATCH 2/3] order imports a bit

---
 code/lib/cli/src/initiate.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
index 1f968cc1347c..5c87e88d0e5a 100644
--- a/code/lib/cli/src/initiate.ts
+++ b/code/lib/cli/src/initiate.ts
@@ -1,4 +1,6 @@
+import { appendFile, readFile } from 'fs/promises';
 import type { PackageJson } from 'read-pkg-up';
+import findUp from 'find-up';
 import chalk from 'chalk';
 import prompts from 'prompts';
 import { telemetry } from '@storybook/telemetry';
@@ -39,8 +41,6 @@ import serverGenerator from './generators/SERVER';
 import type { NpmOptions } from './NpmOptions';
 import type { CommandOptions, GeneratorOptions } from './generators/types';
 import { currentDirectoryIsEmpty, scaffoldNewProject } from './scaffold-new-project';
-import findUp from 'find-up';
-import { appendFile } from 'fs/promises';
 
 const logger = console;
 
@@ -375,7 +375,10 @@ export async function doInitiate(
   const foundGitIgnoreFile = await findUp('.gitignore', { cwd: process.cwd() });
   const rootDirectory = getProjectRoot();
   if (foundGitIgnoreFile && foundGitIgnoreFile.includes(rootDirectory)) {
-    await appendFile(foundGitIgnoreFile, '\n*storybook.log');
+    const contents = await readFile(foundGitIgnoreFile, 'utf-8');
+    if (!contents.includes('*storybook.log')) {
+      await appendFile(foundGitIgnoreFile, '\n*storybook.log');
+    }
   }
 
   const storybookCommand =

From 096d56d3e0cbe5b175c8ede30f8f5e97fe1a6c76 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Tue, 20 Feb 2024 09:18:59 +0100
Subject: [PATCH 3/3] Update code/lib/cli/src/initiate.ts

Co-authored-by: Valentin Palkovic <valentin@chromatic.com>
---
 code/lib/cli/src/initiate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
index 5c87e88d0e5a..3d647f923a43 100644
--- a/code/lib/cli/src/initiate.ts
+++ b/code/lib/cli/src/initiate.ts
@@ -372,7 +372,7 @@ export async function doInitiate(
     return { shouldRunDev: false };
   }
 
-  const foundGitIgnoreFile = await findUp('.gitignore', { cwd: process.cwd() });
+  const foundGitIgnoreFile = await findUp('.gitignore');
   const rootDirectory = getProjectRoot();
   if (foundGitIgnoreFile && foundGitIgnoreFile.includes(rootDirectory)) {
     const contents = await readFile(foundGitIgnoreFile, 'utf-8');