@aurelia/storybook 1.0.0 → 1.0.2

package/dist/preview.mjs

@@ -1,7 +1,84 @@
-import '@storybook/core-events';
 import Aurelia, { CustomElement } from 'aurelia';
 
-function bootstrapAureliaApp(story, args, domElement, component) {
+// Track Aurelia apps for cleanup
+const appMap = new Map();
+async function teardown(element) {
+    if (appMap.has(element)) {
+        const app = appMap.get(element);
+        if (app) {
+            await app.stop();
+            appMap.delete(element);
+        }
+    }
+}
+const render = (args, context) => {
+    const { id, component: Component } = context;
+    if (!Component) {
+        throw new Error(`Unable to render story ${id} as the component annotation is missing from the default export`);
+    }
+    return { Component, props: args, template: '' };
+};
+async function renderToCanvas({ storyFn, title, name, showMain, showError, storyContext, forceRemount, }, canvasElement, bootstrapAppFn) {
+    // Store reference to the original storybook root element
+    const rootElement = canvasElement;
+    // Ensure we have (or create) a single container inside the root where the Aurelia app actually renders
+    let hostElement;
+    if (rootElement.id === 'storybook-root') {
+        hostElement = rootElement.querySelector('.aurelia-story-container');
+        if (!hostElement) {
+            hostElement = document.createElement('div');
+            hostElement.className = 'aurelia-story-container';
+            hostElement.style.height = '100%';
+            rootElement.appendChild(hostElement);
+        }
+    }
+    else {
+        hostElement = rootElement;
+    }
+    // All app instances are now tracked by the *root* element, ensuring we only ever have one per story iframe
+    const appBootstrapFn = bootstrapAppFn ?? createAureliaApp;
+    const { parameters, component, args } = storyContext;
+    let app = appMap.get(rootElement);
+    const story = storyFn();
+    // Temporary debug logging
+    console.log(`[DEBUG] Story: ${name}, forceRemount: ${forceRemount}, hasExistingApp: ${!!app}, canvasId: ${canvasElement.className}`);
+    if (!story) {
+        showError({
+            title: `Expecting an Aurelia component from the story: "${name}" of "${title}".`,
+            description: `
+        Did you forget to return the Aurelia component from the story?
+        Use "() => ({ template: '<custom-component></custom-component>' })" when defining the story.
+      `,
+        });
+        return () => { };
+    }
+    showMain();
+    if (!app || forceRemount) {
+        if (forceRemount && app) {
+            await teardown(rootElement);
+            app = undefined;
+        }
+        // Clear container before mounting new app
+        hostElement.innerHTML = '';
+        const mergedProps = { ...parameters?.args, ...args, ...story.props };
+        const aureliaApp = appBootstrapFn(story, mergedProps, hostElement, component);
+        await aureliaApp.start();
+        appMap.set(rootElement, aureliaApp);
+        app = aureliaApp;
+    }
+    else {
+        // update existing app props
+        const mergedProps = { ...parameters?.args, ...args, ...story.props };
+        if (app?.root?.controller?.viewModel) {
+            Object.assign(app.root.controller.viewModel, mergedProps);
+        }
+    }
+    // Return cleanup fn
+    return async () => {
+        await teardown(rootElement);
+    };
+}
+function createAureliaApp(story, args, domElement, component) {
     const aurelia = new Aurelia(story.container);
     if (story.items?.length) {
         aurelia.register(...story.items);
@@ -15,7 +92,7 @@ function bootstrapAureliaApp(story, args, domElement, component) {
         aurelia.register(component);
     }
     const App = CustomElement.define({
-        name: 'au-storybook',
+        name: 'sb-app',
         template,
         containerless: true,
     }, class {
@@ -33,41 +110,5 @@ function createComponentTemplate(component, innerHtml) {
         .join(' ')}>${innerHtml ?? ''}</${def.name}>`;
 }
 
-// Track the current story's cleanup function
-let currentCleanup = null;
-const render = (args, context) => {
-    // Clean up previous story if exists
-    if (currentCleanup) {
-        currentCleanup();
-        currentCleanup = null;
-    }
-    // Create a container element
-    const container = document.createElement('div');
-    // Get the story function result
-    const story = context.storyFn();
-    // Bootstrap Aurelia app immediately
-    if (story && (story.Component || story.template)) {
-        const app = bootstrapAureliaApp(story, args, container, story.Component || context.component);
-        // Start the app asynchronously
-        const startPromise = app.start();
-        if (startPromise && typeof startPromise.catch === 'function') {
-            startPromise.catch((error) => {
-                console.error('Failed to start Aurelia app:', error);
-            });
-        }
-        // Set cleanup function
-        currentCleanup = () => {
-            const stopPromise = app.stop();
-            if (stopPromise && typeof stopPromise.catch === 'function') {
-                stopPromise.catch((error) => {
-                    console.error('Failed to stop Aurelia app:', error);
-                });
-            }
-        };
-    }
-    // Return the container element immediately
-    return container;
-};
-
-export { render };
+export { render, renderToCanvas };
 //# sourceMappingURL=preview.mjs.map

package/dist/preview.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"preview.mjs","sources":["../src/preview/render.ts","../src/preview.ts"],"sourcesContent":["import { STORY_CHANGED } from '@storybook/core-events';\nimport type { RenderContext, ArgsStoryFn } from '@storybook/types';\nimport type { AureliaRenderer } from './types';\nimport Aurelia, { Constructable, CustomElement } from 'aurelia';\n\ninterface AureliaStoryResult {\n  template: string;\n  components?: unknown[];\n  Component?: unknown;\n  container?: any;\n  items?: unknown[];\n  innerHtml?: string;\n  props?: Record<string, any>;\n}\n\n/**\n * Merges multiple sources into a single object.\n * Sources can be story parameters, args, or story.props.\n */\nfunction mergeStoryProps(\n  ...sources: Array<Record<string, any> | undefined>\n): Record<string, any> {\n  return Object.assign({}, ...sources);\n}\n\n// Track Aurelia apps for cleanup\nconst appMap = new Map<HTMLElement, Aurelia>();\n\nasync function teardown(element: HTMLElement) {\n  if (appMap.has(element)) {\n    const app = appMap.get(element);\n    if (app) {\n      await app.stop();\n      appMap.delete(element);\n    }\n  }\n}\n\nexport const render: ArgsStoryFn<AureliaRenderer> = (args, { id, component: Component }) => {\n  if (!Component) {\n    throw new Error(\n      `Unable to render story ${id} as the component annotation is missing from the default export`\n    );\n  }\n  return { Component, props: args, template: '' };\n};\n\nexport async function renderToCanvas(\n  {\n    storyFn,\n    title,\n    name,\n    showMain,\n    showError,\n    storyContext,\n    forceRemount,\n  }: RenderContext<AureliaRenderer>,\n  canvasElement: HTMLElement,\n  bootstrapAppFn?: typeof bootstrapAureliaApp\n) {\n  const appBootstrapFn = bootstrapAppFn || bootstrapAureliaApp;\n\n  const { parameters, component, args } = storyContext;\n  let app = appMap.get(canvasElement);\n\n  const story = storyFn() as AureliaStoryResult;\n\n  if (!story) {\n    showError({\n      title: `Expecting an Aurelia component from the story: \"${name}\" of \"${title}\".`,\n      description: `\n        Did you forget to return the Aurelia component from the story?\n        Use \"() => ({ template: '<custom-component></custom-component>' })\" when defining the story.\n      `,\n    });\n    return () => {};\n  }\n\n  showMain();\n\n  let mergedProps;\n  // Use full merge (including story.props) when bootstrapping a new app or force remounting.\n  if (!app || forceRemount) {\n    mergedProps = mergeStoryProps(parameters?.args, args, story.props);\n    if (app) {\n      await teardown(canvasElement);\n    }\n    app = appBootstrapFn(\n      story,\n      mergedProps,\n      canvasElement,\n      component as Constructable\n    ) as Aurelia;\n    await app.start();\n    appMap.set(canvasElement, app);\n  } else {\n    // Update the existing app viewModel only with parameters and args (exclude story.props).\n    mergedProps = mergeStoryProps(parameters?.args, args);\n    if (app.root?.controller?.viewModel) {\n      Object.assign(app.root.controller.viewModel, mergedProps);\n    }\n  }\n\n  // Set up story change listener for cleanup\n  const channel = storyContext.viewMode === 'story' ? storyContext.channel : null;\n  let onStoryChange: () => void;\n  if (channel) {\n    onStoryChange = () => {\n      // When the story changes, clean up the Aurelia app\n      teardown(canvasElement);\n    };\n    channel.on(STORY_CHANGED, onStoryChange);\n  }\n\n  // Return teardown function that also unsubscribes from STORY_CHANGED\n  return async () => {\n    if (channel && onStoryChange) {\n      channel.off(STORY_CHANGED, onStoryChange);\n    }\n    await teardown(canvasElement);\n  };\n}\n\nexport function bootstrapAureliaApp(\n  story: AureliaStoryResult,\n  args: Record<string, any>,\n  domElement: HTMLElement,\n  component?: Constructable\n) {\n  const aurelia = new Aurelia(story.container);\n\n  if (story.items?.length) {\n    aurelia.register(...story.items);\n  }\n\n  if (story.components?.length) {\n    aurelia.register(...story.components);\n  }\n\n  let { template } = story;\n\n  if (component) {\n    template = template ?? createComponentTemplate(component, story.innerHtml);\n    aurelia.register(component);\n  }\n\n  const App = CustomElement.define(\n    {\n      name: 'au-storybook',\n      template,\n      containerless: true,\n    },\n    class {}\n  );\n\n  const app = Object.assign(new App(), args);\n\n  return aurelia.app({\n    host: domElement,\n    component: app,\n  });\n}\n\nexport function createComponentTemplate(\n  component: Constructable,\n  innerHtml?: string\n): string {\n  const def = CustomElement.getDefinition(component);\n\n  return `<${def.name} ${Object.values(def.bindables)\n    .map((bindable) => `${bindable.attribute}.bind=\"${bindable.name}\"`)\n    .join(' ')}>${innerHtml ?? ''}</${def.name}>`;\n}","import { renderToCanvas, bootstrapAureliaApp } from './preview/render';\nimport Aurelia from 'aurelia';\n\n// Track the current story's cleanup function\nlet currentCleanup: (() => void) | null = null;\n\nexport const render = (args: any, context: any) => {\n  // Clean up previous story if exists\n  if (currentCleanup) {\n    currentCleanup();\n    currentCleanup = null;\n  }\n\n  // Create a container element\n  const container = document.createElement('div');\n  \n  // Get the story function result\n  const story = context.storyFn();\n  \n  // Bootstrap Aurelia app immediately\n  if (story && (story.Component || story.template)) {\n    const app = bootstrapAureliaApp(\n      story,\n      args,\n      container,\n      story.Component || context.component\n    ) as Aurelia;\n    \n    // Start the app asynchronously\n    const startPromise = app.start();\n    if (startPromise && typeof startPromise.catch === 'function') {\n      startPromise.catch((error: any) => {\n        console.error('Failed to start Aurelia app:', error);\n      });\n    }\n    \n    // Set cleanup function\n    currentCleanup = () => {\n      const stopPromise = app.stop();\n      if (stopPromise && typeof stopPromise.catch === 'function') {\n        stopPromise.catch((error: any) => {\n          console.error('Failed to stop Aurelia app:', error);\n        });\n      }\n    };\n  }\n  \n  // Return the container element immediately\n  return container;\n}; "],"names":[],"mappings":"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"}
+{"version":3,"file":"preview.mjs","sources":["../src/preview/render.ts"],"sourcesContent":["import { STORY_CHANGED } from 'storybook/internal/core-events';\nimport type { RenderContext, ArgsStoryFn } from 'storybook/internal/types';\nimport type { AureliaRenderer } from './types';\nimport Aurelia, { Constructable, CustomElement } from 'aurelia';\n\ninterface AureliaStoryResult {\n  template: string;\n  components?: unknown[];\n  Component?: unknown;\n  container?: any;\n  items?: unknown[];\n  innerHtml?: string;\n  props?: Record<string, any>;\n}\n\n// Track Aurelia apps for cleanup\nconst appMap = new Map<HTMLElement, any>();\n\nasync function teardown(element: HTMLElement) {\n  if (appMap.has(element)) {\n    const app = appMap.get(element);\n    if (app) {\n      await app.stop();\n      appMap.delete(element);\n    }\n  }\n}\n\nexport const render: ArgsStoryFn<AureliaRenderer> = (args, context) => {\n  const { id, component: Component } = context;\n  \n  if (!Component) {\n    throw new Error(\n      `Unable to render story ${id} as the component annotation is missing from the default export`\n    );\n  }\n  return { Component, props: args, template: '' };\n};\n\nexport async function renderToCanvas(\n  {\n    storyFn,\n    title,\n    name,\n    showMain,\n    showError,\n    storyContext,\n    forceRemount,\n  }: RenderContext<AureliaRenderer>,\n  canvasElement: HTMLElement,\n  bootstrapAppFn?: typeof createAureliaApp\n) {\n  // Store reference to the original storybook root element\n  const rootElement = canvasElement;\n\n  // Ensure we have (or create) a single container inside the root where the Aurelia app actually renders\n  let hostElement: HTMLElement;\n  if (rootElement.id === 'storybook-root') {\n    hostElement = rootElement.querySelector('.aurelia-story-container') as HTMLElement;\n    if (!hostElement) {\n      hostElement = document.createElement('div');\n      hostElement.className = 'aurelia-story-container';\n      hostElement.style.height = '100%';\n      rootElement.appendChild(hostElement);\n    }\n  } else {\n    hostElement = rootElement;\n  }\n\n  // All app instances are now tracked by the *root* element, ensuring we only ever have one per story iframe\n  const appBootstrapFn = bootstrapAppFn ?? createAureliaApp;\n  const { parameters, component, args } = storyContext;\n  \n  let app = appMap.get(rootElement);\n  const story = storyFn() as AureliaStoryResult;\n  \n  // Temporary debug logging\n  console.log(`[DEBUG] Story: ${name}, forceRemount: ${forceRemount}, hasExistingApp: ${!!app}, canvasId: ${canvasElement.className}`);\n\n  if (!story) {\n    showError({\n      title: `Expecting an Aurelia component from the story: \"${name}\" of \"${title}\".`,\n      description: `\n        Did you forget to return the Aurelia component from the story?\n        Use \"() => ({ template: '<custom-component></custom-component>' })\" when defining the story.\n      `,\n    });\n    return () => {};\n  }\n\n  showMain();\n\n  if (!app || forceRemount) {\n    if (forceRemount && app) {\n      await teardown(rootElement);\n      app = undefined;\n    }\n    // Clear container before mounting new app\n    hostElement.innerHTML = '';\n\n    const mergedProps = { ...parameters?.args, ...args, ...story.props };\n\n    const aureliaApp = appBootstrapFn(\n      story,\n      mergedProps,\n      hostElement,\n      component as Constructable\n    );\n    await aureliaApp.start();\n    appMap.set(rootElement, aureliaApp);\n    app = aureliaApp;\n  } else {\n    // update existing app props\n    const mergedProps = { ...parameters?.args, ...args, ...story.props };\n    if (app?.root?.controller?.viewModel) {\n      Object.assign(app.root.controller.viewModel, mergedProps);\n    }\n  }\n\n  // Return cleanup fn\n  return async () => {\n    await teardown(rootElement);\n  };\n}\n\nexport function createAureliaApp(\n  story: AureliaStoryResult,\n  args: Record<string, any>,\n  domElement: HTMLElement,\n  component?: Constructable\n) {\n  const aurelia = new Aurelia(story.container);\n\n  if (story.items?.length) {\n    aurelia.register(...story.items);\n  }\n\n  if (story.components?.length) {\n    aurelia.register(...story.components);\n  }\n\n  let { template } = story;\n\n  if (component) {\n    template = template ?? createComponentTemplate(component, story.innerHtml);\n    aurelia.register(component);\n  }\n\n  const App = CustomElement.define(\n    {\n      name: 'sb-app',\n      template,\n      containerless: true,\n    },\n    class {}\n  );\n\n  const app = Object.assign(new App(), args);\n\n  return aurelia.app({\n    host: domElement,\n    component: app,\n  });\n}\n\nexport function createComponentTemplate(\n  component: Constructable,\n  innerHtml?: string\n): string {\n  const def = CustomElement.getDefinition(component);\n\n  return `<${def.name} ${Object.values(def.bindables)\n    .map((bindable) => `${bindable.attribute}.bind=\"${bindable.name}\"`)\n    .join(' ')}>${innerHtml ?? ''}</${def.name}>`;\n}"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aurelia/storybook",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "A Storybook plugin to render Aurelia 2 components using Vite or Webpack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,12 +17,10 @@
   "peerDependencies": {
     "@aurelia/runtime-html": "^2.0.0-beta.24",
     "@aurelia/vite-plugin": "^2.0.0-beta.24",
-    "@storybook/addons": "^7.6.17",
-    "@storybook/builder-vite": "^9.0.12",
-    "@storybook/builder-webpack5": "^9.0.12",
-    "@storybook/core-common": "^8.6.14",
-    "@storybook/core-events": "^8.6.14",
-    "aurelia": "^2.0.0-beta.24"
+    "@storybook/builder-vite": "^9.0.0",
+    "@storybook/builder-webpack5": "^9.0.0",
+    "aurelia": "^2.0.0-beta.24",
+    "storybook": "^9.0.0"
   },
   "devDependencies": {
     "@aurelia/webpack-loader": "^2.0.0-beta.24",
@@ -30,9 +28,7 @@
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-typescript": "^12.1.3",
     "@storybook/builder-vite": "^9.0.12",
-    "@storybook/core-common": "^8.6.14",
-    "@storybook/preview-api": "^8.6.14",
-    "@storybook/types": "^8.6.14",
+    "storybook": "^9.0.12",
     "@types/jest": "^30.0.0",
     "glob": "^11.0.3",
     "jest": "^30.0.2",

package/rollup.config.mjs

@@ -6,11 +6,13 @@ import { glob } from 'glob';
 const external = [
   '@aurelia/runtime-html',
   '@aurelia/vite-plugin',
-  '@storybook/addons',
   '@storybook/builder-vite',
-  '@storybook/core-common',
-  '@storybook/core-events',
-  'aurelia'
+  'aurelia',
+  'react',
+  'react-dom',
+  'storybook/internal/core-events',
+  'storybook/internal/types',
+  'storybook/theming'
 ];
 
 // Get all TypeScript files from src directory

package/src/index.ts

@@ -1,4 +1,32 @@
+import type { StorybookConfig } from 'storybook/internal/types';
 import { renderToCanvas } from './preview/render';
 
 export { renderToCanvas };
 export const render = renderToCanvas;
+
+// Define the framework
+export const framework = {
+  name: '@aurelia/storybook',
+  options: {}
+};
+
+// Framework configuration for Storybook
+export const frameworkOptions = {
+  builder: {
+    name: '@storybook/builder-vite',
+    options: {}
+  }
+};
+
+// Export a complete framework configuration
+export const aureliaFramework = {
+  name: '@aurelia/storybook',
+  options: {},
+  builder: '@storybook/builder-vite'
+};
+
+// Provide external dependencies configuration
+export const externals = {
+  'react': 'React',
+  'react-dom': 'ReactDOM'
+};

package/src/preset.ts

@@ -7,7 +7,25 @@ import { getRules } from './webpack';
  * Optionally adjust the Vite configuration.
  */
 export async function viteFinal(config: any): Promise<any> {
-    // For now, return the config unchanged.
+    // Configure Vite to properly handle dependencies
+    config.define = config.define || {};
+    config.define['process.env.NODE_ENV'] = JSON.stringify(process.env.NODE_ENV || 'development');
+    
+    // Configure optimization deps
+    config.optimizeDeps = config.optimizeDeps || {};
+    config.optimizeDeps.exclude = config.optimizeDeps.exclude || [];
+    
+    // Only exclude Aurelia-specific dependencies that cause issues
+    const excludeList = [
+        '@aurelia/runtime-html'
+    ];
+    
+    excludeList.forEach(dep => {
+        if (!config.optimizeDeps.exclude.includes(dep)) {
+            config.optimizeDeps.exclude.push(dep);
+        }
+    });
+    
     return config;
 }
 

package/src/preview/render.ts

@@ -1,5 +1,5 @@
-import { STORY_CHANGED } from '@storybook/core-events';
-import type { RenderContext, ArgsStoryFn } from '@storybook/types';
+import { STORY_CHANGED } from 'storybook/internal/core-events';
+import type { RenderContext, ArgsStoryFn } from 'storybook/internal/types';
 import type { AureliaRenderer } from './types';
 import Aurelia, { Constructable, CustomElement } from 'aurelia';
 
@@ -13,18 +13,8 @@ interface AureliaStoryResult {
   props?: Record<string, any>;
 }
 
-/**
- * Merges multiple sources into a single object.
- * Sources can be story parameters, args, or story.props.
- */
-function mergeStoryProps(
-  ...sources: Array<Record<string, any> | undefined>
-): Record<string, any> {
-  return Object.assign({}, ...sources);
-}
-
 // Track Aurelia apps for cleanup
-const appMap = new Map<HTMLElement, Aurelia>();
+const appMap = new Map<HTMLElement, any>();
 
 async function teardown(element: HTMLElement) {
   if (appMap.has(element)) {
@@ -36,7 +26,9 @@ async function teardown(element: HTMLElement) {
   }
 }
 
-export const render: ArgsStoryFn<AureliaRenderer> = (args, { id, component: Component }) => {
+export const render: ArgsStoryFn<AureliaRenderer> = (args, context) => {
+  const { id, component: Component } = context;
+  
   if (!Component) {
     throw new Error(
       `Unable to render story ${id} as the component annotation is missing from the default export`
@@ -56,14 +48,34 @@ export async function renderToCanvas(
     forceRemount,
   }: RenderContext<AureliaRenderer>,
   canvasElement: HTMLElement,
-  bootstrapAppFn?: typeof bootstrapAureliaApp
+  bootstrapAppFn?: typeof createAureliaApp
 ) {
-  const appBootstrapFn = bootstrapAppFn || bootstrapAureliaApp;
+  // Store reference to the original storybook root element
+  const rootElement = canvasElement;
+
+  // Ensure we have (or create) a single container inside the root where the Aurelia app actually renders
+  let hostElement: HTMLElement;
+  if (rootElement.id === 'storybook-root') {
+    hostElement = rootElement.querySelector('.aurelia-story-container') as HTMLElement;
+    if (!hostElement) {
+      hostElement = document.createElement('div');
+      hostElement.className = 'aurelia-story-container';
+      hostElement.style.height = '100%';
+      rootElement.appendChild(hostElement);
+    }
+  } else {
+    hostElement = rootElement;
+  }
 
+  // All app instances are now tracked by the *root* element, ensuring we only ever have one per story iframe
+  const appBootstrapFn = bootstrapAppFn ?? createAureliaApp;
   const { parameters, component, args } = storyContext;
-  let app = appMap.get(canvasElement);
-
+  
+  let app = appMap.get(rootElement);
   const story = storyFn() as AureliaStoryResult;
+  
+  // Temporary debug logging
+  console.log(`[DEBUG] Story: ${name}, forceRemount: ${forceRemount}, hasExistingApp: ${!!app}, canvasId: ${canvasElement.className}`);
 
   if (!story) {
     showError({
@@ -78,50 +90,40 @@ export async function renderToCanvas(
 
   showMain();
 
-  let mergedProps;
-  // Use full merge (including story.props) when bootstrapping a new app or force remounting.
   if (!app || forceRemount) {
-    mergedProps = mergeStoryProps(parameters?.args, args, story.props);
-    if (app) {
-      await teardown(canvasElement);
+    if (forceRemount && app) {
+      await teardown(rootElement);
+      app = undefined;
     }
-    app = appBootstrapFn(
+    // Clear container before mounting new app
+    hostElement.innerHTML = '';
+
+    const mergedProps = { ...parameters?.args, ...args, ...story.props };
+
+    const aureliaApp = appBootstrapFn(
       story,
       mergedProps,
-      canvasElement,
+      hostElement,
       component as Constructable
-    ) as Aurelia;
-    await app.start();
-    appMap.set(canvasElement, app);
+    );
+    await aureliaApp.start();
+    appMap.set(rootElement, aureliaApp);
+    app = aureliaApp;
   } else {
-    // Update the existing app viewModel only with parameters and args (exclude story.props).
-    mergedProps = mergeStoryProps(parameters?.args, args);
-    if (app.root?.controller?.viewModel) {
+    // update existing app props
+    const mergedProps = { ...parameters?.args, ...args, ...story.props };
+    if (app?.root?.controller?.viewModel) {
       Object.assign(app.root.controller.viewModel, mergedProps);
     }
   }
 
-  // Set up story change listener for cleanup
-  const channel = storyContext.viewMode === 'story' ? storyContext.channel : null;
-  let onStoryChange: () => void;
-  if (channel) {
-    onStoryChange = () => {
-      // When the story changes, clean up the Aurelia app
-      teardown(canvasElement);
-    };
-    channel.on(STORY_CHANGED, onStoryChange);
-  }
-
-  // Return teardown function that also unsubscribes from STORY_CHANGED
+  // Return cleanup fn
   return async () => {
-    if (channel && onStoryChange) {
-      channel.off(STORY_CHANGED, onStoryChange);
-    }
-    await teardown(canvasElement);
+    await teardown(rootElement);
   };
 }
 
-export function bootstrapAureliaApp(
+export function createAureliaApp(
   story: AureliaStoryResult,
   args: Record<string, any>,
   domElement: HTMLElement,
@@ -146,7 +148,7 @@ export function bootstrapAureliaApp(
 
   const App = CustomElement.define(
     {
-      name: 'au-storybook',
+      name: 'sb-app',
       template,
       containerless: true,
     },

package/src/preview/types.ts

@@ -1,4 +1,4 @@
-import type { Renderer } from '@storybook/types';
+import type { Renderer } from 'storybook/internal/types';
 
 export interface AureliaRenderer extends Renderer {
     /** The DOM element in which the story is rendered */

package/src/preview.ts

@@ -1,50 +1 @@
-import { renderToCanvas, bootstrapAureliaApp } from './preview/render';
-import Aurelia from 'aurelia';
-
-// Track the current story's cleanup function
-let currentCleanup: (() => void) | null = null;
-
-export const render = (args: any, context: any) => {
-  // Clean up previous story if exists
-  if (currentCleanup) {
-    currentCleanup();
-    currentCleanup = null;
-  }
-
-  // Create a container element
-  const container = document.createElement('div');
-  
-  // Get the story function result
-  const story = context.storyFn();
-  
-  // Bootstrap Aurelia app immediately
-  if (story && (story.Component || story.template)) {
-    const app = bootstrapAureliaApp(
-      story,
-      args,
-      container,
-      story.Component || context.component
-    ) as Aurelia;
-    
-    // Start the app asynchronously
-    const startPromise = app.start();
-    if (startPromise && typeof startPromise.catch === 'function') {
-      startPromise.catch((error: any) => {
-        console.error('Failed to start Aurelia app:', error);
-      });
-    }
-    
-    // Set cleanup function
-    currentCleanup = () => {
-      const stopPromise = app.stop();
-      if (stopPromise && typeof stopPromise.catch === 'function') {
-        stopPromise.catch((error: any) => {
-          console.error('Failed to stop Aurelia app:', error);
-        });
-      }
-    };
-  }
-  
-  // Return the container element immediately
-  return container;
-}; 
+export { renderToCanvas, render } from './preview/render';