Further work on making SB setup work

redwoodjs · Oct 4, 2024 · c784247 · c784247
1 parent cf20ab7
commit c784247
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/cli/src/commands/setup/ui/libraries/redwoodui-utils/storybookConfigMods.ts b/packages/cli/src/commands/setup/ui/libraries/redwoodui-utils/storybookConfigMods.ts
@@ -113,7 +113,7 @@ export const addSBAddonsToMain = (
   logTaskOutput(
     task,
     c.info(
-      `Adding Storybook addons to your main config: ${addOnsToAdd.join(', ')}...`,
+      `Confirming Storybook has the following addons: ${addOnsToAdd.join(', ')}...`,
     ),
   )
   const addonsArrayMatch = sbMainContent.match(/addons\s*:\s*\[([^\]]*)\]/)
@@ -125,9 +125,13 @@ export const addSBAddonsToMain = (
     )
 
     if (addonsToAdd.length > 0) {
+      logTaskOutput(
+        task,
+        c.info(`Adding addons: ${addonsToAdd.join(', ')} to your Storybook...`),
+      )
       const updatedAddonsArray = addonsArray.trim()
-        ? `${addonsArray} ${addonsToAdd.map((addon) => `'${addon}'`).join(', ')},`
-        : `${addonsArray}, ${addonsToAdd.map((addon) => `'${addon}'`).join(', ')},`
+        ? `${addonsArray}, ${addonsToAdd.map((addon) => `'${addon}'`).join(', ')}`
+        : `${addonsToAdd.map((addon) => `'${addon}'`).join(', ')}`
       return sbMainContent.replace(
         addonsArrayMatch[0],
         `addons: [${updatedAddonsArray}]`,

diff --git a/packages/cli/src/commands/setup/ui/libraries/redwoodui.ts b/packages/cli/src/commands/setup/ui/libraries/redwoodui.ts
@@ -728,6 +728,9 @@ class RWUIInstallHandler {
         return // skip to next iteration
       }
 
+      // ARI YOU ARE HERE:
+      // - also look in root package.json for installed packages
+      // - figure out why the dev dep packages aren't being installed
       const projectPackageJsonPath = path.join(
         this.rwPaths.web.base,
         'package.json',