@storybook-astro/framework 1.3.0 → 1.4.0-canary.2

package/dist/middleware.js

@@ -1,7 +1,8 @@
 import {
   createAstroRenderHandler,
-  ensureAstroPassthroughImageService
-} from "./chunk-N3WTUD2A.js";
+  ensureAstroPassthroughImageService,
+  resolveAliasedIsland
+} from "./chunk-A4DQ67HA.js";
 import "./chunk-ZIDMHD4S.js";
 import {
   resolveStoryModuleMock
@@ -31,6 +32,13 @@ async function handlerFactory(_integrations, options) {
       if (resolution) {
         return resolution;
       }
+      const aliasedIsland = await resolveAliasedIsland(
+        specifier,
+        options?.resolveFrom ?? process.cwd()
+      );
+      if (aliasedIsland) {
+        return `/@fs/${aliasedIsland}`;
+      }
       return specifier;
     }
   });

package/dist/middleware.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/middleware.ts"],"sourcesContent":["/// <reference path=\"./virtual.d.ts\" />\n\nimport { pathToFileURL } from 'node:url';\nimport { experimental_AstroContainer as AstroContainer } from 'astro/container';\nimport { ensureAstroPassthroughImageService } from './astroImageService.ts';\nimport { createAstroRenderHandler, type HandlerProps } from './astroRenderHandler.ts';\nimport type { Integration } from './integrations/index.ts';\nimport type { SanitizationOptions } from './lib/sanitization.ts';\nimport { resolveStoryModuleMock } from './module-mocks.ts';\nimport { addRenderers, resolveClientModules } from 'virtual:astro-container-renderers';\n\ntype ResolveRulesConfigModule = () => unknown | Promise<unknown>;\n\ntype HandlerFactoryOptions = {\n  sanitization?: SanitizationOptions;\n  rulesConfigFilePath?: string;\n  resolveRulesConfigModule?: ResolveRulesConfigModule;\n  loadModule?: (id: string) => Promise<{ default: unknown }>;\n  invalidateModuleGraph?: () => void;\n  resolveModule?: (specifier: string) => string | undefined;\n};\n\nexport type { HandlerProps };\n\nexport async function handlerFactory(\n  _integrations: Integration[],\n  options?: HandlerFactoryOptions\n) {\n  ensureAstroPassthroughImageService();\n\n  const container = await AstroContainer.create({\n    resolve: async (specifier) => {\n      const mockedModule = resolveStoryModuleMock(specifier);\n\n      if (mockedModule) {\n        return mockedModule;\n      }\n\n      const customResolution = options?.resolveModule?.(specifier);\n\n      if (customResolution) {\n        return customResolution;\n      }\n\n      if (specifier.startsWith('astro:scripts')) {\n        return `/@id/${specifier}`;\n      }\n\n      const resolution = resolveClientModules(specifier);\n\n      if (resolution) {\n        return resolution;\n      }\n\n      return specifier;\n    }\n  });\n\n  addRenderers(container);\n\n  const loadModule =\n    options?.loadModule ??\n    ((id: string) => {\n      const normalizedId = /^[a-zA-Z]:[/\\\\]/.test(id) ? pathToFileURL(id).href : id;\n\n      return import(/* @vite-ignore */ normalizedId);\n    });\n\n  return createAstroRenderHandler({\n    container,\n    sanitization: options?.sanitization,\n    rulesConfigFilePath: options?.rulesConfigFilePath,\n    resolveRulesConfigModule: options?.resolveRulesConfigModule,\n    loadModule,\n    invalidateModuleGraph: options?.invalidateModuleGraph\n  });\n}\n"],"mappings":";;;;;;;;;;;AAEA,SAAS,qBAAqB;AAC9B,SAAS,+BAA+B,sBAAsB;AAM9D,SAAS,cAAc,4BAA4B;AAenD,eAAsB,eACpB,eACA,SACA;AACA,qCAAmC;AAEnC,QAAM,YAAY,MAAM,eAAe,OAAO;AAAA,IAC5C,SAAS,OAAO,cAAc;AAC5B,YAAM,eAAe,uBAAuB,SAAS;AAErD,UAAI,cAAc;AAChB,eAAO;AAAA,MACT;AAEA,YAAM,mBAAmB,SAAS,gBAAgB,SAAS;AAE3D,UAAI,kBAAkB;AACpB,eAAO;AAAA,MACT;AAEA,UAAI,UAAU,WAAW,eAAe,GAAG;AACzC,eAAO,QAAQ,SAAS;AAAA,MAC1B;AAEA,YAAM,aAAa,qBAAqB,SAAS;AAEjD,UAAI,YAAY;AACd,eAAO;AAAA,MACT;AAEA,aAAO;AAAA,IACT;AAAA,EACF,CAAC;AAED,eAAa,SAAS;AAEtB,QAAM,aACJ,SAAS,eACR,CAAC,OAAe;AACf,UAAM,eAAe,kBAAkB,KAAK,EAAE,IAAI,cAAc,EAAE,EAAE,OAAO;AAE3E,WAAO;AAAA;AAAA,MAA0B;AAAA;AAAA,EACnC;AAEF,SAAO,yBAAyB;AAAA,IAC9B;AAAA,IACA,cAAc,SAAS;AAAA,IACvB,qBAAqB,SAAS;AAAA,IAC9B,0BAA0B,SAAS;AAAA,IACnC;AAAA,IACA,uBAAuB,SAAS;AAAA,EAClC,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../src/middleware.ts"],"sourcesContent":["/// <reference path=\"./virtual.d.ts\" />\n\nimport { pathToFileURL } from 'node:url';\nimport { experimental_AstroContainer as AstroContainer } from 'astro/container';\nimport { ensureAstroPassthroughImageService } from './astroImageService.ts';\nimport { createAstroRenderHandler, type HandlerProps } from './astroRenderHandler.ts';\nimport type { Integration } from './integrations/index.ts';\nimport type { SanitizationOptions } from './lib/sanitization.ts';\nimport { resolveAliasedIsland } from './lib/resolve-aliased-island.ts';\nimport { resolveStoryModuleMock } from './module-mocks.ts';\nimport { addRenderers, resolveClientModules } from 'virtual:astro-container-renderers';\n\ntype ResolveRulesConfigModule = () => unknown | Promise<unknown>;\n\ntype HandlerFactoryOptions = {\n  sanitization?: SanitizationOptions;\n  rulesConfigFilePath?: string;\n  resolveRulesConfigModule?: ResolveRulesConfigModule;\n  loadModule?: (id: string) => Promise<{ default: unknown }>;\n  invalidateModuleGraph?: () => void;\n  resolveModule?: (specifier: string) => string | undefined;\n  resolveFrom?: string;\n};\n\nexport type { HandlerProps };\n\nexport async function handlerFactory(\n  _integrations: Integration[],\n  options?: HandlerFactoryOptions\n) {\n  ensureAstroPassthroughImageService();\n\n  const container = await AstroContainer.create({\n    resolve: async (specifier) => {\n      const mockedModule = resolveStoryModuleMock(specifier);\n\n      if (mockedModule) {\n        return mockedModule;\n      }\n\n      const customResolution = options?.resolveModule?.(specifier);\n\n      if (customResolution) {\n        return customResolution;\n      }\n\n      if (specifier.startsWith('astro:scripts')) {\n        return `/@id/${specifier}`;\n      }\n\n      const resolution = resolveClientModules(specifier);\n\n      if (resolution) {\n        return resolution;\n      }\n\n      // Last resort: an island imported via a tsconfig path alias (e.g. `@/...`)\n      // has its raw aliased specifier baked into the island's component-url.\n      // Resolve it to an on-disk file and hand back a `/@fs/` URL the dev Vite\n      // server can serve so the island still hydrates.\n      const aliasedIsland = await resolveAliasedIsland(\n        specifier,\n        options?.resolveFrom ?? process.cwd()\n      );\n\n      if (aliasedIsland) {\n        return `/@fs/${aliasedIsland}`;\n      }\n\n      return specifier;\n    }\n  });\n\n  addRenderers(container);\n\n  const loadModule =\n    options?.loadModule ??\n    ((id: string) => {\n      const normalizedId = /^[a-zA-Z]:[/\\\\]/.test(id) ? pathToFileURL(id).href : id;\n\n      return import(/* @vite-ignore */ normalizedId);\n    });\n\n  return createAstroRenderHandler({\n    container,\n    sanitization: options?.sanitization,\n    rulesConfigFilePath: options?.rulesConfigFilePath,\n    resolveRulesConfigModule: options?.resolveRulesConfigModule,\n    loadModule,\n    invalidateModuleGraph: options?.invalidateModuleGraph\n  });\n}\n"],"mappings":";;;;;;;;;;;;AAEA,SAAS,qBAAqB;AAC9B,SAAS,+BAA+B,sBAAsB;AAO9D,SAAS,cAAc,4BAA4B;AAgBnD,eAAsB,eACpB,eACA,SACA;AACA,qCAAmC;AAEnC,QAAM,YAAY,MAAM,eAAe,OAAO;AAAA,IAC5C,SAAS,OAAO,cAAc;AAC5B,YAAM,eAAe,uBAAuB,SAAS;AAErD,UAAI,cAAc;AAChB,eAAO;AAAA,MACT;AAEA,YAAM,mBAAmB,SAAS,gBAAgB,SAAS;AAE3D,UAAI,kBAAkB;AACpB,eAAO;AAAA,MACT;AAEA,UAAI,UAAU,WAAW,eAAe,GAAG;AACzC,eAAO,QAAQ,SAAS;AAAA,MAC1B;AAEA,YAAM,aAAa,qBAAqB,SAAS;AAEjD,UAAI,YAAY;AACd,eAAO;AAAA,MACT;AAMA,YAAM,gBAAgB,MAAM;AAAA,QAC1B;AAAA,QACA,SAAS,eAAe,QAAQ,IAAI;AAAA,MACtC;AAEA,UAAI,eAAe;AACjB,eAAO,QAAQ,aAAa;AAAA,MAC9B;AAEA,aAAO;AAAA,IACT;AAAA,EACF,CAAC;AAED,eAAa,SAAS;AAEtB,QAAM,aACJ,SAAS,eACR,CAAC,OAAe;AACf,UAAM,eAAe,kBAAkB,KAAK,EAAE,IAAI,cAAc,EAAE,EAAE,OAAO;AAE3E,WAAO;AAAA;AAAA,MAA0B;AAAA;AAAA,EACnC;AAEF,SAAO,yBAAyB;AAAA,IAC9B;AAAA,IACA,cAAc,SAAS;AAAA,IACvB,qBAAqB,SAAS;AAAA,IAC9B,0BAA0B,SAAS;AAAA,IACnC;AAAA,IACA,uBAAuB,SAAS;AAAA,EAClC,CAAC;AACH;","names":[]}

