@payloadcms/figma 0.0.1-alpha.7 → 0.0.1-alpha.71

package/dist/utils/payload-config-ast.js

@@ -9,9 +9,9 @@ import * as log from './log.js';
         hasOtherPayloadImports: false,
         needsImportChange: false
     };
-    // Find buildConfig import
+    // Find buildConfig import — prefer @payloadcms/figma (already migrated) over payload
     const imports = sourceFile.getImportDeclarations();
-    const payloadImport = imports.find((imp)=>imp.getModuleSpecifierValue() === 'payload' || imp.getModuleSpecifierValue() === '@payloadcms/figma');
+    const payloadImport = imports.find((imp)=>imp.getModuleSpecifierValue() === '@payloadcms/figma') || imports.find((imp)=>imp.getModuleSpecifierValue() === 'payload');
     if (!payloadImport) {
         log.debug('No payload or @payloadcms/figma import found');
         result.hasBuildConfig = false;
@@ -20,15 +20,18 @@ import * as log from './log.js';
     log.debug(`Found import from: ${payloadImport.getModuleSpecifierValue()}`);
     const moduleSpecifier = payloadImport.getModuleSpecifierValue();
     const namedImports = payloadImport.getNamedImports();
-    // Check if buildConfig is imported
-    const buildConfigImport = namedImports.find((ni)=>ni.getName() === 'buildConfig');
+    // Determine which function name to look for based on the import source
+    // - From 'payload': look for buildConfig (needs migration)
+    // - From '@payloadcms/figma': look for buildFigmaConfig (already migrated)
+    const expectedFunctionName = moduleSpecifier === 'payload' ? 'buildConfig' : 'buildFigmaConfig';
+    const buildConfigImport = namedImports.find((ni)=>ni.getName() === expectedFunctionName);
     if (!buildConfigImport) {
         result.hasBuildConfig = false;
         return result;
     }
     // Check for alias and get the actual name used in code
     const aliasNode = buildConfigImport.getAliasNode();
-    const buildConfigName = aliasNode ? aliasNode.getText() : 'buildConfig';
+    const buildConfigName = aliasNode ? aliasNode.getText() : expectedFunctionName;
     if (aliasNode) {
         result.hasAlias = true;
     }
@@ -109,6 +112,15 @@ import * as log from './log.js';
             }
         }
     }
+    // Check for sharp property
+    const sharpProperty = configArg.getProperty('sharp');
+    if (sharpProperty) {
+        // Find the import source for sharp
+        const sharpImport = imports.find((imp)=>imp.getModuleSpecifierValue() === 'sharp' || imp.getNamedImports().some((ni)=>ni.getName() === 'sharp'));
+        result.sharpProperty = {
+            importSource: sharpImport?.getModuleSpecifierValue() || 'sharp'
+        };
+    }
     // Check for figma property
     const figmaProperty = configArg.getProperty('figma');
     if (figmaProperty) {
@@ -145,9 +157,27 @@ import * as log from './log.js';
     // Remove duplicates and sort in reverse order to avoid position shifts
     const uniqueRanges = Array.from(new Set(ranges.map((r)=>JSON.stringify(r)))).map((r)=>JSON.parse(r));
     uniqueRanges.sort((a, b)=>b[0] - a[0]);
-    // Remove each comment range
+    // Remove each comment range, extending to the full line when the comment is the only content
     for (const [pos, end] of uniqueRanges){
-        sourceFile.removeText(pos, end);
+        const fullText = sourceFile.getFullText();
+        let removeStart = pos;
+        let removeEnd = end;
+        // Find the start of the line containing this comment
+        let lineStart = pos;
+        while(lineStart > 0 && fullText[lineStart - 1] !== '\n'){
+            lineStart--;
+        }
+        const beforeComment = fullText.substring(lineStart, pos);
+        const nextNewline = fullText.indexOf('\n', end);
+        const afterComment = fullText.substring(end, nextNewline === -1 ? fullText.length : nextNewline);
+        // If the comment is the only content on this line, remove the entire line
+        if (beforeComment.trim() === '' && afterComment.trim() === '') {
+            removeStart = lineStart > 0 ? lineStart - 1 : lineStart;
+            if (nextNewline !== -1) {
+                removeEnd = nextNewline + 1;
+            }
+        }
+        sourceFile.removeText(removeStart, removeEnd);
     }
     return true;
 }
