From 82e10d37bc4bd20dd51f05186ff56626dd94cd43 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Thu, 29 Aug 2024 09:14:23 -0500
Subject: [PATCH] fix: S2 upgrade assistant links and install step (#6972)

---
 packages/dev/codemods/src/s1-to-s2/src/index.ts               | 4 ++--
 .../dev/codemods/src/s1-to-s2/src/utils/installPackage.ts     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/dev/codemods/src/s1-to-s2/src/index.ts b/packages/dev/codemods/src/s1-to-s2/src/index.ts
index 05fc673ae6a..f4356efa3da 100644
--- a/packages/dev/codemods/src/s1-to-s2/src/index.ts
+++ b/packages/dev/codemods/src/s1-to-s2/src/index.ts
@@ -53,7 +53,7 @@ export async function s1_to_s2(options: S1ToS2CodemodOptions) {
       `  - Vite: ${chalk.underline('https://github.com/adobe/react-spectrum/tree/main/examples/s2-vite-project')}\n` +
       `  - Rollup: ${chalk.underline('https://github.com/adobe/react-spectrum/tree/main/examples/s2-rollup-starter-app')}\n` +
       `  - ESBuild: ${chalk.underline('https://github.com/adobe/react-spectrum/tree/main/examples/s2-esbuild-starter-app')}\n\n` +
-      `or view documentation for the plugin here: ${chalk.underline('https://jsr.io/@unplugin/macros')}`
+      `or view documentation here: ${chalk.underline('https://react-spectrum.adobe.com/s2/index.html?path=/docs/intro--docs#configuring-your-bundler')}`
     );
   }
 
@@ -63,7 +63,7 @@ export async function s1_to_s2(options: S1ToS2CodemodOptions) {
     `${chalk.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.underline('https://github.com/adobe/react-spectrum/tree/main/packages/@react-spectrum/codemods/s1-to-s2/UPGRADE.md')}`
+    `For additional help, reference the Spectrum 2 Migration Guide: ${chalk.underline('https://react-spectrum.adobe.com/s2/index.html?path=/docs/migrating--docs')}`
   );
 
   console.log(boxen(
diff --git a/packages/dev/codemods/src/s1-to-s2/src/utils/installPackage.ts b/packages/dev/codemods/src/s1-to-s2/src/utils/installPackage.ts
index b416b0ef5a2..4e08546feff 100644
--- a/packages/dev/codemods/src/s1-to-s2/src/utils/installPackage.ts
+++ b/packages/dev/codemods/src/s1-to-s2/src/utils/installPackage.ts
@@ -38,7 +38,8 @@ export default async function installPackage(packageName: string, options?: {dev
   }
   try {
     logger.info(`Installing ${chalk.bold(packageName)} using ${chalk.bold(packageManager.name)}...`);
-    await execa(packageManager.name, [packageManager.installCommand, `${packageName}@latest`, options?.dev ? '-D' : undefined]);
+    const devFlag = options?.dev ? ['-D'] : [];
+    await execa(packageManager.name, [packageManager.installCommand, `${packageName}@latest`, ...devFlag]);
     logger.success(`Successfully installed ${chalk.bold(packageName)}!\n`);
     return true;
   } catch (e: any) {