@storybook-astro/framework 1.6.0 → 1.7.0-canary.1

package/dist/preset.js

@@ -1,13 +1,13 @@
 import {
   vitePluginAstroComponentMarker
-} from "./chunk-6RIGYMZP.js";
+} from "./chunk-UIGE5653.js";
 import {
-  createAstroRenderHandler,
   ensureAstroPassthroughImageService,
-  resolveAliasedIsland,
-  resolveSanitizationOptions,
-  serializeSanitizationOptions
-} from "./chunk-RERWLIIN.js";
+  resolveAliasedIsland
+} from "./chunk-NOQVUQ7R.js";
+import {
+  separateStorySlots
+} from "./chunk-YRG32BBU.js";
 import {
   createVirtualModule,
   loadUserAstroFonts,
@@ -26,6 +26,11 @@ import {
 import {
   importAstroConfig
 } from "./chunk-PUTCAN6X.js";
+import {
+  createAstroRenderHandler,
+  resolveSanitizationOptions,
+  serializeSanitizationOptions
+} from "./chunk-5POAXNWB.js";
 import "./chunk-ZIDMHD4S.js";
 import {
   resolveStoryModuleMock
@@ -34,6 +39,7 @@ import "./chunk-G3PMV62Z.js";
 
 // src/preset.ts
 import { dirname as dirname4 } from "path";
+import { version as viteVersion } from "vite";
 
 // src/viteStorybookRendererFallbackPlugin.ts
 function viteStorybookRendererFallbackPlugin(integrations) {
@@ -567,18 +573,26 @@ function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
 function createStorybookBrowserStubPlugin() {
+  const STUBBED_SPECIFIERS = /* @__PURE__ */ new Set([
+    "@storybook/addon-docs",
+    "@storybook/addon-docs/blocks",
+    "@storybook/blocks"
+  ]);
   const STUB_ID = "\0storybook-astro-browser-stub";
   return {
     name: "storybook-astro:storybook-browser-stubs",
+    // Must run before Astro's resolvers, which would otherwise resolve these
+    // bare specifiers to their real (browser-only) files before we can stub them.
+    enforce: "pre",
     resolveId(id) {
-      if (id === "@storybook/blocks") {
+      if (STUBBED_SPECIFIERS.has(id)) {
         return STUB_ID;
       }
       return null;
     },
     load(id) {
       if (id === STUB_ID) {
-        return "export {};";
+        return "export default () => ({});";
       }
       return null;
     }
@@ -642,21 +656,19 @@ async function renderProductionStoryToHtml(options) {
   const storyModulePath = resolveProjectImportPath(options.story.importPath, options.resolveFrom);
   const componentPath = resolveProjectImportPath(options.story.componentPath, options.resolveFrom);
   const storyModule = await options.runtime.loadModule(storyModulePath);
-  const defaultStoryMeta = isRecord2(storyModule.default) ? storyModule.default : {};
-  const rawStoryExport = storyModule[options.story.exportName];
-  const selectedStoryExport = isRecord2(rawStoryExport) ? rawStoryExport : {};
-  if (typeof defaultStoryMeta.component !== "function") {
+  const { metaComponent, metaArgs, storyComponent, storyLevelArgs } = resolveStoryAnnotations(
+    storyModule,
+    options.story.exportName
+  );
+  if (typeof metaComponent !== "function") {
     throw new Error(
-      `Unable to prerender story "${options.story.id}". Missing default export component in ${options.story.importPath}.`
+      `Unable to prerender story "${options.story.id}". Missing component in ${options.story.importPath}.`
     );
   }
-  if (selectedStoryExport.component && selectedStoryExport.component !== defaultStoryMeta.component) {
+  if (storyComponent && storyComponent !== metaComponent) {
     return void 0;
   }
-  const storyArgs = mergeMetaArgsWithStoryArgs(
-    toRecord(defaultStoryMeta.args),
-    toRecord(selectedStoryExport.args)
-  );
+  const storyArgs = mergeMetaArgsWithStoryArgs(metaArgs, storyLevelArgs);
   const { componentArgs, storySlots } = separateStorySlots(storyArgs);
   return options.runtime.renderAstroStory({
     component: componentPath,
@@ -669,6 +681,28 @@ async function renderProductionStoryToHtml(options) {
     }
   });
 }
+function resolveStoryAnnotations(storyModule, exportName) {
+  const rawStoryExport = storyModule[exportName];
+  if (isRecord2(rawStoryExport) && rawStoryExport._tag === "Story") {
+    const storyInput = toRecord(rawStoryExport.input) ?? {};
+    const meta = isRecord2(rawStoryExport.meta) ? rawStoryExport.meta : {};
+    const metaInput = toRecord(meta.input) ?? {};
+    return {
+      metaComponent: metaInput.component,
+      metaArgs: toRecord(metaInput.args),
+      storyComponent: storyInput.component,
+      storyLevelArgs: toRecord(storyInput.args)
+    };
+  }
+  const defaultStoryMeta = isRecord2(storyModule.default) ? storyModule.default : {};
+  const selectedStoryExport = isRecord2(rawStoryExport) ? rawStoryExport : {};
+  return {
+    metaComponent: defaultStoryMeta.component,
+    metaArgs: toRecord(defaultStoryMeta.args),
+    storyComponent: selectedStoryExport.component,
+    storyLevelArgs: toRecord(selectedStoryExport.args)
+  };
+}
 function resolveProjectImportPath(importPath, resolveFrom) {
   if (importPath.startsWith("./") || importPath.startsWith("../")) {
     return resolve2(resolveFrom, importPath);
@@ -681,21 +715,6 @@ function mergeMetaArgsWithStoryArgs(metaArgs, storyArgs) {
     ...storyArgs ?? {}
   };
 }
-function separateStorySlots(storyArgs) {
-  const componentArgs = { ...storyArgs };
-  const storySlots = componentArgs.slots;
-  delete componentArgs.slots;
-  if (!isRecord2(storySlots)) {
-    return {
-      componentArgs,
-      storySlots: {}
-    };
-  }
-  return {
-    componentArgs,
-    storySlots
-  };
-}
 function isRecord2(value) {
   return typeof value === "object" && value !== null;
 }
@@ -1553,15 +1572,18 @@ var viteFinal = async (config, storybookOptions) => {
     "astro:preact:opts",
     "astro:toolbar:internal"
   ];
-  if (!finalConfig.optimizeDeps.esbuildOptions) {
-    finalConfig.optimizeDeps.esbuildOptions = {};
-  }
-  if (!finalConfig.optimizeDeps.esbuildOptions.external) {
-    finalConfig.optimizeDeps.esbuildOptions.external = [];
-  }
-  for (const mod of integrationVirtualModules) {
-    if (!finalConfig.optimizeDeps.esbuildOptions.external.includes(mod)) {
-      finalConfig.optimizeDeps.esbuildOptions.external.push(mod);
+  const viteMajor = Number.parseInt(viteVersion, 10);
+  if (viteMajor < 8) {
+    if (!finalConfig.optimizeDeps.esbuildOptions) {
+      finalConfig.optimizeDeps.esbuildOptions = {};
+    }
+    if (!finalConfig.optimizeDeps.esbuildOptions.external) {
+      finalConfig.optimizeDeps.esbuildOptions.external = [];
+    }
+    for (const mod of integrationVirtualModules) {
+      if (!finalConfig.optimizeDeps.esbuildOptions.external.includes(mod)) {
+        finalConfig.optimizeDeps.esbuildOptions.external.push(mod);
+      }
     }
   }
   const optimizeDepsMut = finalConfig.optimizeDeps;
@@ -1570,6 +1592,20 @@ var viteFinal = async (config, storybookOptions) => {
     /* @__PURE__ */ new Set([...rolldownOpts.external ?? [], ...integrationVirtualModules])
   );
   optimizeDepsMut.rolldownOptions = rolldownOpts;
+  if (configType === "DEVELOPMENT" && viteMajor >= 8) {
+    const stripReactRefreshWrapper = (plugins) => plugins.map((plugin) => Array.isArray(plugin) ? stripReactRefreshWrapper(plugin) : plugin).filter(
+      (plugin) => !(plugin && typeof plugin === "object" && plugin.name === "vite:react:refresh-wrapper")
+    );
+    finalConfig.plugins = stripReactRefreshWrapper(
+      finalConfig.plugins ?? []
+    );
+    const entryPreviews = integrations.map((integration) => integration.storybookEntryPreview).filter((specifier) => Boolean(specifier));
+    for (const specifier of entryPreviews) {
+      if (!finalConfig.optimizeDeps.exclude.includes(specifier)) {
+        finalConfig.optimizeDeps.exclude.push(specifier);
+      }
+    }
+  }
   return finalConfig;
 };
 function mergeEnvPrefixes(existing, additionalPrefix) {