@react-spectrum/codemods 3.0.0-nightly-796738501-260310 → 3.0.0-nightly-6a0d13c57-260322

package/dist/index.js

@@ -25,6 +25,9 @@ const options = {
     },
     'components': {
         type: 'string'
+    },
+    'agent': {
+        type: 'boolean'
     }
 };
 const { values, positionals } = parseArgs({
@@ -35,21 +38,21 @@ if (positionals.length < 1) {
     console.error('Please specify a codemod to run. Available codemods: ', Object.keys(codemods).join(', '));
     process.exit(1);
 }
-const codemodName = positionals[0];
-const codemodFunction = codemods[codemodName];
-if (!codemodFunction) {
-    console.error(`Unknown codemod: ${codemodName}, available codemods: ${Object.keys(codemods).join(', ')}`);
-    process.exit(1);
-}
-try {
-    codemodFunction({
+async function main() {
+    const codemodName = positionals[0];
+    const codemodFunction = codemods[codemodName];
+    if (!codemodFunction) {
+        console.error(`Unknown codemod: ${codemodName}, available codemods: ${Object.keys(codemods).join(', ')}`);
+        process.exit(1);
+    }
+    await Promise.resolve(codemodFunction({
         parser: 'tsx',
         ignorePattern: '**/node_modules/**',
         path: '.',
         ...values
-    });
+    }));
 }
-catch (error) {
+main().catch((error) => {
     console.error(`Error running codemod: ${error}`);
     process.exit(1);
-}
+});

package/dist/s1-to-s2/src/codemods/codemod.js

@@ -41,6 +41,7 @@ exports.default = transformer;
 const utils_1 = require("./shared/utils");
 const getComponents_1 = require("../getComponents");
 const iconMap_1 = require("./icons/iconMap");
+const illustrationMap_1 = require("./illustrations/illustrationMap");
 const recast_1 = require("recast");
 const t = __importStar(require("@babel/types"));
 const styleProps_1 = __importDefault(require("./shared/styleProps"));
@@ -63,6 +64,108 @@ availableComponents.add('ActionGroup');
 let renamedComponents = {
     ContextualHelpTrigger: 'UnavailableMenuItemTrigger'
 };
+const relatedComponentGroups = {
+    ActionMenu: {
+        scopedComponents: {
+            Item: ['ActionMenu']
+        }
+    },
+    Breadcrumbs: {
+        scopedComponents: {
+            Item: ['Breadcrumbs']
+        }
+    },
+    ComboBox: {
+        scopedComponents: {
+            Item: ['ComboBox'],
+            Section: ['ComboBox']
+        }
+    },
+    DialogContainer: {
+        components: ['Dialog']
+    },
+    DialogTrigger: {
+        components: ['Dialog']
+    },
+    Menu: {
+        components: ['ContextualHelpTrigger', 'MenuTrigger', 'SubmenuTrigger'],
+        scopedComponents: {
+            Item: ['Menu'],
+            Section: ['Menu']
+        }
+    },
+    Picker: {
+        scopedComponents: {
+            Item: ['Picker'],
+            Section: ['Picker']
+        }
+    },
+    TableView: {
+        components: ['Cell', 'Column', 'Row', 'TableBody', 'TableHeader']
+    },
+    Tabs: {
+        components: ['TabList', 'TabPanels']
+    },
+    TagGroup: {
+        scopedComponents: {
+            Item: ['TagGroup']
+        }
+    },
+    TooltipTrigger: {
+        components: ['Tooltip']
+    }
+};
+function addScopedParents(scopedComponents, component, parents) {
+    let existingParents = scopedComponents.get(component) ?? new Set();
+    for (let parent of parents) {
+        existingParents.add(parent);
+    }
+    scopedComponents.set(component, existingParents);
+}
+function getComponentSelection(components) {
+    if (!components) {
+        return {
+            components: new Set(availableComponents),
+            explicitComponents: new Set(availableComponents),
+            scopedComponents: new Map()
+        };
+    }
+    let explicitComponents = new Set(components.split(',').map(s => s.trim()).filter(Boolean));
+    let expandedComponents = new Set(explicitComponents);
+    let scopedComponents = new Map();
+    for (let component of explicitComponents) {
+        let relatedComponents = relatedComponentGroups[component];
+        if (!relatedComponents) {
+            continue;
+        }
+        for (let relatedComponent of relatedComponents.components ?? []) {
+            expandedComponents.add(relatedComponent);
+        }
+        for (let [relatedComponent, parents] of Object.entries(relatedComponents.scopedComponents ?? {})) {
+            expandedComponents.add(relatedComponent);
+            if (!explicitComponents.has(relatedComponent)) {
+                addScopedParents(scopedComponents, relatedComponent, parents);
+            }
+        }
+    }
+    return {
+        components: new Set([...expandedComponents].filter(component => availableComponents.has(component))),
+        explicitComponents: new Set([...explicitComponents].filter(component => availableComponents.has(component))),
+        scopedComponents
+    };
+}
+function shouldTransformElement(componentName, path, selection) {
+    if (selection.explicitComponents.has(componentName)) {
+        return true;
+    }
+    let allowedParents = selection.scopedComponents.get(componentName);
+    if (!allowedParents || allowedParents.size === 0) {
+        return true;
+    }
+    return !!path.findParent((parentPath) => t.isJSXElement(parentPath.node)
+        && t.isJSXIdentifier(parentPath.node.openingElement.name)
+        && allowedParents.has((0, utils_1.getName)(path, parentPath.node.openingElement.name)));
+}
 function transformer(file, api, options) {
     let j = api.jscodeshift.withParser({
         parse(source) {
@@ -72,7 +175,8 @@ function transformer(file, api, options) {
         }
     });
     let root = j(file.source);
-    let componentsToTransform = options.components ? new Set(options.components.split(',').filter(s => availableComponents.has(s))) : availableComponents;
+    let selection = getComponentSelection(options.components);
+    let componentsToTransform = selection.components;
     let v3ComponentsToRename = new Set(Object.keys(renamedComponents));
     let S2ComponentsToImport = new Set();
     let bindings = [];
@@ -80,8 +184,13 @@ function transformer(file, api, options) {
     let elements = [];
     let lastImportPath = null;
     let iconImports = new Map();
+    let illustrationImports = new Map();
+    let programPath = null;
     const leadingComments = root.find(j.Program).get('body', 0).node.leadingComments;
     (0, traverse_1.default)(root.paths()[0].node, {
+        Program(path) {
+            programPath = path;
+        },
         ImportDeclaration(path) {
             if (path.node.source.value === '@adobe/react-spectrum' || (path.node.source.value.startsWith('@react-spectrum/') && path.node.source.value !== '@react-spectrum/s2')) {
                 lastImportPath = path;
@@ -97,7 +206,10 @@ function transformer(file, api, options) {
                                 if (propName && path.parentPath.parentPath?.parentPath?.isJSXElement()) {
                                     if (componentsToTransform.has(propName)) {
                                         importedComponents.set(propName, clonedSpecifier);
-                                        elements.push([propName, path.parentPath.parentPath.parentPath]);
+                                        let elementPath = path.parentPath.parentPath.parentPath;
+                                        if (shouldTransformElement(propName, elementPath, selection)) {
+                                            elements.push([propName, elementPath]);
+                                        }
                                     }
                                     else if (v3ComponentsToRename.has(propName)) {
                                         S2ComponentsToImport.add(renamedComponents[propName]);
@@ -141,7 +253,10 @@ function transformer(file, api, options) {
                             bindings.push(binding);
                             for (let path of binding.referencePaths) {
                                 if (path.parentPath?.isJSXOpeningElement() && path.parentPath.parentPath.isJSXElement()) {
-                                    elements.push([specifier.imported.name, path.parentPath.parentPath]);
+                                    let elementPath = path.parentPath.parentPath;
+                                    if (shouldTransformElement(specifier.imported.name, elementPath, selection)) {
+                                        elements.push([specifier.imported.name, elementPath]);
+                                    }
                                 }
                             }
                         }
@@ -167,6 +282,24 @@ function transformer(file, api, options) {
                     iconImports.set(localName, { path, newName: null });
                 }
             }
+            else if (path.node.source.value.startsWith('@spectrum-icons/illustrations/')) {
+                let illustrationName = path.node.source.value.split('/').pop();
+                if (!illustrationName) {
+                    return;
+                }
+                let specifier = path.node.specifiers[0];
+                if (!specifier || !t.isImportDefaultSpecifier(specifier)) {
+                    return;
+                }
+                let localName = specifier.local.name;
+                if (illustrationMap_1.illustrationMap.has(illustrationName)) {
+                    let newIllustrationName = illustrationMap_1.illustrationMap.get(illustrationName);
+                    illustrationImports.set(localName, { path, newName: newIllustrationName });
+                }
+                else {
+                    illustrationImports.set(localName, { path, newName: null });
+                }
+            }
         },
         Import(path) {
             let call = path.parentPath;
@@ -177,7 +310,9 @@ function transformer(file, api, options) {
             if (arg.type !== 'StringLiteral') {
                 return;
             }
-            if (arg.value !== '@adobe/react-spectrum' && !arg.value.startsWith('@react-spectrum/')) {
+            let isV3ImportSource = arg.value === '@adobe/react-spectrum'
+                || (arg.value.startsWith('@react-spectrum/') && arg.value !== '@react-spectrum/s2');
+            if (!isV3ImportSource) {
                 return;
             }
             // TODO: implement this. could be a bit challenging. punting for now.
@@ -191,6 +326,12 @@ function transformer(file, api, options) {
                     (0, utils_1.addComment)(path.node, ` TODO(S2-upgrade): A Spectrum 2 equivalent to '${name.name}' was not found. Please update this icon manually.`);
                 }
             }
+            if (t.isJSXIdentifier(name) && illustrationImports.has(name.name)) {
+                let illustrationInfo = illustrationImports.get(name.name);
+                if (illustrationInfo.newName === null) {
+                    (0, utils_1.addComment)(path.node, ` TODO(S2-upgrade): A Spectrum 2 equivalent to '${name.name}' was not found. Please update this illustration manually.`);
+                }
+            }
         }
     });
     iconImports.forEach((iconInfo, localName) => {
@@ -216,6 +357,26 @@ function transformer(file, api, options) {
             path.node.specifiers = [t.importDefaultSpecifier(t.identifier(newLocalName))];
         }
     });
+    illustrationImports.forEach((illustrationInfo, localName) => {
+        let { path, newName } = illustrationInfo;
+        if (newName) {
+            let newImportSource = `@react-spectrum/s2/illustrations/linear/${newName}`;
+            let newLocalName = localName;
+            if (localName === path.node.source.value.split('/').pop() && localName !== newName) {
+                let binding = path.scope.getBinding(localName);
+                if (binding && !path.scope.hasBinding(newName)) {
+                    newLocalName = newName;
+                    binding.referencePaths.forEach(refPath => {
+                        if (t.isJSXIdentifier(refPath.node)) {
+                            refPath.node.name = newName;
+                        }
+                    });
+                }
+            }
+            path.node.source = t.stringLiteral(newImportSource);
+            path.node.specifiers = [t.importDefaultSpecifier(t.identifier(newLocalName))];
+        }
+    });
     let hasMacros = false;
     let usedLightDark = false;
     elements.forEach(([elementName, path]) => {
@@ -268,16 +429,24 @@ function transformer(file, api, options) {
         });
         if (existingImport.length) {
             let importDecl = existingImport.get();
-            for (let specifier of importDecl.node.specifiers) {
-                if (specifier.type === 'ImportSpecifier'
-                    && importedComponents.has(specifier.imported.name)) {
-                    importSpecifiers.add(specifier);
-                }
-            }
+            let existingSpecifiers = importDecl.value.specifiers;
             // add importSpecifiers to existing import
             importDecl.value.specifiers = [...importDecl.value.specifiers, ...[...importSpecifiers].filter(specifier => {
-                    // @ts-ignore
-                    return specifier.imported.name !== 'Item' && ![...importDecl.value.specifiers].find(s => s.imported.name === specifier.imported.name);
+                    if (t.isImportSpecifier(specifier) && t.isIdentifier(specifier.imported)) {
+                        if (specifier.imported.name === 'Item') {
+                            return false;
+                        }
+                        let importedName = specifier.imported.name;
+                        let localName = specifier.local?.name || importedName;
+                        return !existingSpecifiers.find((s) => t.isImportSpecifier(s)
+                            && t.isIdentifier(s.imported)
+                            && s.imported.name === importedName
+                            && (s.local?.name || s.imported.name) === localName);
+                    }
+                    if (t.isImportNamespaceSpecifier(specifier)) {
+                        return !existingSpecifiers.find((s) => t.isImportNamespaceSpecifier(s) && s.local.name === specifier.local.name);
+                    }
+                    return false;
                 })];
         }
         else {
@@ -305,6 +474,9 @@ function transformer(file, api, options) {
             }
         });
     }
+    if (programPath) {
+        (0, utils_1.removeUnusedImports)(programPath, ['@react-spectrum/s2']);
+    }
     root.find(j.Program).get('body', 0).node.comments = leadingComments;
     return root.toSource().replace(/assert\s*\{\s*type:\s*"macro"\s*\}/g, 'with { type: "macro" }');
 }

package/dist/s1-to-s2/src/codemods/components/ActionGroup/transform.js

@@ -51,6 +51,7 @@ let availableComponents = (0, getComponents_1.getComponents)();
  * - Convert dynamic collections render function to items.map.
  */
 function transformActionGroup(path) {
+    let program = path.findParent((p) => t.isProgram(p.node));
     // Comment out overflowMode
     (0, transforms_1.commentOutProp)(path, { propName: 'overflowMode' });
     // Comment out buttonLabelBehavior
@@ -73,12 +74,10 @@ function transformActionGroup(path) {
     }
     let localName = newComponentName;
     if (availableComponents.has(newComponentName)) {
-        let program = path.findParent((p) => t.isProgram(p.node));
         localName = (0, utils_1.addComponentImport)(program, newComponentName);
     }
     let localChildName = childComponentName;
     if (availableComponents.has(childComponentName)) {
-        let program = path.findParent((p) => t.isProgram(p.node));
         localChildName = (0, utils_1.addComponentImport)(program, childComponentName);
     }
     // Convert dynamic collection to an array.map.
@@ -161,4 +160,5 @@ function transformActionGroup(path) {
     if (path.node.closingElement) {
         path.node.closingElement.name = t.jsxIdentifier(localName);
     }
+    (0, utils_1.removeComponentImportIfUnused)(program, 'Item');
 }

package/dist/s1-to-s2/src/codemods/components/ContextualHelpTrigger/transform.js

@@ -65,4 +65,5 @@ function transformContextualHelpTrigger(path) {
             }
         }
     }
+    (0, utils_1.removeComponentImportIfUnused)(program, 'Dialog');
 }

package/dist/s1-to-s2/src/codemods/components/DialogTrigger/transform.js

@@ -49,6 +49,7 @@ let availableComponents = (0, getComponents_1.getComponents)();
  * - When `type="fullscreenTakeover"`, replaces Dialog with `<FullscreenDialog variant="fullscreenTakeover">`.
  */
 function updateDialogChild(path) {
+    let program = path.findParent((p) => t.isProgram(p.node));
     let typePath = path.get('openingElement').get('attributes').find((attr) => t.isJSXAttribute(attr.node) && attr.node.name.name === 'type');
     let type = typePath?.node.value?.type === 'StringLiteral' ? typePath.node.value?.value : 'modal';
     let newComponentName = 'Dialog';
@@ -72,7 +73,6 @@ function updateDialogChild(path) {
     typePath?.remove();
     let localName = newComponentName;
     if (newComponentName !== 'Dialog' && availableComponents.has(newComponentName)) {
-        let program = path.findParent((p) => t.isProgram(p.node));
         localName = (0, utils_1.addComponentImport)(program, newComponentName);
     }
     path.traverse({
@@ -87,6 +87,20 @@ function updateDialogChild(path) {
             dialog.node.openingElement.attributes.push(...props);
         }
     });
+    path.traverse({
+        JSXElement(childPath) {
+            if (t.isJSXIdentifier(childPath.node.openingElement.name)
+                && (0, utils_1.getName)(childPath, childPath.node.openingElement.name) === 'Divider'
+                && t.isJSXElement(childPath.parentPath.node)
+                && t.isJSXIdentifier(childPath.parentPath.node.openingElement.name)) {
+                let parentName = (0, utils_1.getName)(childPath, childPath.parentPath.node.openingElement.name);
+                if (parentName === 'Dialog' || parentName === 'Popover' || parentName === 'FullscreenDialog') {
+                    childPath.remove();
+                }
+            }
+        }
+    });
+    (0, utils_1.removeComponentImportIfUnused)(program, 'Divider');
 }
 /**
  * Transforms DialogTrigger:

package/dist/s1-to-s2/src/codemods/components/Tabs/transform.js

@@ -38,11 +38,12 @@ const utils_1 = require("../../shared/utils");
 const transforms_1 = require("../../shared/transforms");
 const t = __importStar(require("@babel/types"));
 function transformTabList(tabListPath) {
-    tabListPath.get('children').forEach(itemPath => {
-        if (t.isJSXElement(itemPath.node) &&
-            t.isJSXIdentifier(itemPath.node.openingElement.name) &&
-            (0, utils_1.getName)(itemPath, itemPath.node.openingElement.name) === 'Item') {
-            (0, transforms_1.updateComponentWithinCollection)(itemPath, { parentComponentName: 'TabList', newComponentName: 'Tab' });
+    tabListPath.traverse({
+        JSXElement(itemPath) {
+            if (t.isJSXIdentifier(itemPath.node.openingElement.name) &&
+                (0, utils_1.getName)(itemPath, itemPath.node.openingElement.name) === 'Item') {
+                (0, transforms_1.updateComponentWithinCollection)(itemPath, { parentComponentName: 'TabList', newComponentName: 'Tab' });
+            }
         }
     });
     return tabListPath.node;
@@ -113,4 +114,5 @@ function transformTabs(path) {
     (0, transforms_1.removeProp)(path, { propName: 'isEmphasized' });
     // Remove isQuiet
     (0, transforms_1.removeProp)(path, { propName: 'isQuiet' });
+    (0, utils_1.removeComponentImportIfUnused)(program, 'Item');
 }

package/dist/s1-to-s2/src/codemods/illustrations/illustrationMap.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.illustrationMap = void 0;
+exports.illustrationMap = new Map([
+    ['Error', 'Error'],
+    ['File', 'Document'],
+    ['Folder', 'FolderClose'],
+    ['NoSearchResults', 'NoSearchResults'],
+    ['NotFound', 'NoSearchResults'],
+    ['Timeout', 'Clock'],
+    ['Unauthorized', 'LockClose'],
+    ['Unavailable', 'Error'],
+    ['Upload', 'Upload']
+]);

package/dist/s1-to-s2/src/codemods/shared/transforms.js

@@ -404,6 +404,7 @@ function movePropToNewChildComponentName(path, options) {
         (0, utils_1.getName)(path, path.node.openingElement.name) === childComponentName &&
         (0, utils_1.getName)(path, path.parentPath.node.openingElement.name) === parentComponentName) {
         let propValue;
+        let localName = newChildComponentName;
         path.node.openingElement.attributes =
             path.node.openingElement.attributes.filter((attr) => {
                 if (t.isJSXAttribute(attr) && attr.name.name === propName) {
@@ -413,7 +414,11 @@ function movePropToNewChildComponentName(path, options) {
                 return true;
             });
         if (propValue) {
-            path.node.children.unshift(t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier(newChildComponentName), []), t.jsxClosingElement(t.jsxIdentifier(newChildComponentName)), [t.isStringLiteral(propValue) ? t.jsxText(propValue.value) : propValue]));
+            if (availableComponents.has(newChildComponentName)) {
+                let program = path.findParent((p) => t.isProgram(p.node));
+                localName = (0, utils_1.addComponentImport)(program, newChildComponentName);
+            }
+            path.node.children.unshift(t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier(localName), []), t.jsxClosingElement(t.jsxIdentifier(localName)), [t.isStringLiteral(propValue) ? t.jsxText(propValue.value) : propValue]));
             // TODO: handle dynamic collections. Need to wrap export function child in <Collection> and move `items` prop down.
         }
     }

package/dist/s1-to-s2/src/codemods/shared/utils.js

@@ -39,6 +39,8 @@ exports.capitalize = capitalize;
 exports.addComment = addComment;
 exports.addComponentImport = addComponentImport;
 exports.removeComponentImport = removeComponentImport;
+exports.removeComponentImportIfUnused = removeComponentImportIfUnused;
+exports.removeUnusedImports = removeUnusedImports;
 exports.getName = getName;
 const t = __importStar(require("@babel/types"));
 function getPropValue(node) {
@@ -108,6 +110,17 @@ function addComment(node, comment) {
     });
 }
 function addComponentImport(path, newComponentName) {
+    let existingImport = path.node.body.find((node) => t.isImportDeclaration(node) && node.source.value === '@react-spectrum/s2');
+    if (existingImport && t.isImportDeclaration(existingImport)) {
+        let existingSpecifier = existingImport.specifiers.find((specifier) => {
+            return (t.isImportSpecifier(specifier) &&
+                specifier.imported.type === 'Identifier' &&
+                specifier.imported.name === newComponentName);
+        });
+        if (existingSpecifier && t.isImportSpecifier(existingSpecifier)) {
+            return existingSpecifier.local?.name ?? newComponentName;
+        }
+    }
     // If newComponentName variable already exists in scope, alias new import to avoid conflict.
     let existingBinding = path.scope.getBinding(newComponentName);
     let localName = newComponentName;
@@ -120,17 +133,7 @@ function addComponentImport(path, newComponentName) {
         }
         localName = newName;
     }
-    let existingImport = path.node.body.find((node) => t.isImportDeclaration(node) && node.source.value === '@react-spectrum/s2');
     if (existingImport && t.isImportDeclaration(existingImport)) {
-        let specifier = existingImport.specifiers.find((specifier) => {
-            return (t.isImportSpecifier(specifier) &&
-                specifier.imported.type === 'Identifier' &&
-                specifier.imported.name === newComponentName);
-        });
-        if (specifier) {
-            // Already imported
-            return localName;
-        }
         existingImport.specifiers.push(t.importSpecifier(t.identifier(localName), t.identifier(newComponentName)));
     }
     else {
@@ -142,18 +145,66 @@ function addComponentImport(path, newComponentName) {
     return localName;
 }
 function removeComponentImport(path, component) {
-    let existingImport = path.node.body.find((node) => t.isImportDeclaration(node) && node.source.value === '@adobe/react-spectrum' || t.isImportDeclaration(node) && node.source.value.startsWith('@react-spectrum/'));
-    if (existingImport && t.isImportDeclaration(existingImport)) {
-        let specifier = existingImport.specifiers.find((specifier) => {
-            return (t.isImportSpecifier(specifier) &&
-                specifier.imported.type === 'Identifier' &&
-                specifier.imported.name === component);
+    let imports = path.node.body.filter((node) => {
+        return t.isImportDeclaration(node)
+            && (node.source.value === '@adobe/react-spectrum'
+                || (node.source.value.startsWith('@react-spectrum/') && node.source.value !== '@react-spectrum/s2'));
+    });
+    for (let importDecl of imports) {
+        let previousLength = importDecl.specifiers.length;
+        importDecl.specifiers = importDecl.specifiers.filter((specifier) => {
+            return !(t.isImportSpecifier(specifier)
+                && specifier.imported.type === 'Identifier'
+                && specifier.imported.name === component);
+        });
+        if (importDecl.specifiers.length === 0 && previousLength > 0) {
+            path.node.body = path.node.body.filter((node) => node !== importDecl);
+        }
+    }
+}
+function removeComponentImportIfUnused(path, component) {
+    path.scope.crawl();
+    let imports = path.node.body.filter((node) => {
+        return t.isImportDeclaration(node)
+            && (node.source.value === '@adobe/react-spectrum'
+                || node.source.value.startsWith('@react-spectrum/'));
+    });
+    for (let importDecl of imports) {
+        let previousLength = importDecl.specifiers.length;
+        importDecl.specifiers = importDecl.specifiers.filter((specifier) => {
+            if (t.isImportSpecifier(specifier)
+                && specifier.imported.type === 'Identifier'
+                && specifier.imported.name === component) {
+                let localName = specifier.local?.name ?? specifier.imported.name;
+                let binding = path.scope.getBinding(localName);
+                return !!binding?.referencePaths.length;
+            }
+            return true;
         });
-        if (specifier) {
-            existingImport.specifiers = existingImport.specifiers.filter((s) => s !== specifier);
-            if (existingImport.specifiers.length === 0) {
-                path.node.body = path.node.body.filter((node) => node !== existingImport);
+        if (importDecl.specifiers.length === 0 && previousLength > 0) {
+            path.node.body = path.node.body.filter((node) => node !== importDecl);
+        }
+    }
+}
+function removeUnusedImports(path, sources) {
+    path.scope.crawl();
+    let sourceSet = new Set(sources);
+    let imports = path.node.body.filter((node) => {
+        return t.isImportDeclaration(node) && sourceSet.has(node.source.value);
+    });
+    for (let importDecl of imports) {
+        let previousLength = importDecl.specifiers.length;
+        importDecl.specifiers = importDecl.specifiers.filter((specifier) => {
+            if (t.isImportSpecifier(specifier)
+                || t.isImportDefaultSpecifier(specifier)
+                || t.isImportNamespaceSpecifier(specifier)) {
+                let binding = path.scope.getBinding(specifier.local.name);
+                return !!binding?.referencePaths.length;
             }
+            return true;
+        });
+        if (importDecl.specifiers.length === 0 && previousLength > 0) {
+            path.node.body = path.node.body.filter((node) => node !== importDecl);
         }
     }
 }

package/dist/s1-to-s2/src/getComponents.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponents = getComponents;
+const fs_1 = require("fs");
 const parser_1 = require("@babel/parser");
 const path = require('path');
-const fs_1 = require("fs");
 const traverse_1 = __importDefault(require("@babel/traverse"));
 // These are exported but there are no codemods written for them yet.
 // Don't replace imports yet.
@@ -19,8 +19,18 @@ const skipped = new Set([
 function getComponents() {
     // Determine list of available components in S2 from index.ts
     let availableComponents = new Set();
-    const packagePath = require.resolve('@react-spectrum/s2');
-    const indexPath = path.join(path.dirname(packagePath), process.env.NODE_ENV === 'test' ? 'src/index.ts' : '../src/index.ts');
+    let indexPath;
+    try {
+        const packagePath = require.resolve('@react-spectrum/s2');
+        indexPath = path.join(path.dirname(packagePath), process.env.NODE_ENV === 'test' ? 'index.ts' : '../../exports/index.ts');
+    }
+    catch {
+        const workspaceIndexPath = path.resolve(__dirname, '../../../../../@react-spectrum/s2/exports/index.ts');
+        if (!(0, fs_1.existsSync)(workspaceIndexPath)) {
+            throw new Error('Could not resolve @react-spectrum/s2 source for codemods.');
+        }
+        indexPath = workspaceIndexPath;
+    }
     let index = (0, parser_1.parse)((0, fs_1.readFileSync)(indexPath, 'utf8'), { sourceType: 'module', plugins: ['typescript'] });
     (0, traverse_1.default)(index, {
         ExportNamedDeclaration(path) {

package/dist/s1-to-s2/src/index.js

@@ -11,7 +11,24 @@ const logger_js_1 = __importDefault(require("./utils/logger.js"));
 const transform_js_1 = require("./transform.js");
 const waitForKeypress_js_1 = require("./utils/waitForKeypress.js");
 const boxen = require('boxen');
+function printNextSteps(nextSteps) {
+    console.log(boxen(`Next steps:\n\n ${nextSteps.map((step, i) => `${i + 1}. ${step}`).join('\n\n\n')}`, { borderStyle: 'round', padding: 1, borderColor: 'green' }));
+}
 async function s1_to_s2(options) {
+    if (options.agent) {
+        logger_js_1.default.info('Running s1-to-s2 in agent mode (non-interactive, transform-only).');
+        logger_js_1.default.info('Upgrading components...');
+        await (0, transform_js_1.transform)(options);
+        logger_js_1.default.success('Upgrade complete!');
+        printNextSteps([
+            `Ensure ${chalk_1.default.bold('@react-spectrum/s2')} is installed.`,
+            `If your bundler is not Parcel v2.12.0+, configure the Spectrum 2 style macro support. See: ${chalk_1.default.underline('https://react-spectrum.adobe.com/getting-started#framework-setup')}`,
+            `Add ${chalk_1.default.bold('import \'@react-spectrum/s2/page.css\';')} to your entry component if needed.`,
+            `Search for ${chalk_1.default.bold('TODO(S2-upgrade)')} and resolve remaining manual migration updates.`,
+            `Reference the migration guide: ${chalk_1.default.underline('https://react-spectrum.adobe.com/migrating')}`
+        ]);
+        return;
+    }
     console.log(boxen('Welcome to the React Spectrum v3 to Spectrum 2 upgrade assistant!\n\n' +
         'This tool will:\n\n' +
         `1. Install the ${chalk_1.default.bold('@react-spectrum/s2')} package and setup your bundler to use the Spectrum 2 style macro.\n\n` +
@@ -44,14 +61,14 @@ async function s1_to_s2(options) {
             `  - Vite: ${chalk_1.default.underline('https://github.com/adobe/react-spectrum/tree/main/examples/s2-vite-project')}\n` +
             `  - Rollup: ${chalk_1.default.underline('https://github.com/adobe/react-spectrum/tree/main/examples/s2-rollup-starter-app')}\n` +
             `  - ESBuild: ${chalk_1.default.underline('https://github.com/adobe/react-spectrum/tree/main/examples/s2-esbuild-starter-app')}\n\n` +
-            `or view documentation here: ${chalk_1.default.underline('https://react-spectrum.adobe.com/s2/index.html?path=/docs/intro--docs#configuring-your-bundler')}`);
+            `or view documentation here: ${chalk_1.default.underline('https://react-spectrum.adobe.com/getting-started#framework-setup')}`);
     }
     nextSteps.push('Handle remaining upgrades and run your project\'s linter or formatter.\n\n' +
         'There may have been some upgrades that we couldn\'t handle automatically. We marked these with comments containing:\n\n' +
         `${chalk_1.default.bold('TODO(S2-upgrade)')}\n\n` +
         'You should be able to search your codebase and handle these manually. \n\n' +
         'We also recommend running your project\'s code formatter (i.e. Prettier, ESLint) after the upgrade process to clean up any extraneous formatting from the codemod.\n\n' +
-        `For additional help, reference the Spectrum 2 Migration Guide: ${chalk_1.default.underline('https://react-spectrum.adobe.com/s2/index.html?path=/docs/migrating--docs')}`);
-    console.log(boxen(`Next steps:\n\n ${nextSteps.map((step, i) => `${i + 1}. ${step}`).join('\n\n\n')}`, { borderStyle: 'round', padding: 1, borderColor: 'green' }));
+        `For additional help, reference the Spectrum 2 Migration Guide: ${chalk_1.default.underline('https://react-spectrum.adobe.com/migrating')}`);
+    printNextSteps(nextSteps);
     process.exit(0);
 }

package/dist/s1-to-s2/src/transform.js

@@ -8,6 +8,7 @@ const Runner_js_1 = require("jscodeshift/src/Runner.js");
 const path_1 = __importDefault(require("path"));
 const transformPath = path_1.default.join(__dirname, 'codemods', 'codemod.js');
 async function transform(options) {
-    let { path: filePath = '.', ...rest } = options;
-    return await (0, Runner_js_1.run)(transformPath, [filePath], rest);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { path: filePath = '.', agent, ...jscodeshiftOptions } = options;
+    return await (0, Runner_js_1.run)(transformPath, [filePath], jscodeshiftOptions);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-spectrum/codemods",
-  "version": "3.0.0-nightly-796738501-260310",
+  "version": "3.0.0-nightly-6a0d13c57-260322",
   "main": "dist/index.js",
   "source": "src/index.ts",
   "bin": "dist/index.js",
@@ -21,11 +21,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "3.0.0-nightly-6a0d13c57-260322",
     "@babel/parser": "^7.24.5",
     "@babel/traverse": "^7.24.5",
     "@babel/types": "^7.24.5",
-    "@react-spectrum/s2": "3.0.0-nightly-796738501-260310",
-    "@react-types/shared": "3.0.0-nightly-796738501-260310",
+    "@react-spectrum/s2": "3.0.0-nightly-6a0d13c57-260322",
+    "@react-types/shared": "3.0.0-nightly-6a0d13c57-260322",
     "@types/node": "^24",
     "boxen": "^5.1.2",
     "chalk": "^4.0.0",