From f1c7816be182126de70567d841a1f7e6442ce4ec Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Wed, 25 Mar 2026 17:43:22 -0700
Subject: [PATCH] fix: use-monopackages codemod should not rewrite S2 imports
 to v3

---
 .../src/use-monopackages/src/codemod.test.ts  | 47 +++++++++++++++++++
 .../src/use-monopackages/src/codemod.ts       |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 packages/dev/codemods/src/use-monopackages/src/codemod.test.ts

diff --git a/packages/dev/codemods/src/use-monopackages/src/codemod.test.ts b/packages/dev/codemods/src/use-monopackages/src/codemod.test.ts
new file mode 100644
index 00000000000..6c60bcd40eb
--- /dev/null
+++ b/packages/dev/codemods/src/use-monopackages/src/codemod.test.ts
@@ -0,0 +1,47 @@
+// @ts-ignore
+import {defineInlineTest} from 'jscodeshift/dist/testUtils';
+import transform from './codemod';
+
+function test(name: string, input: string, output: string) {
+  defineInlineTest(transform, {}, input, output, name);
+}
+
+test(
+  'rewrites individual react-aria imports',
+  `
+import {useButton} from '@react-aria/button';
+`,
+  `
+import { useButton } from "react-aria";
+`
+);
+
+test(
+  'rewrites individual react-stately imports',
+  `
+import {useComboBoxState} from '@react-stately/combobox';
+`,
+  `
+import { useComboBoxState } from "react-stately";
+`
+);
+
+test(
+  'rewrites individual react-spectrum imports',
+  `
+import {Button} from '@react-spectrum/button';
+`,
+  `
+import { Button } from "@adobe/react-spectrum";
+`
+);
+
+test(
+  'does not re-write S2 imports',
+  `
+import {Button} from '@react-spectrum/s2';
+`,
+  `
+import {Button} from '@react-spectrum/s2';
+`
+);
diff --git a/packages/dev/codemods/src/use-monopackages/src/codemod.ts b/packages/dev/codemods/src/use-monopackages/src/codemod.ts
index f610765a76f..651abacb00e 100644
--- a/packages/dev/codemods/src/use-monopackages/src/codemod.ts
+++ b/packages/dev/codemods/src/use-monopackages/src/codemod.ts
@@ -111,7 +111,7 @@ const transformer: Transformer = function transformer(file: FileInfo, api: API,
     const individualPackageImports = root
       .find(j.ImportDeclaration)
       .filter((path) => {
-        return (path.node.source.value as string)?.startsWith(
+        return path.node.source.value !== '@react-spectrum/s2' && (path.node.source.value as string)?.startsWith(
           packages[pkg].individualPrefix
         );
       });