diff --git a/CHANGELOG.md b/CHANGELOG.md index 5faead8d09d..a8026fc01fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +## 7.0.0-alpha.49 (November 13, 2022) + +#### Bug Fixes + +- Essentials: Fix preview annotations for Vite pnpm support [#19689](https://github.com/storybooks/storybook/pull/19689) + +#### Maintenance + +- Build: convert addon-docs to use ts-up [#19790](https://github.com/storybooks/storybook/pull/19790) +- Core: Allow overriding WebView and UrlStore [#19623](https://github.com/storybooks/storybook/pull/19623) +- Storyshots: Support .cjs and .mjs file extensions [#19726](https://github.com/storybooks/storybook/pull/19726) + +#### Build + +- Build: less noise when compiling [#19808](https://github.com/storybooks/storybook/pull/19808) +- Build: Upgrade bench to `next` [#19791](https://github.com/storybooks/storybook/pull/19791) +- Maintenance: improve error feedback when tasks fail in CI [#19786](https://github.com/storybooks/storybook/pull/19786) +- UI: Enable TurboSnap for UI Storybook [#19767](https://github.com/storybooks/storybook/pull/19767) +- CI: Use a new cadence (ci, pr, merged, daily) and trigger CircleCI from github actions [#19768](https://github.com/storybooks/storybook/pull/19768) +- Maintenance: provide expected failure metadata in junit reports [#19775](https://github.com/storybooks/storybook/pull/19775) + ## 7.0.0-alpha.48 (November 7, 2022) #### Breaking Changes diff --git a/MIGRATION.md b/MIGRATION.md index 06dac6694eb..f55ad50607c 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -44,6 +44,7 @@ - [`Story` type deprecated](#story-type-deprecated) - [`ComponentStory`, `ComponentStoryObj`, `ComponentStoryFn` and `ComponentMeta` types are deprecated](#componentstory-componentstoryobj-componentstoryfn-and-componentmeta-types-are-deprecated) - [Renamed `renderToDOM` to `renderToCanvas`](#renamed-rendertodom-to-rendertoroot) + - [Renamed `XFramework` to `XRenderer`](#renamed-xframework-to-xrenderer) - [From version 6.4.x to 6.5.0](#from-version-64x-to-650) - [Vue 3 upgrade](#vue-3-upgrade) - [React18 new root API](#react18-new-root-api) @@ -841,6 +842,28 @@ CSF2Story.args = { label: 'Label' }; The "rendering" function that renderers (ex-frameworks) must export (`renderToDOM`) has been renamed to `renderToCanvas` to acknowledge that some consumers of frameworks/the preview do not work with DOM elements. +#### Renamed `XFramework` to `XRenderer` + +In 6.x you could import XFramework types: + +```ts +import type { ReactFramework } from '@storybook/react'; +import type { VueFramework } from '@storybook/vue'; +import type { SvelteFramework } from '@storybook/svelte'; + +// etc. +``` + +Those are deprecated in 7.0 as they are renamed to: + +```ts +import type { ReactRenderer } from '@storybook/react'; +import type { VueRenderer } from '@storybook/vue'; +import type { SvelteRenderer } from '@storybook/svelte'; + +// etc. +``` + ## From version 6.4.x to 6.5.0 ### Vue 3 upgrade diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index 94be9333561..5a8b924c279 100644 --- a/code/addons/a11y/package.json +++ b/code/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Test component compliance with web accessibility standards", "keywords": [ "a11y", @@ -62,15 +62,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addon-highlight": "7.0.0-alpha.48", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addon-highlight": "7.0.0-alpha.49", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "axe-core": "^4.2.0", "global": "^4.4.0", "lodash": "^4.17.21", @@ -102,7 +102,7 @@ "./src/preview.tsx" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Accessibility", "icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png", diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index bc054af8536..ccb40937b82 100644 --- a/code/addons/actions/package.json +++ b/code/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Get UI feedback when an action is performed on an interactive element", "keywords": [ "storybook", @@ -76,13 +76,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "dequal": "^2.0.2", "global": "^4.4.0", "lodash": "^4.17.21", @@ -120,7 +120,7 @@ "./src/preview.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Actions", "unsupportedFrameworks": [ diff --git a/code/addons/actions/src/addArgsHelpers.ts b/code/addons/actions/src/addArgsHelpers.ts index 6a91c6e1dde..530cb76c062 100644 --- a/code/addons/actions/src/addArgsHelpers.ts +++ b/code/addons/actions/src/addArgsHelpers.ts @@ -1,4 +1,4 @@ -import type { Args, Framework, ArgsEnhancer } from '@storybook/types'; +import type { Args, Renderer, ArgsEnhancer } from '@storybook/types'; import { action } from './runtime/action'; // interface ActionsParameter { @@ -14,7 +14,7 @@ const isInInitialArgs = (name: string, initialArgs: Args) => * matches a regex, such as `^on.*` for react-style `onClick` etc. */ -export const inferActionsFromArgTypesRegex: ArgsEnhancer = (context) => { +export const inferActionsFromArgTypesRegex: ArgsEnhancer = (context) => { const { initialArgs, argTypes, @@ -40,7 +40,7 @@ export const inferActionsFromArgTypesRegex: ArgsEnhancer = (context) /** * Add action args for list of strings. */ -export const addActionsFromArgTypes: ArgsEnhancer = (context) => { +export const addActionsFromArgTypes: ArgsEnhancer = (context) => { const { initialArgs, argTypes, diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index d22a8221a94..71cf5c39269 100644 --- a/code/addons/backgrounds/package.json +++ b/code/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Switch backgrounds to view components in different settings", "keywords": [ "addon", @@ -75,13 +75,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "memoizerific": "^1.11.3", "ts-dedent": "^2.0.0" @@ -111,7 +111,7 @@ "./src/preview.tsx" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Backgrounds", "icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png", diff --git a/code/addons/backgrounds/src/decorators/withBackground.ts b/code/addons/backgrounds/src/decorators/withBackground.ts index 49500b8a7c1..309c6a8f759 100644 --- a/code/addons/backgrounds/src/decorators/withBackground.ts +++ b/code/addons/backgrounds/src/decorators/withBackground.ts @@ -1,5 +1,5 @@ import { useMemo, useEffect } from '@storybook/addons'; -import type { Framework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; +import type { Renderer, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; import { PARAM_KEY as BACKGROUNDS_PARAM_KEY } from '../constants'; import { @@ -10,8 +10,8 @@ import { } from '../helpers'; export const withBackground = ( - StoryFn: StoryFunction, - context: StoryContext + StoryFn: StoryFunction, + context: StoryContext ) => { const { globals, parameters } = context; const globalsBackgroundColor = globals[BACKGROUNDS_PARAM_KEY]?.value; diff --git a/code/addons/backgrounds/src/decorators/withGrid.ts b/code/addons/backgrounds/src/decorators/withGrid.ts index 8e129dcf5af..3647dd2f4ca 100644 --- a/code/addons/backgrounds/src/decorators/withGrid.ts +++ b/code/addons/backgrounds/src/decorators/withGrid.ts @@ -1,10 +1,10 @@ import { useMemo, useEffect } from '@storybook/addons'; -import type { Framework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; +import type { Renderer, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; import { clearStyles, addGridStyle } from '../helpers'; import { PARAM_KEY as BACKGROUNDS_PARAM_KEY } from '../constants'; -export const withGrid = (StoryFn: StoryFunction, context: StoryContext) => { +export const withGrid = (StoryFn: StoryFunction, context: StoryContext) => { const { globals, parameters } = context; const gridParameters = parameters[BACKGROUNDS_PARAM_KEY].grid; const isActive = globals[BACKGROUNDS_PARAM_KEY]?.grid === true && gridParameters.disable !== true; diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index a1e4cfb6de9..72c1dd484e3 100644 --- a/code/addons/controls/package.json +++ b/code/addons/controls/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-controls", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Interact with component inputs dynamically in the Storybook UI", "keywords": [ "addon", @@ -67,16 +67,16 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/blocks": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/blocks": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "lodash": "^4.17.21", "ts-dedent": "^2.0.0" }, @@ -102,7 +102,7 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Controls", "icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png", diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index cc68b2b3873..45863766d69 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Document component usage and properties in Markdown", "keywords": [ "addon", @@ -87,15 +87,15 @@ "@babel/plugin-transform-react-jsx": "^7.12.12", "@jest/transform": "^26.6.2", "@mdx-js/react": "^2.1.5", - "@storybook/blocks": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/csf-plugin": "7.0.0-alpha.48", - "@storybook/csf-tools": "7.0.0-alpha.48", + "@storybook/blocks": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/csf-plugin": "7.0.0-alpha.49", + "@storybook/csf-tools": "7.0.0-alpha.49", "@storybook/mdx2-csf": "next", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/postinstall": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/postinstall": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "fs-extra": "^9.0.1", "global": "^4.4.0", "remark-external-links": "^8.0.0", @@ -128,7 +128,7 @@ "./src/preview.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Docs", "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png", diff --git a/code/addons/docs/src/DocsRenderer.tsx b/code/addons/docs/src/DocsRenderer.tsx index 7da390037fc..b1c6a6391a1 100644 --- a/code/addons/docs/src/DocsRenderer.tsx +++ b/code/addons/docs/src/DocsRenderer.tsx @@ -1,6 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import type { Framework, Parameters } from '@storybook/types'; +import type { Renderer, Parameters } from '@storybook/types'; import type { DocsContextProps, DocsRenderFunction } from '@storybook/preview-web'; import { components as htmlComponents } from '@storybook/components'; import { Docs, CodeOrSourceMdx, AnchorMdx, HeadersMdx } from '@storybook/blocks'; @@ -14,14 +14,14 @@ export const defaultComponents: Record = { ...HeadersMdx, }; -export class DocsRenderer { - public render: DocsRenderFunction; +export class DocsRenderer { + public render: DocsRenderFunction; public unmount: (element: HTMLElement) => void; constructor() { this.render = ( - context: DocsContextProps, + context: DocsContextProps, docsParameter: Parameters, element: HTMLElement, callback: () => void diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index eb9dcee2c22..faa92842a88 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-essentials", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Curated addons to bring out the best of Storybook", "keywords": [ "addon", @@ -111,24 +111,24 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addon-actions": "7.0.0-alpha.48", - "@storybook/addon-backgrounds": "7.0.0-alpha.48", - "@storybook/addon-controls": "7.0.0-alpha.48", - "@storybook/addon-docs": "7.0.0-alpha.48", - "@storybook/addon-highlight": "7.0.0-alpha.48", - "@storybook/addon-measure": "7.0.0-alpha.48", - "@storybook/addon-outline": "7.0.0-alpha.48", - "@storybook/addon-toolbars": "7.0.0-alpha.48", - "@storybook/addon-viewport": "7.0.0-alpha.48", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", + "@storybook/addon-actions": "7.0.0-alpha.49", + "@storybook/addon-backgrounds": "7.0.0-alpha.49", + "@storybook/addon-controls": "7.0.0-alpha.49", + "@storybook/addon-docs": "7.0.0-alpha.49", + "@storybook/addon-highlight": "7.0.0-alpha.49", + "@storybook/addon-measure": "7.0.0-alpha.49", + "@storybook/addon-outline": "7.0.0-alpha.49", + "@storybook/addon-toolbars": "7.0.0-alpha.49", + "@storybook/addon-viewport": "7.0.0-alpha.49", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", "ts-dedent": "^2.0.0" }, "devDependencies": { "@babel/core": "^7.12.10", - "@storybook/vue": "7.0.0-alpha.48", + "@storybook/vue": "7.0.0-alpha.49", "@types/jest": "^26.0.16", "typescript": "~4.6.3" }, @@ -158,5 +158,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 89ae9a2420d..6a3d20cb9f5 100644 --- a/code/addons/highlight/package.json +++ b/code/addons/highlight/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-highlight", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Highlight DOM nodes within your stories", "keywords": [ "storybook-addons", @@ -60,8 +60,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", "global": "^4.4.0" }, "devDependencies": { @@ -77,7 +77,7 @@ "./src/preview.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "sbmodern": "dist/modern/index.js", "storybook": { "displayName": "Highlight", diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index ca295f478bb..837ea72cd8a 100644 --- a/code/addons/interactions/package.json +++ b/code/addons/interactions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-interactions", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Automate, test and debug user interactions", "keywords": [ "storybook-addons", @@ -72,15 +72,15 @@ }, "dependencies": { "@devtools-ds/object-inspector": "^1.1.2", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/instrumenter": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/instrumenter": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "jest-mock": "^27.0.6", "polished": "^4.2.2", @@ -117,7 +117,7 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Interactions", "unsupportedFrameworks": [ diff --git a/code/addons/interactions/src/preview.ts b/code/addons/interactions/src/preview.ts index d36c4bbf4f5..b4f094b7b98 100644 --- a/code/addons/interactions/src/preview.ts +++ b/code/addons/interactions/src/preview.ts @@ -3,7 +3,7 @@ import { addons } from '@storybook/addons'; import { FORCE_REMOUNT, STORY_RENDER_PHASE_CHANGED } from '@storybook/core-events'; import type { - Framework, + Renderer, ArgsEnhancer, PlayFunction, PlayFunctionContext, @@ -52,7 +52,7 @@ const addSpies = (id: string, val: any, key?: string): any => { return val; }; -const addActionsFromArgTypes: ArgsEnhancer = ({ id, initialArgs }) => +const addActionsFromArgTypes: ArgsEnhancer = ({ id, initialArgs }) => addSpies(id, initialArgs); export const argsEnhancers = [addActionsFromArgTypes]; diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index f795ffdd656..3e9705be896 100644 --- a/code/addons/jest/package.json +++ b/code/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "React storybook addon that show component jest report", "keywords": [ "addon", @@ -69,12 +69,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", "global": "^4.4.0", "react-sizeme": "^3.0.1", "upath": "^1.2.0" @@ -104,7 +104,7 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Jest", "icon": "https://pbs.twimg.com/profile_images/821713465245102080/mMtKIMax_400x400.jpg", diff --git a/code/addons/links/package.json b/code/addons/links/package.json index a1aaf60cb8e..d9addd073ba 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Link stories together to build demos and prototypes with your UI components", "keywords": [ "addon", @@ -76,12 +76,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/csf": "next", - "@storybook/router": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/csf": "0.0.2-next.5", + "@storybook/router": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "prop-types": "^15.7.2", "ts-dedent": "^2.0.0" @@ -112,7 +112,7 @@ "./src/react/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Links", "icon": "https://user-images.githubusercontent.com/263385/101991673-48355c80-3c7c-11eb-9b6e-b627c96a75f6.png", diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index 10fb28b9398..f0d889e3b7c 100644 --- a/code/addons/measure/package.json +++ b/code/addons/measure/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-measure", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Inspect layouts by visualizing the box model", "keywords": [ "storybook-addons", @@ -74,12 +74,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0" }, "devDependencies": { @@ -107,7 +107,7 @@ "./src/preview.tsx" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Measure", "unsupportedFrameworks": [ diff --git a/code/addons/measure/src/withMeasure.ts b/code/addons/measure/src/withMeasure.ts index e0a0fa1a101..4dea5601dc7 100644 --- a/code/addons/measure/src/withMeasure.ts +++ b/code/addons/measure/src/withMeasure.ts @@ -1,6 +1,6 @@ /* eslint-env browser */ import { useEffect } from '@storybook/addons'; -import type { Framework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; +import type { Renderer, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; import { drawSelectedElement } from './box-model/visualizer'; import { init, rescale, destroy } from './box-model/canvas'; import { deepElementFromPoint } from './util'; @@ -13,10 +13,7 @@ function findAndDrawElement(x: number, y: number) { drawSelectedElement(nodeAtPointerRef); } -export const withMeasure = ( - StoryFn: StoryFunction, - context: StoryContext -) => { +export const withMeasure = (StoryFn: StoryFunction, context: StoryContext) => { const { measureEnabled } = context.globals; useEffect(() => { diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index 4337c7e0d74..b6b9d3e3ea2 100644 --- a/code/addons/outline/package.json +++ b/code/addons/outline/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-outline", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Outline all elements with CSS to help with layout placement and alignment", "keywords": [ "storybook-addons", @@ -77,12 +77,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "ts-dedent": "^2.0.0" }, @@ -111,7 +111,7 @@ "./src/preview.tsx" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Outline", "unsupportedFrameworks": [ diff --git a/code/addons/outline/src/withOutline.ts b/code/addons/outline/src/withOutline.ts index 1fc20affb60..455d84ae945 100644 --- a/code/addons/outline/src/withOutline.ts +++ b/code/addons/outline/src/withOutline.ts @@ -1,14 +1,11 @@ import { useMemo, useEffect } from '@storybook/addons'; -import type { Framework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; +import type { Renderer, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; import { clearStyles, addOutlineStyles } from './helpers'; import { PARAM_KEY } from './constants'; import outlineCSS from './outlineCSS'; -export const withOutline = ( - StoryFn: StoryFunction, - context: StoryContext -) => { +export const withOutline = (StoryFn: StoryFunction, context: StoryContext) => { const { globals } = context; const isActive = globals[PARAM_KEY] === true; const isInDocs = context.viewMode === 'docs'; diff --git a/code/addons/storyshots/storyshots-core/package.json b/code/addons/storyshots/storyshots-core/package.json index 539ef73cb34..875e23e408a 100644 --- a/code/addons/storyshots/storyshots-core/package.json +++ b/code/addons/storyshots/storyshots-core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Take a code snapshot of every story automatically with Jest", "keywords": [ "addon", @@ -38,13 +38,13 @@ }, "dependencies": { "@jest/transform": "^26.6.2", - "@storybook/addons": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", "@storybook/babel-plugin-require-context-hook": "1.0.1", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-webpack": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/core-webpack": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/glob": "^7.1.3", "@types/jest": "^26.0.16", "@types/jest-specific-snapshot": "^0.5.3", @@ -62,11 +62,11 @@ "@angular/core": "^13.3.6", "@angular/platform-browser-dynamic": "^13.3.6", "@emotion/jest": "^11.8.0", - "@storybook/addon-docs": "7.0.0-alpha.48", - "@storybook/angular": "7.0.0-alpha.48", - "@storybook/react": "7.0.0-alpha.48", - "@storybook/vue": "7.0.0-alpha.48", - "@storybook/vue3": "7.0.0-alpha.48", + "@storybook/addon-docs": "7.0.0-alpha.49", + "@storybook/angular": "7.0.0-alpha.49", + "@storybook/react": "7.0.0-alpha.49", + "@storybook/vue": "7.0.0-alpha.49", + "@storybook/vue3": "7.0.0-alpha.49", "babel-loader": "^8.2.5", "enzyme": "^3.11.0", "enzyme-to-json": "^3.6.1", @@ -144,7 +144,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Storyshots", "icon": "https://user-images.githubusercontent.com/263385/101991676-48cdf300-3c7c-11eb-8aa1-944dab6ab29b.png", diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/Loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/Loader.ts index c844fe11973..80b863c5110 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/Loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/Loader.ts @@ -1,11 +1,11 @@ -import type { Framework, Addon_Loadable } from '@storybook/types'; +import type { Renderer, Addon_Loadable } from '@storybook/types'; import type { ClientApi as ClientApiClass } from '@storybook/client-api'; import type { StoryshotsOptions } from '../api/StoryshotsOptions'; import type { SupportedFramework } from './SupportedFramework'; export type RenderTree = (story: any, context?: any, options?: any) => any; -export interface ClientApi extends ClientApiClass { +export interface ClientApi extends ClientApiClass { configure( loader: Addon_Loadable, module: NodeModule | false, @@ -19,7 +19,7 @@ export interface Loader { framework: SupportedFramework; renderTree: RenderTree; renderShallowTree: any; - storybook: ClientApi; + storybook: ClientApi; }; test: (options: StoryshotsOptions) => boolean; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/configure.ts b/code/addons/storyshots/storyshots-core/src/frameworks/configure.ts index 25c03f8622e..aafc21c96f6 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/configure.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/configure.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import path from 'path'; import type { - Framework, + Renderer, ArgsEnhancer, ArgTypesEnhancer, CoreCommon_NormalizedStoriesSpecifier, @@ -87,9 +87,9 @@ function getConfigPathParts(input: string): Output { return { preview: configDir }; } -function configure( +function configure( options: { - storybook: ClientApi; + storybook: ClientApi; } & StoryshotsOptions ): void { const { configPath = '.storybook', config, storybook } = options; @@ -125,7 +125,7 @@ function configure( } = jest.requireActual(preview); if (decorators) { - decorators.forEach((decorator: DecoratorFunction) => + decorators.forEach((decorator: DecoratorFunction) => storybook.addDecorator(decorator) ); } @@ -136,12 +136,12 @@ function configure( storybook.addStepRunner(runStep); } if (argsEnhancers) { - argsEnhancers.forEach((enhancer: ArgsEnhancer) => + argsEnhancers.forEach((enhancer: ArgsEnhancer) => storybook.addArgsEnhancer(enhancer as any) ); } if (argTypesEnhancers) { - argTypesEnhancers.forEach((enhancer: ArgTypesEnhancer) => + argTypesEnhancers.forEach((enhancer: ArgTypesEnhancer) => storybook.addArgTypesEnhancer(enhancer as any) ); } diff --git a/code/addons/storyshots/storyshots-puppeteer/package.json b/code/addons/storyshots/storyshots-puppeteer/package.json index 50097f24f00..424c69a28e8 100644 --- a/code/addons/storyshots/storyshots-puppeteer/package.json +++ b/code/addons/storyshots/storyshots-puppeteer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots-puppeteer", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Image snapshots addition to StoryShots based on puppeteer", "keywords": [ "addon", @@ -34,9 +34,9 @@ }, "dependencies": { "@axe-core/puppeteer": "^4.2.0", - "@storybook/csf": "next", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/csf": "0.0.2-next.5", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/jest-image-snapshot": "^4.1.3", "jest-image-snapshot": "^4.3.0" }, @@ -45,7 +45,7 @@ "puppeteer": "^2.0.0 || ^3.0.0" }, "peerDependencies": { - "@storybook/addon-storyshots": "7.0.0-alpha.48", + "@storybook/addon-storyshots": "7.0.0-alpha.49", "puppeteer": ">=2.0.0" }, "peerDependenciesMeta": { @@ -56,5 +56,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index 587615a846c..e93341d6d75 100644 --- a/code/addons/storysource/package.json +++ b/code/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "View a story’s source code to see how it works and paste into your app", "keywords": [ "addon", @@ -53,13 +53,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/router": "7.0.0-alpha.48", - "@storybook/source-loader": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/router": "7.0.0-alpha.49", + "@storybook/source-loader": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", "estraverse": "^5.2.0", "prop-types": "^15.7.2", "react-syntax-highlighter": "^15.5.0" @@ -91,7 +91,7 @@ "./src/preset.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Storysource", "icon": "https://user-images.githubusercontent.com/263385/101991675-48cdf300-3c7c-11eb-9400-58de5ac6daa7.png", diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index e936e70728f..2c60d3eb0d0 100644 --- a/code/addons/toolbars/package.json +++ b/code/addons/toolbars/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-toolbars", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Create your own toolbar items that control story rendering", "keywords": [ "addon", @@ -67,11 +67,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48" + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49" }, "devDependencies": { "typescript": "~4.6.3" @@ -98,7 +98,7 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Toolbars", "icon": "https://user-images.githubusercontent.com/263385/101991677-48cdf300-3c7c-11eb-93b4-19b0e3366959.png", diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index 3f3408a7be6..b22c881302b 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Build responsive components by adjusting Storybook’s viewport size and orientation", "keywords": [ "addon", @@ -72,12 +72,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", "global": "^4.4.0", "memoizerific": "^1.11.3", "prop-types": "^15.7.2" @@ -108,7 +108,7 @@ "./src/preview.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8", "storybook": { "displayName": "Viewport", "icon": "https://user-images.githubusercontent.com/263385/101991678-48cdf300-3c7c-11eb-9764-f8af293c1b28.png", diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 2d513753a17..e1f774250cb 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.", "keywords": [ "storybook", @@ -34,19 +34,19 @@ "prep": "rimraf dist && ../../../scripts/node_modules/.bin/tsc --project tsconfig.build.json && echo \"Preventing passing flags to tsc\"" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/core-server": "7.0.0-alpha.48", - "@storybook/core-webpack": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/core-server": "7.0.0-alpha.49", + "@storybook/core-webpack": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/node": "^16.0.0", "@types/react": "^16.14.23", "@types/react-dom": "^16.9.14", @@ -123,5 +123,5 @@ "access": "public" }, "builders": "dist/builders/builders.json", - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/angular/src/client/angular/helpers.ts b/code/frameworks/angular/src/client/angular/helpers.ts index ce0c1fcd9f1..10ce7171809 100644 --- a/code/frameworks/angular/src/client/angular/helpers.ts +++ b/code/frameworks/angular/src/client/angular/helpers.ts @@ -7,7 +7,7 @@ import { Subscriber, Observable, ReplaySubject } from 'rxjs'; import { PartialStoryFn } from '@storybook/types'; import { AppComponent } from './app.component'; import { STORY } from './app.token'; -import { NgModuleMetadata, StoryFnAngularReturnType, AngularFramework } from '../types'; +import { NgModuleMetadata, StoryFnAngularReturnType, AngularRenderer } from '../types'; const { document } = global; @@ -131,7 +131,7 @@ const getExistenceOfComponentInModules = ( }); }; -const initModule = (storyFn: PartialStoryFn) => { +const initModule = (storyFn: PartialStoryFn) => { const storyObj = storyFn(); const { component, template, props, styles, moduleMetadata = {} } = storyObj; @@ -198,7 +198,7 @@ const draw = (newModule: DynamicComponentType): void => { } }; -export const renderNgApp = (storyFn: PartialStoryFn, forced: boolean) => { +export const renderNgApp = (storyFn: PartialStoryFn, forced: boolean) => { if (!forced) { draw(initModule(storyFn)); } else { diff --git a/code/frameworks/angular/src/client/decorateStory.test.ts b/code/frameworks/angular/src/client/decorateStory.test.ts index 646f56398c8..bf5d7b6dd5b 100644 --- a/code/frameworks/angular/src/client/decorateStory.test.ts +++ b/code/frameworks/angular/src/client/decorateStory.test.ts @@ -3,12 +3,12 @@ import { DecoratorFunction, StoryContext } from '@storybook/types'; import { componentWrapperDecorator } from './decorators'; import decorateStory from './decorateStory'; -import { AngularFramework } from './types'; +import { AngularRenderer } from './types'; describe('decorateStory', () => { describe('angular behavior', () => { it('should use componentWrapperDecorator with args', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ componentWrapperDecorator(ParentComponent, ({ args }) => args), componentWrapperDecorator( (story) => `${story}`, @@ -42,7 +42,7 @@ describe('decorateStory', () => { }); it('should use componentWrapperDecorator with input / output', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ componentWrapperDecorator(ParentComponent, { parentInput: 'Parent input', parentOutput: () => {}, @@ -81,7 +81,7 @@ describe('decorateStory', () => { }); it('should use componentWrapperDecorator', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ componentWrapperDecorator(ParentComponent), componentWrapperDecorator((story) => `${story}`), componentWrapperDecorator((story) => `${story}`), @@ -96,7 +96,7 @@ describe('decorateStory', () => { }); it('should use template in preference to component parameters', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ (s) => { const story = s(); return { @@ -129,7 +129,7 @@ describe('decorateStory', () => { }); it('should include story templates in decorators', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ (s) => { const story = s(); return { @@ -162,7 +162,7 @@ describe('decorateStory', () => { }); it('should include story components in decorators', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ (s) => { const story = s(); return { @@ -195,7 +195,7 @@ describe('decorateStory', () => { }); it('should include legacy story components in decorators', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ (s) => { const story = s(); return { @@ -229,7 +229,7 @@ describe('decorateStory', () => { }); it('should keep template with an empty value', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ componentWrapperDecorator(ParentComponent), ]; const decorated = decorateStory(() => ({ template: '' }), decorators); @@ -272,7 +272,7 @@ describe('decorateStory', () => { describe('default behavior', () => { it('calls decorators in out to in order', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ (s) => { const story = s(); return { ...story, props: { a: [...story.props.a, 1] } }; @@ -292,7 +292,7 @@ describe('decorateStory', () => { }); it('passes context through to sub decorators', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ (s, c) => { const story = s({ ...c, k: 1 }); return { ...story, props: { a: [...story.props.a, c.k] } }; @@ -312,7 +312,7 @@ describe('decorateStory', () => { }); it('DOES NOT merge parameter or pass through parameters key in context', () => { - const decorators: DecoratorFunction[] = [ + const decorators: DecoratorFunction[] = [ (s, c) => { const story = s({ ...c, k: 1, parameters: { p: 1 } }); return { @@ -347,7 +347,7 @@ describe('decorateStory', () => { }); }); -function makeContext(input: Record): StoryContext { +function makeContext(input: Record): StoryContext { return { id: 'id', kind: 'kind', @@ -355,7 +355,7 @@ function makeContext(input: Record): StoryContext; + } as StoryContext; } @Component({ diff --git a/code/frameworks/angular/src/client/decorateStory.ts b/code/frameworks/angular/src/client/decorateStory.ts index a7816084f23..2b3daf65137 100644 --- a/code/frameworks/angular/src/client/decorateStory.ts +++ b/code/frameworks/angular/src/client/decorateStory.ts @@ -2,15 +2,15 @@ import { DecoratorFunction, LegacyStoryFn, StoryContext } from '@storybook/types import { sanitizeStoryContextUpdate } from '@storybook/store'; import { computesTemplateFromComponent } from './angular-beta/ComputesTemplateFromComponent'; -import { AngularFramework } from './types'; +import { AngularRenderer } from './types'; export default function decorateStory( - mainStoryFn: LegacyStoryFn, - decorators: DecoratorFunction[] -): LegacyStoryFn { + mainStoryFn: LegacyStoryFn, + decorators: DecoratorFunction[] +): LegacyStoryFn { const returnDecorators = [cleanArgsDecorator, ...decorators].reduce( - (previousStoryFn: LegacyStoryFn, decorator) => - (context: StoryContext) => { + (previousStoryFn: LegacyStoryFn, decorator) => + (context: StoryContext) => { const decoratedStory = decorator((update) => { return previousStoryFn({ ...context, @@ -29,9 +29,9 @@ export default function decorateStory( export { decorateStory }; const prepareMain = ( - story: AngularFramework['storyResult'], - context: StoryContext -): AngularFramework['storyResult'] => { + story: AngularRenderer['storyResult'], + context: StoryContext +): AngularRenderer['storyResult'] => { let { template } = story; const component = story.component ?? context.component; @@ -50,7 +50,7 @@ function hasNoTemplate(template: string | null | undefined): template is undefin return template === null || template === undefined; } -const cleanArgsDecorator: DecoratorFunction = (storyFn, context) => { +const cleanArgsDecorator: DecoratorFunction = (storyFn, context) => { if (!context.argTypes || !context.args) { return storyFn(); } diff --git a/code/frameworks/angular/src/client/decorators.test.ts b/code/frameworks/angular/src/client/decorators.test.ts index 3f7651051f2..8ed4e347c55 100644 --- a/code/frameworks/angular/src/client/decorators.test.ts +++ b/code/frameworks/angular/src/client/decorators.test.ts @@ -2,9 +2,9 @@ import { Addon_StoryContext } from '@storybook/types'; import { Component } from '@angular/core'; import { moduleMetadata } from './decorators'; -import { AngularFramework } from './types'; +import { AngularRenderer } from './types'; -const defaultContext: Addon_StoryContext = { +const defaultContext: Addon_StoryContext = { componentId: 'unspecified', kind: 'unspecified', title: 'unspecified', diff --git a/code/frameworks/angular/src/client/decorators.ts b/code/frameworks/angular/src/client/decorators.ts index 9e5a59ca04e..b34b416e71a 100644 --- a/code/frameworks/angular/src/client/decorators.ts +++ b/code/frameworks/angular/src/client/decorators.ts @@ -3,12 +3,12 @@ import { Type } from '@angular/core'; import { DecoratorFunction, StoryContext } from '@storybook/types'; import { computesTemplateFromComponent } from './angular-beta/ComputesTemplateFromComponent'; import { isComponent } from './angular-beta/utils/NgComponentAnalyzer'; -import { ICollection, NgModuleMetadata, AngularFramework } from './types'; +import { ICollection, NgModuleMetadata, AngularRenderer } from './types'; // We use `any` here as the default type rather than `Args` because we need something that is // castable to any component-specific args type when the user is being careful. export const moduleMetadata = - (metadata: Partial): DecoratorFunction => + (metadata: Partial): DecoratorFunction => (storyFn) => { const story = storyFn(); const storyMetadata = story.moduleMetadata || {}; @@ -32,8 +32,8 @@ export const moduleMetadata = export const componentWrapperDecorator = ( element: Type | ((story: string) => string), - props?: ICollection | ((storyContext: StoryContext) => ICollection) - ): DecoratorFunction => + props?: ICollection | ((storyContext: StoryContext) => ICollection) + ): DecoratorFunction => (storyFn, storyContext) => { const story = storyFn(); const currentProps = typeof props === 'function' ? (props(storyContext) as ICollection) : props; diff --git a/code/frameworks/angular/src/client/docs/sourceDecorator.ts b/code/frameworks/angular/src/client/docs/sourceDecorator.ts index 605112b11b2..7769aa6968a 100644 --- a/code/frameworks/angular/src/client/docs/sourceDecorator.ts +++ b/code/frameworks/angular/src/client/docs/sourceDecorator.ts @@ -1,7 +1,7 @@ import { addons, useEffect } from '@storybook/addons'; import { PartialStoryFn } from '@storybook/types'; import { SNIPPET_RENDERED, SourceType } from '@storybook/docs-tools'; -import { StoryContext, AngularFramework } from '../types'; +import { StoryContext, AngularRenderer } from '../types'; import { computesTemplateSourceFromComponent } from '../../renderer'; export const skipSourceRender = (context: StoryContext) => { @@ -22,7 +22,7 @@ export const skipSourceRender = (context: StoryContext) => { * @param context StoryContext */ export const sourceDecorator = ( - storyFn: PartialStoryFn, + storyFn: PartialStoryFn, context: StoryContext ) => { const story = storyFn(); diff --git a/code/frameworks/angular/src/client/public-api.ts b/code/frameworks/angular/src/client/public-api.ts index 691db5d30c1..596a5fd1b4a 100644 --- a/code/frameworks/angular/src/client/public-api.ts +++ b/code/frameworks/angular/src/client/public-api.ts @@ -3,20 +3,20 @@ import { Addon_ClientStoryApi, Addon_Loadable } from '@storybook/types'; import { start } from '@storybook/core-client'; import { renderToCanvas, render } from './render'; import decorateStory from './decorateStory'; -import { AngularFramework } from './types'; +import { AngularRenderer } from './types'; export * from './public-types'; const FRAMEWORK = 'angular'; -interface ClientApi extends Addon_ClientStoryApi { +interface ClientApi extends Addon_ClientStoryApi { configure(loader: Addon_Loadable, module: NodeModule): void; forceReRender(): void; raw: () => any; // todo add type load: (...args: any[]) => void; } -const api = start(renderToCanvas, { decorateStory, render }); +const api = start(renderToCanvas, { decorateStory, render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/frameworks/angular/src/client/public-types.ts b/code/frameworks/angular/src/client/public-types.ts index da446898d29..6f14ba79607 100644 --- a/code/frameworks/angular/src/client/public-types.ts +++ b/code/frameworks/angular/src/client/public-types.ts @@ -1,5 +1,5 @@ import { AnnotatedStoryFn, Args, ComponentAnnotations, StoryAnnotations } from '@storybook/types'; -import { AngularFramework } from './types'; +import { AngularRenderer } from './types'; export type { Args, ArgTypes } from '@storybook/types'; @@ -8,21 +8,21 @@ export type { Args, ArgTypes } from '@storybook/types'; * * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ -export type Meta = ComponentAnnotations; +export type Meta = ComponentAnnotations; /** * Story function that represents a CSFv2 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryFn = AnnotatedStoryFn; +export type StoryFn = AnnotatedStoryFn; /** * Story function that represents a CSFv3 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryObj = StoryAnnotations; +export type StoryObj = StoryAnnotations; /** * @deprecated Use `StoryFn` instead. diff --git a/code/frameworks/angular/src/client/render.ts b/code/frameworks/angular/src/client/render.ts index 622fe0ed6e8..f8d220d93c6 100644 --- a/code/frameworks/angular/src/client/render.ts +++ b/code/frameworks/angular/src/client/render.ts @@ -1,13 +1,13 @@ import { Store_RenderContext, ArgsStoryFn } from '@storybook/types'; import { renderNgApp } from './angular/helpers'; -import { AngularFramework } from './types'; +import { AngularRenderer } from './types'; import { RendererFactory } from './angular-beta/RendererFactory'; export const rendererFactory = new RendererFactory(); -export const render: ArgsStoryFn = (props) => ({ props }); +export const render: ArgsStoryFn = (props) => ({ props }); export async function renderToCanvas( { @@ -16,7 +16,7 @@ export async function renderToCanvas( forceRemount, storyContext: { parameters, component }, id, - }: Store_RenderContext, + }: Store_RenderContext, element: HTMLElement ) { showMain(); diff --git a/code/frameworks/angular/src/client/types.ts b/code/frameworks/angular/src/client/types.ts index 36ebabc89ed..14f41557d5d 100644 --- a/code/frameworks/angular/src/client/types.ts +++ b/code/frameworks/angular/src/client/types.ts @@ -1,7 +1,7 @@ import { Parameters as DefaultParameters, StoryContext as DefaultStoryContext, - WebFramework, + WebRenderer, } from '@storybook/types'; export interface NgModuleMetadata { @@ -27,7 +27,11 @@ export interface StoryFnAngularReturnType { userDefinedTemplate?: boolean; } -export interface AngularFramework extends WebFramework { +/** + * @deprecated Use `AngularRenderer` instead. + */ +export type AngularFramework = AngularRenderer; +export interface AngularRenderer extends WebRenderer { component: any; storyResult: StoryFnAngularReturnType; } @@ -38,4 +42,4 @@ export type Parameters = DefaultParameters & { bootstrapModuleOptions?: unknown; }; -export type StoryContext = DefaultStoryContext & { parameters: Parameters }; +export type StoryContext = DefaultStoryContext & { parameters: Parameters }; diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json index bb2ae7b4ce4..aae606ea963 100644 --- a/code/frameworks/ember/package.json +++ b/code/frameworks/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/ember", "bugs": { @@ -31,12 +31,12 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -60,5 +60,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/ember/src/client/preview/render.ts b/code/frameworks/ember/src/client/preview/render.ts index 426eabcc207..0f951bc1962 100644 --- a/code/frameworks/ember/src/client/preview/render.ts +++ b/code/frameworks/ember/src/client/preview/render.ts @@ -3,7 +3,7 @@ import { dedent } from 'ts-dedent'; import type { Store_RenderContext } from '@storybook/types'; // @ts-expect-error (Converted from ts-ignore) import Component from '@ember/component'; // eslint-disable-line import/no-unresolved -import type { OptionsArgs, EmberFramework } from './types'; +import type { OptionsArgs, EmberRenderer } from './types'; const { window: globalWindow, document } = global; @@ -20,7 +20,7 @@ let lastPromise = app.boot(); let hasRendered = false; let isRendering = false; -function render(options: OptionsArgs, el: EmberFramework['canvasElement']) { +function render(options: OptionsArgs, el: EmberRenderer['canvasElement']) { if (isRendering) return; isRendering = true; @@ -61,8 +61,8 @@ function render(options: OptionsArgs, el: EmberFramework['canvasElement']) { } export function renderToCanvas( - { storyFn, kind, name, showMain, showError }: Store_RenderContext, - canvasElement: EmberFramework['canvasElement'] + { storyFn, kind, name, showMain, showError }: Store_RenderContext, + canvasElement: EmberRenderer['canvasElement'] ) { const element = storyFn(); diff --git a/code/frameworks/ember/src/client/preview/types.ts b/code/frameworks/ember/src/client/preview/types.ts index e360063627e..5df0b2632aa 100644 --- a/code/frameworks/ember/src/client/preview/types.ts +++ b/code/frameworks/ember/src/client/preview/types.ts @@ -1,4 +1,4 @@ -import type { WebFramework } from '@storybook/types'; +import type { WebRenderer } from '@storybook/types'; export type { RenderContext } from '@storybook/types'; @@ -13,7 +13,11 @@ export interface OptionsArgs { element: any; } -export interface EmberFramework extends WebFramework { +/** + * @deprecated Use `EmberRenderer` instead. + */ +export type EmberFramework = EmberRenderer; +export interface EmberRenderer extends WebRenderer { component: any; storyResult: OptionsArgs; } diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json index 5d2e4bd25c5..8daa980bd89 100644 --- a/code/frameworks/html-webpack5/package.json +++ b/code/frameworks/html-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/html": "7.0.0-alpha.48", - "@storybook/preset-html-webpack": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/html": "7.0.0-alpha.49", + "@storybook/preset-html-webpack": "7.0.0-alpha.49", "@types/node": "^16.0.0", "global": "^4.4.0", "react": "16.14.0", @@ -78,5 +78,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index 80e845870e8..fbdb99d6f95 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/nextjs", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Next.js", "keywords": [ "storybook", @@ -60,12 +60,12 @@ }, "dependencies": { "@babel/preset-typescript": "^7.18.6", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/preset-react-webpack": "7.0.0-alpha.48", - "@storybook/react": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/preset-react-webpack": "7.0.0-alpha.49", + "@storybook/react": "7.0.0-alpha.49", "@types/node": "^14.14.20 || ^16.0.0", "find-up": "^5.0.0", "fs-extra": "^9.0.1", @@ -81,7 +81,7 @@ "tsconfig-paths-webpack-plugin": "^3.5.2" }, "devDependencies": { - "@storybook/addon-actions": "7.0.0-alpha.48", + "@storybook/addon-actions": "7.0.0-alpha.49", "@types/loader-utils": "^2.0.3", "next": "^12.2.4", "typescript": "~4.6.3", @@ -121,5 +121,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json index 899d9d86fef..b9fb8c040c1 100644 --- a/code/frameworks/preact-webpack5/package.json +++ b/code/frameworks/preact-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/preact": "7.0.0-alpha.48", - "@storybook/preset-preact-webpack": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/preact": "7.0.0-alpha.49", + "@storybook/preset-preact-webpack": "7.0.0-alpha.49", "@types/node": "^16.0.0", "react": "16.14.0", "react-dom": "16.14.0" @@ -79,5 +79,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json index 2955ecc3bdb..ae9e5828df2 100644 --- a/code/frameworks/react-vite/package.json +++ b/code/frameworks/react-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-vite", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for React and Vite: Develop React components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -53,13 +53,13 @@ "dependencies": { "@joshwooding/vite-plugin-react-docgen-typescript": "^0.0.5", "@rollup/pluginutils": "^4.2.0", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/builder-vite": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/react": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/builder-vite": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/react": "7.0.0-alpha.49", "@vitejs/plugin-react": "^2.0.0", "ast-types": "^0.14.2", "magic-string": "^0.26.1", @@ -88,5 +88,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json index fbb4e80d02f..5e91ec97e4b 100644 --- a/code/frameworks/react-webpack5/package.json +++ b/code/frameworks/react-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,9 +51,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/preset-react-webpack": "7.0.0-alpha.48", - "@storybook/react": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/preset-react-webpack": "7.0.0-alpha.49", + "@storybook/react": "7.0.0-alpha.49", "@types/node": "^16.0.0" }, "devDependencies": { @@ -86,5 +86,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json index 213ed072a34..c6746a937d9 100644 --- a/code/frameworks/server-webpack5/package.json +++ b/code/frameworks/server-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/preset-server-webpack": "7.0.0-alpha.48", - "@storybook/server": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/preset-server-webpack": "7.0.0-alpha.49", + "@storybook/server": "7.0.0-alpha.49", "@types/node": "^16.0.0", "react": "16.14.0", "react-dom": "16.14.0" @@ -74,5 +74,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index 1f49c052ce3..0e078c939ed 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-vite", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Svelte and Vite: Develop Svelte components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -52,14 +52,14 @@ }, "dependencies": { "@storybook/addon-svelte-csf": "^2.0.0", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/builder-vite": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/svelte": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/builder-vite": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/svelte": "7.0.0-alpha.49", "@sveltejs/vite-plugin-svelte": "^1.0.0", "magic-string": "^0.26.1", "svelte": "^3.0.0", @@ -92,5 +92,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index 88ef0e088f9..255537c0fa2 100644 --- a/code/frameworks/svelte-webpack5/package.json +++ b/code/frameworks/svelte-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,10 +51,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/preset-svelte-webpack": "7.0.0-alpha.48", - "@storybook/svelte": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/preset-svelte-webpack": "7.0.0-alpha.49", + "@storybook/svelte": "7.0.0-alpha.49", "react": "16.14.0", "react-dom": "16.14.0" }, @@ -81,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/vue-vite/package.json b/code/frameworks/vue-vite/package.json index e879f908697..beada02e0eb 100644 --- a/code/frameworks/vue-vite/package.json +++ b/code/frameworks/vue-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue-vite", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Vue2 and Vite: Develop Vue2 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,15 +50,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/builder-vite": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-server": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/vue": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/builder-vite": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/core-server": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/vue": "7.0.0-alpha.49", "magic-string": "^0.26.1", "vite": "^3.1.3", "vue-docgen-api": "^4.40.0" @@ -83,5 +83,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/vue-webpack5/package.json b/code/frameworks/vue-webpack5/package.json index 88e5f2f825a..740104216ca 100644 --- a/code/frameworks/vue-webpack5/package.json +++ b/code/frameworks/vue-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/preset-vue-webpack": "7.0.0-alpha.48", - "@storybook/vue": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/preset-vue-webpack": "7.0.0-alpha.49", + "@storybook/vue": "7.0.0-alpha.49", "@types/node": "^16.0.0", "react": "16.14.0", "react-dom": "16.14.0" @@ -85,5 +85,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json index 1b1f0a8201d..97ca18020c1 100644 --- a/code/frameworks/vue3-vite/package.json +++ b/code/frameworks/vue3-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-vite", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Vue3 and Vite: Develop Vue3 components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,14 +51,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/builder-vite": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/core-server": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/vue3": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/builder-vite": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/core-server": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/vue3": "7.0.0-alpha.49", "@vitejs/plugin-vue": "^3.0.0", "magic-string": "^0.26.1", "vite": "^3.1.3", @@ -82,5 +82,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json index 1c207881747..f84ef2a14ed 100644 --- a/code/frameworks/vue3-webpack5/package.json +++ b/code/frameworks/vue3-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/preset-vue3-webpack": "7.0.0-alpha.48", - "@storybook/vue3": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/preset-vue3-webpack": "7.0.0-alpha.49", + "@storybook/vue3": "7.0.0-alpha.49", "@types/node": "^16.0.0", "react": "16.14.0", "react-dom": "16.14.0" @@ -82,5 +82,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json index 5cb60b1b3df..8470f0fc71c 100644 --- a/code/frameworks/web-components-vite/package.json +++ b/code/frameworks/web-components-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components-vite", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for web-components and Vite: Develop Web Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,15 +51,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/builder-vite": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/core-server": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/web-components": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/builder-vite": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/core-server": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/web-components": "7.0.0-alpha.49", "magic-string": "^0.26.1", "vite": "3" }, @@ -81,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json index 895cc52e21b..2e21f0ddbf1 100644 --- a/code/frameworks/web-components-webpack5/package.json +++ b/code/frameworks/web-components-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit-html", @@ -53,10 +53,10 @@ }, "dependencies": { "@babel/preset-env": "^7.12.11", - "@storybook/builder-webpack5": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/preset-web-components-webpack": "7.0.0-alpha.48", - "@storybook/web-components": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/preset-web-components-webpack": "7.0.0-alpha.49", + "@storybook/web-components": "7.0.0-alpha.49", "@types/node": "^16.0.0", "react": "16.14.0", "react-dom": "16.14.0" @@ -81,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lerna.json b/code/lerna.json index 8442865df4d..0953a58157e 100644 --- a/code/lerna.json +++ b/code/lerna.json @@ -2,5 +2,5 @@ "npmClient": "yarn", "useWorkspaces": true, "registry": "https://registry.npmjs.org", - "version": "7.0.0-alpha.48" + "version": "7.0.0-alpha.49" } diff --git a/code/lib/addons/package.json b/code/lib/addons/package.json index 57cf53a7beb..0ec5c4273f4 100644 --- a/code/lib/addons/package.json +++ b/code/lib/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook addons store", "keywords": [ "storybook" @@ -42,13 +42,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/api": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/router": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/router": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0" }, "peerDependencies": { @@ -63,5 +63,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/addons/src/hooks.ts b/code/lib/addons/src/hooks.ts index c456c219451..55ec838f995 100644 --- a/code/lib/addons/src/hooks.ts +++ b/code/lib/addons/src/hooks.ts @@ -1,7 +1,7 @@ import global from 'global'; import { logger } from '@storybook/client-logger'; import type { - Framework, + Renderer, Args, DecoratorApplicator, DecoratorFunction, @@ -32,7 +32,7 @@ interface Effect { type AbstractFunction = (...args: any[]) => any; -export class HooksContext { +export class HooksContext { hookListsMap: WeakMap; mountedDecorators: Set; @@ -53,7 +53,7 @@ export class HooksContext { hasUpdates: boolean; - currentContext: StoryContext | null; + currentContext: StoryContext | null; renderListener = (storyId: StoryId) => { if (storyId !== this.currentContext.id) return; @@ -126,15 +126,15 @@ export class HooksContext { } } -function hookify( - storyFn: LegacyStoryFn -): LegacyStoryFn; -function hookify( - decorator: DecoratorFunction -): DecoratorFunction; -function hookify(fn: AbstractFunction) { +function hookify( + storyFn: LegacyStoryFn +): LegacyStoryFn; +function hookify( + decorator: DecoratorFunction +): DecoratorFunction; +function hookify(fn: AbstractFunction) { return (...args: any[]) => { - const { hooks }: { hooks: HooksContext } = + const { hooks }: { hooks: HooksContext } = typeof args[0] === 'function' ? args[1] : args[0]; const prevPhase = hooks.currentPhase; @@ -177,16 +177,16 @@ function hookify(fn: AbstractFunction) { let numberOfRenders = 0; const RENDER_LIMIT = 25; export const applyHooks = - ( - applyDecorators: DecoratorApplicator - ): DecoratorApplicator => - (storyFn: LegacyStoryFn, decorators: DecoratorFunction[]) => { + ( + applyDecorators: DecoratorApplicator + ): DecoratorApplicator => + (storyFn: LegacyStoryFn, decorators: DecoratorFunction[]) => { const decorated = applyDecorators( hookify(storyFn), decorators.map((decorator) => hookify(decorator)) ); return (context) => { - const { hooks } = context as { hooks: HooksContext }; + const { hooks } = context as { hooks: HooksContext }; hooks.prevMountedDecorators = hooks.mountedDecorators; hooks.mountedDecorators = new Set([storyFn, ...decorators]); hooks.currentContext = context; @@ -215,12 +215,12 @@ const areDepsEqual = (deps: any[], nextDeps: any[]) => const invalidHooksError = () => new Error('Storybook preview hooks can only be called inside decorators and story functions.'); -function getHooksContextOrNull(): HooksContext | null { +function getHooksContextOrNull(): HooksContext | null { return global.STORYBOOK_HOOKS_CONTEXT || null; } -function getHooksContextOrThrow(): HooksContext { - const hooks = getHooksContextOrNull(); +function getHooksContextOrThrow(): HooksContext { + const hooks = getHooksContextOrNull(); if (hooks == null) { throw invalidHooksError(); } @@ -404,7 +404,7 @@ export function useChannel(eventMap: EventMap, deps: any[] = []) { } /* Returns current story context */ -export function useStoryContext(): StoryContext { +export function useStoryContext(): StoryContext { const { currentContext } = getHooksContextOrThrow(); if (currentContext == null) { throw invalidHooksError(); diff --git a/code/lib/api/package.json b/code/lib/api/package.json index 7ce8ccd876b..e8d0abff7d8 100644 --- a/code/lib/api/package.json +++ b/code/lib/api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/api", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Core Storybook API & Context", "keywords": [ "storybook" @@ -40,13 +40,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/csf": "next", - "@storybook/router": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/csf": "0.0.2-next.5", + "@storybook/router": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "dequal": "^2.0.2", "global": "^4.4.0", "lodash": "^4.17.21", @@ -59,7 +59,7 @@ }, "devDependencies": { "@jest/globals": "^26.6.2", - "@storybook/core-common": "7.0.0-alpha.48", + "@storybook/core-common": "7.0.0-alpha.49", "@types/lodash": "^4.14.167", "@types/qs": "^6", "flush-promises": "^1.0.2", @@ -78,5 +78,5 @@ "./src/index.tsx" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/api/src/version.ts b/code/lib/api/src/version.ts index 22f21c33eed..4a09a538a35 100644 --- a/code/lib/api/src/version.ts +++ b/code/lib/api/src/version.ts @@ -1 +1 @@ -export const version = '7.0.0-alpha.48'; +export const version = '7.0.0-alpha.49'; diff --git a/code/lib/builder-manager/package.json b/code/lib/builder-manager/package.json index 84a286b93dd..384fa4cac1a 100644 --- a/code/lib/builder-manager/package.json +++ b/code/lib/builder-manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-manager", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook manager builder", "keywords": [ "storybook" @@ -42,9 +42,9 @@ }, "dependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/manager": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/manager": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", "@types/ejs": "^3.1.1", "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10", "browser-assert": "^1.2.1", @@ -69,5 +69,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/builder-vite/package.json b/code/lib/builder-vite/package.json index fcb6fed5af6..369f83ab055 100644 --- a/code/lib/builder-vite/package.json +++ b/code/lib/builder-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-vite", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "A plugin to run and build Storybooks with Vite", "homepage": "https://github.com/storybookjs/storybook/tree/main/code/lib/builder-vite/#readme", "repository": { @@ -19,15 +19,15 @@ }, "dependencies": { "@joshwooding/vite-plugin-react-docgen-typescript": "0.0.5", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", "@storybook/mdx2-csf": "next", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/preview": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/source-loader": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/preview": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/source-loader": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@vitejs/plugin-react": "^2.0.0", "browser-assert": "^1.2.1", "es-module-lexer": "^0.9.3", @@ -48,5 +48,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json index ffb1aaa334e..18e5eb47514 100644 --- a/code/lib/builder-webpack5/package.json +++ b/code/lib/builder-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-webpack5", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -54,23 +54,23 @@ }, "dependencies": { "@babel/core": "^7.12.10", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/core-webpack": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/preview": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/router": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/core-webpack": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/preview": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/router": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", "@types/node": "^16.0.0", "@types/semver": "^7.3.4", "babel-loader": "^8.2.5", @@ -124,5 +124,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/channel-postmessage/package.json b/code/lib/channel-postmessage/package.json index 1b676a31d54..545817e83f9 100644 --- a/code/lib/channel-postmessage/package.json +++ b/code/lib/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -42,9 +42,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", "global": "^4.4.0", "qs": "^6.10.0", "telejson": "^6.0.8" @@ -60,5 +60,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/channel-websocket/package.json b/code/lib/channel-websocket/package.json index 7372527e2a8..0b3cfc75aea 100644 --- a/code/lib/channel-websocket/package.json +++ b/code/lib/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -34,8 +34,8 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", "global": "^4.4.0", "telejson": "^6.0.8" }, @@ -45,5 +45,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/channels/package.json b/code/lib/channels/package.json index 9518d25fee5..b1c1a5577e1 100644 --- a/code/lib/channels/package.json +++ b/code/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -52,5 +52,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json index 6bf000d0e72..3705fddd4e5 100644 --- a/code/lib/cli-sb/package.json +++ b/code/lib/cli-sb/package.json @@ -1,6 +1,6 @@ { "name": "sb", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook CLI", "keywords": [ "storybook" @@ -24,7 +24,7 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/cli": "7.0.0-alpha.48" + "@storybook/cli": "7.0.0-alpha.49" }, "devDependencies": { "typescript": "~4.6.3" @@ -32,5 +32,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 484cef2424e..6f6ef30db2b 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -1,6 +1,6 @@ { "name": "storybook", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook CLI", "keywords": [ "storybook" @@ -27,7 +27,7 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/cli": "7.0.0-alpha.48" + "@storybook/cli": "7.0.0-alpha.49" }, "devDependencies": { "typescript": "~4.6.3" @@ -35,5 +35,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 651e93c0d66..ba127377c0a 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook's CLI - easiest method of adding storybook to your projects", "keywords": [ "cli", @@ -43,13 +43,13 @@ "dependencies": { "@babel/core": "^7.12.10", "@babel/preset-env": "^7.12.11", - "@storybook/codemod": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-server": "7.0.0-alpha.48", - "@storybook/csf-tools": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/telemetry": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/codemod": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/core-server": "7.0.0-alpha.49", + "@storybook/csf-tools": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/telemetry": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/semver": "^7.3.4", "boxen": "^5.1.2", "chalk": "^4.1.0", @@ -77,7 +77,7 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/client-api": "7.0.0-alpha.48", + "@storybook/client-api": "7.0.0-alpha.49", "@types/cross-spawn": "^6.0.2", "@types/degit": "^2.8.3", "@types/prompts": "^2.0.9", @@ -99,5 +99,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/cli/src/versions.ts b/code/lib/cli/src/versions.ts index c00a272d65e..64534e8dbee 100644 --- a/code/lib/cli/src/versions.ts +++ b/code/lib/cli/src/versions.ts @@ -1,85 +1,85 @@ // auto generated file, do not edit export default { - '@storybook/addon-a11y': '7.0.0-alpha.48', - '@storybook/addon-actions': '7.0.0-alpha.48', - '@storybook/addon-backgrounds': '7.0.0-alpha.48', - '@storybook/addon-controls': '7.0.0-alpha.48', - '@storybook/addon-docs': '7.0.0-alpha.48', - '@storybook/addon-essentials': '7.0.0-alpha.48', - '@storybook/addon-highlight': '7.0.0-alpha.48', - '@storybook/addon-interactions': '7.0.0-alpha.48', - '@storybook/addon-jest': '7.0.0-alpha.48', - '@storybook/addon-links': '7.0.0-alpha.48', - '@storybook/addon-measure': '7.0.0-alpha.48', - '@storybook/addon-outline': '7.0.0-alpha.48', - '@storybook/addon-storyshots': '7.0.0-alpha.48', - '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.48', - '@storybook/addon-storysource': '7.0.0-alpha.48', - '@storybook/addon-toolbars': '7.0.0-alpha.48', - '@storybook/addon-viewport': '7.0.0-alpha.48', - '@storybook/addons': '7.0.0-alpha.48', - '@storybook/angular': '7.0.0-alpha.48', - '@storybook/api': '7.0.0-alpha.48', - '@storybook/blocks': '7.0.0-alpha.48', - '@storybook/builder-manager': '7.0.0-alpha.48', - '@storybook/builder-vite': '7.0.0-alpha.48', - '@storybook/builder-webpack5': '7.0.0-alpha.48', - '@storybook/channel-postmessage': '7.0.0-alpha.48', - '@storybook/channel-websocket': '7.0.0-alpha.48', - '@storybook/channels': '7.0.0-alpha.48', - '@storybook/cli': '7.0.0-alpha.48', - '@storybook/client-api': '7.0.0-alpha.48', - '@storybook/client-logger': '7.0.0-alpha.48', - '@storybook/codemod': '7.0.0-alpha.48', - '@storybook/components': '7.0.0-alpha.48', - '@storybook/core-client': '7.0.0-alpha.48', - '@storybook/core-common': '7.0.0-alpha.48', - '@storybook/core-events': '7.0.0-alpha.48', - '@storybook/core-server': '7.0.0-alpha.48', - '@storybook/core-webpack': '7.0.0-alpha.48', - '@storybook/csf-tools': '7.0.0-alpha.48', - '@storybook/docs-tools': '7.0.0-alpha.48', - '@storybook/ember': '7.0.0-alpha.48', - '@storybook/html': '7.0.0-alpha.48', - '@storybook/html-webpack5': '7.0.0-alpha.48', - '@storybook/instrumenter': '7.0.0-alpha.48', - '@storybook/nextjs': '7.0.0-alpha.48', - '@storybook/node-logger': '7.0.0-alpha.48', - '@storybook/postinstall': '7.0.0-alpha.48', - '@storybook/preact': '7.0.0-alpha.48', - '@storybook/preact-webpack5': '7.0.0-alpha.48', - '@storybook/preset-html-webpack': '7.0.0-alpha.48', - '@storybook/preset-preact-webpack': '7.0.0-alpha.48', - '@storybook/preset-react-webpack': '7.0.0-alpha.48', - '@storybook/preset-server-webpack': '7.0.0-alpha.48', - '@storybook/preset-svelte-webpack': '7.0.0-alpha.48', - '@storybook/preset-vue-webpack': '7.0.0-alpha.48', - '@storybook/preset-vue3-webpack': '7.0.0-alpha.48', - '@storybook/preset-web-components-webpack': '7.0.0-alpha.48', - '@storybook/preview-web': '7.0.0-alpha.48', - '@storybook/react': '7.0.0-alpha.48', - '@storybook/react-vite': '7.0.0-alpha.48', - '@storybook/react-webpack5': '7.0.0-alpha.48', - '@storybook/router': '7.0.0-alpha.48', - '@storybook/server': '7.0.0-alpha.48', - '@storybook/server-webpack5': '7.0.0-alpha.48', - '@storybook/source-loader': '7.0.0-alpha.48', - '@storybook/store': '7.0.0-alpha.48', - '@storybook/svelte': '7.0.0-alpha.48', - '@storybook/svelte-vite': '7.0.0-alpha.48', - '@storybook/svelte-webpack5': '7.0.0-alpha.48', - '@storybook/telemetry': '7.0.0-alpha.48', - '@storybook/theming': '7.0.0-alpha.48', - '@storybook/manager': '7.0.0-alpha.48', - '@storybook/vue': '7.0.0-alpha.48', - '@storybook/vue-vite': '7.0.0-alpha.48', - '@storybook/vue-webpack5': '7.0.0-alpha.48', - '@storybook/vue3': '7.0.0-alpha.48', - '@storybook/vue3-vite': '7.0.0-alpha.48', - '@storybook/vue3-webpack5': '7.0.0-alpha.48', - '@storybook/web-components': '7.0.0-alpha.48', - '@storybook/web-components-webpack5': '7.0.0-alpha.48', - '@storybook/web-components-vite': '7.0.0-alpha.48', - sb: '7.0.0-alpha.48', - storybook: '7.0.0-alpha.48', + '@storybook/addon-a11y': '7.0.0-alpha.49', + '@storybook/addon-actions': '7.0.0-alpha.49', + '@storybook/addon-backgrounds': '7.0.0-alpha.49', + '@storybook/addon-controls': '7.0.0-alpha.49', + '@storybook/addon-docs': '7.0.0-alpha.49', + '@storybook/addon-essentials': '7.0.0-alpha.49', + '@storybook/addon-highlight': '7.0.0-alpha.49', + '@storybook/addon-interactions': '7.0.0-alpha.49', + '@storybook/addon-jest': '7.0.0-alpha.49', + '@storybook/addon-links': '7.0.0-alpha.49', + '@storybook/addon-measure': '7.0.0-alpha.49', + '@storybook/addon-outline': '7.0.0-alpha.49', + '@storybook/addon-storyshots': '7.0.0-alpha.49', + '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.49', + '@storybook/addon-storysource': '7.0.0-alpha.49', + '@storybook/addon-toolbars': '7.0.0-alpha.49', + '@storybook/addon-viewport': '7.0.0-alpha.49', + '@storybook/addons': '7.0.0-alpha.49', + '@storybook/angular': '7.0.0-alpha.49', + '@storybook/api': '7.0.0-alpha.49', + '@storybook/blocks': '7.0.0-alpha.49', + '@storybook/builder-manager': '7.0.0-alpha.49', + '@storybook/builder-vite': '7.0.0-alpha.49', + '@storybook/builder-webpack5': '7.0.0-alpha.49', + '@storybook/channel-postmessage': '7.0.0-alpha.49', + '@storybook/channel-websocket': '7.0.0-alpha.49', + '@storybook/channels': '7.0.0-alpha.49', + '@storybook/cli': '7.0.0-alpha.49', + '@storybook/client-api': '7.0.0-alpha.49', + '@storybook/client-logger': '7.0.0-alpha.49', + '@storybook/codemod': '7.0.0-alpha.49', + '@storybook/components': '7.0.0-alpha.49', + '@storybook/core-client': '7.0.0-alpha.49', + '@storybook/core-common': '7.0.0-alpha.49', + '@storybook/core-events': '7.0.0-alpha.49', + '@storybook/core-server': '7.0.0-alpha.49', + '@storybook/core-webpack': '7.0.0-alpha.49', + '@storybook/csf-tools': '7.0.0-alpha.49', + '@storybook/docs-tools': '7.0.0-alpha.49', + '@storybook/ember': '7.0.0-alpha.49', + '@storybook/html': '7.0.0-alpha.49', + '@storybook/html-webpack5': '7.0.0-alpha.49', + '@storybook/instrumenter': '7.0.0-alpha.49', + '@storybook/nextjs': '7.0.0-alpha.49', + '@storybook/node-logger': '7.0.0-alpha.49', + '@storybook/postinstall': '7.0.0-alpha.49', + '@storybook/preact': '7.0.0-alpha.49', + '@storybook/preact-webpack5': '7.0.0-alpha.49', + '@storybook/preset-html-webpack': '7.0.0-alpha.49', + '@storybook/preset-preact-webpack': '7.0.0-alpha.49', + '@storybook/preset-react-webpack': '7.0.0-alpha.49', + '@storybook/preset-server-webpack': '7.0.0-alpha.49', + '@storybook/preset-svelte-webpack': '7.0.0-alpha.49', + '@storybook/preset-vue-webpack': '7.0.0-alpha.49', + '@storybook/preset-vue3-webpack': '7.0.0-alpha.49', + '@storybook/preset-web-components-webpack': '7.0.0-alpha.49', + '@storybook/preview-web': '7.0.0-alpha.49', + '@storybook/react': '7.0.0-alpha.49', + '@storybook/react-vite': '7.0.0-alpha.49', + '@storybook/react-webpack5': '7.0.0-alpha.49', + '@storybook/router': '7.0.0-alpha.49', + '@storybook/server': '7.0.0-alpha.49', + '@storybook/server-webpack5': '7.0.0-alpha.49', + '@storybook/source-loader': '7.0.0-alpha.49', + '@storybook/store': '7.0.0-alpha.49', + '@storybook/svelte': '7.0.0-alpha.49', + '@storybook/svelte-vite': '7.0.0-alpha.49', + '@storybook/svelte-webpack5': '7.0.0-alpha.49', + '@storybook/telemetry': '7.0.0-alpha.49', + '@storybook/theming': '7.0.0-alpha.49', + '@storybook/manager': '7.0.0-alpha.49', + '@storybook/vue': '7.0.0-alpha.49', + '@storybook/vue-vite': '7.0.0-alpha.49', + '@storybook/vue-webpack5': '7.0.0-alpha.49', + '@storybook/vue3': '7.0.0-alpha.49', + '@storybook/vue3-vite': '7.0.0-alpha.49', + '@storybook/vue3-webpack5': '7.0.0-alpha.49', + '@storybook/web-components': '7.0.0-alpha.49', + '@storybook/web-components-webpack5': '7.0.0-alpha.49', + '@storybook/web-components-vite': '7.0.0-alpha.49', + sb: '7.0.0-alpha.49', + storybook: '7.0.0-alpha.49', }; diff --git a/code/lib/cli/src/window.d.ts b/code/lib/cli/src/window.d.ts index 0adbb33da3b..7a5da303ea6 100644 --- a/code/lib/cli/src/window.d.ts +++ b/code/lib/cli/src/window.d.ts @@ -1,8 +1,8 @@ -import type { Framework } from '@storybook/types'; +import type { Renderer } from '@storybook/types'; import type { StoryStore } from '@storybook/client-api'; declare global { interface Window { - __STORYBOOK_STORY_STORE__: StoryStore; + __STORYBOOK_STORY_STORE__: StoryStore; } } diff --git a/code/lib/client-api/package.json b/code/lib/client-api/package.json index 26f9f27e31d..8d85202539f 100644 --- a/code/lib/client-api/package.json +++ b/code/lib/client-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-api", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook Client API", "keywords": [ "storybook" @@ -42,11 +42,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/csf": "next", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/csf": "0.0.2-next.5", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/qs": "^6.9.5", "@types/webpack-env": "^1.16.4", "global": "^4.4.0", @@ -56,7 +56,7 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/core-common": "7.0.0-alpha.48", + "@storybook/core-common": "7.0.0-alpha.49", "typescript": "~4.6.3" }, "peerDependencies": { @@ -71,5 +71,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/client-api/src/ClientApi.ts b/code/lib/client-api/src/ClientApi.ts index b09c69a5ec6..d0d61f76e17 100644 --- a/code/lib/client-api/src/ClientApi.ts +++ b/code/lib/client-api/src/ClientApi.ts @@ -8,7 +8,7 @@ import type { Args, StepRunner, ArgTypes, - Framework, + Renderer, DecoratorFunction, Parameters, ArgTypesEnhancer, @@ -31,7 +31,7 @@ import { StoryStoreFacade } from './StoryStoreFacade'; // ClientApi (and StoreStore) are really singletons. However they are not created until the // relevant framework instanciates them via `start.js`. The good news is this happens right away. -let singleton: ClientApi; +let singleton: ClientApi; const warningAlternatives = { addDecorator: `Instead, use \`export const decorators = [];\` in your \`preview.js\`.`, @@ -60,7 +60,7 @@ const checkMethod = (method: keyof typeof warningAlternatives) => { } }; -export const addDecorator = (decorator: DecoratorFunction) => { +export const addDecorator = (decorator: DecoratorFunction) => { checkMethod('addDecorator'); singleton.addDecorator(decorator); }; @@ -70,7 +70,7 @@ export const addParameters = (parameters: Parameters) => { singleton.addParameters(parameters); }; -export const addLoader = (loader: LoaderFunction) => { +export const addLoader = (loader: LoaderFunction) => { checkMethod('addLoader'); singleton.addLoader(loader); }; @@ -85,12 +85,12 @@ export const addArgTypes = (argTypes: ArgTypes) => { singleton.addArgTypes(argTypes); }; -export const addArgsEnhancer = (enhancer: ArgsEnhancer) => { +export const addArgsEnhancer = (enhancer: ArgsEnhancer) => { checkMethod('addArgsEnhancer'); singleton.addArgsEnhancer(enhancer); }; -export const addArgTypesEnhancer = (enhancer: ArgTypesEnhancer) => { +export const addArgTypesEnhancer = (enhancer: ArgTypesEnhancer) => { checkMethod('addArgTypesEnhancer'); singleton.addArgTypesEnhancer(enhancer); }; @@ -105,18 +105,18 @@ export const getGlobalRender = () => { return singleton.facade.projectAnnotations.render; }; -export const setGlobalRender = (render: StoryFn) => { +export const setGlobalRender = (render: StoryFn) => { checkMethod('setGlobalRender'); singleton.facade.projectAnnotations.render = render; }; const invalidStoryTypes = new Set(['string', 'number', 'boolean', 'symbol']); -export class ClientApi { - facade: StoryStoreFacade; +export class ClientApi { + facade: StoryStoreFacade; - storyStore?: StoryStore; + storyStore?: StoryStore; - private addons: Addon_ClientApiAddons; + private addons: Addon_ClientApiAddons; onImportFnChanged?: ({ importFn }: { importFn: Store_ModuleImportFn }) => void; @@ -124,7 +124,7 @@ export class ClientApi { // just use numeric indexes private lastFileName = 0; - constructor({ storyStore }: { storyStore?: StoryStore } = {}) { + constructor({ storyStore }: { storyStore?: StoryStore } = {}) { this.facade = new StoryStoreFacade(); this.addons = {}; @@ -146,7 +146,7 @@ export class ClientApi { return this.facade.getStoryIndex(this.storyStore); } - addDecorator = (decorator: DecoratorFunction) => { + addDecorator = (decorator: DecoratorFunction) => { this.facade.projectAnnotations.decorators.push(decorator); }; @@ -179,7 +179,7 @@ export class ClientApi { ); }; - addLoader = (loader: LoaderFunction) => { + addLoader = (loader: LoaderFunction) => { this.facade.projectAnnotations.loaders.push(loader); }; @@ -197,11 +197,11 @@ export class ClientApi { }; }; - addArgsEnhancer = (enhancer: ArgsEnhancer) => { + addArgsEnhancer = (enhancer: ArgsEnhancer) => { this.facade.projectAnnotations.argsEnhancers.push(enhancer); }; - addArgTypesEnhancer = (enhancer: ArgTypesEnhancer) => { + addArgTypesEnhancer = (enhancer: ArgTypesEnhancer) => { this.facade.projectAnnotations.argTypesEnhancers.push(enhancer); }; @@ -219,7 +219,7 @@ export class ClientApi { } // what are the occasions that "m" is a boolean vs an obj - storiesOf = (kind: string, m?: NodeModule): Addon_StoryApi => { + storiesOf = (kind: string, m?: NodeModule): Addon_StoryApi => { if (!kind && typeof kind !== 'string') { throw new Error('Invalid or missing kind provided for stories, should be a string'); } @@ -275,7 +275,7 @@ export class ClientApi { } let hasAdded = false; - const api: Addon_StoryApi = { + const api: Addon_StoryApi = { kind: kind.toString(), add: () => api, addDecorator: () => api, @@ -292,7 +292,7 @@ export class ClientApi { }; }); - const meta: Store_NormalizedComponentAnnotations = { + const meta: Store_NormalizedComponentAnnotations = { id: sanitize(kind), title: kind, decorators: [], @@ -304,7 +304,7 @@ export class ClientApi { this._addedExports[fileName] = { default: meta }; let counter = 0; - api.add = (storyName: string, storyFn: StoryFn, parameters: Parameters = {}) => { + api.add = (storyName: string, storyFn: StoryFn, parameters: Parameters = {}) => { hasAdded = true; if (typeof storyName !== 'string') { @@ -340,7 +340,7 @@ export class ClientApi { return api; }; - api.addDecorator = (decorator: DecoratorFunction) => { + api.addDecorator = (decorator: DecoratorFunction) => { if (hasAdded) throw new Error(`You cannot add a decorator after the first story for a kind. Read more here: https://github.com/storybookjs/storybook/blob/master/MIGRATION.md#can-no-longer-add-decoratorsparameters-after-stories`); @@ -349,7 +349,7 @@ Read more here: https://github.com/storybookjs/storybook/blob/master/MIGRATION.m return api; }; - api.addLoader = (loader: LoaderFunction) => { + api.addLoader = (loader: LoaderFunction) => { if (hasAdded) throw new Error(`You cannot add a loader after the first story for a kind.`); meta.loaders.push(loader); diff --git a/code/lib/client-api/src/StoryStoreFacade.ts b/code/lib/client-api/src/StoryStoreFacade.ts index a7a1d6c8f1c..c62c8e2e6c6 100644 --- a/code/lib/client-api/src/StoryStoreFacade.ts +++ b/code/lib/client-api/src/StoryStoreFacade.ts @@ -5,7 +5,7 @@ import { SynchronousPromise } from 'synchronous-promise'; import { toId, isExportStory, storyNameFromExport } from '@storybook/csf'; import type { Addon_IndexEntry, - Framework, + Renderer, ComponentId, DocsOptions, Parameters, @@ -21,8 +21,8 @@ import type { StoryStore } from '@storybook/store'; import { userOrAutoTitle, sortStoriesV6 } from '@storybook/store'; import { logger } from '@storybook/client-logger'; -export class StoryStoreFacade { - projectAnnotations: Store_NormalizedProjectAnnotations; +export class StoryStoreFacade { + projectAnnotations: Store_NormalizedProjectAnnotations; entries: Record; @@ -54,22 +54,22 @@ export class StoryStoreFacade { }); } - getStoryIndex(store: StoryStore) { + getStoryIndex(store: StoryStore) { const fileNameOrder = Object.keys(this.csfExports); const storySortParameter = this.projectAnnotations.parameters?.options?.storySort; const storyEntries = Object.entries(this.entries); // Add the kind parameters and global parameters to each entry - const sortableV6: [StoryId, Store_Story, Parameters, Parameters][] = + const sortableV6: [StoryId, Store_Story, Parameters, Parameters][] = storyEntries.map(([storyId, { type, importPath, ...entry }]) => { const exports = this.csfExports[importPath]; - const csfFile = store.processCSFFileWithCache( + const csfFile = store.processCSFFileWithCache( exports, importPath, exports.default.title ); - let storyLike: Store_Story; + let storyLike: Store_Story; if (type === 'story') { storyLike = store.storyFromCSFFile({ storyId, csfFile }); } else { diff --git a/code/lib/client-logger/package.json b/code/lib/client-logger/package.json index ec0ed24068e..5f7cc3c273c 100644 --- a/code/lib/client-logger/package.json +++ b/code/lib/client-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-logger", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -55,5 +55,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index 61a87d4def3..277954cf4fb 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "A collection of codemod scripts written with JSCodeshift", "keywords": [ "storybook" @@ -38,10 +38,10 @@ }, "dependencies": { "@babel/types": "^7.12.11", - "@storybook/csf": "next", - "@storybook/csf-tools": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/csf": "0.0.2-next.5", + "@storybook/csf-tools": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "cross-spawn": "^7.0.3", "globby": "^11.0.2", "jscodeshift": "^0.13.1", @@ -64,5 +64,5 @@ "./src/index.js" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/core-client/package.json b/code/lib/core-client/package.json index 33788fffd9f..98df76cace1 100644 --- a/code/lib/core-client/package.json +++ b/code/lib/core-client/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-client", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -35,17 +35,17 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/csf": "next", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/csf": "0.0.2-next.5", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "util-deprecate": "^1.0.2" }, @@ -65,5 +65,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/core-client/src/start.ts b/code/lib/core-client/src/start.ts index 99e63c7203a..9c7d69bb5cb 100644 --- a/code/lib/core-client/src/start.ts +++ b/code/lib/core-client/src/start.ts @@ -2,7 +2,7 @@ import global from 'global'; import { ClientApi } from '@storybook/client-api'; import { PreviewWeb } from '@storybook/preview-web'; -import type { Framework, ArgsStoryFn, Loadable, Path, ProjectAnnotations } from '@storybook/types'; +import type { Renderer, ArgsStoryFn, Loadable, Path, ProjectAnnotations } from '@storybook/types'; import { createChannel } from '@storybook/channel-postmessage'; import { addons } from '@storybook/addons'; import { FORCE_RE_RENDER } from '@storybook/core-events'; @@ -15,9 +15,9 @@ const removedApi = (name: string) => () => { throw new Error(`@storybook/client-api:${name} was removed in storyStoreV7.`); }; -interface CoreClient_RendererImplementation { - decorateStory?: ProjectAnnotations['applyDecorators']; - render?: ArgsStoryFn; +interface CoreClient_RendererImplementation { + decorateStory?: ProjectAnnotations['applyDecorators']; + render?: ArgsStoryFn; } interface CoreClient_ClientAPIFacade { @@ -27,19 +27,19 @@ interface CoreClient_ClientAPIFacade { raw: (...args: any[]) => never; } -interface CoreClient_StartReturnValue { +interface CoreClient_StartReturnValue { /* deprecated */ forceReRender: () => void; /* deprecated */ configure: any; /* deprecated */ - clientApi: ClientApi | CoreClient_ClientAPIFacade; + clientApi: ClientApi | CoreClient_ClientAPIFacade; } -export function start( - renderToCanvas: ProjectAnnotations['renderToCanvas'], - { decorateStory, render }: CoreClient_RendererImplementation = {} -): CoreClient_StartReturnValue { +export function start( + renderToCanvas: ProjectAnnotations['renderToCanvas'], + { decorateStory, render }: CoreClient_RendererImplementation = {} +): CoreClient_StartReturnValue { if (globalWindow) { // To enable user code to detect if it is running in Storybook globalWindow.IS_STORYBOOK = true; @@ -59,8 +59,8 @@ export function start( const channel = createChannel({ page: 'preview' }); addons.setChannel(channel); - const clientApi = new ClientApi(); - const preview = new PreviewWeb(); + const clientApi = new ClientApi(); + const preview = new PreviewWeb(); let initialized = false; const importFn = (path: Path) => clientApi.importFn(path); diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index 78bf96fe271..bac9dfabcd2 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-common", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -47,8 +47,8 @@ }, "dependencies": { "@babel/core": "^7.12.10", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/babel__core": "^7.0.0", "@types/express": "^4.7.0", "@types/node": "^16.0.0", @@ -97,5 +97,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/core-events/package.json b/code/lib/core-events/package.json index 2b1a9721a0b..f307ed82769 100644 --- a/code/lib/core-events/package.json +++ b/code/lib/core-events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-events", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Event names used in storybook core", "keywords": [ "storybook" @@ -52,5 +52,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index 1739945e976..8584853295b 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-server", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -35,17 +35,17 @@ "dependencies": { "@aw-web-design/x-default-browser": "1.4.88", "@discoveryjs/json-ext": "^0.5.3", - "@storybook/builder-manager": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/csf": "next", - "@storybook/csf-tools": "7.0.0-alpha.48", + "@storybook/builder-manager": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/csf": "0.0.2-next.5", + "@storybook/csf-tools": "7.0.0-alpha.49", "@storybook/docs-mdx": "0.0.1-canary.12433cf.0", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/telemetry": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/telemetry": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/node": "^16.0.0", "@types/node-fetch": "^2.5.7", "@types/pretty-hrtime": "^1.0.0", @@ -77,7 +77,7 @@ "ws": "^8.2.3" }, "devDependencies": { - "@storybook/builder-webpack5": "7.0.0-alpha.48", + "@storybook/builder-webpack5": "7.0.0-alpha.49", "@types/compression": "^1.7.0", "@types/ip": "^1.1.0", "@types/serve-favicon": "^2.5.2", @@ -103,5 +103,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json index 757e358853e..45d30fb90bc 100644 --- a/code/lib/core-webpack/package.json +++ b/code/lib/core-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -42,9 +42,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/node": "^16.0.0", "ts-dedent": "^2.0.0" }, @@ -61,5 +61,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json index bf9f23a7e56..b22c230671b 100644 --- a/code/lib/csf-plugin/package.json +++ b/code/lib/csf-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-plugin", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Enrich CSF files via static analysis", "keywords": [ "storybook" @@ -42,7 +42,7 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/csf-tools": "7.0.0-alpha.48", + "@storybook/csf-tools": "7.0.0-alpha.49", "unplugin": "^0.10.2" }, "devDependencies": { @@ -56,5 +56,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json index 0baf282324c..862ab1eb903 100644 --- a/code/lib/csf-tools/package.json +++ b/code/lib/csf-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-tools", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -43,8 +43,8 @@ }, "dependencies": { "@babel/types": "^7.12.11", - "@storybook/csf": "next", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/csf": "0.0.2-next.5", + "@storybook/types": "7.0.0-alpha.49", "fs-extra": "^9.0.1", "ts-dedent": "^2.0.0" }, @@ -64,5 +64,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json index b0c9065aa27..f5479de0769 100644 --- a/code/lib/docs-tools/package.json +++ b/code/lib/docs-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/docs-tools", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Shared utility functions for frameworks to implement docs", "keywords": [ "storybook" @@ -43,9 +43,9 @@ }, "dependencies": { "@babel/core": "^7.12.10", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "doctrine": "^3.0.0", "lodash": "^4.17.21" }, @@ -62,5 +62,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts b/code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts index f339c4d68b6..aa2d8c13e5c 100644 --- a/code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts +++ b/code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts @@ -1,8 +1,8 @@ -import type { Framework, StoryContextForEnhancers } from '@storybook/types'; +import type { Renderer, StoryContextForEnhancers } from '@storybook/types'; import { combineParameters } from '@storybook/store'; -export const enhanceArgTypes = ( - context: StoryContextForEnhancers +export const enhanceArgTypes = ( + context: StoryContextForEnhancers ) => { const { component, diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index 438b2693856..79828f15eb6 100644 --- a/code/lib/instrumenter/package.json +++ b/code/lib/instrumenter/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/instrumenter", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -42,10 +42,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", "core-js": "^3.8.2", "global": "^4.4.0" }, @@ -60,5 +60,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/node-logger/package.json b/code/lib/node-logger/package.json index 8b3c1ca3bee..9fd13701c4b 100644 --- a/code/lib/node-logger/package.json +++ b/code/lib/node-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/node-logger", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -59,5 +59,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/postinstall/package.json b/code/lib/postinstall/package.json index 914ed77992a..2722713bfef 100644 --- a/code/lib/postinstall/package.json +++ b/code/lib/postinstall/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/postinstall", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook addons postinstall utilities", "keywords": [ "api", @@ -56,5 +56,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/preview-web/package.json b/code/lib/preview-web/package.json index 0a636823871..7b7a267e371 100644 --- a/code/lib/preview-web/package.json +++ b/code/lib/preview-web/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview-web", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -42,12 +42,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "ansi-to-html": "^0.6.11", "global": "^4.4.0", "lodash": "^4.17.21", @@ -57,7 +57,7 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/channel-postmessage": "7.0.0-alpha.48", + "@storybook/channel-postmessage": "7.0.0-alpha.49", "react": "16.14.0", "ts-jest": "^28.0.8", "typescript": "~4.6.3" @@ -70,5 +70,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/preview-web/src/Preview.tsx b/code/lib/preview-web/src/Preview.tsx index d01e8169e4a..75e0b564a64 100644 --- a/code/lib/preview-web/src/Preview.tsx +++ b/code/lib/preview-web/src/Preview.tsx @@ -17,7 +17,7 @@ import { logger, deprecate } from '@storybook/client-logger'; import type { Channel } from '@storybook/channels'; import { addons } from '@storybook/addons'; import type { - Framework, + Renderer, Args, Globals, Store_ModuleImportFn, @@ -41,7 +41,7 @@ const STORY_INDEX_PATH = './index.json'; export type MaybePromise = Promise | T; -export class Preview { +export class Preview { serverChannel?: Channel; storyStore: StoryStore; diff --git a/code/lib/preview-web/src/PreviewWeb.test.ts b/code/lib/preview-web/src/PreviewWeb.test.ts index b32229c319d..5b3cbc67064 100644 --- a/code/lib/preview-web/src/PreviewWeb.test.ts +++ b/code/lib/preview-web/src/PreviewWeb.test.ts @@ -29,7 +29,7 @@ import { } from '@storybook/core-events'; import { logger } from '@storybook/client-logger'; import { addons, mockChannel as createMockChannel } from '@storybook/addons'; -import type { Framework } from '@storybook/types'; +import type { Renderer } from '@storybook/types'; import type { ModuleImportFn, WebProjectAnnotations } from '@storybook/store'; import { mocked } from 'ts-jest/utils'; @@ -110,7 +110,7 @@ async function createAndRenderPreview({ getProjectAnnotations: inputGetProjectAnnotations = getProjectAnnotations, }: { importFn?: ModuleImportFn; - getProjectAnnotations?: () => WebProjectAnnotations; + getProjectAnnotations?: () => WebProjectAnnotations; } = {}) { const preview = new PreviewWeb(); await preview.initialize({ diff --git a/code/lib/preview-web/src/PreviewWeb.tsx b/code/lib/preview-web/src/PreviewWeb.tsx index 4e21f0b5f35..a1ed45f445c 100644 --- a/code/lib/preview-web/src/PreviewWeb.tsx +++ b/code/lib/preview-web/src/PreviewWeb.tsx @@ -1,10 +1,10 @@ -import type { Framework } from '@storybook/types'; +import type { Renderer } from '@storybook/types'; import { PreviewWithSelection } from './PreviewWithSelection'; import { UrlStore } from './UrlStore'; import { WebView } from './WebView'; -export class PreviewWeb extends PreviewWithSelection { +export class PreviewWeb extends PreviewWithSelection { constructor() { super(new UrlStore(), new WebView()); } diff --git a/code/lib/preview-web/src/PreviewWithSelection.tsx b/code/lib/preview-web/src/PreviewWithSelection.tsx index e4d1802b9bf..4ba91ec99a7 100644 --- a/code/lib/preview-web/src/PreviewWithSelection.tsx +++ b/code/lib/preview-web/src/PreviewWithSelection.tsx @@ -19,7 +19,7 @@ import { } from '@storybook/core-events'; import { logger } from '@storybook/client-logger'; import type { - Framework, + Renderer, Args, Globals, Store_ModuleImportFn, @@ -48,18 +48,18 @@ function focusInInput(event: Event) { return /input|textarea/i.test(target.tagName) || target.getAttribute('contenteditable') !== null; } -type PossibleRender = +type PossibleRender = | StoryRender | TemplateDocsRender | StandaloneDocsRender; -function isStoryRender( +function isStoryRender( r: PossibleRender ): r is StoryRender { return r.type === 'story'; } -export class PreviewWithSelection extends Preview { +export class PreviewWithSelection extends Preview { currentSelection?: Store_Selection; currentRender?: PossibleRender; diff --git a/code/lib/preview-web/src/docs-context/DocsContext.ts b/code/lib/preview-web/src/docs-context/DocsContext.ts index 687cac7295a..953041cf668 100644 --- a/code/lib/preview-web/src/docs-context/DocsContext.ts +++ b/code/lib/preview-web/src/docs-context/DocsContext.ts @@ -1,5 +1,5 @@ import type { - Framework, + Renderer, Store_CSFFile, Store_ModuleExport, Store_ModuleExports, @@ -13,23 +13,23 @@ import type { Channel } from '@storybook/channels'; import type { DocsContextProps } from './DocsContextProps'; -export class DocsContext implements DocsContextProps { - private componentStoriesValue: Store_Story[]; +export class DocsContext implements DocsContextProps { + private componentStoriesValue: Store_Story[]; - private storyIdToCSFFile: Map>; + private storyIdToCSFFile: Map>; private exportToStoryId: Map; private nameToStoryId: Map; - private primaryStory?: Store_Story; + private primaryStory?: Store_Story; constructor( public channel: Channel, - protected store: StoryStore, + protected store: StoryStore, public renderStoryToElement: DocsContextProps['renderStoryToElement'], /** The CSF files known (via the index) to be refererenced by this docs file */ - csfFiles: Store_CSFFile[], + csfFiles: Store_CSFFile[], componentStoriesFromAllCsfFiles = true ) { this.storyIdToCSFFile = new Map(); @@ -45,7 +45,7 @@ export class DocsContext implements DocsContextPro // This docs entry references this CSF file and can syncronously load the stories, as well // as reference them by module export. If the CSF is part of the "component" stories, they // can also be referenced by name and are in the componentStories list. - referenceCSFFile(csfFile: Store_CSFFile, addToComponentStories: boolean) { + referenceCSFFile(csfFile: Store_CSFFile, addToComponentStories: boolean) { Object.values(csfFile.stories).forEach((annotation) => { this.storyIdToCSFFile.set(annotation.id, csfFile); this.exportToStoryId.set(annotation.moduleExport, annotation.id); @@ -96,11 +96,11 @@ export class DocsContext implements DocsContextPro return this.store.storyFromCSFFile({ storyId, csfFile }); }; - getStoryContext = (story: Store_Story) => { + getStoryContext = (story: Store_Story) => { return { ...this.store.getStoryContext(story), viewMode: 'docs', - } as StoryContextForLoaders; + } as StoryContextForLoaders; }; loadStory = (id: StoryId) => { diff --git a/code/lib/preview-web/src/docs-context/DocsContextProps.ts b/code/lib/preview-web/src/docs-context/DocsContextProps.ts index ddb1c66d4e7..268992e5e66 100644 --- a/code/lib/preview-web/src/docs-context/DocsContextProps.ts +++ b/code/lib/preview-web/src/docs-context/DocsContextProps.ts @@ -1,5 +1,5 @@ import type { - Framework, + Renderer, Store_ModuleExport, Store_ModuleExports, Store_Story, @@ -10,7 +10,7 @@ import type { import type { Channel } from '@storybook/channels'; import type { StoryRenderOptions } from '../render/StoryRender'; -export interface DocsContextProps { +export interface DocsContextProps { /** * Register the CSF file that this docs entry represents. * Used by the `` block. @@ -35,26 +35,26 @@ export interface DocsContextProps { * Syncronously find a story by id (if the id is not provided, this will look up the primary * story in the CSF file, if such a file exists). */ - storyById: (id?: StoryId) => Store_Story; + storyById: (id?: StoryId) => Store_Story; /** * Syncronously find all stories of the component referenced by the CSF file. */ - componentStories: () => Store_Story[]; + componentStories: () => Store_Story[]; /** * Get the story context of the referenced story. */ - getStoryContext: (story: Store_Story) => StoryContextForLoaders; + getStoryContext: (story: Store_Story) => StoryContextForLoaders; /** * Asyncronously load an arbitrary story by id. */ - loadStory: (id: StoryId) => Promise>; + loadStory: (id: StoryId) => Promise>; /** * Render a story to a given HTML element and keep it up to date across context changes */ renderStoryToElement: ( - story: Store_Story, + story: Store_Story, element: HTMLElement, options: StoryRenderOptions ) => () => Promise; diff --git a/code/lib/preview-web/src/docs-context/DocsRenderFunction.ts b/code/lib/preview-web/src/docs-context/DocsRenderFunction.ts index 441b8d33d3e..bef733c3e96 100644 --- a/code/lib/preview-web/src/docs-context/DocsRenderFunction.ts +++ b/code/lib/preview-web/src/docs-context/DocsRenderFunction.ts @@ -1,8 +1,8 @@ -import type { Framework, Parameters } from '@storybook/types'; +import type { Renderer, Parameters } from '@storybook/types'; import type { DocsContextProps } from './DocsContextProps'; -export type DocsRenderFunction = ( - docsContext: DocsContextProps, +export type DocsRenderFunction = ( + docsContext: DocsContextProps, docsParameters: Parameters, element: HTMLElement, callback: () => void diff --git a/code/lib/preview-web/src/render/Render.ts b/code/lib/preview-web/src/render/Render.ts index 4e74f5d8439..737a058497c 100644 --- a/code/lib/preview-web/src/render/Render.ts +++ b/code/lib/preview-web/src/render/Render.ts @@ -1,4 +1,4 @@ -import type { StoryId, Framework } from '@storybook/types'; +import type { StoryId, Renderer } from '@storybook/types'; import type { StoryRenderOptions } from './StoryRender'; export type RenderType = 'story' | 'docs'; @@ -10,16 +10,16 @@ export type RenderType = 'story' | 'docs'; * - Tracking the state of the rendering as it moves between preparing, rendering and tearing down. * - Tracking what is rendered to know if a change requires re-rendering or teardown + recreation. */ -export interface Render { +export interface Render { type: RenderType; id: StoryId; isPreparing: () => boolean; - isEqual: (other: Render) => boolean; + isEqual: (other: Render) => boolean; disableKeyListeners: boolean; teardown?: (options: { viewModeChanged: boolean }) => Promise; torndown: boolean; renderToElement: ( - canvasElement: TFramework['canvasElement'], + canvasElement: TRenderer['canvasElement'], renderStoryToElement?: any, options?: StoryRenderOptions ) => Promise; diff --git a/code/lib/preview-web/src/render/StandaloneDocsRender.test.ts b/code/lib/preview-web/src/render/StandaloneDocsRender.test.ts index df6733b7206..85ca36938f7 100644 --- a/code/lib/preview-web/src/render/StandaloneDocsRender.test.ts +++ b/code/lib/preview-web/src/render/StandaloneDocsRender.test.ts @@ -1,6 +1,6 @@ import { jest, describe, it, expect } from '@jest/globals'; import { Channel } from '@storybook/channels'; -import type { Framework, Addon_StandaloneDocsIndexEntry } from '@storybook/types'; +import type { Renderer, Addon_StandaloneDocsIndexEntry } from '@storybook/types'; import type { StoryStore } from '@storybook/store'; import { PREPARE_ABORTED } from './Render'; @@ -36,7 +36,7 @@ describe('StandaloneDocsRender', () => { const render = new StandaloneDocsRender( new Channel(), - mockStore as unknown as StoryStore, + mockStore as unknown as StoryStore, entry ); diff --git a/code/lib/preview-web/src/render/StandaloneDocsRender.ts b/code/lib/preview-web/src/render/StandaloneDocsRender.ts index cb22ca9a739..c88b36f7997 100644 --- a/code/lib/preview-web/src/render/StandaloneDocsRender.ts +++ b/code/lib/preview-web/src/render/StandaloneDocsRender.ts @@ -1,6 +1,6 @@ import type { Addon_IndexEntry, - Framework, + Renderer, Store_CSFFile, Store_ModuleExports, StoryId, @@ -24,7 +24,7 @@ import { DocsContext } from '../docs-context/DocsContext'; * - *.mdx file that may or may not reference a specific CSF file with `` */ -export class StandaloneDocsRender implements Render { +export class StandaloneDocsRender implements Render { public readonly type: RenderType = 'docs'; public readonly id: StoryId; @@ -41,11 +41,11 @@ export class StandaloneDocsRender implements Rende public preparing = false; - private csfFiles?: Store_CSFFile[]; + private csfFiles?: Store_CSFFile[]; constructor( protected channel: Channel, - protected store: StoryStore, + protected store: StoryStore, public entry: Addon_IndexEntry ) { this.id = entry.id; @@ -66,22 +66,22 @@ export class StandaloneDocsRender implements Rende this.preparing = false; } - isEqual(other: Render): boolean { + isEqual(other: Render): boolean { return !!( this.id === other.id && this.exports && - this.exports === (other as StandaloneDocsRender).exports + this.exports === (other as StandaloneDocsRender).exports ); } async renderToElement( - canvasElement: TFramework['canvasElement'], + canvasElement: TRenderer['canvasElement'], renderStoryToElement: DocsContextProps['renderStoryToElement'] ) { if (!this.exports || !this.csfFiles || !this.store.projectAnnotations) throw new Error('Cannot render docs before preparing'); - const docsContext = new DocsContext( + const docsContext = new DocsContext( this.channel, this.store, renderStoryToElement, @@ -98,7 +98,7 @@ export class StandaloneDocsRender implements Rende const docsParameter = { ...docs, page: this.exports.default }; const renderer = await docs.renderer(); - const { render } = renderer as { render: DocsRenderFunction }; + const { render } = renderer as { render: DocsRenderFunction }; const renderDocs = async () => { await new Promise((r) => // NOTE: it isn't currently possible to use a docs renderer outside of "web" mode. diff --git a/code/lib/preview-web/src/render/StoryRender.test.ts b/code/lib/preview-web/src/render/StoryRender.test.ts index 3813597ae5e..13011b3db51 100644 --- a/code/lib/preview-web/src/render/StoryRender.test.ts +++ b/code/lib/preview-web/src/render/StoryRender.test.ts @@ -1,6 +1,6 @@ import { jest, describe, it, expect } from '@jest/globals'; import { Channel } from '@storybook/channels'; -import type { Framework, Addon_StoryIndexEntry } from '@storybook/types'; +import type { Renderer, Addon_StoryIndexEntry } from '@storybook/types'; import type { StoryStore } from '@storybook/store'; import { PREPARE_ABORTED } from './Render'; @@ -35,7 +35,7 @@ describe('StoryRender', () => { const render = new StoryRender( new Channel(), - mockStore as unknown as StoryStore, + mockStore as unknown as StoryStore, jest.fn(), {} as any, entry.id, diff --git a/code/lib/preview-web/src/render/StoryRender.ts b/code/lib/preview-web/src/render/StoryRender.ts index c9206457b7f..d9a02fd3e3f 100644 --- a/code/lib/preview-web/src/render/StoryRender.ts +++ b/code/lib/preview-web/src/render/StoryRender.ts @@ -1,6 +1,6 @@ import global from 'global'; import type { - Framework, + Renderer, Store_RenderContext, RenderToCanvas, Store_Story, @@ -42,8 +42,8 @@ function serializeError(error: any) { } } -export type RenderContextCallbacks = Pick< - Store_RenderContext, +export type RenderContextCallbacks = Pick< + Store_RenderContext, 'showMain' | 'showError' | 'showException' >; @@ -51,16 +51,16 @@ export type StoryRenderOptions = { autoplay?: boolean; }; -export class StoryRender implements Render { +export class StoryRender implements Render { public type: RenderType = 'story'; - public story?: Store_Story; + public story?: Store_Story; public phase?: RenderPhase; private abortController?: AbortController; - private canvasElement?: TFramework['canvasElement']; + private canvasElement?: TRenderer['canvasElement']; private notYetRendered = true; @@ -72,13 +72,13 @@ export class StoryRender implements Render, - private renderToScreen: RenderToCanvas, - private callbacks: RenderContextCallbacks, + public store: StoryStore, + private renderToScreen: RenderToCanvas, + private callbacks: RenderContextCallbacks, public id: StoryId, public viewMode: ViewMode, public renderOptions: StoryRenderOptions = { autoplay: true }, - story?: Store_Story + story?: Store_Story ) { this.abortController = new AbortController(); @@ -109,17 +109,17 @@ export class StoryRender implements Render); + this.store.cleanupStory(this.story as Store_Story); throw PREPARE_ABORTED; } } // The two story "renders" are equal and have both loaded the same story - isEqual(other: Render): boolean { + isEqual(other: Render): boolean { return !!( this.id === other.id && this.story && - this.story === (other as StoryRender).story + this.story === (other as StoryRender).story ); } @@ -131,7 +131,7 @@ export class StoryRender implements Render implements Render); + } as StoryContextForLoaders); }); if (abortSignal.aborted) { return; } - const renderStoryContext: StoryContext = { + const renderStoryContext: StoryContext = { ...loadedContext!, // By this stage, it is possible that new args/globals have been received for this story // and we need to ensure we render it with the new values ...this.storyContext(), abortSignal, - // We should consider parameterizing the story types with TFramework['canvasElement'] in the future + // We should consider parameterizing the story types with TRenderer['canvasElement'] in the future canvasElement: canvasElement as any, }; - const renderContext: Store_RenderContext = { + const renderContext: Store_RenderContext = { componentId, title, kind: title, diff --git a/code/lib/preview-web/src/render/TemplateDocsRender.test.ts b/code/lib/preview-web/src/render/TemplateDocsRender.test.ts index bf765bb3d15..22e6199e43b 100644 --- a/code/lib/preview-web/src/render/TemplateDocsRender.test.ts +++ b/code/lib/preview-web/src/render/TemplateDocsRender.test.ts @@ -1,6 +1,6 @@ import { jest, describe, it, expect } from '@jest/globals'; import { Channel } from '@storybook/channels'; -import type { Framework, Addon_TemplateDocsIndexEntry } from '@storybook/types'; +import type { Renderer, Addon_TemplateDocsIndexEntry } from '@storybook/types'; import type { StoryStore } from '@storybook/store'; import { PREPARE_ABORTED } from './Render'; @@ -36,7 +36,7 @@ describe('TemplateDocsRender', () => { const render = new TemplateDocsRender( new Channel(), - mockStore as unknown as StoryStore, + mockStore as unknown as StoryStore, entry ); diff --git a/code/lib/preview-web/src/render/TemplateDocsRender.ts b/code/lib/preview-web/src/render/TemplateDocsRender.ts index 45a2b38196a..58c996df887 100644 --- a/code/lib/preview-web/src/render/TemplateDocsRender.ts +++ b/code/lib/preview-web/src/render/TemplateDocsRender.ts @@ -1,6 +1,6 @@ import type { Addon_IndexEntry, - Framework, + Renderer, Store_CSFFile, Store_Story, StoryId, @@ -27,12 +27,12 @@ import { DocsContext } from '../docs-context/DocsContext'; * - *.stories.mdx files, where the MDX compiler produces a CSF file with a `.parameter.docs.page` * parameter containing the compiled content of the MDX file. */ -export class TemplateDocsRender implements Render { +export class TemplateDocsRender implements Render { public readonly type: RenderType = 'docs'; public readonly id: StoryId; - public story?: Store_Story; + public story?: Store_Story; public rerender?: () => Promise; @@ -44,11 +44,11 @@ export class TemplateDocsRender implements Render< public preparing = false; - private csfFiles?: Store_CSFFile[]; + private csfFiles?: Store_CSFFile[]; constructor( protected channel: Channel, - protected store: StoryStore, + protected store: StoryStore, public entry: Addon_IndexEntry ) { this.id = entry.id; @@ -64,7 +64,7 @@ export class TemplateDocsRender implements Render< if (this.torndown) throw PREPARE_ABORTED; const { importPath, title } = this.entry; - const primaryCsfFile = this.store.processCSFFileWithCache( + const primaryCsfFile = this.store.processCSFFileWithCache( entryExports, importPath, title @@ -83,21 +83,21 @@ export class TemplateDocsRender implements Render< this.preparing = false; } - isEqual(other: Render): boolean { + isEqual(other: Render): boolean { return !!( this.id === other.id && this.story && - this.story === (other as TemplateDocsRender).story + this.story === (other as TemplateDocsRender).story ); } async renderToElement( - canvasElement: TFramework['canvasElement'], + canvasElement: TRenderer['canvasElement'], renderStoryToElement: DocsContextProps['renderStoryToElement'] ) { if (!this.story || !this.csfFiles) throw new Error('Cannot render docs before preparing'); - const docsContext = new DocsContext( + const docsContext = new DocsContext( this.channel, this.store, renderStoryToElement, @@ -113,7 +113,7 @@ export class TemplateDocsRender implements Render< ); const renderer = await docsParameter.renderer(); - const { render } = renderer as { render: DocsRenderFunction }; + const { render } = renderer as { render: DocsRenderFunction }; const renderDocs = async () => { await new Promise((r) => // NOTE: it isn't currently possible to use a docs renderer outside of "web" mode. diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json index d01a080cb7c..79b1c66be89 100644 --- a/code/lib/preview/package.json +++ b/code/lib/preview/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -97,19 +97,19 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "devDependencies": { - "@storybook/api": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", "@storybook/csf": "next", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/router": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/router": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/qs": "^6.9.5", "@types/webpack-env": "^1.16.4", "ansi-to-html": "^0.6.11", diff --git a/code/lib/router/package.json b/code/lib/router/package.json index 85304d5a3d4..39cced199db 100644 --- a/code/lib/router/package.json +++ b/code/lib/router/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/router", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Core Storybook Router", "keywords": [ "storybook" @@ -47,7 +47,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-alpha.48", + "@storybook/client-logger": "7.0.0-alpha.49", "memoizerific": "^1.11.3", "qs": "^6.10.0" }, @@ -74,5 +74,5 @@ "./src/utils.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index f0d6b3e7e9a..4e980fc6acf 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/source-loader", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Source loader", "keywords": [ "lib", @@ -43,8 +43,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/csf": "next", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/csf": "0.0.2-next.5", + "@storybook/types": "7.0.0-alpha.49", "estraverse": "^5.2.0", "lodash": "^4.17.21", "prettier": ">=2.2.1 <=3.0.0" @@ -66,5 +66,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/store/package.json b/code/lib/store/package.json index 89cc002f403..56840e6c62a 100644 --- a/code/lib/store/package.json +++ b/code/lib/store/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/store", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "", "keywords": [ "storybook" @@ -42,11 +42,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/csf": "next", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/csf": "0.0.2-next.5", + "@storybook/types": "7.0.0-alpha.49", "dequal": "^2.0.2", "global": "^4.4.0", "lodash": "^4.17.21", @@ -72,5 +72,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/store/src/StoryStore.test.ts b/code/lib/store/src/StoryStore.test.ts index 02da944424b..e5bcd67272c 100644 --- a/code/lib/store/src/StoryStore.test.ts +++ b/code/lib/store/src/StoryStore.test.ts @@ -1,4 +1,4 @@ -import type { Framework, ProjectAnnotations } from '@storybook/types'; +import type { Renderer, ProjectAnnotations } from '@storybook/types'; import global from 'global'; import { expect } from '@jest/globals'; @@ -444,7 +444,7 @@ describe('StoryStore', () => { const story = await store.loadStory({ storyId: 'component-one--a' }); - const { hooks } = store.getStoryContext(story) as { hooks: HooksContext }; + const { hooks } = store.getStoryContext(story) as { hooks: HooksContext }; hooks.clean = jest.fn(); store.cleanupStory(story); expect(hooks.clean).toHaveBeenCalled(); diff --git a/code/lib/store/src/StoryStore.ts b/code/lib/store/src/StoryStore.ts index b353428e37e..1cca0afd842 100644 --- a/code/lib/store/src/StoryStore.ts +++ b/code/lib/store/src/StoryStore.ts @@ -1,7 +1,7 @@ import memoize from 'memoizerific'; import type { Addon_IndexEntry, - Framework, + Renderer, API_PreparedStoryIndex, ComponentTitle, Parameters, @@ -37,20 +37,20 @@ import { processCSFFile, prepareStory, normalizeProjectAnnotations } from './csf const CSF_CACHE_SIZE = 1000; const STORY_CACHE_SIZE = 10000; -export class StoryStore { +export class StoryStore { storyIndex?: StoryIndexStore; importFn?: Store_ModuleImportFn; - projectAnnotations?: Store_NormalizedProjectAnnotations; + projectAnnotations?: Store_NormalizedProjectAnnotations; globals?: GlobalsStore; args: ArgsStore; - hooks: Record>; + hooks: Record>; - cachedCSFFiles?: Record>; + cachedCSFFiles?: Record>; processCSFFileWithCache: typeof processCSFFile; @@ -77,7 +77,7 @@ export class StoryStore { }); } - setProjectAnnotations(projectAnnotations: ProjectAnnotations) { + setProjectAnnotations(projectAnnotations: ProjectAnnotations) { // By changing `this.projectAnnotations, we implicitly invalidate the `prepareStoryWithCache` this.projectAnnotations = normalizeProjectAnnotations(projectAnnotations); const { globals, globalTypes } = projectAnnotations; @@ -134,7 +134,7 @@ export class StoryStore { } // To load a single CSF file to service a story we need to look up the importPath in the index - loadCSFFileByStoryId(storyId: StoryId): Store_PromiseLike> { + loadCSFFileByStoryId(storyId: StoryId): Store_PromiseLike> { if (!this.storyIndex || !this.importFn) throw new Error(`loadCSFFileByStoryId called before initialization`); @@ -145,7 +145,7 @@ export class StoryStore { ); } - loadAllCSFFiles(): Store_PromiseLike['cachedCSFFiles']> { + loadAllCSFFiles(): Store_PromiseLike['cachedCSFFiles']> { if (!this.storyIndex) throw new Error(`loadAllCSFFiles called before initialization`); const importPaths: Record = {}; @@ -164,7 +164,7 @@ export class StoryStore { list.reduce((acc, { importPath, csfFile }) => { acc[importPath] = csfFile; return acc; - }, {} as Record>) + }, {} as Record>) ); } @@ -177,7 +177,7 @@ export class StoryStore { } // Load the CSF file for a story and prepare the story from it and the project annotations. - async loadStory({ storyId }: { storyId: StoryId }): Promise> { + async loadStory({ storyId }: { storyId: StoryId }): Promise> { await this.initializationPromise; const csfFile = await this.loadCSFFileByStoryId(storyId); return this.storyFromCSFFile({ storyId, csfFile }); @@ -190,8 +190,8 @@ export class StoryStore { csfFile, }: { storyId: StoryId; - csfFile: Store_CSFFile; - }): Store_Story { + csfFile: Store_CSFFile; + }): Store_Story { if (!this.projectAnnotations) throw new Error(`storyFromCSFFile called before initialization`); const storyAnnotations = csfFile.stories[storyId]; @@ -214,8 +214,8 @@ export class StoryStore { componentStoriesFromCSFFile({ csfFile, }: { - csfFile: Store_CSFFile; - }): Store_Story[] { + csfFile: Store_CSFFile; + }): Store_Story[] { if (!this.storyIndex) throw new Error(`componentStoriesFromCSFFile called before initialization`); @@ -238,7 +238,7 @@ export class StoryStore { const firstStoryEntry = storyIndex.importPathToEntry(storyImportPath); return this.loadCSFFileByStoryId(firstStoryEntry.id); }), - ])) as [Store_ModuleExports, ...Store_CSFFile[]]; + ])) as [Store_ModuleExports, ...Store_CSFFile[]]; return { entryExports, csfFiles }; } @@ -246,8 +246,8 @@ export class StoryStore { // A prepared story does not include args, globals or hooks. These are stored in the story store // and updated separtely to the (immutable) story. getStoryContext( - story: Store_Story - ): Omit, 'viewMode'> { + story: Store_Story + ): Omit, 'viewMode'> { if (!this.globals) throw new Error(`getStoryContext called before initialization`); return { @@ -258,13 +258,13 @@ export class StoryStore { }; } - cleanupStory(story: Store_Story): void { + cleanupStory(story: Store_Story): void { this.hooks[story.id].clean(); } extract( options: Store_ExtractOptions = { includeDocsOnly: false } - ): Record> { + ): Record> { if (!this.storyIndex) throw new Error(`extract called before initialization`); const { cachedCSFFiles } = this; @@ -380,13 +380,13 @@ export class StoryStore { }; } - raw(): Store_BoundStory[] { + raw(): Store_BoundStory[] { return Object.values(this.extract()) .map(({ id }: { id: StoryId }) => this.fromId(id)) - .filter(Boolean) as Store_BoundStory[]; + .filter(Boolean) as Store_BoundStory[]; } - fromId(storyId: StoryId): Store_BoundStory | null { + fromId(storyId: StoryId): Store_BoundStory | null { if (!this.storyIndex) throw new Error(`fromId called before initialization`); if (!this.cachedCSFFiles) @@ -406,7 +406,7 @@ export class StoryStore { const context = { ...this.getStoryContext(story), viewMode: 'story', - } as StoryContext; + } as StoryContext; return story.unboundStoryFn({ ...context, ...update }); }, diff --git a/code/lib/store/src/args.ts b/code/lib/store/src/args.ts index 407776d0a3c..d8f101b1a07 100644 --- a/code/lib/store/src/args.ts +++ b/code/lib/store/src/args.ts @@ -1,5 +1,5 @@ import { dequal as deepEqual } from 'dequal'; -import type { Framework, Args, ArgTypes, InputType, SBType, StoryContext } from '@storybook/types'; +import type { Renderer, Args, ArgTypes, InputType, SBType, StoryContext } from '@storybook/types'; import { once } from '@storybook/client-logger'; import isPlainObject from 'lodash/isPlainObject'; import { dedent } from 'ts-dedent'; @@ -145,10 +145,7 @@ export const deepDiff = (value: any, update: any): any => { }; export const NO_TARGET_NAME = ''; -export function groupArgsByTarget({ - args, - argTypes, -}: StoryContext) { +export function groupArgsByTarget({ args, argTypes }: StoryContext) { const groupedArgs: Record> = {}; (Object.entries(args) as [keyof TArgs, any][]).forEach(([name, value]) => { const { target = NO_TARGET_NAME } = (argTypes[name] || {}) as { target?: string }; @@ -159,6 +156,6 @@ export function groupArgsByTarget({ return groupedArgs; } -export function noTargetArgs(context: StoryContext) { +export function noTargetArgs(context: StoryContext) { return groupArgsByTarget(context)[NO_TARGET_NAME]; } diff --git a/code/lib/store/src/csf/composeConfigs.ts b/code/lib/store/src/csf/composeConfigs.ts index 6069a26df3e..f7d479363ed 100644 --- a/code/lib/store/src/csf/composeConfigs.ts +++ b/code/lib/store/src/csf/composeConfigs.ts @@ -1,4 +1,4 @@ -import type { Framework, Store_ModuleExports, ProjectAnnotations } from '@storybook/types'; +import type { Renderer, Store_ModuleExports, ProjectAnnotations } from '@storybook/types'; import { combineParameters } from '../parameters'; import { composeStepRunners } from './stepRunners'; @@ -31,9 +31,9 @@ export function getSingletonField( return getField(moduleExportList, field).pop(); } -export function composeConfigs( +export function composeConfigs( moduleExportList: Store_ModuleExports[] -): ProjectAnnotations { +): ProjectAnnotations { const allArgTypeEnhancers = getArrayField(moduleExportList, 'argTypesEnhancers'); const stepRunners = getField(moduleExportList, 'runStep'); @@ -54,6 +54,6 @@ export function composeConfigs( renderToCanvas: getSingletonField(moduleExportList, 'renderToCanvas'), renderToDOM: getSingletonField(moduleExportList, 'renderToDOM'), // deprecated applyDecorators: getSingletonField(moduleExportList, 'applyDecorators'), - runStep: composeStepRunners(stepRunners), + runStep: composeStepRunners(stepRunners), }; } diff --git a/code/lib/store/src/csf/normalizeComponentAnnotations.ts b/code/lib/store/src/csf/normalizeComponentAnnotations.ts index 27addf2c667..4ecb4d4a245 100644 --- a/code/lib/store/src/csf/normalizeComponentAnnotations.ts +++ b/code/lib/store/src/csf/normalizeComponentAnnotations.ts @@ -1,17 +1,17 @@ import { sanitize } from '@storybook/csf'; import type { - Framework, + Renderer, Store_ModuleExports, Store_NormalizedComponentAnnotations, } from '@storybook/types'; import { normalizeInputTypes } from './normalizeInputTypes'; -export function normalizeComponentAnnotations( +export function normalizeComponentAnnotations( defaultExport: Store_ModuleExports['default'], title: string = defaultExport.title, importPath?: string -): Store_NormalizedComponentAnnotations { +): Store_NormalizedComponentAnnotations { const { id, argTypes } = defaultExport; return { id: sanitize(id || title), diff --git a/code/lib/store/src/csf/normalizeProjectAnnotations.ts b/code/lib/store/src/csf/normalizeProjectAnnotations.ts index e4700f6d3fa..679bc43edb4 100644 --- a/code/lib/store/src/csf/normalizeProjectAnnotations.ts +++ b/code/lib/store/src/csf/normalizeProjectAnnotations.ts @@ -1,5 +1,5 @@ import type { - Framework, + Renderer, ArgTypes, ProjectAnnotations, Store_NormalizedProjectAnnotations, @@ -9,12 +9,12 @@ import { inferArgTypes } from '../inferArgTypes'; import { inferControls } from '../inferControls'; import { normalizeInputTypes } from './normalizeInputTypes'; -export function normalizeProjectAnnotations({ +export function normalizeProjectAnnotations({ argTypes, globalTypes, argTypesEnhancers, ...annotations -}: ProjectAnnotations): Store_NormalizedProjectAnnotations { +}: ProjectAnnotations): Store_NormalizedProjectAnnotations { return { ...(argTypes && { argTypes: normalizeInputTypes(argTypes as ArgTypes) }), ...(globalTypes && { globalTypes: normalizeInputTypes(globalTypes) }), diff --git a/code/lib/store/src/csf/normalizeStory.test.ts b/code/lib/store/src/csf/normalizeStory.test.ts index c1374f1957b..5a97b4b5635 100644 --- a/code/lib/store/src/csf/normalizeStory.test.ts +++ b/code/lib/store/src/csf/normalizeStory.test.ts @@ -1,5 +1,5 @@ import { expect, describe, it } from '@jest/globals'; -import type { Framework, StoryAnnotationsOrFn } from '@storybook/types'; +import type { Renderer, StoryAnnotationsOrFn } from '@storybook/types'; import { normalizeStory } from './normalizeStory'; @@ -133,7 +133,7 @@ describe('normalizeStory', () => { }); it('full annotations', () => { - const storyObj: StoryAnnotationsOrFn = { + const storyObj: StoryAnnotationsOrFn = { name: 'story name', parameters: { storyParam: 'val' }, decorators: [() => {}], @@ -174,7 +174,7 @@ describe('normalizeStory', () => { }); it('prefers new annotations to legacy, but combines', () => { - const storyObj: StoryAnnotationsOrFn = { + const storyObj: StoryAnnotationsOrFn = { name: 'story name', parameters: { storyParam: 'val' }, decorators: [() => {}], diff --git a/code/lib/store/src/csf/normalizeStory.ts b/code/lib/store/src/csf/normalizeStory.ts index 96a77f5fdc5..a771b5e83ef 100644 --- a/code/lib/store/src/csf/normalizeStory.ts +++ b/code/lib/store/src/csf/normalizeStory.ts @@ -1,5 +1,5 @@ import type { - Framework, + Renderer, ArgTypes, LegacyStoryAnnotationsOrFn, Store_NormalizedComponentAnnotations, @@ -23,13 +23,13 @@ See https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#hoisted-csf- const deprecatedStoryAnnotationWarning = deprecate(() => {}, deprecatedStoryAnnotation); -export function normalizeStory( +export function normalizeStory( key: StoryId, - storyAnnotations: LegacyStoryAnnotationsOrFn, - meta: Store_NormalizedComponentAnnotations -): Store_NormalizedStoryAnnotations { - const storyObject: StoryAnnotations = storyAnnotations; - const userStoryFn: StoryFn | null = + storyAnnotations: LegacyStoryAnnotationsOrFn, + meta: Store_NormalizedComponentAnnotations +): Store_NormalizedStoryAnnotations { + const storyObject: StoryAnnotations = storyAnnotations; + const userStoryFn: StoryFn | null = typeof storyAnnotations === 'function' ? storyAnnotations : null; const { story } = storyObject; diff --git a/code/lib/store/src/csf/prepareStory.test.ts b/code/lib/store/src/csf/prepareStory.test.ts index b67e0d8265c..a724ea7879c 100644 --- a/code/lib/store/src/csf/prepareStory.test.ts +++ b/code/lib/store/src/csf/prepareStory.test.ts @@ -4,7 +4,7 @@ import global from 'global'; import { expect } from '@jest/globals'; import { addons, HooksContext } from '@storybook/addons'; import type { - Framework, + Renderer, ArgsEnhancer, PlayFunctionContext, SBObjectType, @@ -234,11 +234,11 @@ describe('prepareStory', () => { describe('argsEnhancers', () => { it('are applied in the right order', () => { const run: number[] = []; - const enhancerOne: ArgsEnhancer = () => { + const enhancerOne: ArgsEnhancer = () => { run.push(1); return {}; }; - const enhancerTwo: ArgsEnhancer = () => { + const enhancerTwo: ArgsEnhancer = () => { run.push(2); return {}; }; diff --git a/code/lib/store/src/csf/prepareStory.ts b/code/lib/store/src/csf/prepareStory.ts index c8db666bddf..ba7ccc6320d 100644 --- a/code/lib/store/src/csf/prepareStory.ts +++ b/code/lib/store/src/csf/prepareStory.ts @@ -3,7 +3,7 @@ import deprecate from 'util-deprecate'; import global from 'global'; import type { - Framework, + Renderer, Args, ArgsStoryFn, LegacyStoryFn, @@ -41,11 +41,11 @@ const argTypeDefaultValueWarning = deprecate( // // Note that this story function is *stateless* in the sense that it does not track args or globals // Instead, it is expected these are tracked separately (if necessary) and are passed into each invocation. -export function prepareStory( - storyAnnotations: Store_NormalizedStoryAnnotations, - componentAnnotations: Store_NormalizedComponentAnnotations, - projectAnnotations: Store_NormalizedProjectAnnotations -): Store_Story { +export function prepareStory( + storyAnnotations: Store_NormalizedStoryAnnotations, + componentAnnotations: Store_NormalizedComponentAnnotations, + projectAnnotations: Store_NormalizedProjectAnnotations +): Store_Story { // NOTE: in the current implementation we are doing everything once, up front, rather than doing // anything at render time. The assumption is that as we don't load all the stories at once, this // will have a limited cost. If this proves misguided, we can refactor it. @@ -107,7 +107,7 @@ export function prepareStory( ...storyAnnotations.args, } as Args; - const contextForEnhancers: StoryContextForEnhancers = { + const contextForEnhancers: StoryContextForEnhancers = { componentId: componentAnnotations.id, title, kind: title, // Back compat @@ -161,13 +161,13 @@ export function prepareStory( }; } - const applyLoaders = async (context: StoryContextForLoaders) => { + const applyLoaders = async (context: StoryContextForLoaders) => { const loadResults = await Promise.all(loaders.map((loader) => loader(context))); const loaded = Object.assign({}, ...loadResults); return { ...context, loaded }; }; - const undecoratedStoryFn: LegacyStoryFn = (context: StoryContext) => { + const undecoratedStoryFn: LegacyStoryFn = (context: StoryContext) => { const mappedArgs = Object.entries(context.args).reduce((acc, [key, val]) => { const mapping = context.argTypes[key]?.mapping; acc[key] = mapping && val in mapping ? mapping[val] : val; @@ -183,12 +183,12 @@ export function prepareStory( const includedContext = { ...context, args: includedArgs }; const { passArgsFirst: renderTimePassArgsFirst = true } = context.parameters; return renderTimePassArgsFirst - ? (render as ArgsStoryFn)(includedContext.args, includedContext) - : (render as LegacyStoryFn)(includedContext); + ? (render as ArgsStoryFn)(includedContext.args, includedContext) + : (render as LegacyStoryFn)(includedContext); }; - const decoratedStoryFn = applyHooks(applyDecorators)(undecoratedStoryFn, decorators); - const unboundStoryFn = (context: StoryContext) => { - let finalContext: StoryContext = context; + const decoratedStoryFn = applyHooks(applyDecorators)(undecoratedStoryFn, decorators); + const unboundStoryFn = (context: StoryContext) => { + let finalContext: StoryContext = context; if (global.FEATURES?.argTypeTargetsV7) { const argsByTarget = groupArgsByTarget(context); finalContext = { @@ -204,11 +204,11 @@ export function prepareStory( const { play } = storyAnnotations; const playFunction = play && - (async (storyContext: StoryContext) => { - const playFunctionContext: PlayFunctionContext = { + (async (storyContext: StoryContext) => { + const playFunctionContext: PlayFunctionContext = { ...storyContext, // eslint-disable-next-line @typescript-eslint/no-shadow - step: (label: StepLabel, play: PlayFunction) => + step: (label: StepLabel, play: PlayFunction) => // TODO: We know runStep is defined, we need a proper normalized annotations type runStep!(label, play, playFunctionContext), }; diff --git a/code/lib/store/src/csf/processCSFFile.ts b/code/lib/store/src/csf/processCSFFile.ts index 176432dffe2..7698701153f 100644 --- a/code/lib/store/src/csf/processCSFFile.ts +++ b/code/lib/store/src/csf/processCSFFile.ts @@ -1,5 +1,5 @@ import type { - Framework, + Renderer, ComponentTitle, Parameters, Path, @@ -39,19 +39,19 @@ const checkDisallowedParameters = (parameters?: Parameters) => { }; // Given the raw exports of a CSF file, check and normalize it. -export function processCSFFile( +export function processCSFFile( moduleExports: Store_ModuleExports, importPath: Path, title: ComponentTitle -): Store_CSFFile { +): Store_CSFFile { // eslint-disable-next-line @typescript-eslint/naming-convention const { default: defaultExport, __namedExportsOrder, ...namedExports } = moduleExports; - const meta: Store_NormalizedComponentAnnotations = - normalizeComponentAnnotations(defaultExport, title, importPath); + const meta: Store_NormalizedComponentAnnotations = + normalizeComponentAnnotations(defaultExport, title, importPath); checkDisallowedParameters(meta.parameters); - const csfFile: Store_CSFFile = { meta, stories: {} }; + const csfFile: Store_CSFFile = { meta, stories: {} }; Object.keys(namedExports).forEach((key) => { if (isExportStory(key, meta)) { diff --git a/code/lib/store/src/csf/stepRunners.ts b/code/lib/store/src/csf/stepRunners.ts index a19d7180a21..2a5b5be88e1 100644 --- a/code/lib/store/src/csf/stepRunners.ts +++ b/code/lib/store/src/csf/stepRunners.ts @@ -1,4 +1,4 @@ -import type { Framework, StepRunner } from '@storybook/types'; +import type { Renderer, StepRunner } from '@storybook/types'; /** * Compose step runners to create a single step runner that applies each step runner in order. @@ -18,9 +18,9 @@ import type { Framework, StepRunner } from '@storybook/types'; * @param stepRunners an array of StepRunner * @returns a StepRunner that is the composition of the arguments */ -export function composeStepRunners( - stepRunners: StepRunner[] -): StepRunner { +export function composeStepRunners( + stepRunners: StepRunner[] +): StepRunner { return async (label, play, playContext) => { const composedPlay = stepRunners.reduceRight<() => Promise>( (innerPlay, stepRunner) => async () => stepRunner(label, innerPlay, playContext), diff --git a/code/lib/store/src/csf/testing-utils/index.ts b/code/lib/store/src/csf/testing-utils/index.ts index b0e663dc5a0..4db39dba0c6 100644 --- a/code/lib/store/src/csf/testing-utils/index.ts +++ b/code/lib/store/src/csf/testing-utils/index.ts @@ -1,6 +1,7 @@ +import type { AnnotatedStoryFn } from '@storybook/csf'; import { isExportStory } from '@storybook/csf'; import type { - Framework, + Renderer, Args, ComponentAnnotations, LegacyStoryAnnotationsOrFn, @@ -9,6 +10,7 @@ import type { Store_ComposeStory, Store_CSFExports, StoryContext, + Parameters, } from '@storybook/types'; import { HooksContext } from '@storybook/addons'; @@ -21,18 +23,18 @@ import { normalizeProjectAnnotations } from '../normalizeProjectAnnotations'; let GLOBAL_STORYBOOK_PROJECT_ANNOTATIONS = {}; -export function setProjectAnnotations( - projectAnnotations: ProjectAnnotations | ProjectAnnotations[] +export function setProjectAnnotations( + projectAnnotations: ProjectAnnotations | ProjectAnnotations[] ) { const annotations = Array.isArray(projectAnnotations) ? projectAnnotations : [projectAnnotations]; GLOBAL_STORYBOOK_PROJECT_ANNOTATIONS = composeConfigs(annotations); } -export function composeStory( - storyAnnotations: LegacyStoryAnnotationsOrFn, - componentAnnotations: ComponentAnnotations, - projectAnnotations: ProjectAnnotations = GLOBAL_STORYBOOK_PROJECT_ANNOTATIONS, - defaultConfig: ProjectAnnotations = {}, +export function composeStory( + storyAnnotations: LegacyStoryAnnotationsOrFn, + componentAnnotations: ComponentAnnotations, + projectAnnotations: ProjectAnnotations = GLOBAL_STORYBOOK_PROJECT_ANNOTATIONS, + defaultConfig: ProjectAnnotations = {}, exportsName?: string ) { if (storyAnnotations === undefined) { @@ -43,7 +45,7 @@ export function composeStory(componentAnnotations); + normalizeComponentAnnotations(componentAnnotations); const storyName = exportsName || @@ -52,7 +54,7 @@ export function composeStory( + const normalizedStory = normalizeStory( storyName, storyAnnotations, normalizedComponentAnnotations @@ -63,7 +65,7 @@ export function composeStory( + const story = prepareStory( normalizedStory, normalizedComponentAnnotations, normalizedProjectAnnotations @@ -85,14 +87,14 @@ export function composeStory( storiesImport: TModule, - globalConfig: ProjectAnnotations, + globalConfig: ProjectAnnotations, composeStoryFn: Store_ComposeStory ) { // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/code/lib/store/src/decorators.test.ts b/code/lib/store/src/decorators.test.ts index df4bab1e4e5..b6ced0754f5 100644 --- a/code/lib/store/src/decorators.test.ts +++ b/code/lib/store/src/decorators.test.ts @@ -1,9 +1,9 @@ import { expect } from '@jest/globals'; -import type { Framework, StoryContext } from '@storybook/types'; +import type { Renderer, StoryContext } from '@storybook/types'; import { defaultDecorateStory } from './decorators'; -function makeContext(input: Record = {}): StoryContext { +function makeContext(input: Record = {}): StoryContext { return { id: 'id', kind: 'kind', @@ -11,7 +11,7 @@ function makeContext(input: Record = {}): StoryContext { viewMode: 'story', parameters: {}, ...input, - } as StoryContext; + } as StoryContext; } describe('client-api.decorators', () => { diff --git a/code/lib/store/src/decorators.ts b/code/lib/store/src/decorators.ts index 8868cd803af..f76597423b2 100644 --- a/code/lib/store/src/decorators.ts +++ b/code/lib/store/src/decorators.ts @@ -1,5 +1,5 @@ import type { - Framework, + Renderer, DecoratorFunction, LegacyStoryFn, PartialStoryFn, @@ -7,11 +7,11 @@ import type { StoryContextUpdate, } from '@storybook/types'; -export function decorateStory( - storyFn: LegacyStoryFn, - decorator: DecoratorFunction, - bindWithContext: (storyFn: LegacyStoryFn) => PartialStoryFn -): LegacyStoryFn { +export function decorateStory( + storyFn: LegacyStoryFn, + decorator: DecoratorFunction, + bindWithContext: (storyFn: LegacyStoryFn) => PartialStoryFn +): LegacyStoryFn { // Bind the partially decorated storyFn so that when it is called it always knows about the story context, // no matter what it is passed directly. This is because we cannot guarantee a decorator will // pass the context down to the next decorated story in the chain. @@ -42,17 +42,17 @@ export function sanitizeStoryContextUpdate({ return update; } -export function defaultDecorateStory( - storyFn: LegacyStoryFn, - decorators: DecoratorFunction[] -): LegacyStoryFn { +export function defaultDecorateStory( + storyFn: LegacyStoryFn, + decorators: DecoratorFunction[] +): LegacyStoryFn { // We use a trick to avoid recreating the bound story function inside `decorateStory`. // Instead we pass it a context "getter", which is defined once (at "decoration time") // The getter reads a variable which is scoped to this call of `decorateStory` // (ie to this story), so there is no possibility of overlap. // This will break if you call the same story twice interleaved // (React might do it if you rendered the same story twice in the one ReactDom.render call, for instance) - const contextStore: Store_ContextStore = {}; + const contextStore: Store_ContextStore = {}; /** * When you call the story function inside a decorator, e.g.: @@ -65,7 +65,7 @@ export function defaultDecorateStory( * merged in with the default context */ const bindWithContext = - (decoratedStoryFn: LegacyStoryFn): PartialStoryFn => + (decoratedStoryFn: LegacyStoryFn): PartialStoryFn => (update) => { // This code path isn't possible because we always set `contextStore.value` before calling // `decoratedWithContextStore`, but TS doesn't know that. diff --git a/code/lib/store/src/inferArgTypes.ts b/code/lib/store/src/inferArgTypes.ts index 76f009d3138..fab33db4586 100644 --- a/code/lib/store/src/inferArgTypes.ts +++ b/code/lib/store/src/inferArgTypes.ts @@ -1,7 +1,7 @@ import mapValues from 'lodash/mapValues'; import { dedent } from 'ts-dedent'; import { logger } from '@storybook/client-logger'; -import type { Framework, SBType, ArgTypesEnhancer } from '@storybook/types'; +import type { Renderer, SBType, ArgTypesEnhancer } from '@storybook/types'; import { combineParameters } from './parameters'; const inferType = (value: any, name: string, visited: Set): SBType => { @@ -41,7 +41,7 @@ const inferType = (value: any, name: string, visited: Set): SBType => { return { name: 'object', value: {} }; }; -export const inferArgTypes: ArgTypesEnhancer = (context) => { +export const inferArgTypes: ArgTypesEnhancer = (context) => { const { id, argTypes: userArgTypes = {}, initialArgs = {} } = context; const argTypes = mapValues(initialArgs, (arg, key) => ({ name: key, diff --git a/code/lib/store/src/inferControls.ts b/code/lib/store/src/inferControls.ts index a603fa9b4fe..a77a5a71608 100644 --- a/code/lib/store/src/inferControls.ts +++ b/code/lib/store/src/inferControls.ts @@ -1,7 +1,7 @@ import mapValues from 'lodash/mapValues'; import { logger } from '@storybook/client-logger'; import type { - Framework, + Renderer, ArgTypesEnhancer, SBEnumType, Store_ControlsMatchers, @@ -61,7 +61,7 @@ const inferControl = ( } }; -export const inferControls: ArgTypesEnhancer = (context) => { +export const inferControls: ArgTypesEnhancer = (context) => { const { argTypes, // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json index 9a01d526fda..fe4593a89ea 100644 --- a/code/lib/telemetry/package.json +++ b/code/lib/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/telemetry", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Telemetry logging for crash reports and usage statistics", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-common": "7.0.0-alpha.49", "chalk": "^4.1.0", "detect-package-manager": "^2.0.1", "fetch-retry": "^5.0.2", @@ -64,5 +64,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json index ae4f99b2db4..d5ad1d052ff 100644 --- a/code/lib/theming/package.json +++ b/code/lib/theming/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/theming", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Core Storybook Components", "keywords": [ "storybook" @@ -48,7 +48,7 @@ }, "dependencies": { "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", - "@storybook/client-logger": "7.0.0-alpha.48", + "@storybook/client-logger": "7.0.0-alpha.49", "memoizerific": "^1.11.3" }, "devDependencies": { @@ -79,5 +79,5 @@ ], "post": "./scripts/fix-theme-type-export.ts" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/types/package.json b/code/lib/types/package.json index 7a10064451d..02719893f89 100644 --- a/code/lib/types/package.json +++ b/code/lib/types/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/types", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Core Storybook Types", "keywords": [ "storybook" @@ -47,7 +47,7 @@ "file-system-cache": "^2.0.0" }, "devDependencies": { - "@storybook/csf": "0.0.2--canary.53.4879818.0", + "@storybook/csf": "0.0.2-next.5", "@types/node": "^16.0.0", "synchronous-promise": "^2.0.15", "typescript": "~4.6.3" @@ -60,5 +60,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/lib/types/src/modules/addons.ts b/code/lib/types/src/modules/addons.ts index 4d2d0a78782..d45ab93d4f6 100644 --- a/code/lib/types/src/modules/addons.ts +++ b/code/lib/types/src/modules/addons.ts @@ -7,8 +7,8 @@ import type { ArgsStoryFn as ArgsStoryFnForFramework, ComponentTitle, DecoratorFunction as DecoratorFunctionForFramework, - Framework, InputType, + Renderer, LegacyStoryFn as LegacyStoryFnForFramework, LoaderFunction as LoaderFunctionForFramework, Parameters, @@ -89,8 +89,8 @@ export interface Addon_OptionsParameter extends Object { [key: string]: any; } -export type Addon_StoryContext = - StoryContextForFramework; +export type Addon_StoryContext = + StoryContextForFramework; export type Addon_StoryContextUpdate = Partial; type Addon_ReturnTypeFramework = { diff --git a/code/lib/types/src/modules/client-api.ts b/code/lib/types/src/modules/client-api.ts index d9739a80227..ee1fddf7e0b 100644 --- a/code/lib/types/src/modules/client-api.ts +++ b/code/lib/types/src/modules/client-api.ts @@ -5,7 +5,7 @@ import type { Args, ArgTypes, DecoratorFunction, - Framework, + Renderer, LoaderFunction, Parameters, LegacyStoryFn, @@ -68,13 +68,13 @@ export interface ClientAPI_ClientApiAddons { export type ClientAPI_RenderContextWithoutStoryContext = Omit; -export interface ClientAPI_GetStorybookStory { +export interface ClientAPI_GetStorybookStory { name: string; - render: LegacyStoryFn; + render: LegacyStoryFn; } -export interface ClientAPI_GetStorybookKind { +export interface ClientAPI_GetStorybookKind { kind: string; fileName: string; - stories: ClientAPI_GetStorybookStory[]; + stories: ClientAPI_GetStorybookStory[]; } diff --git a/code/lib/types/src/modules/csf.ts b/code/lib/types/src/modules/csf.ts index 96c8d1363fc..28b1753ef69 100644 --- a/code/lib/types/src/modules/csf.ts +++ b/code/lib/types/src/modules/csf.ts @@ -15,7 +15,6 @@ import type { Conditional, DecoratorApplicator, DecoratorFunction, - Framework, Globals, GlobalTypes, IncludeExcludeOptions, @@ -28,6 +27,7 @@ import type { PartialStoryFn, PlayFunction, PlayFunctionContext, + Renderer, SBArrayType, SBEnumType, SBIntersectionType, @@ -74,7 +74,7 @@ export type { Conditional, DecoratorApplicator, DecoratorFunction, - Framework, + Renderer, Globals, GlobalTypes, IncludeExcludeOptions, diff --git a/code/lib/types/src/modules/store.ts b/code/lib/types/src/modules/store.ts index 94a6a1f0c90..534945113d4 100644 --- a/code/lib/types/src/modules/store.ts +++ b/code/lib/types/src/modules/store.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ import type { SynchronousPromise } from 'synchronous-promise'; -import type { Framework, ProjectAnnotations as CsfProjectAnnotations } from '@storybook/csf'; +import type { Renderer, ProjectAnnotations as CsfProjectAnnotations } from '@storybook/csf'; import type { Addon_IndexEntry, Addon_StoryIndexEntry } from './addons'; import type { @@ -27,7 +27,7 @@ import type { ViewMode, } from './csf'; -export interface WebFramework extends Framework { +export interface WebRenderer extends Renderer { canvasElement: HTMLElement; } @@ -39,34 +39,34 @@ export type Store_ModuleImportFn = (path: Path) => Store_PromiseLike = Promise | T; export type TeardownRenderToCanvas = () => Store_MaybePromise; -export type RenderToCanvas = ( - context: Store_RenderContext, - element: TFramework['canvasElement'] +export type RenderToCanvas = ( + context: Store_RenderContext, + element: TRenderer['canvasElement'] ) => Store_MaybePromise; -export type ProjectAnnotations = CsfProjectAnnotations & { - renderToCanvas?: RenderToCanvas; +export type ProjectAnnotations = CsfProjectAnnotations & { + renderToCanvas?: RenderToCanvas; /* @deprecated use renderToCanvas */ - renderToDOM?: RenderToCanvas; + renderToDOM?: RenderToCanvas; }; -export type Store_NormalizedProjectAnnotations = - ProjectAnnotations & { +export type Store_NormalizedProjectAnnotations = + ProjectAnnotations & { argTypes?: StrictArgTypes; globalTypes?: StrictGlobalTypes; }; -export type Store_NormalizedComponentAnnotations = - ComponentAnnotations & { +export type Store_NormalizedComponentAnnotations = + ComponentAnnotations & { // Useful to guarantee that id & title exists id: ComponentId; title: ComponentTitle; argTypes?: StrictArgTypes; }; -export type Store_NormalizedStoryAnnotations = Omit< - StoryAnnotations, +export type Store_NormalizedStoryAnnotations = Omit< + StoryAnnotations, 'storyName' | 'story' > & { moduleExport: Store_ModuleExport; @@ -74,42 +74,39 @@ export type Store_NormalizedStoryAnnotations; + userStoryFn?: StoryFn; }; -export type Store_CSFFile = { - meta: Store_NormalizedComponentAnnotations; - stories: Record>; +export type Store_CSFFile = { + meta: Store_NormalizedComponentAnnotations; + stories: Record>; }; -export type Store_Story = - StoryContextForEnhancers & { +export type Store_Story = + StoryContextForEnhancers & { moduleExport: Store_ModuleExport; - originalStoryFn: StoryFn; - undecoratedStoryFn: LegacyStoryFn; - unboundStoryFn: LegacyStoryFn; + originalStoryFn: StoryFn; + undecoratedStoryFn: LegacyStoryFn; + unboundStoryFn: LegacyStoryFn; applyLoaders: ( - context: StoryContextForLoaders - ) => Promise< - StoryContextForLoaders & { loaded: StoryContext['loaded'] } - >; - playFunction?: (context: StoryContext) => Promise | void; + context: StoryContextForLoaders + ) => Promise & { loaded: StoryContext['loaded'] }>; + playFunction?: (context: StoryContext) => Promise | void; }; -export type Store_BoundStory = Store_Story & { - storyFn: PartialStoryFn; +export type Store_BoundStory = Store_Story & { + storyFn: PartialStoryFn; }; -export declare type Store_RenderContext = - StoryIdentifier & { - showMain: () => void; - showError: (error: { title: string; description: string }) => void; - showException: (err: Error) => void; - forceRemount: boolean; - storyContext: StoryContext; - storyFn: PartialStoryFn; - unboundStoryFn: LegacyStoryFn; - }; +export declare type Store_RenderContext = StoryIdentifier & { + showMain: () => void; + showError: (error: { title: string; description: string }) => void; + showException: (err: Error) => void; + forceRemount: boolean; + storyContext: StoryContext; + storyFn: PartialStoryFn; + unboundStoryFn: LegacyStoryFn; +}; export interface Store_V2CompatIndexEntry extends Omit { kind: Addon_StoryIndexEntry['title']; @@ -141,10 +138,10 @@ export interface Store_Selection { viewMode: ViewMode; } -export type Store_DecoratorApplicator = ( - storyFn: LegacyStoryFn, - decorators: DecoratorFunction[] -) => LegacyStoryFn; +export type Store_DecoratorApplicator = ( + storyFn: LegacyStoryFn, + decorators: DecoratorFunction[] +) => LegacyStoryFn; export interface Store_StoriesSpecifier { directory: string; @@ -166,14 +163,14 @@ export interface Store_NormalizedStoriesSpecifierEntry { importPathMatcher: RegExp; } -export type Store_ContextStore = { - value?: StoryContext; +export type Store_ContextStore = { + value?: StoryContext; }; export type Store_PropDescriptor = string[] | RegExp; -export type Store_CSFExports = { - default: ComponentAnnotations; +export type Store_CSFExports = { + default: ComponentAnnotations; __esModule?: boolean; __namedExportsOrder?: string[]; }; @@ -185,14 +182,14 @@ export type Store_ComposedStoryPlayFn = ( context: Store_ComposedStoryPlayContext ) => Promise | void; -export type Store_StoryFn< - TFramework extends Framework = Framework, - TArgs = Args -> = AnnotatedStoryFn & { play: Store_ComposedStoryPlayFn }; +export type Store_StoryFn = AnnotatedStoryFn< + TRenderer, + TArgs +> & { play: Store_ComposedStoryPlayFn }; -export type Store_ComposedStory = - | StoryFn - | StoryAnnotations; +export type Store_ComposedStory = + | StoryFn + | StoryAnnotations; /** * T represents the whole ES module of a stories file. K of T means named exports (basically the Story type) @@ -200,11 +197,11 @@ export type Store_ComposedStory -> Story> */ -export type Store_StoriesWithPartialProps = { +export type Store_StoriesWithPartialProps = { // @TODO once we can use Typescript 4.0 do this to exclude nonStory exports: // replace [K in keyof TModule] with [K in keyof TModule as TModule[K] extends ComposedStory ? K : never] [K in keyof TModule]: TModule[K] extends Store_ComposedStory - ? AnnotatedStoryFn> + ? AnnotatedStoryFn> : unknown; }; @@ -214,16 +211,16 @@ export type Store_ControlsMatchers = { }; export interface Store_ComposeStory< - TFramework extends Framework = Framework, + TRenderer extends Renderer = Renderer, TArgs extends Args = Args > { ( - storyAnnotations: AnnotatedStoryFn | StoryAnnotations, - componentAnnotations: ComponentAnnotations, - projectAnnotations: ProjectAnnotations, + storyAnnotations: AnnotatedStoryFn | StoryAnnotations, + componentAnnotations: ComponentAnnotations, + projectAnnotations: ProjectAnnotations, exportsName?: string ): { - (extraArgs: Partial): TFramework['storyResult']; + (extraArgs: Partial): TRenderer['storyResult']; storyName: string; args: Args; play: Store_ComposedStoryPlayFn; diff --git a/code/package.json b/code/package.json index 86727c22853..e69db64de77 100644 --- a/code/package.json +++ b/code/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/root", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "private": true, "description": "Storybook is an open source tool for developing UI components in isolation for React, Vue and Angular. It makes building stunning UIs organized and efficient.", "keywords": [ @@ -184,7 +184,7 @@ "@storybook/core-events": "workspace:*", "@storybook/core-server": "workspace:*", "@storybook/core-webpack": "workspace:*", - "@storybook/csf": "next", + "@storybook/csf": "0.0.2-next.5", "@storybook/csf-plugin": "workspace:*", "@storybook/csf-tools": "workspace:*", "@storybook/docs-tools": "workspace:*", @@ -350,6 +350,7 @@ "zx": "^7.0.3" }, "devDependencies": { + "eslint-import-resolver-typescript": "^3.5.2", "expect-type": "^0.14.2" }, "dependenciesMeta": { diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json index 3061ebb22b3..b1d6e40471d 100644 --- a/code/presets/html-webpack/package.json +++ b/code/presets/html-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-html-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,7 +50,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.0.0-alpha.48", + "@storybook/core-webpack": "7.0.0-alpha.49", "@types/node": "^16.0.0", "html-loader": "^3.1.0", "react": "16.14.0", @@ -75,5 +75,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json index f4e4cd3c727..2f3786934ca 100644 --- a/code/presets/preact-webpack/package.json +++ b/code/presets/preact-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-preact-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" @@ -51,7 +51,7 @@ }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.12.12", - "@storybook/core-webpack": "7.0.0-alpha.48", + "@storybook/core-webpack": "7.0.0-alpha.49", "@types/node": "^16.0.0", "react": "16.14.0", "react-dom": "16.14.0" @@ -76,5 +76,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json index 95d7dd87810..254cd5e6df5 100644 --- a/code/presets/react-webpack/package.json +++ b/code/presets/react-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-react-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -74,10 +74,10 @@ "@babel/preset-flow": "^7.12.1", "@babel/preset-react": "^7.12.10", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5", - "@storybook/core-webpack": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", - "@storybook/react": "7.0.0-alpha.48", + "@storybook/core-webpack": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", + "@storybook/react": "7.0.0-alpha.49", "@storybook/react-docgen-typescript-plugin": "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0", "@types/node": "^16.0.0", "@types/semver": "^7.3.4", @@ -123,5 +123,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json index 65a86253f76..b7c651ffbe4 100644 --- a/code/presets/server-webpack/package.json +++ b/code/presets/server-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-server-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -55,9 +55,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-server": "7.0.0-alpha.48", - "@storybook/core-webpack": "7.0.0-alpha.48", - "@storybook/server": "7.0.0-alpha.48", + "@storybook/core-server": "7.0.0-alpha.49", + "@storybook/core-webpack": "7.0.0-alpha.49", + "@storybook/server": "7.0.0-alpha.49", "@types/node": "^16.0.0", "global": "^4.4.0", "react": "16.14.0", @@ -85,5 +85,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json index 92a88b7b018..1c49177319d 100644 --- a/code/presets/svelte-webpack/package.json +++ b/code/presets/svelte-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-svelte-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -65,8 +65,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.0.0-alpha.48", - "@storybook/node-logger": "7.0.0-alpha.48", + "@storybook/core-webpack": "7.0.0-alpha.49", + "@storybook/node-logger": "7.0.0-alpha.49", "react": "16.14.0", "react-dom": "16.14.0", "sveltedoc-parser": "^4.2.1", @@ -97,5 +97,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/presets/vue-webpack/package.json b/code/presets/vue-webpack/package.json index f6b77240d08..8cf6a3aa5fb 100644 --- a/code/presets/vue-webpack/package.json +++ b/code/presets/vue-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-vue-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -60,8 +60,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", + "@storybook/core-webpack": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", "@types/node": "^16.0.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -99,5 +99,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json index 427d9e63ae3..18fe363b79d 100644 --- a/code/presets/vue3-webpack/package.json +++ b/code/presets/vue3-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-vue3-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -60,8 +60,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", + "@storybook/core-webpack": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", "@types/node": "^16.0.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -96,5 +96,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/presets/web-components-webpack/package.json b/code/presets/web-components-webpack/package.json index f2d7817975d..9fc5d4ab562 100644 --- a/code/presets/web-components-webpack/package.json +++ b/code/presets/web-components-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-web-components-webpack", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit-html", @@ -55,7 +55,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/preset-env": "^7.12.11", - "@storybook/core-webpack": "7.0.0-alpha.48", + "@storybook/core-webpack": "7.0.0-alpha.49", "@types/node": "^16.0.0", "babel-loader": "^7.0.0 || ^8.0.0", "babel-plugin-bundled-import-meta": "^0.3.1", @@ -81,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index 79a6c4bd163..7e665a37cf4 100644 --- a/code/renderers/html/package.json +++ b/code/renderers/html/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook HTML renderer", "keywords": [ "storybook" @@ -51,12 +51,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -81,5 +81,5 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/html/src/docs/sourceDecorator.ts b/code/renderers/html/src/docs/sourceDecorator.ts index 419013e7372..1920c6d9d76 100644 --- a/code/renderers/html/src/docs/sourceDecorator.ts +++ b/code/renderers/html/src/docs/sourceDecorator.ts @@ -5,7 +5,7 @@ import { addons, useEffect } from '@storybook/addons'; import type { PartialStoryFn } from '@storybook/types'; import { dedent } from 'ts-dedent'; -import type { HtmlFramework, StoryContext } from '../types'; +import type { HtmlRenderer, StoryContext } from '../types'; import type { StoryFn } from '../public-types'; @@ -36,7 +36,7 @@ function applyTransformSource(source: string, context: StoryContext): string { return transformSource(source, context); } -export function sourceDecorator(storyFn: PartialStoryFn, context: StoryContext) { +export function sourceDecorator(storyFn: PartialStoryFn, context: StoryContext) { const story = context?.parameters.docs?.source?.excludeDecorators ? (context.originalStoryFn as StoryFn)(context.args, context) : storyFn(); diff --git a/code/renderers/html/src/public-api.ts b/code/renderers/html/src/public-api.ts index db30ee4a223..bc813beb093 100644 --- a/code/renderers/html/src/public-api.ts +++ b/code/renderers/html/src/public-api.ts @@ -1,19 +1,19 @@ /* eslint-disable prefer-destructuring */ import type { Addon_ClientStoryApi, Addon_Loadable } from '@storybook/types'; import { start } from '@storybook/core-client'; -import type { HtmlFramework } from './types'; +import type { HtmlRenderer } from './types'; import { renderToCanvas, render } from './render'; const FRAMEWORK = 'html'; -interface ClientApi extends Addon_ClientStoryApi { +interface ClientApi extends Addon_ClientStoryApi { configure(loader: Addon_Loadable, module: NodeModule): void; forceReRender(): void; raw: () => any; // todo add type } -const api = start(renderToCanvas, { render }); +const api = start(renderToCanvas, { render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/html/src/public-types.ts b/code/renderers/html/src/public-types.ts index 0591c18212b..9cf7cddfd54 100644 --- a/code/renderers/html/src/public-types.ts +++ b/code/renderers/html/src/public-types.ts @@ -5,7 +5,7 @@ import type { StoryAnnotations, } from '@storybook/types'; -import type { HtmlFramework } from './types'; +import type { HtmlRenderer } from './types'; export type { Args, ArgTypes, Parameters } from '@storybook/types'; @@ -14,21 +14,21 @@ export type { Args, ArgTypes, Parameters } from '@storybook/types'; * * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ -export type Meta = ComponentAnnotations; +export type Meta = ComponentAnnotations; /** * Story function that represents a CSFv2 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryFn = AnnotatedStoryFn; +export type StoryFn = AnnotatedStoryFn; /** * Story function that represents a CSFv3 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryObj = StoryAnnotations; +export type StoryObj = StoryAnnotations; /** * @deprecated Use `StoryFn` instead. diff --git a/code/renderers/html/src/render.ts b/code/renderers/html/src/render.ts index 05a2d9e9721..3b40e1e5063 100644 --- a/code/renderers/html/src/render.ts +++ b/code/renderers/html/src/render.ts @@ -5,11 +5,11 @@ import global from 'global'; import { dedent } from 'ts-dedent'; import { simulatePageLoad, simulateDOMContentLoaded } from '@storybook/preview-web'; import type { Store_RenderContext, ArgsStoryFn } from '@storybook/types'; -import type { HtmlFramework } from './types'; +import type { HtmlRenderer } from './types'; const { Node } = global; -export const render: ArgsStoryFn = (args, context) => { +export const render: ArgsStoryFn = (args, context) => { const { id, component: Component } = context; if (typeof Component === 'string') { @@ -42,8 +42,8 @@ export const render: ArgsStoryFn = (args, context) => { }; export function renderToCanvas( - { storyFn, kind, name, showMain, showError, forceRemount }: Store_RenderContext, - canvasElement: HtmlFramework['canvasElement'] + { storyFn, kind, name, showMain, showError, forceRemount }: Store_RenderContext, + canvasElement: HtmlRenderer['canvasElement'] ) { const element = storyFn(); showMain(); diff --git a/code/renderers/html/src/types.ts b/code/renderers/html/src/types.ts index 0aac594ea9a..992efc87db7 100644 --- a/code/renderers/html/src/types.ts +++ b/code/renderers/html/src/types.ts @@ -1,7 +1,7 @@ import type { ArgsStoryFn, StoryContext as DefaultStoryContext, - WebFramework, + WebRenderer, } from '@storybook/types'; import type { parameters } from './config'; @@ -15,11 +15,15 @@ export interface ShowErrorArgs { description: string; } -export interface HtmlFramework extends WebFramework { - component: string | HTMLElement | ArgsStoryFn; +/** + * @deprecated Use `HtmlRenderer` instead. + */ +export type HtmlFramework = HtmlRenderer; +export interface HtmlRenderer extends WebRenderer { + component: string | HTMLElement | ArgsStoryFn; storyResult: StoryFnHtmlReturnType; } -export type StoryContext = DefaultStoryContext & { - parameters: DefaultStoryContext['parameters'] & typeof parameters; +export type StoryContext = DefaultStoryContext & { + parameters: DefaultStoryContext['parameters'] & typeof parameters; }; diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index 27c8d2331bc..8c73c37ae50 100644 --- a/code/renderers/preact/package.json +++ b/code/renderers/preact/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook Preact renderer", "keywords": [ "storybook" @@ -51,10 +51,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -80,5 +80,5 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/preact/src/public-api.ts b/code/renderers/preact/src/public-api.ts index 31980a0b571..81298c96277 100644 --- a/code/renderers/preact/src/public-api.ts +++ b/code/renderers/preact/src/public-api.ts @@ -3,9 +3,9 @@ import type { Addon_ClientStoryApi, Addon_Loadable } from '@storybook/types'; import { start } from '@storybook/core-client'; import { renderToCanvas } from './render'; -import type { PreactFramework } from './types'; +import type { PreactRenderer } from './types'; -export interface ClientApi extends Addon_ClientStoryApi { +export interface ClientApi extends Addon_ClientStoryApi { configure(loader: Addon_Loadable, module: NodeModule): void; forceReRender(): void; raw: () => any; // todo add type @@ -13,7 +13,7 @@ export interface ClientApi extends Addon_ClientStoryApi(renderToCanvas); +const api = start(renderToCanvas); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/preact/src/public-types.ts b/code/renderers/preact/src/public-types.ts index ecee7291c1e..11a55e5dabd 100644 --- a/code/renderers/preact/src/public-types.ts +++ b/code/renderers/preact/src/public-types.ts @@ -4,7 +4,7 @@ import type { ComponentAnnotations, StoryAnnotations, } from '@storybook/types'; -import type { PreactFramework } from './types'; +import type { PreactRenderer } from './types'; export type { Args, ArgTypes, Parameters, StoryContext } from '@storybook/types'; @@ -13,21 +13,21 @@ export type { Args, ArgTypes, Parameters, StoryContext } from '@storybook/types' * * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ -export type Meta = ComponentAnnotations; +export type Meta = ComponentAnnotations; /** * Story function that represents a CSFv2 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryFn = AnnotatedStoryFn; +export type StoryFn = AnnotatedStoryFn; /** * Story function that represents a CSFv3 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryObj = StoryAnnotations; +export type StoryObj = StoryAnnotations; /** * @deprecated Use `StoryFn` instead. diff --git a/code/renderers/preact/src/render.tsx b/code/renderers/preact/src/render.tsx index c90b5bfc8da..37403636a94 100644 --- a/code/renderers/preact/src/render.tsx +++ b/code/renderers/preact/src/render.tsx @@ -3,11 +3,11 @@ import * as preact from 'preact'; import { dedent } from 'ts-dedent'; import type { Store_RenderContext, ArgsStoryFn } from '@storybook/types'; -import type { StoryFnPreactReturnType, PreactFramework } from './types'; +import type { StoryFnPreactReturnType, PreactRenderer } from './types'; const { h } = preact; -export const render: ArgsStoryFn = (args, context) => { +export const render: ArgsStoryFn = (args, context) => { const { id, component: Component } = context; if (!Component) { throw new Error( @@ -35,9 +35,9 @@ function preactRender(story: StoryFnPreactReturnType | null, canvasElement: Elem const StoryHarness: preact.FunctionalComponent<{ name: string; title: string; - showError: Store_RenderContext['showError']; + showError: Store_RenderContext['showError']; storyFn: () => any; - canvasElement: PreactFramework['canvasElement']; + canvasElement: PreactRenderer['canvasElement']; }> = ({ showError, name, title, storyFn, canvasElement }) => { const content = preact.h(storyFn as any, null); if (!content) { @@ -54,8 +54,8 @@ const StoryHarness: preact.FunctionalComponent<{ }; export function renderToCanvas( - { storyFn, title, name, showMain, showError, forceRemount }: Store_RenderContext, - canvasElement: PreactFramework['canvasElement'] + { storyFn, title, name, showMain, showError, forceRemount }: Store_RenderContext, + canvasElement: PreactRenderer['canvasElement'] ) { if (forceRemount) { preactRender(null, canvasElement); diff --git a/code/renderers/preact/src/types.ts b/code/renderers/preact/src/types.ts index 8864d47da62..233528349a1 100644 --- a/code/renderers/preact/src/types.ts +++ b/code/renderers/preact/src/types.ts @@ -1,4 +1,4 @@ -import type { WebFramework } from '@storybook/types'; +import type { WebRenderer } from '@storybook/types'; import type { AnyComponent } from 'preact'; export type { RenderContext } from '@storybook/types'; @@ -10,7 +10,14 @@ export interface ShowErrorArgs { description: string; } -export interface PreactFramework extends WebFramework { +/** + * @dep + */ +/** + * @deprecated Use `PreactRenderer` instead. + */ +export type PreactFramework = PreactRenderer; +export interface PreactRenderer extends WebRenderer { component: AnyComponent; storyResult: StoryFnPreactReturnType; } diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index 134d4e3de5b..9349a25c244 100644 --- a/code/renderers/react/package.json +++ b/code/renderers/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook React renderer", "keywords": [ "storybook" @@ -52,12 +52,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/estree": "^0.0.51", "@types/node": "^16.0.0", "acorn": "^7.4.1", @@ -104,5 +104,5 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/react/src/docs/extractArgTypes.test.ts b/code/renderers/react/src/docs/extractArgTypes.test.ts index 7be5004b165..1c1c1ab06a9 100644 --- a/code/renderers/react/src/docs/extractArgTypes.test.ts +++ b/code/renderers/react/src/docs/extractArgTypes.test.ts @@ -5,7 +5,7 @@ import requireFromString from 'require-from-string'; import { transformFileSync, transformSync } from '@babel/core'; import { inferControls } from '@storybook/store'; -import type { Framework } from '@storybook/types'; +import type { Renderer } from '@storybook/types'; import { normalizeNewlines } from '@storybook/docs-tools'; import type { StoryContext } from '../types'; @@ -88,7 +88,7 @@ describe('react component properties', () => { const rows = inferControls({ argTypes, parameters, - } as unknown as StoryContext); + } as unknown as StoryContext); expect(rows).toMatchSpecificSnapshot(path.join(testDir, 'argTypes.snapshot')); }); } diff --git a/code/renderers/react/src/docs/jsxDecorator.tsx b/code/renderers/react/src/docs/jsxDecorator.tsx index 75e9d461697..cbef7513943 100644 --- a/code/renderers/react/src/docs/jsxDecorator.tsx +++ b/code/renderers/react/src/docs/jsxDecorator.tsx @@ -9,7 +9,7 @@ import type { StoryContext, ArgsStoryFn, PartialStoryFn } from '@storybook/types import { SourceType, SNIPPET_RENDERED, getDocgenSection } from '@storybook/docs-tools'; import { logger } from '@storybook/client-logger'; -import type { ReactFramework } from '../types'; +import type { ReactRenderer } from '../types'; import { isMemo, isForwardRef } from './lib'; @@ -23,14 +23,14 @@ type JSXOptions = Options & { /** Override the display name used for a component */ displayName?: string | Options['displayName']; /** A function ran after a story is rendered */ - transformSource?(dom: string, context?: StoryContext): string; + transformSource?(dom: string, context?: StoryContext): string; }; /** Run the user supplied transformSource function if it exists */ const applyTransformSource = ( domString: string, options: JSXOptions, - context?: StoryContext + context?: StoryContext ) => { if (typeof options.transformSource !== 'function') { return domString; @@ -132,7 +132,7 @@ const defaultOpts = { showDefaultProps: false, }; -export const skipJsxRender = (context: StoryContext) => { +export const skipJsxRender = (context: StoryContext) => { const sourceParams = context?.parameters.docs?.source; const isArgsStory = context?.parameters.__isArgsStory; @@ -160,8 +160,8 @@ const mdxToJsx = (node: any) => { }; export const jsxDecorator = ( - storyFn: PartialStoryFn, - context: StoryContext + storyFn: PartialStoryFn, + context: StoryContext ) => { const channel = addons.getChannel(); const skip = skipJsxRender(context); @@ -188,7 +188,7 @@ export const jsxDecorator = ( // Exclude decorators from source code snippet by default const storyJsx = context?.parameters.docs?.source?.excludeDecorators - ? (context.originalStoryFn as ArgsStoryFn)(context.args, context) + ? (context.originalStoryFn as ArgsStoryFn)(context.args, context) : story; const sourceJsx = mdxToJsx(storyJsx); diff --git a/code/renderers/react/src/public-api.tsx b/code/renderers/react/src/public-api.tsx index 35275b58630..ca854cbe54d 100644 --- a/code/renderers/react/src/public-api.tsx +++ b/code/renderers/react/src/public-api.tsx @@ -8,16 +8,16 @@ import type { import { start } from '@storybook/core-client'; import { renderToCanvas, render } from './render'; -import type { ReactFramework } from './types'; +import type { ReactRenderer } from './types'; -interface ClientApi extends Addon_ClientStoryApi { +interface ClientApi extends Addon_ClientStoryApi { configure(loader: Addon_Loadable, module: NodeModule): void; forceReRender(): void; raw: () => any; // todo add type } const FRAMEWORK = 'react'; -const api = start(renderToCanvas, { render }); +const api = start(renderToCanvas, { render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ @@ -29,4 +29,4 @@ export const configure: ClientApi['configure'] = (...args) => api.configure(FRAM export const forceReRender: ClientApi['forceReRender'] = api.forceReRender; export const raw: ClientApi['raw'] = api.clientApi.raw; -export type DecoratorFn = DecoratorFunction; +export type DecoratorFn = DecoratorFunction; diff --git a/code/renderers/react/src/public-types.test.tsx b/code/renderers/react/src/public-types.test.tsx index 42aaf6217fe..538e4cb9db3 100644 --- a/code/renderers/react/src/public-types.test.tsx +++ b/code/renderers/react/src/public-types.test.tsx @@ -10,9 +10,9 @@ import type { SetOptional } from 'type-fest'; import type { DecoratorFn } from './public-api'; import type { Meta, StoryObj } from './public-types'; -import type { ReactFramework } from './types'; +import type { ReactRenderer } from './types'; -type ReactStory = StoryAnnotations; +type ReactStory = StoryAnnotations; type ButtonProps = { label: string; disabled: boolean }; const Button: (props: ButtonProps) => JSX.Element = () => <>; diff --git a/code/renderers/react/src/public-types.ts b/code/renderers/react/src/public-types.ts index 531ece5874e..6f89b2f7647 100644 --- a/code/renderers/react/src/public-types.ts +++ b/code/renderers/react/src/public-types.ts @@ -10,9 +10,9 @@ import type { import type { ComponentProps, ComponentType, JSXElementConstructor } from 'react'; import type { SetOptional, Simplify } from 'type-fest'; -import type { ReactFramework } from './types'; +import type { ReactRenderer } from './types'; -export { ReactFramework }; +export { ReactRenderer }; type JSXElement = keyof JSX.IntrinsicElements | JSXElementConstructor; @@ -22,8 +22,8 @@ type JSXElement = keyof JSX.IntrinsicElements | JSXElementConstructor; * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ export type Meta = TCmpOrArgs extends ComponentType - ? ComponentAnnotations> - : ComponentAnnotations; + ? ComponentAnnotations> + : ComponentAnnotations; /** * Story function that represents a CSFv2 component example. @@ -31,8 +31,8 @@ export type Meta = TCmpOrArgs extends ComponentType * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ export type StoryFn = TCmpOrArgs extends ComponentType - ? AnnotatedStoryFn> - : AnnotatedStoryFn; + ? AnnotatedStoryFn> + : AnnotatedStoryFn; /** * Story function that represents a CSFv3 component example. @@ -40,23 +40,23 @@ export type StoryFn = TCmpOrArgs extends ComponentType * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ export type StoryObj = TMetaOrCmpOrArgs extends { - render?: ArgsStoryFn; + render?: ArgsStoryFn; component?: infer Component; args?: infer DefaultArgs; } ? Simplify< (Component extends ComponentType ? ComponentProps : unknown) & - ArgsFromMeta + ArgsFromMeta > extends infer TArgs ? StoryAnnotations< - ReactFramework, + ReactRenderer, TArgs, SetOptional)>> > : never : TMetaOrCmpOrArgs extends ComponentType - ? StoryAnnotations> - : StoryAnnotations; + ? StoryAnnotations> + : StoryAnnotations; type ActionArgs = { [P in keyof RArgs as ((...args: any[]) => void) extends RArgs[P] ? P : never]: RArgs[P]; diff --git a/code/renderers/react/src/render.tsx b/code/renderers/react/src/render.tsx index 8b77447dd5a..d0a2c112e72 100644 --- a/code/renderers/react/src/render.tsx +++ b/code/renderers/react/src/render.tsx @@ -14,14 +14,14 @@ import type { Root as ReactRoot } from 'react-dom/client'; import type { Store_RenderContext, ArgsStoryFn } from '@storybook/types'; -import type { ReactFramework, StoryContext } from './types'; +import type { ReactRenderer, StoryContext } from './types'; const { FRAMEWORK_OPTIONS } = global; // A map of all rendered React 18 nodes const nodes = new Map(); -export const render: ArgsStoryFn = (args, context) => { +export const render: ArgsStoryFn = (args, context) => { const { id, component: Component } = context; if (!Component) { throw new Error( @@ -135,10 +135,10 @@ export async function renderToCanvas( showMain, showException, forceRemount, - }: Store_RenderContext, - canvasElement: ReactFramework['canvasElement'] + }: Store_RenderContext, + canvasElement: ReactRenderer['canvasElement'] ) { - const Story = unboundStoryFn as FC>; + const Story = unboundStoryFn as FC>; const content = ( diff --git a/code/renderers/react/src/testing-api.ts b/code/renderers/react/src/testing-api.ts index 0b655419f33..4477ec8bb81 100644 --- a/code/renderers/react/src/testing-api.ts +++ b/code/renderers/react/src/testing-api.ts @@ -14,7 +14,7 @@ import { deprecate } from '@storybook/client-logger'; import { render } from './render'; import type { Meta } from './public-types'; -import type { ReactFramework } from './types'; +import type { ReactRenderer } from './types'; /** Function that sets the globalConfig of your storybook. The global config is the preview module of your .storybook folder. * @@ -32,7 +32,7 @@ import type { ReactFramework } from './types'; * @param projectAnnotations - e.g. (import * as projectAnnotations from '../.storybook/preview') */ export function setProjectAnnotations( - projectAnnotations: ProjectAnnotations | ProjectAnnotations[] + projectAnnotations: ProjectAnnotations | ProjectAnnotations[] ) { originalSetProjectAnnotations(projectAnnotations); } @@ -42,14 +42,14 @@ export function setProjectAnnotations( * @deprecated Use setProjectAnnotations instead */ export function setGlobalConfig( - projectAnnotations: ProjectAnnotations | ProjectAnnotations[] + projectAnnotations: ProjectAnnotations | ProjectAnnotations[] ) { deprecate(`setGlobalConfig is deprecated. Use setProjectAnnotations instead.`); setProjectAnnotations(projectAnnotations); } // This will not be necessary once we have auto preset loading -const defaultProjectAnnotations: ProjectAnnotations = { +const defaultProjectAnnotations: ProjectAnnotations = { render, }; @@ -81,13 +81,13 @@ const defaultProjectAnnotations: ProjectAnnotations = { * @param [exportsName] - in case your story does not contain a name and you want it to have a name. */ export function composeStory( - story: Store_ComposedStory, + story: Store_ComposedStory, componentAnnotations: Meta, - projectAnnotations?: ProjectAnnotations, + projectAnnotations?: ProjectAnnotations, exportsName?: string ) { - return originalComposeStory( - story as Store_ComposedStory, + return originalComposeStory( + story as Store_ComposedStory, componentAnnotations, projectAnnotations, defaultProjectAnnotations, @@ -120,15 +120,15 @@ export function composeStory( * @param csfExports - e.g. (import * as stories from './Button.stories') * @param [projectAnnotations] - e.g. (import * as projectAnnotations from '../.storybook/preview') this can be applied automatically if you use `setProjectAnnotations` in your setup files. */ -export function composeStories>( +export function composeStories>( csfExports: TModule, - projectAnnotations?: ProjectAnnotations + projectAnnotations?: ProjectAnnotations ) { // @ts-expect-error (Converted from ts-ignore) const composedStories = originalComposeStories(csfExports, projectAnnotations, composeStory); return composedStories as unknown as Omit< - Store_StoriesWithPartialProps, + Store_StoriesWithPartialProps, keyof Store_CSFExports >; } diff --git a/code/renderers/react/src/types.ts b/code/renderers/react/src/types.ts index 7f2751988f9..ce3100384fd 100644 --- a/code/renderers/react/src/types.ts +++ b/code/renderers/react/src/types.ts @@ -1,10 +1,14 @@ import type { ComponentType, ReactElement } from 'react'; -import type { WebFramework } from '@storybook/types'; +import type { WebRenderer } from '@storybook/types'; export type { Store_RenderContext as RenderContext } from '@storybook/types'; export type { StoryContext } from '@storybook/types'; -export interface ReactFramework extends WebFramework { +/** + * @deprecated Use `ReactRenderer` instead. + */ +export type ReactFramework = ReactRenderer; +export interface ReactRenderer extends WebRenderer { component: ComponentType; storyResult: StoryFnReactReturnType; } diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index ad16e0a0123..be41803f829 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook Server renderer", "keywords": [ "storybook" @@ -51,11 +51,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -77,5 +77,5 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/server/src/public-api.ts b/code/renderers/server/src/public-api.ts index 2f23fcbafef..c55854ffc5a 100644 --- a/code/renderers/server/src/public-api.ts +++ b/code/renderers/server/src/public-api.ts @@ -2,17 +2,17 @@ import type { Addon_ClientStoryApi, Addon_Loadable } from '@storybook/types'; import { start } from '@storybook/core-client'; import { renderToCanvas, render } from './render'; -import type { ServerFramework } from './types'; +import type { ServerRenderer } from './types'; const FRAMEWORK = 'server'; -interface ClientApi extends Addon_ClientStoryApi { +interface ClientApi extends Addon_ClientStoryApi { configure(loader: Addon_Loadable, module: NodeModule): void; forceReRender(): void; raw: () => any; // todo add type } -const api = start(renderToCanvas, { render }); +const api = start(renderToCanvas, { render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/server/src/public-types.ts b/code/renderers/server/src/public-types.ts index e356f7fef36..4d61201fd9d 100644 --- a/code/renderers/server/src/public-types.ts +++ b/code/renderers/server/src/public-types.ts @@ -4,7 +4,7 @@ import type { ComponentAnnotations, StoryAnnotations, } from '@storybook/types'; -import type { ServerFramework } from './types'; +import type { ServerRenderer } from './types'; export type { Args, ArgTypes, Parameters, StoryContext } from '@storybook/types'; @@ -13,21 +13,21 @@ export type { Args, ArgTypes, Parameters, StoryContext } from '@storybook/types' * * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ -export type Meta = ComponentAnnotations; +export type Meta = ComponentAnnotations; /** * Story function that represents a CSFv2 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryFn = AnnotatedStoryFn; +export type StoryFn = AnnotatedStoryFn; /** * Story function that represents a CSFv3 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryObj = StoryAnnotations; +export type StoryObj = StoryAnnotations; /** * @deprecated Use `StoryFn` instead. diff --git a/code/renderers/server/src/render.ts b/code/renderers/server/src/render.ts index cb1049dc3b8..a6f31ee2817 100644 --- a/code/renderers/server/src/render.ts +++ b/code/renderers/server/src/render.ts @@ -6,7 +6,7 @@ import { dedent } from 'ts-dedent'; import type { Store_RenderContext } from '@storybook/types'; import { simulatePageLoad, simulateDOMContentLoaded } from '@storybook/preview-web'; import type { StoryFn, Args, ArgTypes } from './public-types'; -import type { FetchStoryHtmlType, ServerFramework } from './types'; +import type { FetchStoryHtmlType, ServerRenderer } from './types'; const { fetch, Node } = global; @@ -42,7 +42,7 @@ const buildStoryArgs = (args: Args, argTypes: ArgTypes) => { return storyArgs; }; -export const render: StoryFn = (args: Args) => {}; +export const render: StoryFn = (args: Args) => {}; export async function renderToCanvas( { @@ -55,8 +55,8 @@ export async function renderToCanvas( storyFn, storyContext, storyContext: { parameters, args, argTypes }, - }: Store_RenderContext, - canvasElement: ServerFramework['canvasElement'] + }: Store_RenderContext, + canvasElement: ServerRenderer['canvasElement'] ) { // Some addons wrap the storyFn so we need to call it even though Server doesn't need the answer storyFn(); diff --git a/code/renderers/server/src/types.ts b/code/renderers/server/src/types.ts index dcabd8a41e5..4b562f771fb 100644 --- a/code/renderers/server/src/types.ts +++ b/code/renderers/server/src/types.ts @@ -1,11 +1,15 @@ -import type { StoryContext as StoryContextBase, WebFramework } from '@storybook/types'; +import type { StoryContext as StoryContextBase, WebRenderer } from '@storybook/types'; export type { RenderContext } from '@storybook/types'; export type StoryFnServerReturnType = any; -export type StoryContext = StoryContextBase; +export type StoryContext = StoryContextBase; -export interface ServerFramework extends WebFramework { +/** + * @deprecated Use `ServerRenderer` instead. + */ +export type ServerFramework = ServerRenderer; +export interface ServerRenderer extends WebRenderer { component: string; storyResult: StoryFnServerReturnType; } diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 848fdd3cbcd..84798553ad8 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook Svelte renderer", "keywords": [ "storybook" @@ -55,12 +55,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -90,5 +90,5 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/svelte/src/decorators.ts b/code/renderers/svelte/src/decorators.ts index 8bbb2d90e17..b4f516a944c 100644 --- a/code/renderers/svelte/src/decorators.ts +++ b/code/renderers/svelte/src/decorators.ts @@ -1,7 +1,7 @@ import type { DecoratorFunction, StoryContext, LegacyStoryFn } from '@storybook/types'; import { sanitizeStoryContextUpdate } from '@storybook/store'; import SlotDecorator from '../templates/SlotDecorator.svelte'; -import type { SvelteFramework } from './types'; +import type { SvelteRenderer } from './types'; /** * Check if an object is a svelte component. @@ -31,7 +31,7 @@ function unWrap(obj: any) { * @param story the current story * @param originalStory the story decorated by the current story */ -function prepareStory(context: StoryContext, story: any, originalStory?: any) { +function prepareStory(context: StoryContext, story: any, originalStory?: any) { let result = unWrap(story); if (isSvelteComponent(result)) { // wrap the component @@ -66,10 +66,10 @@ function prepareStory(context: StoryContext, story: any, origin export function decorateStory(storyFn: any, decorators: any[]) { return decorators.reduce( ( - previousStoryFn: LegacyStoryFn, - decorator: DecoratorFunction + previousStoryFn: LegacyStoryFn, + decorator: DecoratorFunction ) => - (context: StoryContext) => { + (context: StoryContext) => { let story; const decoratedStory = decorator((update) => { story = previousStoryFn({ @@ -89,6 +89,6 @@ export function decorateStory(storyFn: any, decorators: any[]) { return prepareStory(context, decoratedStory, story); }, - (context: StoryContext) => prepareStory(context, storyFn(context)) + (context: StoryContext) => prepareStory(context, storyFn(context)) ); } diff --git a/code/renderers/svelte/src/docs/sourceDecorator.ts b/code/renderers/svelte/src/docs/sourceDecorator.ts index 061dc821d46..e00243aaa56 100644 --- a/code/renderers/svelte/src/docs/sourceDecorator.ts +++ b/code/renderers/svelte/src/docs/sourceDecorator.ts @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle */ import { addons, useEffect } from '@storybook/addons'; import { deprecate } from '@storybook/client-logger'; -import type { ArgTypes, Args, StoryContext, Framework } from '@storybook/types'; +import type { ArgTypes, Args, StoryContext, Renderer } from '@storybook/types'; import { SourceType, SNIPPET_RENDERED } from '@storybook/docs-tools'; @@ -10,7 +10,7 @@ import { SourceType, SNIPPET_RENDERED } from '@storybook/docs-tools'; * * @param context StoryContext */ -const skipSourceRender = (context: StoryContext) => { +const skipSourceRender = (context: StoryContext) => { const sourceParams = context?.parameters.docs?.source; const isArgsStory = context?.parameters.__isArgsStory; @@ -148,7 +148,7 @@ function getWrapperProperties(component: any) { * @param storyFn Fn * @param context StoryContext */ -export const sourceDecorator = (storyFn: any, context: StoryContext) => { +export const sourceDecorator = (storyFn: any, context: StoryContext) => { const channel = addons.getChannel(); const skip = skipSourceRender(context); const story = storyFn(); diff --git a/code/renderers/svelte/src/public-types.test.ts b/code/renderers/svelte/src/public-types.test.ts index a0edd3d3615..e7af27cb7f0 100644 --- a/code/renderers/svelte/src/public-types.test.ts +++ b/code/renderers/svelte/src/public-types.test.ts @@ -8,10 +8,10 @@ import Decorator from './__test__/Decorator.svelte'; import Decorator2 from './__test__/Decorator2.svelte'; import type { DecoratorFn, Meta, StoryObj } from './public-types'; -import type { SvelteFramework } from './types'; +import type { SvelteRenderer } from './types'; type SvelteStory = StoryAnnotations< - SvelteFramework, + SvelteRenderer, Args, RequiredArgs >; @@ -27,7 +27,7 @@ describe('Meta', () => { }; expectTypeOf(meta).toEqualTypeOf< - ComponentAnnotations, { disabled: boolean; label: string }> + ComponentAnnotations, { disabled: boolean; label: string }> >(); }); @@ -38,7 +38,7 @@ describe('Meta', () => { }; expectTypeOf(meta).toEqualTypeOf< - ComponentAnnotations + ComponentAnnotations >(); }); diff --git a/code/renderers/svelte/src/public-types.ts b/code/renderers/svelte/src/public-types.ts index 11355def873..315f875d013 100644 --- a/code/renderers/svelte/src/public-types.ts +++ b/code/renderers/svelte/src/public-types.ts @@ -10,7 +10,7 @@ import type { import type { ComponentProps, ComponentType, SvelteComponentTyped } from 'svelte'; import type { SetOptional, Simplify } from 'type-fest'; -import type { SvelteFramework } from './types'; +import type { SvelteRenderer } from './types'; /** * Metadata to configure the stories for a component. @@ -18,16 +18,16 @@ import type { SvelteFramework } from './types'; * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ export type Meta = CmpOrArgs extends SvelteComponentTyped - ? ComponentAnnotations, Props> - : ComponentAnnotations; + ? ComponentAnnotations, Props> + : ComponentAnnotations; /** * Story function that represents a CSFv2 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ export type StoryFn = TCmpOrArgs extends SvelteComponentTyped - ? AnnotatedStoryFn - : AnnotatedStoryFn; + ? AnnotatedStoryFn + : AnnotatedStoryFn; /** * Story function that represents a CSFv3 component example. @@ -35,21 +35,21 @@ export type StoryFn = TCmpOrArgs extends SvelteComponentTyped * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ export type StoryObj = MetaOrCmpOrArgs extends { - render?: ArgsStoryFn; + render?: ArgsStoryFn; component?: ComponentType; args?: infer DefaultArgs; } ? Simplify< - ComponentProps & ArgsFromMeta + ComponentProps & ArgsFromMeta > extends infer TArgs ? StoryAnnotations< - SvelteFramework, + SvelteRenderer, TArgs, SetOptional> > : never : MetaOrCmpOrArgs extends SvelteComponentTyped - ? StoryAnnotations, ComponentProps> - : StoryAnnotations; + ? StoryAnnotations, ComponentProps> + : StoryAnnotations; -export type DecoratorFn = DecoratorFunction; +export type DecoratorFn = DecoratorFunction; diff --git a/code/renderers/svelte/src/render.ts b/code/renderers/svelte/src/render.ts index bcd3f421283..ad2b2a981bf 100644 --- a/code/renderers/svelte/src/render.ts +++ b/code/renderers/svelte/src/render.ts @@ -1,14 +1,15 @@ /* eslint-disable no-param-reassign */ import type { Store_RenderContext, ArgsStoryFn } from '@storybook/types'; import type { SvelteComponentTyped } from 'svelte'; + // eslint-disable-next-line import/no-extraneous-dependencies import PreviewRender from '@storybook/svelte/templates/PreviewRender.svelte'; -import type { SvelteFramework } from './types'; +import type { SvelteRenderer } from './types'; -const componentsByDomElement = new Map(); +const componentsByDomElement = new Map(); -function teardown(canvasElement: SvelteFramework['canvasElement']) { +function teardown(canvasElement: SvelteRenderer['canvasElement']) { if (!componentsByDomElement.has(canvasElement)) { return; } @@ -28,8 +29,8 @@ export function renderToCanvas( showError, storyContext, forceRemount, - }: Store_RenderContext, - canvasElement: SvelteFramework['canvasElement'] + }: Store_RenderContext, + canvasElement: SvelteRenderer['canvasElement'] ) { const existingComponent = componentsByDomElement.get(canvasElement); @@ -67,7 +68,7 @@ export function renderToCanvas( }; } -export const render: ArgsStoryFn = (args, context) => { +export const render: ArgsStoryFn = (args, context) => { const { id, component: Component } = context; if (!Component) { throw new Error( diff --git a/code/renderers/svelte/src/types.ts b/code/renderers/svelte/src/types.ts index 4a420e636e5..23e76243f70 100644 --- a/code/renderers/svelte/src/types.ts +++ b/code/renderers/svelte/src/types.ts @@ -1,7 +1,7 @@ -import type { StoryContext as StoryContextBase, WebFramework } from '@storybook/types'; +import type { StoryContext as StoryContextBase, WebRenderer } from '@storybook/types'; import type { ComponentConstructorOptions, ComponentEvents, SvelteComponentTyped } from 'svelte'; -export type StoryContext = StoryContextBase; +export type StoryContext = StoryContextBase; export interface ShowErrorArgs { title: string; @@ -31,8 +31,8 @@ type ComponentType< : P]: SvelteComponentTyped[P]; }; -export interface SvelteFramework - extends WebFramework { +export interface SvelteRenderer + extends WebRenderer { component: ComponentType ? this['T'] : any>; storyResult: this['T'] extends Record ? SvelteStoryResult> diff --git a/code/renderers/vue/package.json b/code/renderers/vue/package.json index 3bd2c396a8c..dd50e58b692 100644 --- a/code/renderers/vue/package.json +++ b/code/renderers/vue/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook Vue renderer", "keywords": [ "storybook" @@ -51,12 +51,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -92,5 +92,5 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/vue/src/decorateStory.ts b/code/renderers/vue/src/decorateStory.ts index 6cde549fb8c..fcbae92f50b 100644 --- a/code/renderers/vue/src/decorateStory.ts +++ b/code/renderers/vue/src/decorateStory.ts @@ -3,7 +3,7 @@ import Vue from 'vue'; import type { DecoratorFunction, StoryContext, LegacyStoryFn } from '@storybook/types'; import { sanitizeStoryContextUpdate } from '@storybook/store'; -import type { StoryFnVueReturnType, VueFramework } from './types'; +import type { StoryFnVueReturnType, VueRenderer } from './types'; import { extractProps } from './util'; import { VALUES } from './render'; @@ -12,7 +12,7 @@ export const WRAPS = 'STORYBOOK_WRAPS'; function prepare( rawStory: StoryFnVueReturnType, innerStory?: StoryFnVueReturnType, - context?: StoryContext + context?: StoryContext ): VueConstructor | null { let story: ComponentOptions | VueConstructor; @@ -62,12 +62,12 @@ function prepare( } export function decorateStory( - storyFn: LegacyStoryFn, - decorators: DecoratorFunction[] + storyFn: LegacyStoryFn, + decorators: DecoratorFunction[] ) { return decorators.reduce( - (decorated: LegacyStoryFn, decorator) => (context: StoryContext) => { - let story: VueFramework['storyResult'] | undefined; + (decorated: LegacyStoryFn, decorator) => (context: StoryContext) => { + let story: VueRenderer['storyResult'] | undefined; const decoratedStory = decorator((update) => { story = decorated({ ...context, ...sanitizeStoryContextUpdate(update) }); @@ -82,10 +82,10 @@ export function decorateStory( return story; } - return prepare(decoratedStory, story) as VueFramework['storyResult']; + return prepare(decoratedStory, story) as VueRenderer['storyResult']; }, (context) => { - return prepare(storyFn(context), undefined, context) as VueFramework['storyResult']; + return prepare(storyFn(context), undefined, context) as VueRenderer['storyResult']; } ); } diff --git a/code/renderers/vue/src/public-api.ts b/code/renderers/vue/src/public-api.ts index fa6c95f1f4b..553e42b76c3 100644 --- a/code/renderers/vue/src/public-api.ts +++ b/code/renderers/vue/src/public-api.ts @@ -2,20 +2,20 @@ import type { Addon_ClientStoryApi, Addon_Loadable } from '@storybook/types'; import { start } from '@storybook/core-client'; -import type { VueFramework } from './types'; +import type { VueRenderer } from './types'; import { renderToCanvas, render } from './render'; import { decorateStory } from './decorateStory'; const FRAMEWORK = 'vue'; -interface ClientApi extends Addon_ClientStoryApi { +interface ClientApi extends Addon_ClientStoryApi { configure(loader: Addon_Loadable, module: NodeModule): void; forceReRender(): void; raw: () => any; // todo add type load: (...args: any[]) => void; } -const api = start(renderToCanvas, { decorateStory, render }); +const api = start(renderToCanvas, { decorateStory, render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/vue/src/public-types.test.ts b/code/renderers/vue/src/public-types.test.ts index cd0d3b079b8..5ceaa0d1581 100644 --- a/code/renderers/vue/src/public-types.test.ts +++ b/code/renderers/vue/src/public-types.test.ts @@ -7,7 +7,7 @@ import type { ExtendedVue } from 'vue/types/vue'; import { Vue } from 'vue/types/vue'; import type { DecoratorFn, Meta, StoryObj } from './public-types'; import Button from './__tests__/Button.vue'; -import type { VueFramework } from './types'; +import type { VueRenderer } from './types'; describe('Meta', () => { test('Generic parameter of Meta can be a component', () => { @@ -18,7 +18,7 @@ describe('Meta', () => { expectTypeOf(meta).toEqualTypeOf< ComponentAnnotations< - VueFramework, + VueRenderer, { disabled: boolean; label: string; @@ -34,7 +34,7 @@ describe('Meta', () => { }; expectTypeOf(meta).toEqualTypeOf< - ComponentAnnotations + ComponentAnnotations >(); }); }); @@ -52,7 +52,7 @@ describe('StoryObj', () => { }); type Actual = StoryObj; - type Expected = StoryAnnotations>; + type Expected = StoryAnnotations>; expectTypeOf().toEqualTypeOf(); }); @@ -60,7 +60,7 @@ describe('StoryObj', () => { { const meta = satisfies>()({ component: Button }); - type Expected = StoryAnnotations; + type Expected = StoryAnnotations; expectTypeOf>().toEqualTypeOf(); } { @@ -71,11 +71,7 @@ describe('StoryObj', () => { // @ts-expect-error disabled not provided ❌ const Basic: StoryObj = {}; - type Expected = StoryAnnotations< - VueFramework, - ButtonProps, - SetOptional - >; + type Expected = StoryAnnotations>; expectTypeOf(Basic).toEqualTypeOf(); } { @@ -85,14 +81,14 @@ describe('StoryObj', () => { args: { label: 'good' }, }; - type Expected = StoryAnnotations; + type Expected = StoryAnnotations; expectTypeOf(Basic).toEqualTypeOf(); } }); test('Component can be used as generic parameter for StoryObj', () => { expectTypeOf>().toEqualTypeOf< - StoryAnnotations + StoryAnnotations >(); }); }); @@ -122,7 +118,7 @@ describe('Story args can be inferred', () => { const Basic: StoryObj = { args: { theme: 'light', label: 'good' } }; - type Expected = StoryAnnotations>; + type Expected = StoryAnnotations>; expectTypeOf(Basic).toEqualTypeOf(); }); @@ -146,7 +142,7 @@ describe('Story args can be inferred', () => { const Basic: StoryObj = { args: { decoratorArg: 'title', label: 'good' } }; - type Expected = StoryAnnotations>; + type Expected = StoryAnnotations>; expectTypeOf(Basic).toEqualTypeOf(); }); @@ -173,7 +169,7 @@ describe('Story args can be inferred', () => { args: { decoratorArg: '', decoratorArg2: '', label: 'good' }, }; - type Expected = StoryAnnotations>; + type Expected = StoryAnnotations>; expectTypeOf(Basic).toEqualTypeOf(); }); }); diff --git a/code/renderers/vue/src/public-types.ts b/code/renderers/vue/src/public-types.ts index 6c125e0795d..18c64547962 100644 --- a/code/renderers/vue/src/public-types.ts +++ b/code/renderers/vue/src/public-types.ts @@ -10,7 +10,7 @@ import type { import type { SetOptional, Simplify } from 'type-fest'; import type { Component } from 'vue'; import type { ExtendedVue } from 'vue/types/vue'; -import type { VueFramework } from './types'; +import type { VueRenderer } from './types'; export type { Args, ArgTypes, Parameters, StoryContext } from '@storybook/types'; @@ -20,7 +20,7 @@ export type { Args, ArgTypes, Parameters, StoryContext } from '@storybook/types' * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ export type Meta = ComponentAnnotations< - VueFramework, + VueRenderer, ComponentPropsOrProps >; @@ -30,7 +30,7 @@ export type Meta = ComponentAnnotations< * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ export type StoryFn = AnnotatedStoryFn< - VueFramework, + VueRenderer, ComponentPropsOrProps >; @@ -40,20 +40,20 @@ export type StoryFn = AnnotatedStoryFn< * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ export type StoryObj = TMetaOrCmpOrArgs extends { - render?: ArgsStoryFn; + render?: ArgsStoryFn; component?: infer C; args?: infer DefaultArgs; } ? TMetaOrCmpOrArgs extends Component // needed because StoryObj falls into this branch, see test - ? StoryAnnotations> - : Simplify & ArgsFromMeta> extends infer TArgs + ? StoryAnnotations> + : Simplify & ArgsFromMeta> extends infer TArgs ? StoryAnnotations< - VueFramework, + VueRenderer, TArgs, SetOptional> > : never - : StoryAnnotations>; + : StoryAnnotations>; type ComponentProps = C extends ExtendedVue ? P @@ -78,4 +78,4 @@ type ComponentPropsOrProps = TCmpOrArgs extends Component */ export type Story = StoryFn; -export type DecoratorFn = DecoratorFunction; +export type DecoratorFn = DecoratorFunction; diff --git a/code/renderers/vue/src/render.ts b/code/renderers/vue/src/render.ts index 25d5708409f..22a896d6d93 100644 --- a/code/renderers/vue/src/render.ts +++ b/code/renderers/vue/src/render.ts @@ -3,12 +3,12 @@ import { dedent } from 'ts-dedent'; import Vue from 'vue'; import type { Store_RenderContext, ArgsStoryFn } from '@storybook/types'; import type { CombinedVueInstance } from 'vue/types/vue'; -import type { VueFramework } from './types'; +import type { VueRenderer } from './types'; export const COMPONENT = 'STORYBOOK_COMPONENT'; export const VALUES = 'STORYBOOK_VALUES'; -const map = new Map(); +const map = new Map(); type Instance = CombinedVueInstance< Vue, { @@ -20,7 +20,7 @@ type Instance = CombinedVueInstance< Record >; -const getRoot = (canvasElement: VueFramework['canvasElement']): Instance => { +const getRoot = (canvasElement: VueRenderer['canvasElement']): Instance => { const cachedInstance = map.get(canvasElement); if (cachedInstance != null) return cachedInstance; @@ -49,9 +49,9 @@ const getRoot = (canvasElement: VueFramework['canvasElement']): Instance => { return instance; }; -export const render: ArgsStoryFn = (args, context) => { +export const render: ArgsStoryFn = (args, context) => { const { id, component: Component, argTypes } = context; - const component = Component as VueFramework['component'] & { + const component = Component as VueRenderer['component'] & { __docgenInfo?: { displayName: string }; props: Record; }; @@ -91,14 +91,14 @@ export function renderToCanvas( showError, showException, forceRemount, - }: Store_RenderContext, - canvasElement: VueFramework['canvasElement'] + }: Store_RenderContext, + canvasElement: VueRenderer['canvasElement'] ) { const root = getRoot(canvasElement); Vue.config.errorHandler = showException; const element = storyFn(); - let mountTarget: Element | VueFramework['canvasElement'] | null; + let mountTarget: Element | VueRenderer['canvasElement'] | null; // Vue2 mount always replaces the mount target with Vue-generated DOM. // https://v2.vuejs.org/v2/api/#el:~:text=replaced%20with%20Vue%2Dgenerated%20DOM diff --git a/code/renderers/vue/src/types.ts b/code/renderers/vue/src/types.ts index a261d6acdea..4ae4c9c4ab3 100644 --- a/code/renderers/vue/src/types.ts +++ b/code/renderers/vue/src/types.ts @@ -1,4 +1,4 @@ -import type { StoryContext as StoryContextBase, WebFramework } from '@storybook/types'; +import type { StoryContext as StoryContextBase, WebRenderer } from '@storybook/types'; import type { Component, AsyncComponent } from 'vue'; export type { RenderContext } from '@storybook/types'; @@ -12,9 +12,13 @@ export type StoryFnVueReturnType = | Component | AsyncComponent; -export type StoryContext = StoryContextBase; +export type StoryContext = StoryContextBase; -export interface VueFramework extends WebFramework { +/** + * @deprecated Use `VueRenderer` instead. + */ +export type VueFramework = VueRenderer; +export interface VueRenderer extends WebRenderer { component: Component | AsyncComponent; storyResult: StoryFnVueReturnType; } diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index 330a16e8b37..134a005efb6 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook Vue 3 renderer", "keywords": [ "storybook" @@ -51,11 +51,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -91,5 +91,5 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/vue3/src/decorateStory.ts b/code/renderers/vue3/src/decorateStory.ts index c066e21a147..44275f89a63 100644 --- a/code/renderers/vue3/src/decorateStory.ts +++ b/code/renderers/vue3/src/decorateStory.ts @@ -3,7 +3,7 @@ import { h } from 'vue'; import type { DecoratorFunction, StoryContext, LegacyStoryFn } from '@storybook/types'; import { sanitizeStoryContextUpdate } from '@storybook/store'; -import type { VueFramework } from './types'; +import type { VueRenderer } from './types'; /* This normalizes a functional component into a render method in ComponentOptions. @@ -16,7 +16,7 @@ function normalizeFunctionalComponent(options: ConcreteComponent): ComponentOpti } function prepare( - rawStory: VueFramework['storyResult'], + rawStory: VueRenderer['storyResult'], innerStory?: ConcreteComponent ): Component | null { const story = rawStory as ComponentOptions; @@ -41,14 +41,14 @@ function prepare( } export function decorateStory( - storyFn: LegacyStoryFn, - decorators: DecoratorFunction[] -): LegacyStoryFn { + storyFn: LegacyStoryFn, + decorators: DecoratorFunction[] +): LegacyStoryFn { return decorators.reduce( - (decorated: LegacyStoryFn, decorator) => (context: StoryContext) => { - let story: VueFramework['storyResult'] | undefined; + (decorated: LegacyStoryFn, decorator) => (context: StoryContext) => { + let story: VueRenderer['storyResult'] | undefined; - const decoratedStory: VueFramework['storyResult'] = decorator((update) => { + const decoratedStory: VueRenderer['storyResult'] = decorator((update) => { story = decorated({ ...context, ...sanitizeStoryContextUpdate(update) }); return story; }, context); @@ -61,8 +61,8 @@ export function decorateStory( return story; } - return prepare(decoratedStory, story) as VueFramework['storyResult']; + return prepare(decoratedStory, story) as VueRenderer['storyResult']; }, - (context) => prepare(storyFn(context)) as LegacyStoryFn + (context) => prepare(storyFn(context)) as LegacyStoryFn ); } diff --git a/code/renderers/vue3/src/public-api.ts b/code/renderers/vue3/src/public-api.ts index c78e56e968e..f7a0220a0d0 100644 --- a/code/renderers/vue3/src/public-api.ts +++ b/code/renderers/vue3/src/public-api.ts @@ -2,14 +2,14 @@ import type { Addon_ClientStoryApi, Addon_Loadable } from '@storybook/types'; import type { App } from 'vue'; import { start } from '@storybook/core-client'; -import type { VueFramework } from './types'; +import type { VueRenderer } from './types'; import { decorateStory } from './decorateStory'; import { render, renderToCanvas } from './render'; const FRAMEWORK = 'vue3'; -interface ClientApi extends Addon_ClientStoryApi { +interface ClientApi extends Addon_ClientStoryApi { configure(loader: Addon_Loadable, module: NodeModule): void; forceReRender(): void; raw: () => any; // todo add type @@ -17,7 +17,7 @@ interface ClientApi extends Addon_ClientStoryApi { app: App; } -const api = start(renderToCanvas, { decorateStory, render }); +const api = start(renderToCanvas, { decorateStory, render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/vue3/src/public-types.test.ts b/code/renderers/vue3/src/public-types.test.ts index 5cf1257f12a..cbf4fff8f48 100644 --- a/code/renderers/vue3/src/public-types.test.ts +++ b/code/renderers/vue3/src/public-types.test.ts @@ -5,7 +5,7 @@ import type { SetOptional } from 'type-fest'; import type { ComponentOptions, FunctionalComponent } from 'vue'; import { h } from 'vue'; import type { DecoratorFn, Meta, StoryObj } from './public-types'; -import type { VueFramework } from './types'; +import type { VueRenderer } from './types'; import Button from './__tests__/Button.vue'; import DecoratorTsVue from './__tests__/Decorator.vue'; import Decorator2TsVue from './__tests__/Decorator2.vue'; @@ -19,7 +19,7 @@ describe('Meta', () => { expectTypeOf(meta).toEqualTypeOf< ComponentAnnotations< - VueFramework, + VueRenderer, { readonly disabled: boolean; readonly label: string; @@ -37,7 +37,7 @@ describe('Meta', () => { }; expectTypeOf(meta).toEqualTypeOf< - ComponentAnnotations + ComponentAnnotations >(); }); @@ -78,7 +78,7 @@ describe('StoryObj', () => { }); type Actual = StoryObj; - type Expected = StoryAnnotations>; + type Expected = StoryAnnotations>; expectTypeOf().toEqualTypeOf(); }); @@ -86,7 +86,7 @@ describe('StoryObj', () => { { const meta = satisfies>()({ component: Button }); - type Expected = StoryAnnotations; + type Expected = StoryAnnotations; expectTypeOf>().toEqualTypeOf(); } { @@ -97,11 +97,7 @@ describe('StoryObj', () => { // @ts-expect-error disabled not provided ❌ const Basic: StoryObj = {}; - type Expected = StoryAnnotations< - VueFramework, - ButtonProps, - SetOptional - >; + type Expected = StoryAnnotations>; expectTypeOf(Basic).toEqualTypeOf(); } { @@ -111,14 +107,14 @@ describe('StoryObj', () => { args: { label: 'good' }, }; - type Expected = StoryAnnotations; + type Expected = StoryAnnotations; expectTypeOf(Basic).toEqualTypeOf(); } }); test('Component can be used as generic parameter for StoryObj', () => { expectTypeOf>().toEqualTypeOf< - StoryAnnotations + StoryAnnotations >(); }); }); @@ -145,7 +141,7 @@ describe('Story args can be inferred', () => { const Basic: StoryObj = { args: { theme: 'light', label: 'good' } }; - type Expected = StoryAnnotations>; + type Expected = StoryAnnotations>; expectTypeOf(Basic).toEqualTypeOf(); }); @@ -165,7 +161,7 @@ describe('Story args can be inferred', () => { const Basic: StoryObj = { args: { decoratorArg: 'title', label: 'good' } }; - type Expected = StoryAnnotations>; + type Expected = StoryAnnotations>; expectTypeOf(Basic).toEqualTypeOf(); }); @@ -187,7 +183,7 @@ describe('Story args can be inferred', () => { args: { decoratorArg: '', decoratorArg2: '', label: 'good' }, }; - type Expected = StoryAnnotations>; + type Expected = StoryAnnotations>; expectTypeOf(Basic).toEqualTypeOf(); }); }); diff --git a/code/renderers/vue3/src/public-types.ts b/code/renderers/vue3/src/public-types.ts index 7a37ec29e1f..cd39d70f79c 100644 --- a/code/renderers/vue3/src/public-types.ts +++ b/code/renderers/vue3/src/public-types.ts @@ -10,7 +10,7 @@ import type { import type { SetOptional, Simplify } from 'type-fest'; import type { ComponentOptions, ConcreteComponent, FunctionalComponent } from 'vue'; -import type { VueFramework } from './types'; +import type { VueRenderer } from './types'; /** * Metadata to configure the stories for a component. @@ -18,7 +18,7 @@ import type { VueFramework } from './types'; * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ export type Meta = ComponentAnnotations< - VueFramework, + VueRenderer, ComponentPropsOrProps >; @@ -28,7 +28,7 @@ export type Meta = ComponentAnnotations< * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ export type StoryFn = AnnotatedStoryFn< - VueFramework, + VueRenderer, ComponentPropsOrProps >; @@ -38,20 +38,20 @@ export type StoryFn = AnnotatedStoryFn< * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ export type StoryObj = TMetaOrCmpOrArgs extends { - render?: ArgsStoryFn; + render?: ArgsStoryFn; component?: infer Component; args?: infer DefaultArgs; } ? Simplify< - ComponentProps & ArgsFromMeta + ComponentProps & ArgsFromMeta > extends infer TArgs ? StoryAnnotations< - VueFramework, + VueRenderer, TArgs, SetOptional> > : never - : StoryAnnotations>; + : StoryAnnotations>; type ComponentProps = C extends ComponentOptions ? P @@ -76,4 +76,4 @@ type ComponentPropsOrProps = TCmpOrArgs extends ConcreteComponent = StoryFn; -export type DecoratorFn = DecoratorFunction; +export type DecoratorFn = DecoratorFunction; diff --git a/code/renderers/vue3/src/render.ts b/code/renderers/vue3/src/render.ts index 7fb96f596a3..520f31bddce 100644 --- a/code/renderers/vue3/src/render.ts +++ b/code/renderers/vue3/src/render.ts @@ -2,9 +2,9 @@ import { dedent } from 'ts-dedent'; import { createApp, h } from 'vue'; import type { Store_RenderContext, ArgsStoryFn } from '@storybook/types'; -import type { StoryFnVueReturnType, VueFramework } from './types'; +import type { StoryFnVueReturnType, VueRenderer } from './types'; -export const render: ArgsStoryFn = (props, context) => { +export const render: ArgsStoryFn = (props, context) => { const { id, component: Component } = context; if (!Component) { throw new Error( @@ -20,11 +20,11 @@ export const setup = (fn: (app: any) => void) => { setupFunction = fn; }; -const map = new Map>(); +const map = new Map>(); export function renderToCanvas( - { title, name, storyFn, showMain, showError, showException }: Store_RenderContext, - canvasElement: VueFramework['canvasElement'] + { title, name, storyFn, showMain, showError, showException }: Store_RenderContext, + canvasElement: VueRenderer['canvasElement'] ) { // TODO: explain cyclical nature of these app => story => mount let element: StoryFnVueReturnType; diff --git a/code/renderers/vue3/src/types.ts b/code/renderers/vue3/src/types.ts index dec8e6585ef..15809f9094e 100644 --- a/code/renderers/vue3/src/types.ts +++ b/code/renderers/vue3/src/types.ts @@ -1,4 +1,4 @@ -import type { StoryContext as StoryContextBase, WebFramework } from '@storybook/types'; +import type { StoryContext as StoryContextBase, WebRenderer } from '@storybook/types'; import type { ConcreteComponent } from 'vue'; export type { RenderContext } from '@storybook/types'; @@ -10,9 +10,13 @@ export interface ShowErrorArgs { export type StoryFnVueReturnType = ConcreteComponent; -export type StoryContext = StoryContextBase; +export type StoryContext = StoryContextBase; -export interface VueFramework extends WebFramework { +/** + * @deprecated Use `VueRenderer` instead. + */ +export type VueFramework = VueRenderer; +export interface VueRenderer extends WebRenderer { // We are omitting props, as we don't use it internally, and more importantly, it completely changes the assignability of meta.component. // Try not omitting, and check the type errros in the test file, if you want to learn more. component: Omit, 'props'>; diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index 785ae8f0b7d..8d638d25e21 100644 --- a/code/renderers/web-components/package.json +++ b/code/renderers/web-components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook web-components renderer", "keywords": [ "lit-html", @@ -53,14 +53,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/core-client": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/core-client": "7.0.0-alpha.49", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", @@ -87,5 +87,5 @@ ], "platform": "browser" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/renderers/web-components/src/docs/sourceDecorator.ts b/code/renderers/web-components/src/docs/sourceDecorator.ts index 8436dab16fc..bef93cade87 100644 --- a/code/renderers/web-components/src/docs/sourceDecorator.ts +++ b/code/renderers/web-components/src/docs/sourceDecorator.ts @@ -5,12 +5,12 @@ import type { ArgsStoryFn, PartialStoryFn, StoryContext } from '@storybook/types import { addons, useEffect } from '@storybook/addons'; import { SNIPPET_RENDERED, SourceType } from '@storybook/docs-tools'; -import type { WebComponentsFramework } from '../types'; +import type { WebComponentsRenderer } from '../types'; // Taken from https://github.com/lit/lit/blob/main/packages/lit-html/src/test/test-utils/strip-markers.ts const LIT_EXPRESSION_COMMENTS = /|/g; -function skipSourceRender(context: StoryContext) { +function skipSourceRender(context: StoryContext) { const sourceParams = context?.parameters.docs?.source; const isArgsStory = context?.parameters.__isArgsStory; @@ -26,7 +26,7 @@ function skipSourceRender(context: StoryContext) { function applyTransformSource( source: string, - context: StoryContext + context: StoryContext ): string { const { transformSource } = context.parameters.docs ?? {}; if (typeof transformSource !== 'function') return source; @@ -34,11 +34,11 @@ function applyTransformSource( } export function sourceDecorator( - storyFn: PartialStoryFn, - context: StoryContext -): WebComponentsFramework['storyResult'] { + storyFn: PartialStoryFn, + context: StoryContext +): WebComponentsRenderer['storyResult'] { const story = context?.parameters.docs?.source?.excludeDecorators - ? (context.originalStoryFn as ArgsStoryFn)(context.args, context) + ? (context.originalStoryFn as ArgsStoryFn)(context.args, context) : storyFn(); let source: string; diff --git a/code/renderers/web-components/src/public-api.ts b/code/renderers/web-components/src/public-api.ts index 857d66ea10f..3d5590fbf73 100644 --- a/code/renderers/web-components/src/public-api.ts +++ b/code/renderers/web-components/src/public-api.ts @@ -3,17 +3,17 @@ import type { Addon_ClientStoryApi, Addon_Loadable } from '@storybook/types'; import { start } from '@storybook/core-client'; import { renderToCanvas } from './render'; -import type { WebComponentsFramework } from './types'; +import type { WebComponentsRenderer } from './types'; const FRAMEWORK = 'web-components'; -interface ClientApi extends Addon_ClientStoryApi { +interface ClientApi extends Addon_ClientStoryApi { configure(loader: Addon_Loadable, module: NodeModule): void; forceReRender(): void; raw: () => any; // todo add type } -const api = start(renderToCanvas); +const api = start(renderToCanvas); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/web-components/src/public-types.ts b/code/renderers/web-components/src/public-types.ts index d23ac54b610..eec13e38365 100644 --- a/code/renderers/web-components/src/public-types.ts +++ b/code/renderers/web-components/src/public-types.ts @@ -4,28 +4,28 @@ import type { ComponentAnnotations, StoryAnnotations, } from '@storybook/types'; -import type { WebComponentsFramework } from './types'; +import type { WebComponentsRenderer } from './types'; /** * Metadata to configure the stories for a component. * * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export) */ -export type Meta = ComponentAnnotations; +export type Meta = ComponentAnnotations; /** * Story function that represents a CSFv2 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryFn = AnnotatedStoryFn; +export type StoryFn = AnnotatedStoryFn; /** * Story function that represents a CSFv3 component example. * * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports) */ -export type StoryObj = StoryAnnotations; +export type StoryObj = StoryAnnotations; /** * @deprecated Use `StoryFn` instead. diff --git a/code/renderers/web-components/src/render.ts b/code/renderers/web-components/src/render.ts index 075215cd452..d95129b98c3 100644 --- a/code/renderers/web-components/src/render.ts +++ b/code/renderers/web-components/src/render.ts @@ -10,11 +10,11 @@ import { render as litRender } from 'lit-html'; import { isTemplateResult } from 'lit-html/directive-helpers.js'; import { simulatePageLoad, simulateDOMContentLoaded } from '@storybook/preview-web'; import type { Store_RenderContext, ArgsStoryFn } from '@storybook/types'; -import type { WebComponentsFramework } from './types'; +import type { WebComponentsRenderer } from './types'; const { Node } = global; -export const render: ArgsStoryFn = (args, context) => { +export const render: ArgsStoryFn = (args, context) => { const { id, component } = context; if (!component) { throw new Error( @@ -38,8 +38,8 @@ export function renderToCanvas( showMain, showError, forceRemount, - }: Store_RenderContext, - canvasElement: WebComponentsFramework['canvasElement'] + }: Store_RenderContext, + canvasElement: WebComponentsRenderer['canvasElement'] ) { const element = storyFn(); diff --git a/code/renderers/web-components/src/types.ts b/code/renderers/web-components/src/types.ts index e938d201771..d6f397db0ac 100644 --- a/code/renderers/web-components/src/types.ts +++ b/code/renderers/web-components/src/types.ts @@ -1,11 +1,15 @@ -import type { StoryContext as StoryContextBase, WebFramework } from '@storybook/types'; +import type { StoryContext as StoryContextBase, WebRenderer } from '@storybook/types'; import type { TemplateResult, SVGTemplateResult } from 'lit-html'; export type StoryFnHtmlReturnType = string | Node | TemplateResult | SVGTemplateResult; -export type StoryContext = StoryContextBase; +export type StoryContext = StoryContextBase; -export interface WebComponentsFramework extends WebFramework { +/** + * @deprecated Use `WebComponentsRenderer` instead. + */ +export type WebComponentsFramework = WebComponentsRenderer; +export interface WebComponentsRenderer extends WebRenderer { component: string; storyResult: StoryFnHtmlReturnType; } diff --git a/code/ui/.storybook/preview.tsx b/code/ui/.storybook/preview.tsx index 4c97aff00fd..3cd958bd6d1 100644 --- a/code/ui/.storybook/preview.tsx +++ b/code/ui/.storybook/preview.tsx @@ -14,7 +14,7 @@ import { useArgs } from '@storybook/addons'; import { Symbols } from '@storybook/components'; import type { PreviewWeb } from '@storybook/preview-web'; import { DocsContext } from '@storybook/preview-web'; -import type { ReactFramework } from '@storybook/react'; +import type { ReactRenderer } from '@storybook/react'; import type { Channel } from '@storybook/channels'; import { DocsContainer } from '../blocks/src/blocks/DocsContainer'; @@ -94,7 +94,7 @@ const ThemedSetRoot = () => { }; // eslint-disable-next-line no-underscore-dangle -const preview = (window as any).__STORYBOOK_PREVIEW__ as PreviewWeb; +const preview = (window as any).__STORYBOOK_PREVIEW__ as PreviewWeb; const channel = (window as any).__STORYBOOK_ADDONS_CHANNEL__ as Channel; export const loaders = [ async () => ({ globalValue: 1 }), diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index 72c46be00fa..4612b09b457 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/blocks", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Storybook Doc Blocks", "keywords": [ "storybook" @@ -42,17 +42,17 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/api": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/csf": "next", - "@storybook/docs-tools": "7.0.0-alpha.48", - "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/csf": "0.0.2-next.5", + "@storybook/docs-tools": "7.0.0-alpha.49", + "@storybook/preview-web": "7.0.0-alpha.49", + "@storybook/store": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@types/lodash": "^4.14.167", "color-convert": "^2.0.1", "dequal": "^2.0.2", @@ -66,8 +66,8 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/addon-actions": "7.0.0-alpha.48", - "@storybook/addons": "7.0.0-alpha.48", + "@storybook/addon-actions": "7.0.0-alpha.49", + "@storybook/addons": "7.0.0-alpha.49", "@types/color-convert": "^2.0.0" }, "peerDependencies": { @@ -82,5 +82,5 @@ "./src/index.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/ui/blocks/src/blocks/Canvas.tsx b/code/ui/blocks/src/blocks/Canvas.tsx index 239bca9c8a7..8336993ac08 100644 --- a/code/ui/blocks/src/blocks/Canvas.tsx +++ b/code/ui/blocks/src/blocks/Canvas.tsx @@ -1,6 +1,6 @@ import type { FC, ReactElement, ReactNode, ReactNodeArray } from 'react'; import React, { useContext } from 'react'; -import type { Framework } from '@storybook/types'; +import type { Renderer } from '@storybook/types'; import type { PreviewProps as PurePreviewProps } from '../components'; import { Preview as PurePreview, PreviewSkeleton } from '../components'; import type { DocsContextProps } from './DocsContext'; @@ -19,7 +19,7 @@ type CanvasProps = PurePreviewProps & { const getPreviewProps = ( { withSource, mdxSource, children, ...props }: CanvasProps & { children?: ReactNode }, - docsContext: DocsContextProps, + docsContext: DocsContextProps, sourceContext: SourceContextProps ) => { let sourceState = withSource; diff --git a/code/ui/blocks/src/blocks/Docs.tsx b/code/ui/blocks/src/blocks/Docs.tsx index 41c0ccb8442..d5525176e3d 100644 --- a/code/ui/blocks/src/blocks/Docs.tsx +++ b/code/ui/blocks/src/blocks/Docs.tsx @@ -1,13 +1,13 @@ import React from 'react'; import type { FunctionComponent, ComponentType } from 'react'; -import type { Framework, Parameters } from '@storybook/types'; +import type { Renderer, Parameters } from '@storybook/types'; import type { Theme } from '@storybook/theming'; import type { DocsContextProps } from './DocsContext'; import { DocsContainer } from './DocsContainer'; import { DocsPage } from './DocsPage'; -export type DocsProps = { +export type DocsProps = { docsParameter: Parameters; context: DocsContextProps; }; diff --git a/code/ui/blocks/src/blocks/DocsContainer.tsx b/code/ui/blocks/src/blocks/DocsContainer.tsx index 0ae07863fbd..f80dc3e42dd 100644 --- a/code/ui/blocks/src/blocks/DocsContainer.tsx +++ b/code/ui/blocks/src/blocks/DocsContainer.tsx @@ -3,7 +3,7 @@ import React, { useEffect } from 'react'; import global from 'global'; import type { ThemeVars } from '@storybook/theming'; import { ThemeProvider, ensure as ensureTheme } from '@storybook/theming'; -import type { Framework } from '@storybook/types'; +import type { Renderer } from '@storybook/types'; import { DocsWrapper, DocsContent } from '../components'; import type { DocsContextProps } from './DocsContext'; import { DocsContext } from './DocsContext'; @@ -12,7 +12,7 @@ import { scrollToElement } from './utils'; const { document, window: globalWindow } = global; -export interface DocsContainerProps { +export interface DocsContainerProps { context: DocsContextProps; theme?: ThemeVars; children?: ReactNode; diff --git a/code/ui/blocks/src/blocks/DocsContext.ts b/code/ui/blocks/src/blocks/DocsContext.ts index 958a5717205..0c3e301a5a7 100644 --- a/code/ui/blocks/src/blocks/DocsContext.ts +++ b/code/ui/blocks/src/blocks/DocsContext.ts @@ -4,7 +4,7 @@ import { createContext } from 'react'; import { window as globalWindow } from 'global'; import type { DocsContextProps } from '@storybook/preview-web'; -import type { Framework } from '@storybook/types'; +import type { Renderer } from '@storybook/types'; export type { DocsContextProps }; @@ -18,6 +18,6 @@ if (globalWindow && globalWindow.__DOCS_CONTEXT__ === undefined) { globalWindow.__DOCS_CONTEXT__.displayName = 'DocsContext'; } -export const DocsContext: Context> = globalWindow +export const DocsContext: Context> = globalWindow ? globalWindow.__DOCS_CONTEXT__ : createContext(null); diff --git a/code/ui/blocks/src/blocks/Story.tsx b/code/ui/blocks/src/blocks/Story.tsx index be42c12850d..daca709e6b2 100644 --- a/code/ui/blocks/src/blocks/Story.tsx +++ b/code/ui/blocks/src/blocks/Story.tsx @@ -1,7 +1,7 @@ import type { FC, ReactNode, ElementType, ComponentProps } from 'react'; import React, { useContext, useRef, useEffect, useState } from 'react'; import type { - Framework, + Renderer, Store_ModuleExport, Store_ModuleExports, Store_Story as StoryType, @@ -53,7 +53,7 @@ export const getStoryId = (props: StoryProps, context: DocsContextProps): StoryI return inputId || context.storyIdByName(name); }; -export const getStoryProps = ( +export const getStoryProps = ( { height, inline }: StoryProps, story: StoryType ): PureStoryProps => { diff --git a/code/ui/blocks/src/blocks/external/ExternalDocs.tsx b/code/ui/blocks/src/blocks/external/ExternalDocs.tsx index d7488015851..9329473a759 100644 --- a/code/ui/blocks/src/blocks/external/ExternalDocs.tsx +++ b/code/ui/blocks/src/blocks/external/ExternalDocs.tsx @@ -1,16 +1,16 @@ import type { FunctionComponent } from 'react'; import React, { useRef } from 'react'; -import type { Framework, ProjectAnnotations } from '@storybook/types'; +import type { Renderer, ProjectAnnotations } from '@storybook/types'; import { composeConfigs } from '@storybook/store'; import { Docs } from '../Docs'; import { ExternalPreview } from './ExternalPreview'; -export type ExternalDocsProps = { +export type ExternalDocsProps = { projectAnnotationsList: ProjectAnnotations[]; }; -function usePreview( +function usePreview( projectAnnotations: ProjectAnnotations ) { const previewRef = useRef(); diff --git a/code/ui/blocks/src/blocks/external/ExternalDocsContainer.tsx b/code/ui/blocks/src/blocks/external/ExternalDocsContainer.tsx index 697fc55b1d6..1de088a2439 100644 --- a/code/ui/blocks/src/blocks/external/ExternalDocsContainer.tsx +++ b/code/ui/blocks/src/blocks/external/ExternalDocsContainer.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { ThemeProvider, themes, ensure } from '@storybook/theming'; -import type { Framework } from '@storybook/types'; +import type { Renderer } from '@storybook/types'; import { DocsContext } from '../DocsContext'; import { ExternalPreview } from './ExternalPreview'; -let preview: ExternalPreview; +let preview: ExternalPreview; export const ExternalDocsContainer: React.FC<{ projectAnnotations: any }> = ({ projectAnnotations, diff --git a/code/ui/blocks/src/blocks/external/ExternalDocsContext.ts b/code/ui/blocks/src/blocks/external/ExternalDocsContext.ts index e347812b6b6..64bb3e609cc 100644 --- a/code/ui/blocks/src/blocks/external/ExternalDocsContext.ts +++ b/code/ui/blocks/src/blocks/external/ExternalDocsContext.ts @@ -1,5 +1,5 @@ import type { - Framework, + Renderer, Store_CSFFile, Store_ModuleExport, Store_ModuleExports, @@ -9,12 +9,12 @@ import type { StoryStore } from '@storybook/store'; import type { DocsContextProps } from '@storybook/preview-web'; import type { Channel } from '@storybook/channels'; -export class ExternalDocsContext extends DocsContext { +export class ExternalDocsContext extends DocsContext { constructor( public channel: Channel, - protected store: StoryStore, + protected store: StoryStore, public renderStoryToElement: DocsContextProps['renderStoryToElement'], - private processMetaExports: (metaExports: Store_ModuleExports) => Store_CSFFile + private processMetaExports: (metaExports: Store_ModuleExports) => Store_CSFFile ) { super(channel, store, renderStoryToElement, [], true); } diff --git a/code/ui/blocks/src/blocks/external/ExternalPreview.ts b/code/ui/blocks/src/blocks/external/ExternalPreview.ts index 2c9955af00d..b7d09d7a69a 100644 --- a/code/ui/blocks/src/blocks/external/ExternalPreview.ts +++ b/code/ui/blocks/src/blocks/external/ExternalPreview.ts @@ -1,6 +1,6 @@ import { Preview } from '@storybook/preview-web'; import type { - Framework, + Renderer, ComponentTitle, Path, ProjectAnnotations, @@ -27,7 +27,7 @@ class ConstantMap { } } -export class ExternalPreview extends Preview { +export class ExternalPreview extends Preview { private importPaths = new ConstantMap('./importPath/'); private titles = new ConstantMap('title-'); @@ -36,7 +36,7 @@ export class ExternalPreview extends P private moduleExportsByImportPath: Record = {}; - constructor(public projectAnnotations: ProjectAnnotations) { + constructor(public projectAnnotations: ProjectAnnotations) { super(new Channel()); this.initialize({ @@ -58,7 +58,7 @@ export class ExternalPreview extends P const title = metaExports.default.title || this.titles.get(metaExports); - const csfFile = this.storyStore.processCSFFileWithCache( + const csfFile = this.storyStore.processCSFFileWithCache( metaExports, importPath, title diff --git a/code/ui/blocks/src/blocks/useStory.ts b/code/ui/blocks/src/blocks/useStory.ts index 6904c196aab..c97e9171643 100644 --- a/code/ui/blocks/src/blocks/useStory.ts +++ b/code/ui/blocks/src/blocks/useStory.ts @@ -1,23 +1,23 @@ import { useState, useEffect } from 'react'; -import type { StoryId, Framework, Store_Story } from '@storybook/types'; +import type { StoryId, Renderer, Store_Story } from '@storybook/types'; import type { DocsContextProps } from './DocsContext'; -export function useStory( +export function useStory( storyId: StoryId, - context: DocsContextProps -): Store_Story | void { + context: DocsContextProps +): Store_Story | void { const stories = useStories([storyId], context); return stories && stories[0]; } -export function useStories( +export function useStories( storyIds: StoryId[], - context: DocsContextProps -): (Store_Story | void)[] { + context: DocsContextProps +): (Store_Story | void)[] { // Legacy docs pages can reference any story by id. Those stories will need to be // asyncronously loaded; we use the state for this - const [storiesById, setStories] = useState>>({}); + const [storiesById, setStories] = useState>>({}); useEffect(() => { // deepscan-disable-next-line NO_EFFECT_CALL diff --git a/code/ui/components/package.json b/code/ui/components/package.json index c5290bd6cde..9a77b2bb435 100644 --- a/code/ui/components/package.json +++ b/code/ui/components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/components", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Core Storybook Components", "keywords": [ "storybook" @@ -51,10 +51,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/csf": "next", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/csf": "0.0.2-next.5", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "memoizerific": "^1.11.3", "util-deprecate": "^1.0.2" }, @@ -87,5 +87,5 @@ ], "platform": "neutral" }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json index a5aba95f653..837a3931722 100644 --- a/code/ui/manager/package.json +++ b/code/ui/manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager", - "version": "7.0.0-alpha.48", + "version": "7.0.0-alpha.49", "description": "Core Storybook UI", "keywords": [ "storybook" @@ -53,17 +53,17 @@ }, "devDependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", - "@storybook/channel-postmessage": "7.0.0-alpha.48", - "@storybook/channel-websocket": "7.0.0-alpha.48", - "@storybook/channels": "7.0.0-alpha.48", - "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", - "@storybook/router": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", - "@storybook/types": "7.0.0-alpha.48", + "@storybook/addons": "7.0.0-alpha.49", + "@storybook/api": "7.0.0-alpha.49", + "@storybook/channel-postmessage": "7.0.0-alpha.49", + "@storybook/channel-websocket": "7.0.0-alpha.49", + "@storybook/channels": "7.0.0-alpha.49", + "@storybook/client-logger": "7.0.0-alpha.49", + "@storybook/components": "7.0.0-alpha.49", + "@storybook/core-events": "7.0.0-alpha.49", + "@storybook/router": "7.0.0-alpha.49", + "@storybook/theming": "7.0.0-alpha.49", + "@storybook/types": "7.0.0-alpha.49", "@testing-library/react": "^11.2.2", "@types/semver": "^7.3.4", "copy-to-clipboard": "^3.3.1", @@ -100,5 +100,5 @@ "./src/runtime.ts" ] }, - "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd" + "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8" } diff --git a/code/yarn.lock b/code/yarn.lock index 3872c59af38..fc274427603 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5190,6 +5190,20 @@ __metadata: languageName: node linkType: hard +"@pkgr/utils@npm:^2.3.1": + version: 2.3.1 + resolution: "@pkgr/utils@npm:2.3.1" + dependencies: + cross-spawn: ^7.0.3 + is-glob: ^4.0.3 + open: ^8.4.0 + picocolors: ^1.0.0 + tiny-glob: ^0.2.9 + tslib: ^2.4.0 + checksum: 50c2480c3580c0f75b9325271deeb4f4cb24f6a29f1ebc5a7de0c6991380e23625fd554ecdbc7d7e93ad6dab92532a254f7490433cf2b8f1b18d75c9e01636ea + languageName: node + linkType: hard + "@playwright/test@npm:1.27.0": version: 1.27.0 resolution: "@playwright/test@npm:1.27.0" @@ -5381,15 +5395,15 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-a11y@workspace:addons/a11y" dependencies: - "@storybook/addon-highlight": 7.0.0-alpha.48 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addon-highlight": 7.0.0-alpha.49 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@testing-library/react": ^11.2.2 axe-core: ^4.2.0 global: ^4.4.0 @@ -5407,17 +5421,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-actions@7.0.0-alpha.48, @storybook/addon-actions@workspace:*, @storybook/addon-actions@workspace:addons/actions": +"@storybook/addon-actions@7.0.0-alpha.49, @storybook/addon-actions@workspace:*, @storybook/addon-actions@workspace:addons/actions": version: 0.0.0-use.local resolution: "@storybook/addon-actions@workspace:addons/actions" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/lodash": ^4.14.167 dequal: ^2.0.2 global: ^4.4.0 @@ -5440,17 +5454,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-backgrounds@7.0.0-alpha.48, @storybook/addon-backgrounds@workspace:*, @storybook/addon-backgrounds@workspace:addons/backgrounds": +"@storybook/addon-backgrounds@7.0.0-alpha.49, @storybook/addon-backgrounds@workspace:*, @storybook/addon-backgrounds@workspace:addons/backgrounds": version: 0.0.0-use.local resolution: "@storybook/addon-backgrounds@workspace:addons/backgrounds" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 memoizerific: ^1.11.3 ts-dedent: ^2.0.0 @@ -5466,20 +5480,20 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-controls@7.0.0-alpha.48, @storybook/addon-controls@workspace:*, @storybook/addon-controls@workspace:addons/controls": +"@storybook/addon-controls@7.0.0-alpha.49, @storybook/addon-controls@workspace:*, @storybook/addon-controls@workspace:addons/controls": version: 0.0.0-use.local resolution: "@storybook/addon-controls@workspace:addons/controls" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/blocks": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/blocks": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 lodash: ^4.17.21 ts-dedent: ^2.0.0 peerDependencies: @@ -5493,7 +5507,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-docs@7.0.0-alpha.48, @storybook/addon-docs@workspace:*, @storybook/addon-docs@workspace:addons/docs": +"@storybook/addon-docs@7.0.0-alpha.49, @storybook/addon-docs@workspace:*, @storybook/addon-docs@workspace:addons/docs": version: 0.0.0-use.local resolution: "@storybook/addon-docs@workspace:addons/docs" dependencies: @@ -5501,15 +5515,15 @@ __metadata: "@babel/plugin-transform-react-jsx": ^7.12.12 "@jest/transform": ^26.6.2 "@mdx-js/react": ^2.1.5 - "@storybook/blocks": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/csf-plugin": 7.0.0-alpha.48 - "@storybook/csf-tools": 7.0.0-alpha.48 + "@storybook/blocks": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/csf-plugin": 7.0.0-alpha.49 + "@storybook/csf-tools": 7.0.0-alpha.49 "@storybook/mdx2-csf": next - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/postinstall": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/postinstall": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 fs-extra: ^9.0.1 global: ^4.4.0 remark-external-links: ^8.0.0 @@ -5532,20 +5546,20 @@ __metadata: resolution: "@storybook/addon-essentials@workspace:addons/essentials" dependencies: "@babel/core": ^7.12.10 - "@storybook/addon-actions": 7.0.0-alpha.48 - "@storybook/addon-backgrounds": 7.0.0-alpha.48 - "@storybook/addon-controls": 7.0.0-alpha.48 - "@storybook/addon-docs": 7.0.0-alpha.48 - "@storybook/addon-highlight": 7.0.0-alpha.48 - "@storybook/addon-measure": 7.0.0-alpha.48 - "@storybook/addon-outline": 7.0.0-alpha.48 - "@storybook/addon-toolbars": 7.0.0-alpha.48 - "@storybook/addon-viewport": 7.0.0-alpha.48 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/vue": 7.0.0-alpha.48 + "@storybook/addon-actions": 7.0.0-alpha.49 + "@storybook/addon-backgrounds": 7.0.0-alpha.49 + "@storybook/addon-controls": 7.0.0-alpha.49 + "@storybook/addon-docs": 7.0.0-alpha.49 + "@storybook/addon-highlight": 7.0.0-alpha.49 + "@storybook/addon-measure": 7.0.0-alpha.49 + "@storybook/addon-outline": 7.0.0-alpha.49 + "@storybook/addon-toolbars": 7.0.0-alpha.49 + "@storybook/addon-viewport": 7.0.0-alpha.49 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/vue": 7.0.0-alpha.49 "@types/jest": ^26.0.16 ts-dedent: ^2.0.0 typescript: ~4.6.3 @@ -5554,12 +5568,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-highlight@7.0.0-alpha.48, @storybook/addon-highlight@workspace:*, @storybook/addon-highlight@workspace:addons/highlight": +"@storybook/addon-highlight@7.0.0-alpha.49, @storybook/addon-highlight@workspace:*, @storybook/addon-highlight@workspace:addons/highlight": version: 0.0.0-use.local resolution: "@storybook/addon-highlight@workspace:addons/highlight" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 "@types/webpack-env": ^1.16.0 global: ^4.4.0 typescript: ~4.6.3 @@ -5571,17 +5585,17 @@ __metadata: resolution: "@storybook/addon-interactions@workspace:addons/interactions" dependencies: "@devtools-ds/object-inspector": ^1.1.2 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/instrumenter": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/instrumenter": 7.0.0-alpha.49 "@storybook/jest": ^0.0.10 "@storybook/testing-library": 0.0.14-next.0 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/node": ^16.0.0 formik: ^2.2.9 global: ^4.4.0 @@ -5604,12 +5618,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-jest@workspace:addons/jest" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 global: ^4.4.0 react-sizeme: ^3.0.1 typescript: ~4.6.3 @@ -5629,12 +5643,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-links@workspace:addons/links" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/csf": next - "@storybook/router": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/csf": 0.0.2-next.5 + "@storybook/router": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 prop-types: ^15.7.2 ts-dedent: ^2.0.0 @@ -5650,16 +5664,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-measure@7.0.0-alpha.48, @storybook/addon-measure@workspace:*, @storybook/addon-measure@workspace:addons/measure": +"@storybook/addon-measure@7.0.0-alpha.49, @storybook/addon-measure@workspace:*, @storybook/addon-measure@workspace:addons/measure": version: 0.0.0-use.local resolution: "@storybook/addon-measure@workspace:addons/measure" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 typescript: ~4.6.3 peerDependencies: @@ -5673,16 +5687,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-outline@7.0.0-alpha.48, @storybook/addon-outline@workspace:*, @storybook/addon-outline@workspace:addons/outline": +"@storybook/addon-outline@7.0.0-alpha.49, @storybook/addon-outline@workspace:*, @storybook/addon-outline@workspace:addons/outline": version: 0.0.0-use.local resolution: "@storybook/addon-outline@workspace:addons/outline" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 ts-dedent: ^2.0.0 typescript: ~4.6.3 @@ -5702,15 +5716,15 @@ __metadata: resolution: "@storybook/addon-storyshots-puppeteer@workspace:addons/storyshots/storyshots-puppeteer" dependencies: "@axe-core/puppeteer": ^4.2.0 - "@storybook/csf": next - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/csf": 0.0.2-next.5 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/jest-image-snapshot": ^4.1.3 "@types/puppeteer": ^5.4.0 jest-image-snapshot: ^4.3.0 puppeteer: ^2.0.0 || ^3.0.0 peerDependencies: - "@storybook/addon-storyshots": 7.0.0-alpha.48 + "@storybook/addon-storyshots": 7.0.0-alpha.49 puppeteer: ">=2.0.0" peerDependenciesMeta: puppeteer: @@ -5726,18 +5740,18 @@ __metadata: "@angular/platform-browser-dynamic": ^13.3.6 "@emotion/jest": ^11.8.0 "@jest/transform": ^26.6.2 - "@storybook/addon-docs": 7.0.0-alpha.48 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/angular": 7.0.0-alpha.48 + "@storybook/addon-docs": 7.0.0-alpha.49 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/angular": 7.0.0-alpha.49 "@storybook/babel-plugin-require-context-hook": 1.0.1 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-webpack": 7.0.0-alpha.48 - "@storybook/react": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 - "@storybook/vue": 7.0.0-alpha.48 - "@storybook/vue3": 7.0.0-alpha.48 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-webpack": 7.0.0-alpha.49 + "@storybook/react": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 + "@storybook/vue": 7.0.0-alpha.49 + "@storybook/vue3": 7.0.0-alpha.49 "@types/glob": ^7.1.3 "@types/jest": ^26.0.16 "@types/jest-specific-snapshot": ^0.5.3 @@ -5812,13 +5826,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-storysource@workspace:addons/storysource" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/router": 7.0.0-alpha.48 - "@storybook/source-loader": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/router": 7.0.0-alpha.49 + "@storybook/source-loader": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 "@types/react": ^16.14.23 "@types/react-syntax-highlighter": 11.0.5 estraverse: ^5.2.0 @@ -5852,15 +5866,15 @@ __metadata: languageName: node linkType: hard -"@storybook/addon-toolbars@7.0.0-alpha.48, @storybook/addon-toolbars@workspace:*, @storybook/addon-toolbars@workspace:addons/toolbars": +"@storybook/addon-toolbars@7.0.0-alpha.49, @storybook/addon-toolbars@workspace:*, @storybook/addon-toolbars@workspace:addons/toolbars": version: 0.0.0-use.local resolution: "@storybook/addon-toolbars@workspace:addons/toolbars" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 typescript: ~4.6.3 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -5873,16 +5887,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-viewport@7.0.0-alpha.48, @storybook/addon-viewport@workspace:*, @storybook/addon-viewport@workspace:addons/viewport": +"@storybook/addon-viewport@7.0.0-alpha.49, @storybook/addon-viewport@workspace:*, @storybook/addon-viewport@workspace:addons/viewport": version: 0.0.0-use.local resolution: "@storybook/addon-viewport@workspace:addons/viewport" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 global: ^4.4.0 memoizerific: ^1.11.3 prop-types: ^15.7.2 @@ -5898,17 +5912,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addons@7.0.0-alpha.48, @storybook/addons@workspace:*, @storybook/addons@workspace:lib/addons": +"@storybook/addons@7.0.0-alpha.49, @storybook/addons@workspace:*, @storybook/addons@workspace:lib/addons": version: 0.0.0-use.local resolution: "@storybook/addons@workspace:lib/addons" dependencies: - "@storybook/api": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/router": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/router": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -5938,7 +5952,7 @@ __metadata: languageName: node linkType: hard -"@storybook/angular@7.0.0-alpha.48, @storybook/angular@workspace:*, @storybook/angular@workspace:frameworks/angular": +"@storybook/angular@7.0.0-alpha.49, @storybook/angular@workspace:*, @storybook/angular@workspace:frameworks/angular": version: 0.0.0-use.local resolution: "@storybook/angular@workspace:frameworks/angular" dependencies: @@ -5954,19 +5968,19 @@ __metadata: "@angular/platform-browser": ^13.3.6 "@angular/platform-browser-dynamic": ^13.3.6 "@nrwl/workspace": 14.6.1 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/core-server": 7.0.0-alpha.48 - "@storybook/core-webpack": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/core-server": 7.0.0-alpha.49 + "@storybook/core-webpack": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/node": ^16.0.0 "@types/react": ^16.14.23 "@types/react-dom": ^16.9.14 @@ -6019,19 +6033,19 @@ __metadata: languageName: unknown linkType: soft -"@storybook/api@7.0.0-alpha.48, @storybook/api@workspace:*, @storybook/api@workspace:lib/api": +"@storybook/api@7.0.0-alpha.49, @storybook/api@workspace:*, @storybook/api@workspace:lib/api": version: 0.0.0-use.local resolution: "@storybook/api@workspace:lib/api" dependencies: "@jest/globals": ^26.6.2 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/csf": next - "@storybook/router": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/csf": 0.0.2-next.5 + "@storybook/router": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/lodash": ^4.14.167 "@types/qs": ^6 dequal: ^2.0.2 @@ -6087,23 +6101,23 @@ __metadata: languageName: node linkType: hard -"@storybook/blocks@7.0.0-alpha.48, @storybook/blocks@workspace:*, @storybook/blocks@workspace:ui/blocks": +"@storybook/blocks@7.0.0-alpha.49, @storybook/blocks@workspace:*, @storybook/blocks@workspace:ui/blocks": version: 0.0.0-use.local resolution: "@storybook/blocks@workspace:ui/blocks" dependencies: - "@storybook/addon-actions": 7.0.0-alpha.48 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/csf": next - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addon-actions": 7.0.0-alpha.49 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/csf": 0.0.2-next.5 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/color-convert": ^2.0.0 "@types/lodash": ^4.14.167 color-convert: ^2.0.1 @@ -6122,14 +6136,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-manager@7.0.0-alpha.48, @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:lib/builder-manager": +"@storybook/builder-manager@7.0.0-alpha.49, @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:lib/builder-manager": version: 0.0.0-use.local resolution: "@storybook/builder-manager@workspace:lib/builder-manager" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/manager": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/manager": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 "@types/ejs": ^3.1.1 "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10 browser-assert: ^1.2.1 @@ -6145,20 +6159,20 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-vite@7.0.0-alpha.48, @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:lib/builder-vite": +"@storybook/builder-vite@7.0.0-alpha.49, @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:lib/builder-vite": version: 0.0.0-use.local resolution: "@storybook/builder-vite@workspace:lib/builder-vite" dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.0.5 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 "@storybook/mdx2-csf": next - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/preview": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/source-loader": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/preview": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/source-loader": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/express": ^4.17.13 "@types/node": ^16.0.0 "@vitejs/plugin-react": ^2.0.0 @@ -6175,28 +6189,28 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-webpack5@7.0.0-alpha.48, @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:lib/builder-webpack5": +"@storybook/builder-webpack5@7.0.0-alpha.49, @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:lib/builder-webpack5": version: 0.0.0-use.local resolution: "@storybook/builder-webpack5@workspace:lib/builder-webpack5" dependencies: "@babel/core": ^7.12.10 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/core-webpack": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/preview": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/router": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/core-webpack": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/preview": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/router": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 "@types/case-sensitive-paths-webpack-plugin": ^2.1.6 "@types/node": ^16.0.0 "@types/semver": ^7.3.4 @@ -6236,13 +6250,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/channel-postmessage@7.0.0-alpha.48, @storybook/channel-postmessage@workspace:*, @storybook/channel-postmessage@workspace:lib/channel-postmessage": +"@storybook/channel-postmessage@7.0.0-alpha.49, @storybook/channel-postmessage@workspace:*, @storybook/channel-postmessage@workspace:lib/channel-postmessage": version: 0.0.0-use.local resolution: "@storybook/channel-postmessage@workspace:lib/channel-postmessage" dependencies: - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 global: ^4.4.0 qs: ^6.10.0 telejson: ^6.0.8 @@ -6250,19 +6264,19 @@ __metadata: languageName: unknown linkType: soft -"@storybook/channel-websocket@7.0.0-alpha.48, @storybook/channel-websocket@workspace:*, @storybook/channel-websocket@workspace:lib/channel-websocket": +"@storybook/channel-websocket@7.0.0-alpha.49, @storybook/channel-websocket@workspace:*, @storybook/channel-websocket@workspace:lib/channel-websocket": version: 0.0.0-use.local resolution: "@storybook/channel-websocket@workspace:lib/channel-websocket" dependencies: - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 global: ^4.4.0 telejson: ^6.0.8 typescript: ~4.6.3 languageName: unknown linkType: soft -"@storybook/channels@7.0.0-alpha.48, @storybook/channels@workspace:*, @storybook/channels@workspace:lib/channels": +"@storybook/channels@7.0.0-alpha.49, @storybook/channels@workspace:*, @storybook/channels@workspace:lib/channels": version: 0.0.0-use.local resolution: "@storybook/channels@workspace:lib/channels" dependencies: @@ -6281,20 +6295,20 @@ __metadata: languageName: node linkType: hard -"@storybook/cli@7.0.0-alpha.48, @storybook/cli@workspace:*, @storybook/cli@workspace:lib/cli": +"@storybook/cli@7.0.0-alpha.49, @storybook/cli@workspace:*, @storybook/cli@workspace:lib/cli": version: 0.0.0-use.local resolution: "@storybook/cli@workspace:lib/cli" dependencies: "@babel/core": ^7.12.10 "@babel/preset-env": ^7.12.11 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/codemod": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-server": 7.0.0-alpha.48 - "@storybook/csf-tools": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/telemetry": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/codemod": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-server": 7.0.0-alpha.49 + "@storybook/csf-tools": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/telemetry": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/cross-spawn": ^6.0.2 "@types/degit": ^2.8.3 "@types/prompts": ^2.0.9 @@ -6334,16 +6348,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/client-api@7.0.0-alpha.48, @storybook/client-api@workspace:*, @storybook/client-api@workspace:lib/client-api": +"@storybook/client-api@7.0.0-alpha.49, @storybook/client-api@workspace:*, @storybook/client-api@workspace:lib/client-api": version: 0.0.0-use.local resolution: "@storybook/client-api@workspace:lib/client-api" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/csf": next - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/csf": 0.0.2-next.5 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/qs": ^6.9.5 "@types/webpack-env": ^1.16.4 global: ^4.4.0 @@ -6358,7 +6372,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/client-logger@7.0.0-alpha.48, @storybook/client-logger@workspace:*, @storybook/client-logger@workspace:lib/client-logger": +"@storybook/client-logger@7.0.0-alpha.49, @storybook/client-logger@workspace:*, @storybook/client-logger@workspace:lib/client-logger": version: 0.0.0-use.local resolution: "@storybook/client-logger@workspace:lib/client-logger" dependencies: @@ -6377,15 +6391,15 @@ __metadata: languageName: node linkType: hard -"@storybook/codemod@7.0.0-alpha.48, @storybook/codemod@workspace:*, @storybook/codemod@workspace:lib/codemod": +"@storybook/codemod@7.0.0-alpha.49, @storybook/codemod@workspace:*, @storybook/codemod@workspace:lib/codemod": version: 0.0.0-use.local resolution: "@storybook/codemod@workspace:lib/codemod" dependencies: "@babel/types": ^7.12.11 - "@storybook/csf": next - "@storybook/csf-tools": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/csf": 0.0.2-next.5 + "@storybook/csf-tools": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 cross-spawn: ^7.0.3 globby: ^11.0.2 jest: ^26.6.3 @@ -6399,15 +6413,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/components@7.0.0-alpha.48, @storybook/components@workspace:*, @storybook/components@workspace:ui/components": +"@storybook/components@7.0.0-alpha.49, @storybook/components@workspace:*, @storybook/components@workspace:ui/components": version: 0.0.0-use.local resolution: "@storybook/components@workspace:ui/components" dependencies: "@popperjs/core": ^2.6.0 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/csf": next - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/csf": 0.0.2-next.5 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/overlayscrollbars": ^1.12.0 "@types/react-syntax-highlighter": 11.0.5 "@types/util-deprecate": ^1.0.0 @@ -6429,21 +6443,21 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-client@7.0.0-alpha.48, @storybook/core-client@workspace:*, @storybook/core-client@workspace:lib/core-client": +"@storybook/core-client@7.0.0-alpha.49, @storybook/core-client@workspace:*, @storybook/core-client@workspace:lib/core-client": version: 0.0.0-use.local resolution: "@storybook/core-client@workspace:lib/core-client" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/csf": next - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/csf": 0.0.2-next.5 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 typescript: ~4.6.3 util-deprecate: ^1.0.2 @@ -6453,13 +6467,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-common@7.0.0-alpha.48, @storybook/core-common@workspace:*, @storybook/core-common@workspace:lib/core-common": +"@storybook/core-common@7.0.0-alpha.49, @storybook/core-common@workspace:*, @storybook/core-common@workspace:lib/core-common": version: 0.0.0-use.local resolution: "@storybook/core-common@workspace:lib/core-common" dependencies: "@babel/core": ^7.12.10 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/babel__core": ^7.0.0 "@types/express": ^4.7.0 "@types/mock-fs": ^4.13.0 @@ -6496,7 +6510,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-events@7.0.0-alpha.48, @storybook/core-events@workspace:*, @storybook/core-events@workspace:lib/core-events": +"@storybook/core-events@7.0.0-alpha.49, @storybook/core-events@workspace:*, @storybook/core-events@workspace:lib/core-events": version: 0.0.0-use.local resolution: "@storybook/core-events@workspace:lib/core-events" dependencies: @@ -6513,24 +6527,24 @@ __metadata: languageName: node linkType: hard -"@storybook/core-server@7.0.0-alpha.48, @storybook/core-server@workspace:*, @storybook/core-server@workspace:lib/core-server": +"@storybook/core-server@7.0.0-alpha.49, @storybook/core-server@workspace:*, @storybook/core-server@workspace:lib/core-server": version: 0.0.0-use.local resolution: "@storybook/core-server@workspace:lib/core-server" dependencies: "@aw-web-design/x-default-browser": 1.4.88 "@discoveryjs/json-ext": ^0.5.3 - "@storybook/builder-manager": 7.0.0-alpha.48 - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/csf": next - "@storybook/csf-tools": 7.0.0-alpha.48 + "@storybook/builder-manager": 7.0.0-alpha.49 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/csf": 0.0.2-next.5 + "@storybook/csf-tools": 7.0.0-alpha.49 "@storybook/docs-mdx": 0.0.1-canary.12433cf.0 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/telemetry": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/telemetry": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/compression": ^1.7.0 "@types/ip": ^1.1.0 "@types/node": ^16.0.0 @@ -6580,13 +6594,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-webpack@7.0.0-alpha.48, @storybook/core-webpack@workspace:*, @storybook/core-webpack@workspace:lib/core-webpack": +"@storybook/core-webpack@7.0.0-alpha.49, @storybook/core-webpack@workspace:*, @storybook/core-webpack@workspace:lib/core-webpack": version: 0.0.0-use.local resolution: "@storybook/core-webpack@workspace:lib/core-webpack" dependencies: - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/node": ^16.0.0 ts-dedent: ^2.0.0 typescript: ~4.6.3 @@ -6594,17 +6608,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/csf-plugin@7.0.0-alpha.48, @storybook/csf-plugin@workspace:*, @storybook/csf-plugin@workspace:lib/csf-plugin": +"@storybook/csf-plugin@7.0.0-alpha.49, @storybook/csf-plugin@workspace:*, @storybook/csf-plugin@workspace:lib/csf-plugin": version: 0.0.0-use.local resolution: "@storybook/csf-plugin@workspace:lib/csf-plugin" dependencies: - "@storybook/csf-tools": 7.0.0-alpha.48 + "@storybook/csf-tools": 7.0.0-alpha.49 typescript: ~4.6.3 unplugin: ^0.10.2 languageName: unknown linkType: soft -"@storybook/csf-tools@7.0.0-alpha.48, @storybook/csf-tools@workspace:*, @storybook/csf-tools@workspace:lib/csf-tools": +"@storybook/csf-tools@7.0.0-alpha.49, @storybook/csf-tools@workspace:*, @storybook/csf-tools@workspace:lib/csf-tools": version: 0.0.0-use.local resolution: "@storybook/csf-tools@workspace:lib/csf-tools" dependencies: @@ -6612,8 +6626,8 @@ __metadata: "@babel/parser": ^7.12.11 "@babel/traverse": ^7.12.11 "@babel/types": ^7.12.11 - "@storybook/csf": next - "@storybook/types": 7.0.0-alpha.48 + "@storybook/csf": 0.0.2-next.5 + "@storybook/types": 7.0.0-alpha.49 "@types/fs-extra": ^9.0.6 fs-extra: ^9.0.1 js-yaml: ^3.14.1 @@ -6631,14 +6645,14 @@ __metadata: languageName: node linkType: hard -"@storybook/csf@npm:0.0.2--canary.53.4879818.0": - version: 0.0.2--canary.53.4879818.0 - resolution: "@storybook/csf@npm:0.0.2--canary.53.4879818.0" +"@storybook/csf@npm:0.0.2-next.5, @storybook/csf@npm:next": + version: 0.0.2-next.5 + resolution: "@storybook/csf@npm:0.0.2-next.5" dependencies: expect-type: ^0.14.2 lodash: ^4.17.15 type-fest: ^2.19.0 - checksum: 23f5e01d4d090d6454df0b06831a238a2d30f725c145ef5e9f2a4c9ae5d260e7ed85d288cc6750e0efc78650cac24b1104bdc12fafc09a8469a70b1f8f6c123d + checksum: 5be51f30cf91895085ff2a2ab45af086f3a46233c2899b251c0ec04a14636dd58428af0f1ab9fb7a8995011e7fb2498ed6590e57b403d9f0cfefb2685403ca85 languageName: node linkType: hard @@ -6651,17 +6665,6 @@ __metadata: languageName: node linkType: hard -"@storybook/csf@npm:next": - version: 0.0.2-next.2 - resolution: "@storybook/csf@npm:0.0.2-next.2" - dependencies: - expect-type: ^0.14.2 - lodash: ^4.17.15 - type-fest: ^2.19.0 - checksum: 744e701c826826af065faf3ea3d932a761396fc5e348d097dbe66528e8184b2f5ae67dec8432262e0341dba87997c1d77020697803884e2766f29a4d2fc9f90d - languageName: node - linkType: hard - "@storybook/docs-mdx@npm:0.0.1-canary.12433cf.0": version: 0.0.1-canary.12433cf.0 resolution: "@storybook/docs-mdx@npm:0.0.1-canary.12433cf.0" @@ -6674,14 +6677,14 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-tools@7.0.0-alpha.48, @storybook/docs-tools@workspace:*, @storybook/docs-tools@workspace:lib/docs-tools": +"@storybook/docs-tools@7.0.0-alpha.49, @storybook/docs-tools@workspace:*, @storybook/docs-tools@workspace:lib/docs-tools": version: 0.0.0-use.local resolution: "@storybook/docs-tools@workspace:lib/docs-tools" dependencies: "@babel/core": ^7.12.10 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 doctrine: ^3.0.0 jest-specific-snapshot: ^4.0.0 lodash: ^4.17.21 @@ -6694,12 +6697,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/ember@workspace:frameworks/ember" dependencies: - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 ember-source: ~3.28.1 global: ^4.4.0 react: 16.14.0 @@ -6738,10 +6741,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/html-webpack5@workspace:frameworks/html-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/html": 7.0.0-alpha.48 - "@storybook/preset-html-webpack": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/html": 7.0.0-alpha.49 + "@storybook/preset-html-webpack": 7.0.0-alpha.49 "@types/node": ^16.0.0 global: ^4.4.0 react: 16.14.0 @@ -6752,16 +6755,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/html@7.0.0-alpha.48, @storybook/html@workspace:*, @storybook/html@workspace:renderers/html": +"@storybook/html@7.0.0-alpha.49, @storybook/html@workspace:*, @storybook/html@workspace:renderers/html": version: 0.0.0-use.local resolution: "@storybook/html@workspace:renderers/html" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 react: 16.14.0 react-dom: 16.14.0 @@ -6772,14 +6775,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/instrumenter@7.0.0-alpha.48, @storybook/instrumenter@workspace:*, @storybook/instrumenter@workspace:lib/instrumenter": +"@storybook/instrumenter@7.0.0-alpha.49, @storybook/instrumenter@workspace:*, @storybook/instrumenter@workspace:lib/instrumenter": version: 0.0.0-use.local resolution: "@storybook/instrumenter@workspace:lib/instrumenter" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 core-js: ^3.8.2 global: ^4.4.0 typescript: ~4.6.3 @@ -6866,22 +6869,22 @@ __metadata: languageName: node linkType: hard -"@storybook/manager@7.0.0-alpha.48, @storybook/manager@workspace:*, @storybook/manager@workspace:ui/manager": +"@storybook/manager@7.0.0-alpha.49, @storybook/manager@workspace:*, @storybook/manager@workspace:ui/manager": version: 0.0.0-use.local resolution: "@storybook/manager@workspace:ui/manager" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/router": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/components": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/router": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@testing-library/react": ^11.2.2 "@types/semver": ^7.3.4 copy-to-clipboard: ^3.3.1 @@ -6923,13 +6926,13 @@ __metadata: resolution: "@storybook/nextjs@workspace:frameworks/nextjs" dependencies: "@babel/preset-typescript": ^7.18.6 - "@storybook/addon-actions": 7.0.0-alpha.48 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/preset-react-webpack": 7.0.0-alpha.48 - "@storybook/react": 7.0.0-alpha.48 + "@storybook/addon-actions": 7.0.0-alpha.49 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/preset-react-webpack": 7.0.0-alpha.49 + "@storybook/react": 7.0.0-alpha.49 "@types/loader-utils": ^2.0.3 "@types/node": ^14.14.20 || ^16.0.0 find-up: ^5.0.0 @@ -6964,7 +6967,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/node-logger@7.0.0-alpha.48, @storybook/node-logger@workspace:*, @storybook/node-logger@workspace:lib/node-logger": +"@storybook/node-logger@7.0.0-alpha.49, @storybook/node-logger@workspace:*, @storybook/node-logger@workspace:lib/node-logger": version: 0.0.0-use.local resolution: "@storybook/node-logger@workspace:lib/node-logger" dependencies: @@ -6977,7 +6980,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/postinstall@7.0.0-alpha.48, @storybook/postinstall@workspace:*, @storybook/postinstall@workspace:lib/postinstall": +"@storybook/postinstall@7.0.0-alpha.49, @storybook/postinstall@workspace:*, @storybook/postinstall@workspace:lib/postinstall": version: 0.0.0-use.local resolution: "@storybook/postinstall@workspace:lib/postinstall" dependencies: @@ -6992,10 +6995,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preact-webpack5@workspace:frameworks/preact-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/preact": 7.0.0-alpha.48 - "@storybook/preset-preact-webpack": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/preact": 7.0.0-alpha.49 + "@storybook/preset-preact-webpack": 7.0.0-alpha.49 "@types/node": ^16.0.0 preact: ^10.5.13 react: 16.14.0 @@ -7007,14 +7010,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preact@7.0.0-alpha.48, @storybook/preact@workspace:*, @storybook/preact@workspace:renderers/preact": +"@storybook/preact@7.0.0-alpha.49, @storybook/preact@workspace:*, @storybook/preact@workspace:renderers/preact": version: 0.0.0-use.local resolution: "@storybook/preact@workspace:renderers/preact" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 preact: ^10.5.13 react: 16.14.0 @@ -7026,11 +7029,11 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-html-webpack@7.0.0-alpha.48, @storybook/preset-html-webpack@workspace:*, @storybook/preset-html-webpack@workspace:presets/html-webpack": +"@storybook/preset-html-webpack@7.0.0-alpha.49, @storybook/preset-html-webpack@workspace:*, @storybook/preset-html-webpack@workspace:presets/html-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-html-webpack@workspace:presets/html-webpack" dependencies: - "@storybook/core-webpack": 7.0.0-alpha.48 + "@storybook/core-webpack": 7.0.0-alpha.49 "@types/node": ^16.0.0 html-loader: ^3.1.0 react: 16.14.0 @@ -7042,12 +7045,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-preact-webpack@7.0.0-alpha.48, @storybook/preset-preact-webpack@workspace:*, @storybook/preset-preact-webpack@workspace:presets/preact-webpack": +"@storybook/preset-preact-webpack@7.0.0-alpha.49, @storybook/preset-preact-webpack@workspace:*, @storybook/preset-preact-webpack@workspace:presets/preact-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-preact-webpack@workspace:presets/preact-webpack" dependencies: "@babel/plugin-transform-react-jsx": ^7.12.12 - "@storybook/core-webpack": 7.0.0-alpha.48 + "@storybook/core-webpack": 7.0.0-alpha.49 "@types/node": ^16.0.0 preact: ^10.5.13 react: 16.14.0 @@ -7059,17 +7062,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-react-webpack@7.0.0-alpha.48, @storybook/preset-react-webpack@workspace:*, @storybook/preset-react-webpack@workspace:presets/react-webpack": +"@storybook/preset-react-webpack@7.0.0-alpha.49, @storybook/preset-react-webpack@workspace:*, @storybook/preset-react-webpack@workspace:presets/react-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-react-webpack@workspace:presets/react-webpack" dependencies: "@babel/preset-flow": ^7.12.1 "@babel/preset-react": ^7.12.10 "@pmmmwh/react-refresh-webpack-plugin": ^0.5.5 - "@storybook/core-webpack": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/react": 7.0.0-alpha.48 + "@storybook/core-webpack": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/react": 7.0.0-alpha.49 "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0 "@types/node": ^16.0.0 "@types/semver": ^7.3.4 @@ -7095,13 +7098,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-server-webpack@7.0.0-alpha.48, @storybook/preset-server-webpack@workspace:*, @storybook/preset-server-webpack@workspace:presets/server-webpack": +"@storybook/preset-server-webpack@7.0.0-alpha.49, @storybook/preset-server-webpack@workspace:*, @storybook/preset-server-webpack@workspace:presets/server-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-server-webpack@workspace:presets/server-webpack" dependencies: - "@storybook/core-server": 7.0.0-alpha.48 - "@storybook/core-webpack": 7.0.0-alpha.48 - "@storybook/server": 7.0.0-alpha.48 + "@storybook/core-server": 7.0.0-alpha.49 + "@storybook/core-webpack": 7.0.0-alpha.49 + "@storybook/server": 7.0.0-alpha.49 "@types/node": ^16.0.0 fs-extra: ^9.0.1 global: ^4.4.0 @@ -7116,12 +7119,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-svelte-webpack@7.0.0-alpha.48, @storybook/preset-svelte-webpack@workspace:*, @storybook/preset-svelte-webpack@workspace:presets/svelte-webpack": +"@storybook/preset-svelte-webpack@7.0.0-alpha.49, @storybook/preset-svelte-webpack@workspace:*, @storybook/preset-svelte-webpack@workspace:presets/svelte-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-svelte-webpack@workspace:presets/svelte-webpack" dependencies: - "@storybook/core-webpack": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 + "@storybook/core-webpack": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 react: 16.14.0 react-dom: 16.14.0 svelte: ^3.31.2 @@ -7136,12 +7139,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-vue-webpack@7.0.0-alpha.48, @storybook/preset-vue-webpack@workspace:*, @storybook/preset-vue-webpack@workspace:presets/vue-webpack": +"@storybook/preset-vue-webpack@7.0.0-alpha.49, @storybook/preset-vue-webpack@workspace:*, @storybook/preset-vue-webpack@workspace:presets/vue-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-vue-webpack@workspace:presets/vue-webpack" dependencies: - "@storybook/core-webpack": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 + "@storybook/core-webpack": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 "@types/node": ^16.0.0 react: 16.14.0 react-dom: 16.14.0 @@ -7163,12 +7166,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-vue3-webpack@7.0.0-alpha.48, @storybook/preset-vue3-webpack@workspace:*, @storybook/preset-vue3-webpack@workspace:presets/vue3-webpack": +"@storybook/preset-vue3-webpack@7.0.0-alpha.49, @storybook/preset-vue3-webpack@workspace:*, @storybook/preset-vue3-webpack@workspace:presets/vue3-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-vue3-webpack@workspace:presets/vue3-webpack" dependencies: - "@storybook/core-webpack": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 + "@storybook/core-webpack": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 "@types/node": ^16.0.0 "@vue/compiler-sfc": ^3.2.33 react: 16.14.0 @@ -7188,14 +7191,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-web-components-webpack@7.0.0-alpha.48, @storybook/preset-web-components-webpack@workspace:*, @storybook/preset-web-components-webpack@workspace:presets/web-components-webpack": +"@storybook/preset-web-components-webpack@7.0.0-alpha.49, @storybook/preset-web-components-webpack@workspace:*, @storybook/preset-web-components-webpack@workspace:presets/web-components-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-web-components-webpack@workspace:presets/web-components-webpack" dependencies: "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/preset-env": ^7.12.11 - "@storybook/core-webpack": 7.0.0-alpha.48 + "@storybook/core-webpack": 7.0.0-alpha.49 "@types/node": ^16.0.0 babel-loader: ^7.0.0 || ^8.0.0 babel-plugin-bundled-import-meta: ^0.3.1 @@ -7208,17 +7211,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-web@7.0.0-alpha.48, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:lib/preview-web": +"@storybook/preview-web@7.0.0-alpha.49, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:lib/preview-web": version: 0.0.0-use.local resolution: "@storybook/preview-web@workspace:lib/preview-web" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 ansi-to-html: ^0.6.11 global: ^4.4.0 lodash: ^4.17.21 @@ -7232,23 +7235,23 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview@7.0.0-alpha.48, @storybook/preview@workspace:lib/preview": +"@storybook/preview@7.0.0-alpha.49, @storybook/preview@workspace:lib/preview": version: 0.0.0-use.local resolution: "@storybook/preview@workspace:lib/preview" dependencies: - "@storybook/api": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/channels": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/channels": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 "@storybook/csf": next - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/router": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/router": 7.0.0-alpha.49 + "@storybook/theming": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/qs": ^6.9.5 "@types/webpack-env": ^1.16.4 ansi-to-html: ^0.6.11 @@ -7291,13 +7294,13 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": ^0.0.5 "@rollup/pluginutils": ^4.2.0 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/builder-vite": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/react": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/builder-vite": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/react": 7.0.0-alpha.49 "@types/node": ^16.0.0 "@vitejs/plugin-react": ^2.0.0 ast-types: ^0.14.2 @@ -7315,9 +7318,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/react-webpack5@workspace:frameworks/react-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/preset-react-webpack": 7.0.0-alpha.48 - "@storybook/react": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/preset-react-webpack": 7.0.0-alpha.49 + "@storybook/react": 7.0.0-alpha.49 "@types/node": ^16.0.0 jest-specific-snapshot: ^4.0.0 typescript: ~4.6.3 @@ -7333,18 +7336,18 @@ __metadata: languageName: unknown linkType: soft -"@storybook/react@7.0.0-alpha.48, @storybook/react@workspace:*, @storybook/react@workspace:renderers/react": +"@storybook/react@7.0.0-alpha.49, @storybook/react@workspace:*, @storybook/react@workspace:renderers/react": version: 0.0.0-use.local resolution: "@storybook/react@workspace:renderers/react" dependencies: "@babel/core": ^7.11.5 "@jest/globals": ^26.6.2 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 "@types/estree": ^0.0.51 "@types/node": ^16.0.0 "@types/util-deprecate": ^1.0.0 @@ -7440,7 +7443,7 @@ __metadata: "@storybook/core-events": "workspace:*" "@storybook/core-server": "workspace:*" "@storybook/core-webpack": "workspace:*" - "@storybook/csf": next + "@storybook/csf": 0.0.2-next.5 "@storybook/csf-plugin": "workspace:*" "@storybook/csf-tools": "workspace:*" "@storybook/docs-tools": "workspace:*" @@ -7537,6 +7540,7 @@ __metadata: esbuild-loader: ^2.19.0 esbuild-plugin-alias: ^0.2.1 eslint: ^8.26.0 + eslint-import-resolver-typescript: ^3.5.2 eslint-plugin-import: ^2.26.0 eslint-plugin-react: ^7.31.10 eslint-plugin-storybook: ^0.6.6 @@ -7638,11 +7642,11 @@ __metadata: languageName: unknown linkType: soft -"@storybook/router@7.0.0-alpha.48, @storybook/router@workspace:*, @storybook/router@workspace:lib/router": +"@storybook/router@7.0.0-alpha.49, @storybook/router@workspace:*, @storybook/router@workspace:lib/router": version: 0.0.0-use.local resolution: "@storybook/router@workspace:lib/router" dependencies: - "@storybook/client-logger": 7.0.0-alpha.48 + "@storybook/client-logger": 7.0.0-alpha.49 dequal: ^2.0.2 global: ^4.4.0 lodash: ^4.17.21 @@ -7690,10 +7694,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/server-webpack5@workspace:frameworks/server-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/preset-server-webpack": 7.0.0-alpha.48 - "@storybook/server": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/preset-server-webpack": 7.0.0-alpha.49 + "@storybook/server": 7.0.0-alpha.49 "@types/node": ^16.0.0 react: 16.14.0 react-dom: 16.14.0 @@ -7701,15 +7705,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/server@7.0.0-alpha.48, @storybook/server@workspace:*, @storybook/server@workspace:renderers/server": +"@storybook/server@7.0.0-alpha.49, @storybook/server@workspace:*, @storybook/server@workspace:renderers/server": version: 0.0.0-use.local resolution: "@storybook/server@workspace:renderers/server" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 react: 16.14.0 react-dom: 16.14.0 @@ -7718,12 +7722,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/source-loader@7.0.0-alpha.48, @storybook/source-loader@workspace:*, @storybook/source-loader@workspace:lib/source-loader": +"@storybook/source-loader@7.0.0-alpha.49, @storybook/source-loader@workspace:*, @storybook/source-loader@workspace:lib/source-loader": version: 0.0.0-use.local resolution: "@storybook/source-loader@workspace:lib/source-loader" dependencies: - "@storybook/csf": next - "@storybook/types": 7.0.0-alpha.48 + "@storybook/csf": 0.0.2-next.5 + "@storybook/types": 7.0.0-alpha.49 estraverse: ^5.2.0 jest-specific-snapshot: ^4.0.0 lodash: ^4.17.21 @@ -7735,15 +7739,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/store@7.0.0-alpha.48, @storybook/store@workspace:*, @storybook/store@workspace:lib/store": +"@storybook/store@7.0.0-alpha.49, @storybook/store@workspace:*, @storybook/store@workspace:lib/store": version: 0.0.0-use.local resolution: "@storybook/store@workspace:lib/store" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 - "@storybook/csf": next - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-events": 7.0.0-alpha.49 + "@storybook/csf": 0.0.2-next.5 + "@storybook/types": 7.0.0-alpha.49 dequal: ^2.0.2 global: ^4.4.0 lodash: ^4.17.21 @@ -7764,14 +7768,14 @@ __metadata: resolution: "@storybook/svelte-vite@workspace:frameworks/svelte-vite" dependencies: "@storybook/addon-svelte-csf": ^2.0.0 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/builder-vite": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/svelte": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/builder-vite": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/svelte": 7.0.0-alpha.49 "@sveltejs/vite-plugin-svelte": ^1.0.0 "@types/node": ^16.0.0 magic-string: ^0.26.1 @@ -7791,10 +7795,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/svelte-webpack5@workspace:frameworks/svelte-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/preset-svelte-webpack": 7.0.0-alpha.48 - "@storybook/svelte": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/preset-svelte-webpack": 7.0.0-alpha.49 + "@storybook/svelte": 7.0.0-alpha.49 react: 16.14.0 react-dom: 16.14.0 svelte: ^3.48.0 @@ -7807,16 +7811,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/svelte@7.0.0-alpha.48, @storybook/svelte@workspace:*, @storybook/svelte@workspace:renderers/svelte": +"@storybook/svelte@7.0.0-alpha.49, @storybook/svelte@workspace:*, @storybook/svelte@workspace:renderers/svelte": version: 0.0.0-use.local resolution: "@storybook/svelte@workspace:renderers/svelte" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 expect-type: ^0.14.2 global: ^4.4.0 react: 16.14.0 @@ -7832,12 +7836,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/telemetry@7.0.0-alpha.48, @storybook/telemetry@workspace:*, @storybook/telemetry@workspace:lib/telemetry": +"@storybook/telemetry@7.0.0-alpha.49, @storybook/telemetry@workspace:*, @storybook/telemetry@workspace:lib/telemetry": version: 0.0.0-use.local resolution: "@storybook/telemetry@workspace:lib/telemetry" dependencies: - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 chalk: ^4.1.0 detect-package-manager: ^2.0.1 fetch-retry: ^5.0.2 @@ -7862,7 +7866,7 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@7.0.0-alpha.48, @storybook/theming@workspace:*, @storybook/theming@workspace:lib/theming": +"@storybook/theming@7.0.0-alpha.49, @storybook/theming@workspace:*, @storybook/theming@workspace:lib/theming": version: 0.0.0-use.local resolution: "@storybook/theming@workspace:lib/theming" dependencies: @@ -7871,7 +7875,7 @@ __metadata: "@emotion/react": ^11.10.4 "@emotion/styled": ^11.10.4 "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 - "@storybook/client-logger": 7.0.0-alpha.48 + "@storybook/client-logger": 7.0.0-alpha.49 "@types/fs-extra": ^9.0.6 "@types/node": ^16.0.0 deep-object-diff: ^1.1.0 @@ -7902,12 +7906,12 @@ __metadata: languageName: node linkType: hard -"@storybook/types@7.0.0-alpha.48, @storybook/types@workspace:*, @storybook/types@workspace:lib/types": +"@storybook/types@7.0.0-alpha.49, @storybook/types@workspace:*, @storybook/types@workspace:lib/types": version: 0.0.0-use.local resolution: "@storybook/types@workspace:lib/types" dependencies: "@babel/core": ^7.12.10 - "@storybook/csf": 0.0.2--canary.53.4879818.0 + "@storybook/csf": 0.0.2-next.5 "@types/babel__core": ^7.0.0 "@types/express": ^4.7.0 "@types/node": ^16.0.0 @@ -7922,15 +7926,15 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue-vite@workspace:frameworks/vue-vite" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/builder-vite": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-server": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/vue": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/builder-vite": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/core-server": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/vue": 7.0.0-alpha.49 magic-string: ^0.26.1 typescript: ~4.6.3 vite: ^3.1.3 @@ -7945,10 +7949,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue-webpack5@workspace:frameworks/vue-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/preset-vue-webpack": 7.0.0-alpha.48 - "@storybook/vue": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/preset-vue-webpack": 7.0.0-alpha.49 + "@storybook/vue": 7.0.0-alpha.49 "@types/node": ^16.0.0 react: 16.14.0 react-dom: 16.14.0 @@ -7970,14 +7974,14 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue3-vite@workspace:frameworks/vue3-vite" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/builder-vite": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/core-server": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/vue3": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/builder-vite": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/core-server": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/vue3": 7.0.0-alpha.49 "@types/node": ^16.0.0 "@vitejs/plugin-vue": ^3.0.0 magic-string: ^0.26.1 @@ -7991,10 +7995,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue3-webpack5@workspace:frameworks/vue3-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/preset-vue3-webpack": 7.0.0-alpha.48 - "@storybook/vue3": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/preset-vue3-webpack": 7.0.0-alpha.49 + "@storybook/vue3": 7.0.0-alpha.49 "@types/node": ^16.0.0 "@vue/compiler-sfc": 3.0.0 react: 16.14.0 @@ -8009,16 +8013,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/vue3@7.0.0-alpha.48, @storybook/vue3@workspace:*, @storybook/vue3@workspace:renderers/vue3": +"@storybook/vue3@7.0.0-alpha.49, @storybook/vue3@workspace:*, @storybook/vue3@workspace:renderers/vue3": version: 0.0.0-use.local resolution: "@storybook/vue3@workspace:renderers/vue3" dependencies: "@digitak/esrun": ^3.2.2 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 react: 16.14.0 react-dom: 16.14.0 @@ -8037,16 +8041,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/vue@7.0.0-alpha.48, @storybook/vue@workspace:*, @storybook/vue@workspace:renderers/vue": +"@storybook/vue@7.0.0-alpha.49, @storybook/vue@workspace:*, @storybook/vue@workspace:renderers/vue": version: 0.0.0-use.local resolution: "@storybook/vue@workspace:renderers/vue" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 react: 16.14.0 react-dom: 16.14.0 @@ -8070,15 +8074,15 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/web-components-vite@workspace:frameworks/web-components-vite" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/builder-vite": 7.0.0-alpha.48 - "@storybook/channel-postmessage": 7.0.0-alpha.48 - "@storybook/channel-websocket": 7.0.0-alpha.48 - "@storybook/client-api": 7.0.0-alpha.48 - "@storybook/core-server": 7.0.0-alpha.48 - "@storybook/node-logger": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/web-components": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/builder-vite": 7.0.0-alpha.49 + "@storybook/channel-postmessage": 7.0.0-alpha.49 + "@storybook/channel-websocket": 7.0.0-alpha.49 + "@storybook/client-api": 7.0.0-alpha.49 + "@storybook/core-server": 7.0.0-alpha.49 + "@storybook/node-logger": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/web-components": 7.0.0-alpha.49 "@types/node": ^16.0.0 magic-string: ^0.26.1 typescript: ~4.6.3 @@ -8091,10 +8095,10 @@ __metadata: resolution: "@storybook/web-components-webpack5@workspace:frameworks/web-components-webpack5" dependencies: "@babel/preset-env": ^7.12.11 - "@storybook/builder-webpack5": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/preset-web-components-webpack": 7.0.0-alpha.48 - "@storybook/web-components": 7.0.0-alpha.48 + "@storybook/builder-webpack5": 7.0.0-alpha.49 + "@storybook/core-common": 7.0.0-alpha.49 + "@storybook/preset-web-components-webpack": 7.0.0-alpha.49 + "@storybook/web-components": 7.0.0-alpha.49 "@types/node": ^16.0.0 lit-html: 2.0.2 react: 16.14.0 @@ -8105,18 +8109,18 @@ __metadata: languageName: unknown linkType: soft -"@storybook/web-components@7.0.0-alpha.48, @storybook/web-components@workspace:*, @storybook/web-components@workspace:renderers/web-components": +"@storybook/web-components@7.0.0-alpha.49, @storybook/web-components@workspace:*, @storybook/web-components@workspace:renderers/web-components": version: 0.0.0-use.local resolution: "@storybook/web-components@workspace:renderers/web-components" dependencies: - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 - "@storybook/client-logger": 7.0.0-alpha.48 - "@storybook/core-client": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 - "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/types": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.49 + "@storybook/api": 7.0.0-alpha.49 + "@storybook/client-logger": 7.0.0-alpha.49 + "@storybook/core-client": 7.0.0-alpha.49 + "@storybook/docs-tools": 7.0.0-alpha.49 + "@storybook/preview-web": 7.0.0-alpha.49 + "@storybook/store": 7.0.0-alpha.49 + "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 lit: 2.3.1 lit-html: 2.0.2 @@ -16415,6 +16419,24 @@ __metadata: languageName: node linkType: hard +"eslint-import-resolver-typescript@npm:^3.5.2": + version: 3.5.2 + resolution: "eslint-import-resolver-typescript@npm:3.5.2" + dependencies: + debug: ^4.3.4 + enhanced-resolve: ^5.10.0 + get-tsconfig: ^4.2.0 + globby: ^13.1.2 + is-core-module: ^2.10.0 + is-glob: ^4.0.3 + synckit: ^0.8.4 + peerDependencies: + eslint: "*" + eslint-plugin-import: "*" + checksum: 7947cccc80d439132cb75ec7a74bf710fef72b3b0d6d804246265836f143e86520608a5a3c3313aec0e21a8b0ca0eb99101236895ea89b71559d0cf9c9ac377a + languageName: node + linkType: hard + "eslint-module-utils@npm:^2.7.3": version: 2.7.4 resolution: "eslint-module-utils@npm:2.7.4" @@ -18509,6 +18531,13 @@ __metadata: languageName: node linkType: hard +"get-tsconfig@npm:^4.2.0": + version: 4.2.0 + resolution: "get-tsconfig@npm:4.2.0" + checksum: a60b2665d57894f844116cd0947722d107f2f639ef62d01a488da70f3d91707eeb3843a5c2eb49e21b6a46a68853d42450a63c251cb1659576454febb03bd307 + languageName: node + linkType: hard + "get-value@npm:^2.0.3, get-value@npm:^2.0.6": version: 2.0.6 resolution: "get-value@npm:2.0.6" @@ -18825,6 +18854,13 @@ __metadata: languageName: node linkType: hard +"globalyzer@npm:0.1.0": + version: 0.1.0 + resolution: "globalyzer@npm:0.1.0" + checksum: e16e47a5835cbe8a021423d4c7fcd9f5f85815b4190a7f50c1fdb95fc559d72e4fb30be96f106c66a99413f36d72da0f8323d19d27f60a8feec9d936139ec5a8 + languageName: node + linkType: hard + "globby@npm:10.0.0": version: 10.0.0 resolution: "globby@npm:10.0.0" @@ -18912,6 +18948,13 @@ __metadata: languageName: node linkType: hard +"globrex@npm:^0.1.2": + version: 0.1.2 + resolution: "globrex@npm:0.1.2" + checksum: a54c029520cf58bda1d8884f72bd49b4cd74e977883268d931fd83bcbd1a9eb96d57c7dbd4ad80148fb9247467ebfb9b215630b2ed7563b2a8de02e1ff7f89d1 + languageName: node + linkType: hard + "glur@npm:^1.1.2": version: 1.1.2 resolution: "glur@npm:1.1.2" @@ -20440,7 +20483,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0": +"is-core-module@npm:^2.10.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0": version: 2.11.0 resolution: "is-core-module@npm:2.11.0" dependencies: @@ -31529,7 +31572,7 @@ __metadata: version: 0.0.0-use.local resolution: "sb@workspace:lib/cli-sb" dependencies: - "@storybook/cli": 7.0.0-alpha.48 + "@storybook/cli": 7.0.0-alpha.49 typescript: ~4.6.3 bin: sb: ./index.js @@ -32654,7 +32697,7 @@ __metadata: version: 0.0.0-use.local resolution: "storybook@workspace:lib/cli-storybook" dependencies: - "@storybook/cli": 7.0.0-alpha.48 + "@storybook/cli": 7.0.0-alpha.49 typescript: ~4.6.3 bin: sb: ./index.js @@ -33352,6 +33395,16 @@ __metadata: languageName: node linkType: hard +"synckit@npm:^0.8.4": + version: 0.8.4 + resolution: "synckit@npm:0.8.4" + dependencies: + "@pkgr/utils": ^2.3.1 + tslib: ^2.4.0 + checksum: cd2444b7879b010b220721874527dbf3231a05cd42a47b24260db9c9427e9c3d3e481bd41175112434267dec3402166cfde417c4ae254937b5cc3b0cd994b992 + languageName: node + linkType: hard + "syntax-error@npm:^1.1.6": version: 1.4.0 resolution: "syntax-error@npm:1.4.0" @@ -33688,6 +33741,16 @@ __metadata: languageName: node linkType: hard +"tiny-glob@npm:^0.2.9": + version: 0.2.9 + resolution: "tiny-glob@npm:0.2.9" + dependencies: + globalyzer: 0.1.0 + globrex: ^0.1.2 + checksum: cbe072f0d213a1395d30aa94845a051d4af18fe8ffb79c8e99ac1787cd25df69083f17791a53997cb65f469f48950cb61426ccc0683cc9df170ac2430e883702 + languageName: node + linkType: hard + "tiny-inflate@npm:^1.0.0, tiny-inflate@npm:^1.0.2": version: 1.0.3 resolution: "tiny-inflate@npm:1.0.3" diff --git a/docs/contribute/how-to-reproduce.md b/docs/contribute/how-to-reproduce.md index 2936c2be92a..fd18dabe760 100644 --- a/docs/contribute/how-to-reproduce.md +++ b/docs/contribute/how-to-reproduce.md @@ -14,7 +14,7 @@ Make sure you have: - Installed [`Yarn`](https://yarnpkg.com/) on your local development machine. - A [GitHub account](https://github.com/signup) for hosting the reproduction's code. -- A [Chromatic account](https://www.chromatic.com/start) for publishing your Storybook. +- A [Chromatic account](https://www.chromatic.com/start/?utm_source=storybook_website&utm_medium=link&utm_campaign=storybook) for publishing your Storybook. ## Initial setup @@ -72,14 +72,14 @@ Then, follow GitHub's instructions to set up the repository. ## Publish -An excellent way to check your reproduction is to have it deployed online. We recommend [Chromatic](https://www.chromatic.com/), a free publishing service created by the Storybook maintainers. It allows you to deploy and host your reproduction safely and securely in the cloud. +An excellent way to check your reproduction is to have it deployed online. We recommend [Chromatic](https://www.chromatic.com/?utm_source=storybook_website&utm_medium=link&utm_campaign=storybook), a free publishing service created by the Storybook maintainers. It allows you to deploy and host your reproduction safely and securely in the cloud. ### Helpful resources when working with Chromatic - [Publish Storybook](../sharing/publish-storybook.md) -- [Setup Chromatic](https://www.chromatic.com/docs/setup) -- [Automate Chromatic with continuous integration](https://www.chromatic.com/docs/ci) +- [Setup Chromatic](https://www.chromatic.com/docs/setup?utm_source=storybook_website&utm_medium=link&utm_campaign=storybook) +- [Automate Chromatic with continuous integration](https://www.chromatic.com/docs/ci?utm_source=storybook_website&utm_medium=link&utm_campaign=storybook) ## Submit the issue -Finally, create your issue in the [Storybook issue tracker](https://github.com/storybookjs/storybook/issues/new/choose), go through the required steps, and provide a detailed description of the problem. Add the GitHub repository and [deployed reproduction](https://www.chromatic.com/docs/setup#view-published-storybook) to help with the triage process. +Finally, create your issue in the [Storybook issue tracker](https://github.com/storybookjs/storybook/issues/new/choose), go through the required steps, and provide a detailed description of the problem. Add the GitHub repository and [deployed reproduction](https://www.chromatic.com/docs/setup?utm_source=storybook_website&utm_medium=link&utm_campaign=storybook#view-published-storybook) to help with the triage process. diff --git a/docs/sharing/design-integrations.md b/docs/sharing/design-integrations.md index 58c5a88e7df..814997c5575 100644 --- a/docs/sharing/design-integrations.md +++ b/docs/sharing/design-integrations.md @@ -13,7 +13,7 @@ Storybook integrates with design tools to speed up your development workflow. Th ### Embed Storybook in Figma with the plugin -[Storybook Connect](https://www.figma.com/community/plugin/1056265616080331589/Storybook-Connect) is a Figma plugin that allows you to embed component stories in Figma. It’s powered by [Storybook embeds](./embed.md) and [Chromatic](https://www.chromatic.com/), a publishing tool created by the Storybook team. +[Storybook Connect](https://www.figma.com/community/plugin/1056265616080331589/Storybook-Connect) is a Figma plugin that allows you to embed component stories in Figma. It’s powered by [Storybook embeds](./embed.md) and [Chromatic](https://www.chromatic.com/?utm_source=storybook_website&utm_medium=link&utm_campaign=storybook), a publishing tool created by the Storybook team.