check whether a file path should be overwritten

lmgyuan · May 24, 2024 · 900faa9 · 900faa9
1 parent 55f9ae7
commit 900faa9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/generator.js b/lib/generator.js
@@ -963,9 +963,6 @@ class Generator {
    * @return {Promise<boolean>}
    */
   async shouldOverwriteFile(filePath) {
-    const fullPath = path.resolve(this.targetDir, filePath);
-    // Additional logging for debugging purposes
-
     if (!Array.isArray(this.noOverwriteGlobs)) return true;
     const fileExists = await exists(path.resolve(this.targetDir, filePath));
     if (!fileExists) return true;

diff --git a/lib/renderer/react.js b/lib/renderer/react.js
@@ -89,7 +89,9 @@ const saveContentToFile = async (renderedContent, outputPath, noOverwriteGlobs =
   // get the final file name of the file
   const finalFileName = path.basename(filePath);
   // check whether the filename should be ignored based on user's inputs
-  const shouldOverwrite = !noOverwriteGlobs.some(globExp => minimatch(finalFileName, globExp));
+  // const shouldOverwrite = !noOverwriteGlobs.some(globExp => minimatch(finalFileName, globExp));
+  // reuse methods from the generator.js to check if the file should be overwritten
+  const shouldOverwrite = await reactExport.shouldOverwriteFile(filePath, noOverwriteGlobs);
 
   // Write the file only if it should not be skipped
   if (shouldOverwrite) {