From 66e226e9eb4f7fa2e98e1d2b691c1d8906f69978 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Sat, 11 Sep 2021 16:28:21 +1000 Subject: [PATCH] Somehow missed this --- app/angular/preset.js | 7 +++++++ app/angular/src/client/preview/config.ts | 3 +++ app/angular/src/client/preview/index.ts | 5 ++--- app/angular/src/client/preview/render.ts | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 app/angular/preset.js create mode 100644 app/angular/src/client/preview/config.ts diff --git a/app/angular/preset.js b/app/angular/preset.js new file mode 100644 index 00000000000..20b417ae97b --- /dev/null +++ b/app/angular/preset.js @@ -0,0 +1,7 @@ +function config(entry = []) { + return [...entry, require.resolve('./dist/esm/client/preview/config')]; +} + +module.exports = { + config, +}; diff --git a/app/angular/src/client/preview/config.ts b/app/angular/src/client/preview/config.ts new file mode 100644 index 00000000000..2ea6e7700bc --- /dev/null +++ b/app/angular/src/client/preview/config.ts @@ -0,0 +1,3 @@ +export { render, renderToDOM } from './render'; + +export const parameters = { framework: 'angular' }; diff --git a/app/angular/src/client/preview/index.ts b/app/angular/src/client/preview/index.ts index 408d96f0f83..91ff1e5e2ea 100644 --- a/app/angular/src/client/preview/index.ts +++ b/app/angular/src/client/preview/index.ts @@ -2,10 +2,10 @@ import { ClientStoryApi, Loadable } from '@storybook/addons'; import { start } from '@storybook/core/client'; import './globals'; -import renderToDOM from './render'; +import { renderToDOM, render } from './render'; import decorateStory from './decorateStory'; import { IStorybookSection } from './types'; -import { AngularFramework, Story } from './types-6-0'; +import { AngularFramework } from './types-6-0'; const framework = 'angular'; @@ -19,7 +19,6 @@ interface ClientApi extends ClientStoryApi { load: (...args: any[]) => void; } -const render: Story = (props) => ({ props }); const api = start(renderToDOM, { decorateStory, render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { diff --git a/app/angular/src/client/preview/render.ts b/app/angular/src/client/preview/render.ts index 4b6749a5e10..a942d7e05ad 100644 --- a/app/angular/src/client/preview/render.ts +++ b/app/angular/src/client/preview/render.ts @@ -1,4 +1,5 @@ import { RenderContext } from '@storybook/store'; +import { ArgsStoryFn } from '@storybook/csf'; import { renderNgApp } from './angular/helpers'; import { AngularFramework } from './types-6-0'; @@ -7,7 +8,9 @@ import { RendererFactory } from './angular-beta/RendererFactory'; export const rendererFactory = new RendererFactory(); -export default async function renderMain( +export const render: ArgsStoryFn = (props) => ({ props }); + +export async function renderToDOM( { storyFn, showMain,