Core: Fix moving log file across drives and projectRoot detection on Windows

code/core/src/cli/detect.ts

@@ -236,7 +236,6 @@ export async function detect(
     }
 
     const { packageJson } = packageManager.primaryPackageJson;
-
     return detectFrameworkPreset(packageJson);
   } catch (e) {
     return ProjectType.UNDETECTED;

code/core/src/common/utils/cli.ts

@@ -1,6 +1,6 @@
 import type { WriteStream } from 'node:fs';
 import { createWriteStream, mkdirSync } from 'node:fs';
-import { readFile, realpath, rename, rm, writeFile } from 'node:fs/promises';
+import { copyFile, readFile, realpath, rm, writeFile } from 'node:fs/promises';
 import os from 'node:os';
 import { join } from 'node:path';
 
@@ -147,10 +147,11 @@ export const createLogStream = async (
 
   return new Promise((resolve, reject) => {
     logStream.once('open', () => {
-      const moveLogFile = async () => rename(temporaryLogPath, finalLogPath);
       const clearLogFile = async () => writeFile(temporaryLogPath, '');
       const removeLogFile = async () => rm(temporaryLogPath, { recursive: true, force: true });
       const readLogFile = async () => readFile(temporaryLogPath, { encoding: 'utf8' });
+      // Can't use rename because it doesn't work across disks.
+      const moveLogFile = async () => copyFile(temporaryLogPath, finalLogPath).then(removeLogFile);
       resolve({ logStream, moveLogFile, clearLogFile, removeLogFile, readLogFile });
     });
     logStream.once('error', reject);

code/core/src/common/utils/paths.ts

@@ -11,66 +11,49 @@ export const getProjectRoot = () => {
     return projectRoot;
   }
 
-  let result;
   // Allow manual override in cases where auto-detect doesn't work
   if (process.env.STORYBOOK_PROJECT_ROOT) {
     return process.env.STORYBOOK_PROJECT_ROOT;
   }
 
   try {
-    const found = findUpSync('.git', { type: 'directory' });
+    const found =
+      findUpSync('.git', { type: 'directory' }) ||
+      findUpSync('.svn', { type: 'directory' }) ||
+      findUpSync('.hg', { type: 'directory' });
     if (found) {
-      result = join(found, '..');
+      projectRoot = join(found, '..');
+      return projectRoot;
     }
   } catch (e) {
-    //
+    process.stdout.write(`\nerror searching for repository root: ${e}\n`);
   }
 
   try {
-    const found = findUpSync('.svn', { type: 'directory' });
+    const found = findUpSync(LOCK_FILES, { type: 'file' });
     if (found) {
-      result = result || join(found, '..');
+      projectRoot = join(found, '..');
+      return projectRoot;
     }
   } catch (e) {
-    //
+    process.stdout.write(`\nerror searching for lock file: ${e}\n`);
   }
 
   try {
-    const found = findUpSync('.hg', { type: 'directory' });
-    if (found) {
-      result = result || join(found, '..');
-    }
-  } catch (e) {
-    //
-  }
-
-  try {
-    const splitDirname = __dirname.split('node_modules');
-    const isSplitDirnameReachable = !relative(splitDirname[0], process.cwd()).startsWith('..');
-    result =
-      result ||
-      (isSplitDirnameReachable
-        ? splitDirname.length >= 2
-          ? splitDirname[0]
-          : undefined
-        : undefined);
-  } catch (e) {
-    //
-  }
-
-  try {
-    const found = findUpSync(LOCK_FILES, {
-      type: 'file',
-    });
-    if (found) {
-      result = result || join(found, '..');
+    const [basePath, rest] = __dirname.split(`${sep}node_modules${sep}`, 2);
+    if (
+      rest &&
+      !basePath.includes(`${sep}npm-cache${sep}`) &&
+      !relative(basePath, process.cwd()).startsWith('..')
+    ) {
+      projectRoot = basePath;
+      return projectRoot;
     }
   } catch (e) {
-    //
+    process.stdout.write(`\nerror searching for splitDirname: ${e}\n`);
   }
 
-  projectRoot = result || process.cwd();
-
+  projectRoot = process.cwd();
   return projectRoot;
 };