@@ -240,7 +270,16 @@ import * as log from './log.js';
             modified = true;
         }
     }
-    // 4. Update buildConfig import
+    // 4. Remove sharp property
+    if (detection.sharpProperty) {
+        const sharpProperty = configArg.getProperty('sharp');
+        if (sharpProperty) {
+            sharpProperty.remove();
+            changes.push('Removed sharp property');
+            modified = true;
+        }
+    }
+    // 5. Update buildConfig import
     if (detection.needsImportChange) {
         if (payloadImport) {
             if (detection.hasOtherPayloadImports) {
@@ -258,19 +297,38 @@ import * as log from './log.js';
                 sourceFile.addImportDeclaration({
                     moduleSpecifier: '@payloadcms/figma',
                     namedImports: [
-                        'buildConfig'
+                        'buildFigmaConfig'
                     ]
                 });
+                // Rename all usages of 'buildConfig' to 'buildFigmaConfig'
+                const identifiers = sourceFile.getDescendantsOfKind(SyntaxKind.Identifier);
+                identifiers.forEach((identifier)=>{
+                    if (identifier.getText() === 'buildConfig') {
+                        identifier.replaceWithText('buildFigmaConfig');
+                    }
+                });
                 changes.push('Split buildConfig import to @payloadcms/figma');
             } else {
-                // Replace entire import
+                // Replace entire import: change module specifier and rename all references
+                const buildConfigImport = payloadImport.getNamedImports().find((ni)=>ni.getName() === 'buildConfig');
+                if (buildConfigImport) {
+                    // Change the import name
+                    buildConfigImport.setName('buildFigmaConfig');
+                    // Find and rename all usages of 'buildConfig' in the file
+                    const identifiers = sourceFile.getDescendantsOfKind(SyntaxKind.Identifier);
+                    identifiers.forEach((identifier)=>{
+                        if (identifier.getText() === 'buildConfig') {
+                            identifier.replaceWithText('buildFigmaConfig');
+                        }
+                    });
+                }
                 payloadImport.setModuleSpecifier('@payloadcms/figma');
                 changes.push('Changed buildConfig import to @payloadcms/figma');
             }
             modified = true;
         }
     }
-    // 5. Remove orphaned imports
+    // 6. Remove orphaned imports
     // Re-fetch imports after each removal to avoid stale references
     if (detection.dbProperty) {
         const currentImports = sourceFile.getImportDeclarations();
@@ -290,6 +348,15 @@ import * as log from './log.js';
             modified = true;
         }
     }
