fix: addon file resolution

storybookjs · Oct 26, 2024 · 244ba1e · 244ba1e
1 parent 0d9dbca
commit 244ba1e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/examples/expo-example/.storybook/storybook.requires.ts b/examples/expo-example/.storybook/storybook.requires.ts
@@ -6,7 +6,6 @@ import "@storybook/addon-ondevice-controls/register";
 import "@storybook/addon-ondevice-backgrounds/register";
 import "@storybook/addon-ondevice-actions/register";
 import "@storybook/addon-ondevice-notes/register";
-import "storybook-addon-deep-controls/register";
 
 const normalizedStories = [
   {

diff --git a/packages/react-native/scripts/common.js b/packages/react-native/scripts/common.js
@@ -58,11 +58,34 @@ function getPreviewExists({ configPath }) {
   return !!getFilePathExtension({ configPath }, 'preview');
 }
 
+function resolveAddonFile(addon, file, extensions = ['js', 'mjs', 'ts']) {
+  try {
+    const basePath = path.join(addon, file);
+
+    require.resolve(basePath);
+
+    return basePath;
+  } catch (error) {}
+
+  for (const ext of extensions) {
+    try {
+      const filePath = path.join(addon, `${file}.${ext}`);
+
+      require.resolve(filePath);
+
+      return filePath;
+    } catch (error) {}
+  }
+
+  return null;
+}
+
 module.exports = {
   toRequireContext,
   requireUncached,
   getFilePathExtension,
   getMain,
   ensureRelativePathHasDot,
   getPreviewExists,
+  resolveAddonFile,
 };
diff --git a/packages/react-native/scripts/generate.js b/packages/react-native/scripts/generate.js
@@ -3,6 +3,7 @@ const {
   ensureRelativePathHasDot,
   getMain,
   getPreviewExists,
+  resolveAddonFile,
 } = require('./common');
 const { normalizeStories, globToRegexp } = require('@storybook/core/common');
 const fs = require('fs');
@@ -46,26 +47,26 @@ function generate({ configPath, absolute = false, useJs = false }) {
     }`;
   });
 
-  const registerAddons = main.addons?.map((addon) => `import "${addon}/register";`).join('\n');
+  let registerAddons = '';
+
+  for (const addon of main.addons) {
+    const registerPath = resolveAddonFile(addon, 'register', ['js', 'mjs', 'ts', 'tsx']);
+
+    if (registerPath) {
+      registerAddons += `import "${registerPath}";\n`;
+    }
+  }
 
   const docTools = 'require("@storybook/react-native/dist/preview")';
 
   const enhancers = [docTools];
 
   for (const addon of main.addons) {
-    let addonPath;
-    try {
-      addonPath = path.dirname(require.resolve(addon));
-    } catch (error) {
-      console.error(`Failed to resolve addon: ${addon}`, error);
-
-      return null; // Skip this addon if it cannot be resolved
-    }
-
-    const isPreviewFileExists = getPreviewExists({ configPath: addonPath });
+    const previewPath = resolveAddonFile(addon, 'preview', ['js', 'mjs', 'jsx', 'ts', 'tsx']);
 
-    if (isPreviewFileExists) {
-      enhancers.push(`require('${addon}/preview')`);
+    if (previewPath) {
+      enhancers.push(`require('${previewPath}')`);
+      continue;
     }
   }