package/dist/node/index.d.ts

@@ -1,4 +1,4 @@
-import { a as RenderStoryInput, d as StorybookConfig } from '../types-BCpJLSTo.js';
+import { a as RenderStoryInput, d as StorybookConfig } from '../types--SvYP5Ri.js';
 import 'storybook/internal/types';
 import 'vite';
 import '../base-DT67T5pi.js';

package/dist/preset.d.ts

@@ -1,4 +1,4 @@
-import { e as StorybookConfigVite } from './types-BCpJLSTo.js';
+import { e as StorybookConfigVite } from './types--SvYP5Ri.js';
 import 'storybook/internal/types';
 import 'vite';
 import './base-DT67T5pi.js';

package/dist/preset.js

@@ -4,21 +4,23 @@ import {
 import {
   createAstroRenderHandler,
   ensureAstroPassthroughImageService,
+  resolveAliasedIsland,
   resolveSanitizationOptions,
   serializeSanitizationOptions
-} from "./chunk-N3WTUD2A.js";
+} from "./chunk-A4DQ67HA.js";
 import {
   createVirtualModule,
+  loadUserAstroIntegrations,
   resolveRulesConfigFilePath,
   ssrLoadModuleWithFsFallback,
   viteAstroContainerRenderersPlugin,
-  vitePluginAstroFontsFallback,
+  vitePluginAstroFonts,
   vitePluginAstroIntegrationOptsFallback,
   vitePluginAstroRoutesFallback,
   vitePluginAstroVueFallback,
   vitePluginStoryModuleMocks,
   vitePluginStorybookAstroMiddleware
-} from "./chunk-AYYMNFI6.js";
+} from "./chunk-VZXGPM6P.js";
 import {
   importAstroConfig
 } from "./chunk-PUTCAN6X.js";
