@react-spectrum/codemods 3.0.0-nightly-e60fb427c-240930 → 3.0.0-nightly-4818630a7-241002

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

@@ -33,6 +33,7 @@ const changes_1 = require("./changes");
 const transforms_1 = require("./transforms");
 const getComponents_1 = require("../getComponents");
 const iconMap_1 = require("../iconMap");
+const recast_1 = require("recast");
 const t = __importStar(require("@babel/types"));
 const styleProps_1 = require("./styleProps");
 const traverse_1 = __importDefault(require("@babel/traverse"));
@@ -49,7 +50,13 @@ availableComponents.add('Section');
 // Don't update v3 Provider
 availableComponents.delete('Provider');
 function transformer(file, api, options) {
-    let j = api.jscodeshift;
+    let j = api.jscodeshift.withParser({
+        parse(source) {
+            return (0, recast_1.parse)(source, {
+                parser: require('recast/parsers/babel')
+            });
+        }
+    });
     let root = j(file.source);
     let componentsToTransform = options.components ? new Set(options.components.split(',').filter(s => availableComponents.has(s))) : availableComponents;
     let bindings = [];
@@ -60,7 +67,7 @@ function transformer(file, api, options) {
     const leadingComments = root.find(j.Program).get('body', 0).node.leadingComments;
     (0, traverse_1.default)(root.paths()[0].node, {
         ImportDeclaration(path) {
-            if (path.node.source.value === '@adobe/react-spectrum' || path.node.source.value.startsWith('@react-spectrum/')) {
+            if (path.node.source.value === '@adobe/react-spectrum' || (path.node.source.value.startsWith('@react-spectrum/') && path.node.source.value !== '@react-spectrum/s2')) {
                 lastImportPath = path;
                 for (let specifier of path.node.specifiers) {
                     if (specifier.type === 'ImportNamespaceSpecifier') {
@@ -267,4 +274,3 @@ function transformer(file, api, options) {
     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" }');
 }
-transformer.parser = 'tsx';

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

@@ -8,6 +8,19 @@ 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.
+const skipped = new Set([
+    'Accordion',
+    'Card',
+    'CardView',
+    'TableView',
+    'TableHeader',
+    'Column',
+    'TableBody',
+    'Row',
+    'Cell'
+]);
 function getComponents() {
     // Determine list of available components in S2 from index.ts
     let availableComponents = new Set();
@@ -18,7 +31,10 @@ function getComponents() {
         ExportNamedDeclaration(path) {
             if (path.node.exportKind === 'value') {
                 for (let specifier of path.node.specifiers) {
-                    availableComponents.add(specifier.exported.type === 'Identifier' ? specifier.exported.name : specifier.exported.value);
+                    let name = specifier.exported.type === 'Identifier' ? specifier.exported.name : specifier.exported.value;
+                    if (!skipped.has(name)) {
+                        availableComponents.add(name);
+                    }
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-spectrum/codemods",
-  "version": "3.0.0-nightly-e60fb427c-240930",
+  "version": "3.0.0-nightly-4818630a7-241002",
   "main": "dist/index.js",
   "source": "src/index.ts",
   "bin": "dist/index.js",
@@ -24,8 +24,8 @@
     "@babel/parser": "^7.24.5",
     "@babel/traverse": "^7.24.5",
     "@babel/types": "^7.24.5",
-    "@react-spectrum/s2": "^3.0.0-nightly-e60fb427c-240930",
-    "@react-types/shared": "^3.0.0-nightly-e60fb427c-240930",
+    "@react-spectrum/s2": "^3.0.0-nightly-4818630a7-241002",
+    "@react-types/shared": "^3.0.0-nightly-4818630a7-241002",
     "@types/node": "^20",
     "boxen": "^5.1.2",
     "build": "^0.1.4",
@@ -33,6 +33,7 @@
     "execa": "^5.1.1",
     "jscodeshift": "^0.15.2",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0",
+    "recast": "^0.23.9",
     "ts-node": "^10.9.2",
     "uuid": "^9.0.1"
   },
@@ -47,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "stableVersion": "0.1.1"
+  "stableVersion": "0.2.0"
 }