+    if (detection.sharpProperty) {
+        const currentImports = sourceFile.getImportDeclarations();
+        const sharpImport = currentImports.find((imp)=>imp.getModuleSpecifierValue() === 'sharp');
+        if (sharpImport) {
+            sharpImport.remove();
+            changes.push('Removed sharp import');
+            modified = true;
+        }
+    }
     return {
         changes,
         modified
@@ -301,15 +368,15 @@ import * as log from './log.js';
  */ export function addFigmaProperty(sourceFile, config) {
     const changes = [];
     let modified = false;
-    // Find buildConfig call
+    // Find buildFigmaConfig call (this function is only used with Figma configs)
     const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression);
     const buildConfigCall = callExpressions.find((ce)=>{
         const expr = ce.getExpression();
         const text = expr.getText();
-        return text === 'buildConfig' || text.endsWith('.buildConfig');
+        return text === 'buildFigmaConfig' || text.endsWith('.buildFigmaConfig');
     });
     if (!buildConfigCall) {
-        log.debug('No buildConfig call found');
+        log.debug('No buildFigmaConfig call found');
         return {
             changes: [],
             modified: false
@@ -336,15 +403,14 @@ import * as log from './log.js';
         };
     }
     // Add figma property
+    // contentSystemId is resolved automatically by buildFigmaConfig from env vars or bootstrap cache.
+    // useContentSystem defaults to true, so we only generate it when explicitly false.
+    const figmaObj = config.useContentSystem === false ? `{\nuseContentSystem: false,\n}` : '{}';
     configArg.addPropertyAssignment({
         name: 'figma',
-        initializer: `{
-    region: '${config.region}',
-    tenantId: '${config.tenantId}',
-    useContentSystem: ${config.useContentSystem},
-  }`
+        initializer: figmaObj
     });
-    changes.push(`Added figma property (region: ${config.region}, tenantId: ${config.tenantId}, useContentSystem: ${config.useContentSystem})`);
+    changes.push(`Added figma property (contentSystemId: ${config.contentSystemId})`);
     modified = true;
     return {
         changes,
@@ -352,60 +418,42 @@ import * as log from './log.js';
     };
 }
 /**
- * Read figma configuration from payload.config.ts
- * Returns the figma object if it exists, null otherwise
- */ export function readFigmaConfig(sourceFile) {
-    // Find buildConfig call
+ * Remove the contentSystemId property from figma config object.
+ * Used during upgrade migration — contentSystemId is now resolved from bootstrap data.
+ *
+ * @returns true if the property was found and removed
+ */ export function removeFigmaContentSystemId(sourceFile) {
     const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression);
     const buildConfigCall = callExpressions.find((ce)=>{
         const expr = ce.getExpression();
         const text = expr.getText();
-        return text === 'buildConfig' || text.endsWith('.buildConfig');
+        return text === 'buildFigmaConfig' || text.endsWith('.buildFigmaConfig');
     });
     if (!buildConfigCall) {
-        log.debug('No buildConfig call found');
-        return null;
+        return false;
     }
-    // Get config object argument
     const configArg = buildConfigCall.getArguments()[0];
     if (!configArg || !Node.isObjectLiteralExpression(configArg)) {
-        log.debug('buildConfig argument is not an object literal');
-        return null;
+        return false;
     }
-    // Find figma property
     const figmaProperty = configArg.getProperty('figma');
     if (!figmaProperty || !Node.isPropertyAssignment(figmaProperty)) {
-        log.debug('No figma property found in buildConfig');
-        return null;
+        return false;
     }
-    // Get initializer (the object value)
     const initializer = figmaProperty.getInitializer();
     if (!initializer || !Node.isObjectLiteralExpression(initializer)) {
-        log.debug('figma property is not an object literal');
-        return null;
-    }
-    // Extract values
-    const regionProp = initializer.getProperty('region');
-    const tenantIdProp = initializer.getProperty('tenantId');
-    const useContentSystemProp = initializer.getProperty('useContentSystem');
-    if (!regionProp || !tenantIdProp) {
-        log.debug('Missing required figma properties (region or tenantId)');
-        return null;
-    }
-    // Extract string values (remove quotes)
-    const region = Node.isPropertyAssignment(regionProp) ? regionProp.getInitializer()?.getText().replace(/['"]/g, '') : undefined;
-    const tenantId = Node.isPropertyAssignment(tenantIdProp) ? tenantIdProp.getInitializer()?.getText().replace(/['"]/g, '') : undefined;
-    const useContentSystem = Node.isPropertyAssignment(useContentSystemProp) ? useContentSystemProp.getInitializer()?.getText() === 'true' : true // Default to true if not specified
-    ;
-    if (!region || !tenantId) {
-        log.debug('Could not extract region or tenantId values');
-        return null;
+        return false;
     }
-    return {
-        region,
-        tenantId,
-        useContentSystem
-    };
+    const contentSystemIdProp = initializer.getProperty('contentSystemId');
+    if (!contentSystemIdProp) {
+        return false;
+    }
+    contentSystemIdProp.remove();
+    // Collapse empty object to avoid ts-morph whitespace artifacts
+    if (initializer.getProperties().length === 0) {
+        initializer.replaceWithText('{}');
+    }
+    return true;
 }
 
 //# sourceMappingURL=payload-config-ast.js.map

package/dist/utils/payload-config-finder.d.ts

@@ -1,6 +1,6 @@
 /**
- * Find the Payload config file using Payload's built-in finder
- * Changes to project directory temporarily and restores afterward
+ * Find the Payload config file using Payload's built-in finder when available,
+ * with fallback to simple file search for npx environments where payload isn't installed.
  *
  * @param projectPath - Absolute path to project directory
  * @returns Absolute path to config file, or null if not found

package/dist/utils/payload-config-finder.js

@@ -1,26 +1,65 @@
-import { findConfig } from 'payload/node';
+import fs from 'fs/promises';
+import path from 'path';
+import * as log from './log.js';
+// Standard Payload config file names in priority order
+const CONFIG_FILES = [
+    'payload.config.ts',
+    'payload.config.js',
+    'src/payload.config.ts',
+    'src/payload.config.js'
+];
 /**
- * Find the Payload config file using Payload's built-in finder
- * Changes to project directory temporarily and restores afterward
+ * Find the Payload config file using Payload's built-in finder when available,
+ * with fallback to simple file search for npx environments where payload isn't installed.
  *
  * @param projectPath - Absolute path to project directory
  * @returns Absolute path to config file, or null if not found
  */ export async function findPayloadConfig(projectPath) {
+    // First, try using Payload's official config finder (if payload is installed)
+    const configFromPayload = await findConfigWithPayload(projectPath);
+    if (configFromPayload) {
+        return configFromPayload;
+    }
+    // Fallback: Simple file search for standard config locations
+    // This works when running via npx before payload is installed
+    log.debug('Payload not available, using fallback config finder');
+    return findConfigFallback(projectPath);
+}
+/**
+ * Try to find config using Payload's findConfig function.
+ * Returns null if payload is not installed (dynamic import fails).
+ */ async function findConfigWithPayload(projectPath) {
     const originalCwd = process.cwd();
     try {
+        // Dynamic import - will fail gracefully if payload is not installed
+        const { findConfig } = await import('payload/node');
         // findConfig requires being in the project directory
         process.chdir(projectPath);
-        // Use Payload's official config finder
         const configPath = findConfig();
-        // Wrap in Promise.resolve to satisfy async requirement
-        return await Promise.resolve(configPath || null);
-    } catch  {
-        // Config not found or error occurred
+        return configPath || null;
+    } catch (error) {
+        // payload not installed or other error - return null to use fallback
+        log.debug(`Could not use Payload findConfig: ${error instanceof Error ? error.message : 'unknown'}`);
         return null;
     } finally{
-        // Always restore original working directory
         process.chdir(originalCwd);
     }
 }
+/**
+ * Fallback config finder that checks standard locations.
+ * Used when payload is not installed (e.g., running via npx).
+ */ async function findConfigFallback(projectPath) {
+    for (const configFile of CONFIG_FILES){
+        const fullPath = path.join(projectPath, configFile);
+        try {
+            await fs.access(fullPath);
+            log.debug(`Found config at: ${fullPath}`);
+            return fullPath;
+        } catch  {
+        // File doesn't exist, try next
+        }
+    }
+    return null;
+}
 
 //# sourceMappingURL=payload-config-finder.js.map

package/dist/utils/payload-config-modifier.d.ts

@@ -15,5 +15,5 @@ export declare function ensurePayloadFigmaConfig(projectPath: string, packageMan
 /**
  * Display manual configuration instructions
  */
-export declare function displayManualInstructions(reason: string): void;
+export declare function displayManualInstructions(reason: string, packageManager?: PackageManager): void;
 //# sourceMappingURL=payload-config-modifier.d.ts.map

package/dist/utils/payload-config-modifier.js

@@ -1,21 +1,22 @@
 import pc from 'picocolors';
-import { Project } from 'ts-morph';
+import { IndentationText, Project } from 'ts-morph';
 import { formatFile } from './formatter.js';
 import * as log from './log.js';
+import { getAddCommand, getRunCommand } from './package-manager.js';
 import { addFigmaProperty, applyModifications, detectRequiredChanges } from './payload-config-ast.js';
 import { findPayloadConfig } from './payload-config-finder.js';
-import { checkPackageInstalled, installPackage, uninstallPackage } from './payload-package-check.js';
+import { checkPackageInstalled, getPayloadVersion, installPackages, uninstallPackages } from './payload-package-check.js';
 import { runTypeScriptCheck } from './typescript-validator.js';
+import { getOwnVersion } from './version-check.js';
 /**
  * Main orchestrator for payload config modification
  * Checks package, detects needed changes, applies modifications
  */ export async function ensurePayloadFigmaConfig(projectPath, packageManager, figmaConfig) {
     const changes = [];
     const warnings = [];
-    let modified = false;
+    let astModified = false;
     try {
         log.debug(`Starting payload config modification for: ${projectPath}`);
-        // 1. Find config file
         const configPath = await findPayloadConfig(projectPath);
         if (!configPath) {
             log.debug(`Config file not found in: ${projectPath}`);
@@ -27,44 +28,28 @@ import { runTypeScriptCheck } from './typescript-validator.js';
             };
         }
         log.debug(`Found config file: ${configPath}`);
-        // 2. Check/install @payloadcms/figma package
-        const isInstalled = await checkPackageInstalled(projectPath, '@payloadcms/figma');
-        if (!isInstalled) {
-            log.debug('@payloadcms/figma not installed, attempting installation...');
-            try {
-                await installPackage(projectPath, '@payloadcms/figma', packageManager);
-                changes.push('Installed @payloadcms/figma');
-                modified = true;
-                log.debug('@payloadcms/figma installed successfully');
-            } catch (error) {
-                log.debug(`Failed to install @payloadcms/figma: ${error instanceof Error ? error.message : 'Unknown error'}`);
-                return {
-                    changes: [],
-                    error: 'Failed to install @payloadcms/figma',
-                    modified: false,
-                    success: false
-                };
-            }
-        } else {
-            log.debug('@payloadcms/figma already installed');
-        }
-        // 3. Parse config with ts-morph
+        // Pin @payloadcms/* packages to the project's payload version when possible.
+        const payloadVersion = await getPayloadVersion(projectPath);
+        log.debug(`Detected payload version: ${payloadVersion || 'unknown'}`);
+        // Parse first so a malformed config fails fast before we touch node_modules.
         log.debug('Parsing config file with ts-morph...');
         const project = new Project({
+            manipulationSettings: {
+                indentationText: IndentationText.TwoSpaces,
+                useTrailingCommas: true
+            },
             skipAddingFilesFromTsConfig: true
         });
         const sourceFile = project.addSourceFileAtPath(configPath);
-        // 4. Detect required changes
         log.debug('Detecting required changes...');
         const detection = detectRequiredChanges(sourceFile);
         log.debug(`Detection results: needsImportChange=${detection.needsImportChange}, hasAlias=${detection.hasAlias}, hasBuildConfig=${detection.hasBuildConfig}`);
-        // Handle failure modes
         if (detection.hasAlias) {
             log.debug('Config uses import alias (e.g., buildConfig as X)');
             return {
                 changes,
                 error: 'Config uses import alias - manual modification required',
-                modified,
+                modified: false,
                 success: false
             };
         }
@@ -73,25 +58,95 @@ import { runTypeScriptCheck } from './typescript-validator.js';
             return {
                 changes,
                 error: 'Config structure not recognized (no buildConfig call found)',
-                modified,
+                modified: false,
                 success: false
             };
         }
-        // 5. Apply modifications
+        // Compute the full install/uninstall diff up front so each can run as a
+        // single package-manager call. npm leaves node_modules transient between
+        // back-to-back calls, which causes generate:importmap to silently miss
+        // subpath components — batching avoids that intermediate state.
+        const packagesToInstall = [];
+        const packagesToUninstall = [];
+        const figmaInstalled = await checkPackageInstalled(projectPath, '@payloadcms/figma');
+        if (!figmaInstalled) {
+            const figmaVersion = await getOwnVersion();
+            packagesToInstall.push({
+                name: '@payloadcms/figma',
+                changeMessage: 'Installed @payloadcms/figma',
+                version: figmaVersion
+            });
+        }
+        const editorIsDefault = !detection.editorProperty || detection.editorProperty.isDefault;
+        if (editorIsDefault) {
+            const hasLexical = await checkPackageInstalled(projectPath, '@payloadcms/richtext-lexical');
+            if (!hasLexical) {
+                packagesToInstall.push({
+                    name: '@payloadcms/richtext-lexical',
+                    changeMessage: 'Installed @payloadcms/richtext-lexical (default editor)',
+                    version: payloadVersion
+                });
+            }
+        } else {
+            log.debug(`Custom editor detected (${detection.editorProperty?.importSource}) - skipping lexical installation`);
+        }
+        const hasCloudStorage = await checkPackageInstalled(projectPath, '@payloadcms/plugin-cloud-storage');
+        if (!hasCloudStorage) {
+            packagesToInstall.push({
+                name: '@payloadcms/plugin-cloud-storage',
+                changeMessage: 'Installed @payloadcms/plugin-cloud-storage',
+                version: payloadVersion
+            });
+        }
+        if (detection.dbProperty) {
+            packagesToUninstall.push(detection.dbProperty.importSource);
+        }
+        if (detection.sharpProperty) {
+            packagesToUninstall.push('sharp');
+        }
+        if (packagesToInstall.length > 0) {
+            log.debug(`Installing ${packagesToInstall.length} packages in a single operation: ${packagesToInstall.map((p)=>p.name).join(', ')}`);
+            try {
+                await installPackages(projectPath, packagesToInstall.map(({ name, version })=>({
+                        name,
+                        version
+                    })), packageManager);
+                for (const { changeMessage } of packagesToInstall){
+                    changes.push(changeMessage);
+                }
+            } catch (error) {
+                const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+                log.debug(`Batched install failed: ${errorMessage}`);
+                const figmaInBatch = packagesToInstall.some((p)=>p.name === '@payloadcms/figma');
+                if (figmaInBatch) {
+                    // Without @payloadcms/figma the rewritten config would import a
+                    // missing package, so abort before touching the file.
+                    return {
+                        changes: [],
+                        error: 'Failed to install @payloadcms/figma',
+                        modified: false,
+                        success: false
+                    };
+                }
+                // Lexical and cloud-storage are non-fatal — payload still loads without
+                // them, so warn (with package names) and continue.
+                const failedNames = packagesToInstall.map((p)=>p.name).join(', ');
+                warnings.push(`Could not install dependencies (${failedNames}) — install them manually. Details: ${errorMessage}`);
+            }
+        }
         log.debug('Applying modifications...');
         const modResult = applyModifications(sourceFile, detection);
         if (modResult.modified) {
             changes.push(...modResult.changes);
-            modified = true;
+            astModified = true;
             log.debug(`Applied ${modResult.changes.length} modifications`);
         }
-        // 6. Add figma property if config provided and doesn't exist
         if (figmaConfig && !detection.figmaObjectExists) {
             log.debug('Adding figma property to buildConfig...');
             const figmaResult = addFigmaProperty(sourceFile, figmaConfig);
             if (figmaResult.modified) {
                 changes.push(...figmaResult.changes);
-                modified = true;
+                astModified = true;
                 log.debug(`Added figma property`);
             } else {
                 log.debug('Figma property not added (may already exist)');
@@ -99,46 +154,39 @@ import { runTypeScriptCheck } from './typescript-validator.js';
         } else if (detection.figmaObjectExists) {
             log.debug('Figma property already exists, skipping');
         }
-        // Save file if any modifications were made
-        if (modified) {
+        if (astModified) {
+            sourceFile.formatText({
+                indentSize: 2,
+                tabSize: 2
+            });
             await sourceFile.save();
             log.debug('Config file saved');
-            // 7. Uninstall orphaned packages
-            const packagesToUninstall = [];
-            if (detection.dbProperty) {
-                packagesToUninstall.push(detection.dbProperty.importSource);
-            }
-            if (detection.editorProperty?.isDefault) {
-                packagesToUninstall.push(detection.editorProperty.importSource);
-            }
-            if (packagesToUninstall.length > 0) {
-                log.debug(`Uninstalling ${packagesToUninstall.length} orphaned packages...`);
-            }
-            for (const pkg of packagesToUninstall){
-                try {
-                    await uninstallPackage(projectPath, pkg, packageManager);
-                    changes.push(`Uninstalled ${pkg}`);
-                    log.debug(`Uninstalled ${pkg}`);
-                } catch (error) {
-                    log.debug(`Failed to uninstall ${pkg}: ${error instanceof Error ? error.message : 'Unknown error'}`);
-                // Don't fail on uninstall errors - orphaned package is better than broken config
-                }
-            }
-            // 8. Format file
             log.debug('Formatting config file...');
             const formatResult = await formatFile(configPath, packageManager);
             if (!formatResult.success && formatResult.warning) {
                 warnings.push(formatResult.warning);
                 log.debug(`Formatting warning: ${formatResult.warning}`);
             }
-            // 9. Run TypeScript validation
             log.debug('Running TypeScript validation...');
             const tsResult = await runTypeScriptCheck(projectPath, packageManager);
             if (!tsResult.success && tsResult.errors.length > 0) {
-                warnings.push("TypeScript validation found issues - run 'pnpm build' for details");
+                warnings.push(`TypeScript validation found issues - run '${getRunCommand(packageManager)} build' for details`);
                 log.debug(`TypeScript validation found ${tsResult.errors.length} issues`);
             }
-        } else {
+        }
+        if (packagesToUninstall.length > 0) {
+            log.debug(`Uninstalling ${packagesToUninstall.length} orphaned packages: ${packagesToUninstall.join(', ')}`);
+            const uninstallResult = await uninstallPackages(projectPath, packagesToUninstall, packageManager);
+            if (uninstallResult.success) {
+                for (const pkg of packagesToUninstall){
+                    changes.push(`Uninstalled ${pkg}`);
+                }
+            } else {
+                warnings.push(`Could not uninstall ${uninstallResult.failedPackages.join(', ')} — they may remain as orphaned dependencies in package.json`);
+            }
+        }
+        const modified = astModified || changes.length > 0;
+        if (!modified) {
             log.debug('No modifications needed - config already correct');
         }
         log.debug('Payload config modification completed successfully');
@@ -156,17 +204,17 @@ import { runTypeScriptCheck } from './typescript-validator.js';
         return {
             changes,
             error: error instanceof Error ? error.message : 'Unknown error occurred',
-            modified,
+            modified: astModified,
             success: false
         };
     }
 }
 /**
  * Display manual configuration instructions
- */ export function displayManualInstructions(reason) {
+ */ export function displayManualInstructions(reason, packageManager = 'npm') {
     const leftLineWrap = (message)=>{
         // Add '┌  ' prefix to first line, '│  ' to subsequent lines, and '└  ' to last line
-        return message.split('\n').map((line, index, arr)=>{
+        return message.split(/\r?\n/).map((line, index, arr)=>{
             if (index === 0) {
                 return `${pc.dim('┌  ')}${line}`;
             } else if (index === arr.length - 1) {
@@ -185,7 +233,7 @@ ${pc.bold('Required changes:')}
 
 1. Replace buildConfig import:
    ${pc.dim('- FROM: ')}${pc.cyan("import { buildConfig } from 'payload'")}
-   ${pc.dim('- TO:   ')}${pc.cyan("import { buildConfig } from '@payloadcms/figma'")}
+   ${pc.dim('- TO:   ')}${pc.cyan("import { buildFigmaConfig } from '@payloadcms/figma'")}
 
 2. Remove these properties from buildConfig():
    • db
@@ -193,7 +241,7 @@ ${pc.bold('Required changes:')}
    • editor (if using default lexicalEditor())
 
 3. Install package:
-   ${pc.cyan('pnpm add @payloadcms/figma')}
+   ${pc.cyan(`${getAddCommand(packageManager)} @payloadcms/figma`)}
 
 Then run: ${pc.cyan('npx @payloadcms/figma init')}`);
     // eslint-disable-next-line no-console