@@ -139,7 +141,10 @@ async function emitBuildEntrypoints(options) {
   });
 }
 async function emitHydratedComponentEntriesFromAstroFile(options) {
-  const hydratedComponentPaths = await collectHydratedComponentPaths(options.astroFilePath);
+  const hydratedComponentPaths = await collectHydratedComponentPaths(
+    options.astroFilePath,
+    options.resolveFrom
+  );
   for (const resolvedImportPath of hydratedComponentPaths) {
     if (options.componentEntrypointRefs.has(resolvedImportPath)) {
       continue;
@@ -152,11 +157,11 @@ async function emitHydratedComponentEntriesFromAstroFile(options) {
     options.componentEntrypointRefs.set(resolvedImportPath, fileReferenceId);
   }
 }
-async function collectHydratedComponentPaths(astroFilePath) {
-  const localImportSpecifiers = await readLocalImportSpecifiers(astroFilePath);
+async function collectHydratedComponentPaths(astroFilePath, resolveFrom) {
+  const allImportSpecifiers = await readAllImportSpecifiers(astroFilePath);
   const hydratedComponentPaths = [];
-  for (const specifier of localImportSpecifiers) {
-    const resolvedImportPath = await resolveLocalImportPath(astroFilePath, specifier);
+  for (const specifier of allImportSpecifiers) {
+    const resolvedImportPath = specifier.startsWith(".") ? await resolveLocalImportPath(astroFilePath, specifier) : await resolveAliasedIsland(specifier, resolveFrom);
     if (!resolvedImportPath) {
       continue;
     }
@@ -332,18 +337,19 @@ async function copyLocalRuntimeDependencies(sourcePath, options, copiedFiles) {
     await copyLocalRuntimeDependencies(resolvedDependency, options, copiedFiles);
   }
 }
-async function readLocalImportSpecifiers(filePath) {
+var IMPORT_RE = /(?:import|export)\s+(?:[^'"`]*?\s+from\s+)?['"`]([^'"`]+)['"`]|import\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
+async function readAllImportSpecifiers(filePath) {
   if (!/\.(astro|[cm]?[jt]sx?|vue|svelte)$/.test(filePath)) {
     return [];
   }
   const source = await readFile(filePath, "utf-8");
-  const matches = source.matchAll(
-    /(?:import|export)\s+(?:[^'"`]*?\s+from\s+)?['"`]([^'"`]+)['"`]|import\(\s*['"`]([^'"`]+)['"`]\s*\)/g
-  );
-  return Array.from(matches, (match) => match[1] ?? match[2]).filter(
-    (specifier) => Boolean(specifier) && specifier.startsWith(".")
+  return Array.from(source.matchAll(IMPORT_RE), (match) => match[1] ?? match[2]).filter(
+    (specifier) => Boolean(specifier)
   );
 }
+async function readLocalImportSpecifiers(filePath) {
+  return (await readAllImportSpecifiers(filePath)).filter((s) => s.startsWith("."));
+}
 async function resolveLocalImportPath(importerPath, specifier) {
   const basePath = resolve(dirname(importerPath), specifier);
   const candidates = [
@@ -413,7 +419,7 @@ async function createStorySsrViteServer(options) {
     },
     plugins: [
       createProjectAstroResolutionPlugin(options.resolveFrom),
-      vitePluginAstroFontsFallback(),
+      vitePluginAstroFonts({ fonts: options.fonts, root: options.resolveFrom }),
       vitePluginAstroIntegrationOptsFallback(),
       vitePluginAstroVueFallback(),
       vitePluginAstroRoutesFallback(),
@@ -471,6 +477,10 @@ async function createProductionAstroContainer(options) {
       if (resolution) {
         return resolution;
       }
+      const abs = await resolveAliasedIsland(specifier, options.resolveFrom);
+      if (abs) {
+        return options.resolveClientModule(abs) ?? specifier;
+      }
       return specifier;
     }
   });
@@ -558,7 +568,8 @@ async function createProductionRenderRuntime(options) {
   const viteServer = await createStorySsrViteServer({
     integrations: options.integrations,
     trackedSpecifiers: options.trackedSpecifiers,
-    resolveFrom: options.resolveFrom
+    resolveFrom: options.resolveFrom,
+    fonts: options.fonts
   });
   try {
     const rulesConfigModule = await loadRulesConfigModule(
@@ -572,7 +583,8 @@ async function createProductionRenderRuntime(options) {
     const astroContainer = await createProductionAstroContainer({
       integrations: options.integrations,
       resolveClientModule,
-      viteServer
+      viteServer,
+      resolveFrom: options.resolveFrom
     });
     const loadModule = async (moduleId) => {
       return await viteServer.ssrLoadModule(
@@ -708,13 +720,17 @@ var ASTRO_PLUGINS_THAT_ARE_SUPPOSEDLY_NOT_NEEDED_IN_STORYBOOK = [
 async function mergeWithAstroConfig(config, integrations = [], resolveFrom = process.cwd(), mode = "development", command = "serve") {
   const { getViteConfig } = await importAstroConfig(resolveFrom);
   const safeIntegrations = integrations ?? [];
+  const frameworkIntegrations = await Promise.all(
+    safeIntegrations.map((integration) => integration.loadIntegration(resolveFrom))
+  );
+  const userIntegrations = await loadUserAstroIntegrations(resolveFrom);
+  const frameworkNames = new Set(frameworkIntegrations.map((i) => i.name));
+  const extraIntegrations = userIntegrations.filter((i) => !frameworkNames.has(i.name));
   const astroConfig = await getViteConfig(
     {},
     {
       configFile: false,
-      integrations: await Promise.all(
-        safeIntegrations.map((integration) => integration.loadIntegration(resolveFrom))
-      )
+      integrations: [...frameworkIntegrations, ...extraIntegrations]
     }
   )({
     mode,
@@ -966,6 +982,7 @@ function vitePluginAstroBuildPrerender(options) {
         staticCssMap,
         trackedSpecifiers,
         resolveFrom,
+        fonts: options.fonts,
         bundle
       });
       await writePrerenderedStoriesFile(outDir, prerenderedStories);
@@ -983,7 +1000,8 @@ async function prerenderAstroStories(options) {
     storyRulesConfigFilePath: options.storyRulesConfigFilePath,
     staticModuleMap: options.staticModuleMap,
     trackedSpecifiers: options.trackedSpecifiers,
-    resolveFrom: options.resolveFrom
+    resolveFrom: options.resolveFrom,
+    fonts: options.fonts
   });
   const assetPathMap = buildAssetPathMap(options.bundle);
   try {