refactor: logic

Author: alexander-akait

packages/create-webpack-app/src/utils/generate-files.ts

@@ -162,10 +162,6 @@ async function checkAndPrepareContent(config: AddConfig, isTemplate: boolean): P
       return { status: "identical", content: existingFileContent };
     }
 
-    // Prompt for conflict resolution
-    const tempFilePath = path.join("/tmp", `temp_${path.basename(config.path)}`);
-    await fs.writeFile(tempFilePath, newContent || "");
-
     let userChoice: Result | undefined;
     while (!userChoice) {
       const action = await expand({
@@ -194,7 +190,14 @@ async function checkAndPrepareContent(config: AddConfig, isTemplate: boolean): P
         case "overwrite_all":
           globalConfig.overwriteAll = true;
           return { status: "overwrite", content: newContent };
-        case "diff":
+        case "diff": {
+          // Prompt for conflict resolution
+          const tempFilePath = path.join(
+            config.data!.projectPath as string,
+            `.temp_${path.basename(config.path)}`,
+          );
+          await fs.writeFile(tempFilePath, newContent || "");
+
           if (!isTemplate && Buffer.isBuffer(existingFileContent)) {
             const existingStats = await fs.stat(config.path);
             const newStats = await fs.stat(tempFilePath);
@@ -219,17 +222,18 @@ async function checkAndPrepareContent(config: AddConfig, isTemplate: boolean): P
           } else {
             await getDiff(config.path, tempFilePath);
           }
+
+          await fs.unlink(tempFilePath).catch(() => {
+            logger.warn(`Failed to delete temporary file: ${tempFilePath}`);
+          });
           break;
+        }
         case "abort":
           logger.error("Aborting process...");
           process.exit(1);
       }
     }
 
-    await fs.unlink(tempFilePath).catch(() => {
-      logger.warn(`Failed to delete temporary file: ${tempFilePath}`);
-    });
-
     return userChoice;
   }
   // If the file doesn't exist, create it

test/external-command/my-loader.mjs

@@ -7,11 +7,11 @@ export async function resolve(specifier, context, nextResolve) {
   } catch (err) {
     if (err.code === "ERR_MODULE_NOT_FOUND" && !specifier.startsWith(".")) {
       try {
-        const baseDir = pathToFileURL(join(process.cwd(), "node_modules/")).href;
+        const baseDir = join(process.cwd(), "node_modules/");
         const resolved = join(baseDir, specifier, "index.js");
 
         return {
-          url: resolved,
+          url: pathToFileURL(resolved).href,
           shortCircuit: true,
         };
       } catch {