@graphcommerce/next-config 9.0.0-canary.106 → 9.0.0-canary.107

package/dist/commands/copyFiles.js

@@ -4,18 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyFiles = copyFiles;
+/* eslint-disable no-await-in-loop */
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
-const glob_1 = require("glob");
+const fast_glob_1 = __importDefault(require("fast-glob"));
 const resolveDependenciesSync_1 = require("../utils/resolveDependenciesSync");
 // Add debug logging helper
 const debug = (...args) => {
     if (process.env.DEBUG)
-        console.log('[copyFiles]', ...args);
+        console.log('[copy-files]', ...args);
 };
-const createManagementComment = (type) => `// managed by: ${type}`;
-const MANAGED_BY_GC = createManagementComment('graphcommerce');
-const MANAGED_LOCALLY = createManagementComment('local');
+// Add constants for the magic comments
+const MANAGED_BY_GC = '// managed by: graphcommerce';
+const MANAGED_LOCALLY = '// managed by: local';
 const GITIGNORE_SECTION_START = '# managed by: graphcommerce';
 const GITIGNORE_SECTION_END = '# end managed by: graphcommerce';
 /**
@@ -29,10 +30,9 @@ const GITIGNORE_SECTION_END = '# end managed by: graphcommerce';
 async function updateGitignore(managedFiles) {
     const gitignorePath = path_1.default.join(process.cwd(), '.gitignore');
     let content;
-    debug('Updating .gitignore with managed files:', managedFiles);
     try {
         content = await promises_1.default.readFile(gitignorePath, 'utf-8');
-        debug('Existing .gitignore content:', content);
+        debug('Reading existing .gitignore');
     }
     catch (err) {
         debug('.gitignore not found, creating new file');
@@ -41,7 +41,6 @@ async function updateGitignore(managedFiles) {
     // Remove existing GraphCommerce section if it exists
     const sectionRegex = new RegExp(`${GITIGNORE_SECTION_START}[\\s\\S]*?${GITIGNORE_SECTION_END}\\n?`, 'g');
     content = content.replace(sectionRegex, '');
-    debug('Content after removing existing section:', content);
     // Only add new section if there are files to manage
     if (managedFiles.length > 0) {
         const newSection = [
@@ -50,22 +49,15 @@ async function updateGitignore(managedFiles) {
             GITIGNORE_SECTION_END,
             '', // Empty line at the end
         ].join('\n');
-        debug('New section to add:', newSection);
         // Append the new section
         content = `${content.trim()}\n\n${newSection}`;
+        debug(`Updated .gitignore with ${managedFiles.length} managed files`);
     }
     else {
-        // Just trim the content when no files to manage
         content = `${content.trim()}\n`;
+        debug('Cleaned up .gitignore managed section');
     }
-    debug('Final content:', content);
-    try {
-        await promises_1.default.writeFile(gitignorePath, content);
-        debug('Successfully wrote .gitignore file');
-    }
-    catch (err) {
-        console.error('Error writing .gitignore:', err);
-    }
+    await promises_1.default.writeFile(gitignorePath, content);
 }
 /** Determines how a file should be managed based on its content */
 function getFileManagement(content) {
@@ -91,44 +83,84 @@ function getFileManagement(content) {
  *    4. If the file is managed by graphcommerce: Update if content differs
  */
 async function copyFiles() {
+    const startTime = performance.now();
     debug('Starting copyFiles');
     const cwd = process.cwd();
     const deps = (0, resolveDependenciesSync_1.resolveDependenciesSync)();
     const packages = [...deps.values()].filter((p) => p !== '.');
-    debug('Found packages:', packages);
     // Track files and their source packages to detect conflicts
     const fileMap = new Map();
-    // Track which files are managed by GraphCommerce
     const managedFiles = new Set();
+    const existingManagedFiles = new Set();
+    // First scan existing files to find GraphCommerce managed ones
+    const scanStart = performance.now();
+    try {
+        // Use only default patterns for testing
+        const gitignorePatterns = [
+            '**/dist/**',
+            '**/build/**',
+            '**/.next/**',
+            '**/.git/**',
+            '**/node_modules/**',
+        ];
+        const allFiles = await (0, fast_glob_1.default)('**/*', {
+            cwd,
+            dot: true,
+            ignore: gitignorePatterns,
+            onlyFiles: true,
+        });
+        debug(`Found ${allFiles.length} project files in ${(performance.now() - scanStart).toFixed(0)}ms`);
+        const readStart = performance.now();
+        await Promise.all(allFiles.map(async (file) => {
+            const filePath = path_1.default.join(cwd, file);
+            try {
+                const content = await promises_1.default.readFile(filePath);
+                if (getFileManagement(content) === 'graphcommerce') {
+                    existingManagedFiles.add(file);
+                    debug(`Found existing managed file: ${file}`);
+                }
+            }
+            catch (err) {
+                debug(`Error reading file ${file}:`, err);
+            }
+        }));
+        debug(`Read ${existingManagedFiles.size} managed files in ${(performance.now() - readStart).toFixed(0)}ms`);
+    }
+    catch (err) {
+        debug('Error scanning project files:', err);
+    }
     // First pass: collect all files and check for conflicts
+    const collectStart = performance.now();
     await Promise.all(packages.map(async (pkg) => {
         const copyDir = path_1.default.join(pkg, 'copy');
         try {
-            const files = await (0, glob_1.glob)('**/*', { cwd: copyDir, nodir: true, dot: true });
-            debug(`Found files in ${pkg}:`, files);
-            for (const file of files) {
-                const sourcePath = path_1.default.join(copyDir, file);
-                const existing = fileMap.get(file);
-                if (existing) {
-                    console.error(`Error: File conflict detected for '${file}'
+            const files = await (0, fast_glob_1.default)('**/*', { cwd: copyDir, dot: true, suppressErrors: true });
+            if (files.length > 0) {
+                debug(`Found files in ${pkg}:`, files);
+                for (const file of files) {
+                    const sourcePath = path_1.default.join(copyDir, file);
+                    const existing = fileMap.get(file);
+                    if (existing) {
+                        console.error(`Error: File conflict detected for '${file}'
 Found in packages:
   - ${existing.packagePath} -> ${existing.sourcePath}
   - ${pkg} -> ${sourcePath}`);
-                    process.exit(1);
+                        process.exit(1);
+                    }
+                    fileMap.set(file, { sourcePath, packagePath: pkg });
                 }
-                fileMap.set(file, { sourcePath, packagePath: pkg });
             }
         }
         catch (err) {
-            // Skip if copy directory doesn't exist
-            if (err.code !== 'ENOENT') {
-                console.error(`Error scanning directory ${copyDir}: ${err.message}
-Path: ${copyDir}`);
-                process.exit(1);
-            }
+            if (err.code === 'ENOENT')
+                return;
+            console.error(`Error scanning directory ${copyDir}: ${err.message}\nPath: ${copyDir}`);
+            process.exit(1);
         }
     }));
-    // Second pass: copy files
+    debug(`Collected ${fileMap.size} files in ${(performance.now() - collectStart).toFixed(0)}ms`);
+    // Second pass: copy files and handle removals
+    const copyStart = performance.now();
     await Promise.all(Array.from(fileMap.entries()).map(async ([file, { sourcePath }]) => {
         const targetPath = path_1.default.join(cwd, file);
         debug(`Processing file: ${file}`);
@@ -136,8 +168,7 @@ Path: ${copyDir}`);
             await promises_1.default.mkdir(path_1.default.dirname(targetPath), { recursive: true });
             const sourceContent = await promises_1.default.readFile(sourcePath);
             const contentWithComment = Buffer.concat([
-                Buffer.from(`${MANAGED_BY_GC}\n`),
-                Buffer.from('// to modify this file, change it to managed by: local\n\n'),
+                Buffer.from(`${MANAGED_BY_GC}\n// to modify this file, change it to managed by: local\n\n`),
                 sourceContent,
             ]);
             let targetContent;
@@ -189,13 +220,74 @@ Source: ${sourcePath}`);
             process.exit(1);
         }
     }));
-    // Update .gitignore with the list of managed files
+    debug(`Copied ${managedFiles.size} files in ${(performance.now() - copyStart).toFixed(0)}ms`);
+    // Remove files that are no longer provided
+    const removeStart = performance.now();
+    const filesToRemove = Array.from(existingManagedFiles).filter((file) => !managedFiles.has(file));
+    debug(`Files to remove: ${filesToRemove.length}`);
+    // Helper function to recursively clean up empty directories
+    async function cleanupEmptyDirs(startPath) {
+        let currentDir = startPath;
+        while (currentDir !== cwd) {
+            try {
+                const dirContents = await promises_1.default.readdir(currentDir);
+                if (dirContents.length === 0) {
+                    await promises_1.default.rmdir(currentDir);
+                    debug(`Removed empty directory: ${currentDir}`);
+                    currentDir = path_1.default.dirname(currentDir);
+                }
+                else {
+                    break; // Stop if directory is not empty
+                }
+            }
+            catch (err) {
+                if (err.code === 'EACCES') {
+                    console.error(`Error cleaning up directory ${currentDir}: ${err.message}`);
+                    process.exit(1);
+                }
+                break; // Stop on other errors (like ENOENT)
+            }
+        }
+    }
+    // Process file removals in parallel
+    await Promise.all(filesToRemove.map(async (file) => {
+        const filePath = path_1.default.join(cwd, file);
+        const dirPath = path_1.default.dirname(filePath);
+        try {
+            // First check if the directory exists and is accessible
+            await promises_1.default.readdir(dirPath);
+            // Then try to remove the file
+            try {
+                await promises_1.default.unlink(filePath);
+                console.log(`Removed managed file: ${file}`);
+                debug(`Removed file: ${file}`);
+            }
+            catch (err) {
+                if (err.code !== 'ENOENT') {
+                    console.error(`Error removing file ${file}: ${err.message}`);
+                    process.exit(1);
+                }
+            }
+            // Finally, try to clean up empty directories
+            await cleanupEmptyDirs(dirPath);
+        }
+        catch (err) {
+            if (err.code === 'EACCES') {
+                console.error(`Error accessing directory ${dirPath}: ${err.message}`);
+                process.exit(1);
+            }
+            // Ignore ENOENT errors for directories that don't exist
+        }
+    }));
+    debug(`Removed files in ${(performance.now() - removeStart).toFixed(0)}ms`);
+    // Update .gitignore with current list of managed files
     if (managedFiles.size > 0) {
         debug('Found managed files:', Array.from(managedFiles));
         await updateGitignore(Array.from(managedFiles));
     }
     else {
         debug('No managed files found, cleaning up .gitignore section');
-        await updateGitignore([]); // Pass empty array to clean up the section
+        await updateGitignore([]);
     }
+    debug(`Total execution time: ${(performance.now() - startTime).toFixed(0)}ms`);
 }

package/dist/config/utils/mergeEnvIntoConfig.js

@@ -155,7 +155,7 @@ function formatAppliedEnv(applyResult) {
     const lines = applyResult.map(({ from, to, envValue, envVar, dotVar, error, warning }) => {
         const fromFmt = chalk_1.default.red(JSON.stringify(from));
         const toFmt = chalk_1.default.green(JSON.stringify(to));
-        const envVariableFmt = `${envVar}='${envValue}'`;
+        const envVariableFmt = `${envVar}`;
         const dotVariableFmt = chalk_1.default.bold.underline(`${dotVar}`);
         const baseLog = `${envVariableFmt} => ${dotVariableFmt}`;
         if (error) {
@@ -169,12 +169,12 @@ function formatAppliedEnv(applyResult) {
         if (!dotVar)
             return chalk_1.default.red(`${envVariableFmt} => ignored (no matching config)`);
         if (from === undefined && to === undefined)
-            return ` = ${baseLog}: (ignored, no change/wrong format)`;
+            return ` = ${baseLog}: (ignored)`;
         if (from === undefined && to !== undefined)
-            return ` ${chalk_1.default.green('+')} ${baseLog}: ${toFmt}`;
+            return ` ${chalk_1.default.green('+')} ${baseLog}`;
         if (from !== undefined && to === undefined)
-            return ` ${chalk_1.default.red('-')} ${baseLog}: ${fromFmt}`;
-        return ` ${chalk_1.default.yellowBright('~')} ${baseLog}: ${fromFmt} => ${toFmt}`;
+            return ` ${chalk_1.default.red('-')} ${baseLog}`;
+        return ` ${chalk_1.default.yellowBright('~')} ${baseLog}`;
     });
     let header = chalk_1.default.blueBright('info');
     if (hasWarning)

package/dist/generated/config.js

@@ -4,6 +4,7 @@ exports.WebsitePermissionsSchema = exports.SidebarGalleryPaginationVariantSchema
 exports.DatalayerConfigSchema = DatalayerConfigSchema;
 exports.GraphCommerceConfigSchema = GraphCommerceConfigSchema;
 exports.GraphCommerceDebugConfigSchema = GraphCommerceDebugConfigSchema;
+exports.GraphCommerceGooglePlaystoreConfigSchema = GraphCommerceGooglePlaystoreConfigSchema;
 exports.GraphCommercePermissionsSchema = GraphCommercePermissionsSchema;
 exports.GraphCommerceStorefrontConfigSchema = GraphCommerceStorefrontConfigSchema;
 exports.MagentoConfigurableVariantValuesSchema = MagentoConfigurableVariantValuesSchema;
@@ -46,6 +47,7 @@ function GraphCommerceConfigSchema() {
         demoMode: zod_1.z.boolean().default(true).nullish(),
         enableGuestCheckoutLogin: zod_1.z.boolean().nullish(),
         googleAnalyticsId: zod_1.z.string().nullish(),
+        googlePlaystore: GraphCommerceGooglePlaystoreConfigSchema().nullish(),
         googleRecaptchaKey: zod_1.z.string().nullish(),
         googleTagmanagerId: zod_1.z.string().nullish(),
         hygraphEndpoint: zod_1.z.string().min(1),
@@ -77,6 +79,12 @@ function GraphCommerceDebugConfigSchema() {
         webpackDuplicatesPlugin: zod_1.z.boolean().nullish()
     });
 }
+function GraphCommerceGooglePlaystoreConfigSchema() {
+    return zod_1.z.object({
+        packageName: zod_1.z.string().min(1),
+        sha256CertificateFingerprint: zod_1.z.string().min(1)
+    });
+}
 function GraphCommercePermissionsSchema() {
     return zod_1.z.object({
         cart: exports.CartPermissionsSchema.nullish(),

package/dist/interceptors/generateInterceptor.js

@@ -41,8 +41,8 @@ function isReplacePluginConfig(plugin) {
 function isPluginConfig(plugin) {
     return isPluginBaseConfig(plugin);
 }
-exports.SOURCE_START = '/** Original source starts here (do not modify!): **/';
-exports.SOURCE_END = '/** Original source ends here (do not modify!) **/';
+exports.SOURCE_START = '/** SOURCE_START */';
+exports.SOURCE_END = '/** SOURCE_END */';
 const originalSuffix = 'Original';
 const interceptorSuffix = 'Interceptor';
 const disabledSuffix = 'Disabled';
@@ -68,9 +68,7 @@ const generateIdentifyer = (s) => Math.abs(s.split('').reduce((a, b) => {
     // eslint-disable-next-line no-bitwise
     return a & a;
 }, 0)).toString();
-/**
- * The is on the first line, with the format: \/* hash:${identifer} *\/
- */
+/** The is on the first line, with the format: /* hash:${identifer} */
 function extractIdentifier(source) {
     if (!source)
         return null;

package/dist/withGraphCommerce.js

@@ -41,10 +41,10 @@ function withGraphCommerce(nextConfig, cwd) {
     ];
     return {
         ...nextConfig,
+        bundlePagesRouterDependencies: true,
         experimental: {
             ...nextConfig.experimental,
             scrollRestoration: true,
-            bundlePagesExternals: true,
             swcPlugins: [...(nextConfig.experimental?.swcPlugins ?? []), ['@lingui/swc-plugin', {}]],
         },
         i18n: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.106",
+  "version": "9.0.0-canary.107",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -23,6 +23,7 @@
     "@types/lodash": "^4.17.13",
     "babel-plugin-macros": "^3.1.0",
     "circular-dependency-plugin": "^5.2.2",
+    "fast-glob": "^3.3.2",
     "glob": "^10.4.5",
     "graphql": "^16",
     "inspectpack": "^4.7.1",

package/src/commands/copyFiles.ts

@@ -1,19 +1,17 @@
+/* eslint-disable no-await-in-loop */
 import fs from 'fs/promises'
 import path from 'path'
-import { glob } from 'glob'
+import fg from 'fast-glob'
 import { resolveDependenciesSync } from '../utils/resolveDependenciesSync'
 
 // Add debug logging helper
 const debug = (...args: unknown[]) => {
-  if (process.env.DEBUG) console.log('[copyFiles]', ...args)
+  if (process.env.DEBUG) console.log('[copy-files]', ...args)
 }
 
 // Add constants for the magic comments
-type FileManagement = 'graphcommerce' | 'local'
-const createManagementComment = (type: FileManagement) => `// managed by: ${type}`
-
-const MANAGED_BY_GC = createManagementComment('graphcommerce')
-const MANAGED_LOCALLY = createManagementComment('local')
+const MANAGED_BY_GC = '// managed by: graphcommerce'
+const MANAGED_LOCALLY = '// managed by: local'
 
 const GITIGNORE_SECTION_START = '# managed by: graphcommerce'
 const GITIGNORE_SECTION_END = '# end managed by: graphcommerce'
@@ -30,11 +28,9 @@ async function updateGitignore(managedFiles: string[]) {
   const gitignorePath = path.join(process.cwd(), '.gitignore')
   let content: string
 
-  debug('Updating .gitignore with managed files:', managedFiles)
-
   try {
     content = await fs.readFile(gitignorePath, 'utf-8')
-    debug('Existing .gitignore content:', content)
+    debug('Reading existing .gitignore')
   } catch (err) {
     debug('.gitignore not found, creating new file')
     content = ''
@@ -46,7 +42,6 @@ async function updateGitignore(managedFiles: string[]) {
     'g',
   )
   content = content.replace(sectionRegex, '')
-  debug('Content after removing existing section:', content)
 
   // Only add new section if there are files to manage
   if (managedFiles.length > 0) {
@@ -56,23 +51,16 @@ async function updateGitignore(managedFiles: string[]) {
       GITIGNORE_SECTION_END,
       '', // Empty line at the end
     ].join('\n')
-    debug('New section to add:', newSection)
 
     // Append the new section
     content = `${content.trim()}\n\n${newSection}`
+    debug(`Updated .gitignore with ${managedFiles.length} managed files`)
   } else {
-    // Just trim the content when no files to manage
     content = `${content.trim()}\n`
+    debug('Cleaned up .gitignore managed section')
   }
 
-  debug('Final content:', content)
-
-  try {
-    await fs.writeFile(gitignorePath, content)
-    debug('Successfully wrote .gitignore file')
-  } catch (err) {
-    console.error('Error writing .gitignore:', err)
-  }
+  await fs.writeFile(gitignorePath, content)
 }
 
 /** Determines how a file should be managed based on its content */
@@ -97,53 +85,100 @@ function getFileManagement(content: Buffer | undefined): 'local' | 'graphcommerc
  *    4. If the file is managed by graphcommerce: Update if content differs
  */
 export async function copyFiles() {
+  const startTime = performance.now()
   debug('Starting copyFiles')
 
   const cwd = process.cwd()
   const deps = resolveDependenciesSync()
   const packages = [...deps.values()].filter((p) => p !== '.')
-  debug('Found packages:', packages)
 
   // Track files and their source packages to detect conflicts
   const fileMap = new Map<string, { sourcePath: string; packagePath: string }>()
-  // Track which files are managed by GraphCommerce
   const managedFiles = new Set<string>()
+  const existingManagedFiles = new Set<string>()
+
+  // First scan existing files to find GraphCommerce managed ones
+  const scanStart = performance.now()
+  try {
+    // Use only default patterns for testing
+    const gitignorePatterns = [
+      '**/dist/**',
+      '**/build/**',
+      '**/.next/**',
+      '**/.git/**',
+      '**/node_modules/**',
+    ]
+
+    const allFiles = await fg('**/*', {
+      cwd,
+      dot: true,
+      ignore: gitignorePatterns,
+      onlyFiles: true,
+    })
+    debug(
+      `Found ${allFiles.length} project files in ${(performance.now() - scanStart).toFixed(0)}ms`,
+    )
+
+    const readStart = performance.now()
+    await Promise.all(
+      allFiles.map(async (file) => {
+        const filePath = path.join(cwd, file)
+        try {
+          const content = await fs.readFile(filePath)
+          if (getFileManagement(content) === 'graphcommerce') {
+            existingManagedFiles.add(file)
+            debug(`Found existing managed file: ${file}`)
+          }
+        } catch (err) {
+          debug(`Error reading file ${file}:`, err)
+        }
+      }),
+    )
+    debug(
+      `Read ${existingManagedFiles.size} managed files in ${(performance.now() - readStart).toFixed(0)}ms`,
+    )
+  } catch (err) {
+    debug('Error scanning project files:', err)
+  }
 
   // First pass: collect all files and check for conflicts
+  const collectStart = performance.now()
   await Promise.all(
     packages.map(async (pkg) => {
       const copyDir = path.join(pkg, 'copy')
-
       try {
-        const files = await glob('**/*', { cwd: copyDir, nodir: true, dot: true })
-        debug(`Found files in ${pkg}:`, files)
+        const files = await fg('**/*', { cwd: copyDir, dot: true, suppressErrors: true })
+        if (files.length > 0) {
+          debug(`Found files in ${pkg}:`, files)
 
-        for (const file of files) {
-          const sourcePath = path.join(copyDir, file)
-          const existing = fileMap.get(file)
+          for (const file of files) {
+            const sourcePath = path.join(copyDir, file)
+            const existing = fileMap.get(file)
 
-          if (existing) {
-            console.error(`Error: File conflict detected for '${file}'
+            if (existing) {
+              console.error(`Error: File conflict detected for '${file}'
 Found in packages:
   - ${existing.packagePath} -> ${existing.sourcePath}
   - ${pkg} -> ${sourcePath}`)
-            process.exit(1)
-          }
+              process.exit(1)
+            }
 
-          fileMap.set(file, { sourcePath, packagePath: pkg })
+            fileMap.set(file, { sourcePath, packagePath: pkg })
+          }
         }
       } catch (err) {
-        // Skip if copy directory doesn't exist
-        if ((err as { code?: string }).code !== 'ENOENT') {
-          console.error(`Error scanning directory ${copyDir}: ${(err as Error).message}
-Path: ${copyDir}`)
-          process.exit(1)
-        }
+        if ((err as { code?: string }).code === 'ENOENT') return
+        console.error(
+          `Error scanning directory ${copyDir}: ${(err as Error).message}\nPath: ${copyDir}`,
+        )
+        process.exit(1)
       }
     }),
   )
+  debug(`Collected ${fileMap.size} files in ${(performance.now() - collectStart).toFixed(0)}ms`)
 
-  // Second pass: copy files
+  // Second pass: copy files and handle removals
+  const copyStart = performance.now()
   await Promise.all(
     Array.from(fileMap.entries()).map(async ([file, { sourcePath }]) => {
       const targetPath = path.join(cwd, file)
@@ -154,8 +189,9 @@ Path: ${copyDir}`)
 
         const sourceContent = await fs.readFile(sourcePath)
         const contentWithComment = Buffer.concat([
-          Buffer.from(`${MANAGED_BY_GC}\n`),
-          Buffer.from('// to modify this file, change it to managed by: local\n\n'),
+          Buffer.from(
+            `${MANAGED_BY_GC}\n// to modify this file, change it to managed by: local\n\n`,
+          ),
           sourceContent,
         ])
 
@@ -215,13 +251,79 @@ Source: ${sourcePath}`)
       }
     }),
   )
+  debug(`Copied ${managedFiles.size} files in ${(performance.now() - copyStart).toFixed(0)}ms`)
+
+  // Remove files that are no longer provided
+  const removeStart = performance.now()
+  const filesToRemove = Array.from(existingManagedFiles).filter((file) => !managedFiles.has(file))
+  debug(`Files to remove: ${filesToRemove.length}`)
 
-  // Update .gitignore with the list of managed files
+  // Helper function to recursively clean up empty directories
+  async function cleanupEmptyDirs(startPath: string) {
+    let currentDir = startPath
+    while (currentDir !== cwd) {
+      try {
+        const dirContents = await fs.readdir(currentDir)
+        if (dirContents.length === 0) {
+          await fs.rmdir(currentDir)
+          debug(`Removed empty directory: ${currentDir}`)
+          currentDir = path.dirname(currentDir)
+        } else {
+          break // Stop if directory is not empty
+        }
+      } catch (err) {
+        if ((err as { code?: string }).code === 'EACCES') {
+          console.error(`Error cleaning up directory ${currentDir}: ${(err as Error).message}`)
+          process.exit(1)
+        }
+        break // Stop on other errors (like ENOENT)
+      }
+    }
+  }
+
+  // Process file removals in parallel
+  await Promise.all(
+    filesToRemove.map(async (file) => {
+      const filePath = path.join(cwd, file)
+      const dirPath = path.dirname(filePath)
+
+      try {
+        // First check if the directory exists and is accessible
+        await fs.readdir(dirPath)
+
+        // Then try to remove the file
+        try {
+          await fs.unlink(filePath)
+          console.log(`Removed managed file: ${file}`)
+          debug(`Removed file: ${file}`)
+        } catch (err) {
+          if ((err as { code?: string }).code !== 'ENOENT') {
+            console.error(`Error removing file ${file}: ${(err as Error).message}`)
+            process.exit(1)
+          }
+        }
+
+        // Finally, try to clean up empty directories
+        await cleanupEmptyDirs(dirPath)
+      } catch (err) {
+        if ((err as { code?: string }).code === 'EACCES') {
+          console.error(`Error accessing directory ${dirPath}: ${(err as Error).message}`)
+          process.exit(1)
+        }
+        // Ignore ENOENT errors for directories that don't exist
+      }
+    }),
+  )
+  debug(`Removed files in ${(performance.now() - removeStart).toFixed(0)}ms`)
+
+  // Update .gitignore with current list of managed files
   if (managedFiles.size > 0) {
     debug('Found managed files:', Array.from(managedFiles))
     await updateGitignore(Array.from(managedFiles))
   } else {
     debug('No managed files found, cleaning up .gitignore section')
-    await updateGitignore([]) // Pass empty array to clean up the section
+    await updateGitignore([])
   }
+
+  debug(`Total execution time: ${(performance.now() - startTime).toFixed(0)}ms`)
 }