From ed3a8ec6420ba9d574930edc89219f67d63f487f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 3 Nov 2022 14:39:43 +0100 Subject: [PATCH] step 4 --- code/addons/a11y/package.json | 1 + code/addons/a11y/src/a11yRunner.test.ts | 4 +-- code/addons/a11y/src/a11yRunner.ts | 2 +- code/addons/a11y/src/manager.test.tsx | 4 +-- code/addons/a11y/src/manager.tsx | 2 +- code/addons/actions/package.json | 1 + code/addons/actions/src/decorator.ts | 2 +- code/addons/actions/src/manager.tsx | 2 +- .../src/runtime/__tests__/action.test.js | 4 +-- .../src/runtime/__tests__/actions.test.js | 4 +-- code/addons/actions/src/runtime/action.ts | 2 +- code/addons/backgrounds/package.json | 1 + .../src/decorators/withBackground.ts | 2 +- .../backgrounds/src/decorators/withGrid.ts | 2 +- code/addons/backgrounds/src/manager.tsx | 2 +- code/addons/controls/package.json | 1 + code/addons/controls/src/manager.tsx | 2 +- code/addons/docs/package.json | 1 + code/addons/essentials/package.json | 1 + code/addons/highlight/package.json | 1 + code/addons/highlight/src/highlight.ts | 2 +- code/addons/interactions/package.json | 1 + code/addons/interactions/src/manager.tsx | 2 +- .../addons/interactions/src/preset/preview.ts | 2 +- code/addons/jest/package.json | 1 + code/addons/jest/src/index.ts | 2 +- code/addons/jest/src/manager.tsx | 2 +- code/addons/links/package.json | 1 + code/addons/links/src/manager.ts | 2 +- .../links/src/react/components/link.test.tsx | 4 +-- code/addons/links/src/utils.test.ts | 4 +-- code/addons/links/src/utils.ts | 2 +- code/addons/measure/package.json | 1 + code/addons/measure/src/manager.tsx | 2 +- code/addons/measure/src/withMeasure.ts | 2 +- code/addons/outline/package.json | 1 + code/addons/outline/src/manager.tsx | 2 +- code/addons/outline/src/withOutline.ts | 2 +- .../storyshots/storyshots-core/package.json | 1 + .../storyshots-core/src/api/index.ts | 2 +- code/addons/storysource/package.json | 1 + code/addons/storysource/src/manager.tsx | 2 +- code/addons/toolbars/package.json | 1 + code/addons/toolbars/src/manager.tsx | 2 +- code/addons/viewport/package.json | 1 + code/addons/viewport/src/manager.tsx | 2 +- code/frameworks/angular/package.json | 1 + .../src/client/angular-beta/DocsRenderer.ts | 2 +- .../src/client/docs/sourceDecorator.ts | 2 +- .../framework-preset-angular-cli.test.ts | 2 +- code/frameworks/nextjs/package.json | 1 + code/frameworks/react-vite/src/index.ts | 2 +- code/frameworks/svelte-vite/src/index.ts | 2 +- code/frameworks/vue-vite/src/index.ts | 2 +- code/frameworks/vue3-vite/src/index.ts | 2 +- .../web-components-vite/src/index.ts | 2 +- code/lib/builder-vite/src/optimizeDeps.ts | 2 +- .../virtualModuleModernEntry.js.handlebars | 2 +- .../js-package-manager/JsPackageManager.ts | 2 +- .../src/js-package-manager/NPMProxy.test.ts | 34 +++++++++---------- .../src/js-package-manager/PNPMProxy.test.ts | 22 ++++++------ .../src/js-package-manager/Yarn1Proxy.test.ts | 22 ++++++------ .../src/js-package-manager/Yarn2Proxy.test.ts | 26 +++++++------- code/lib/cli/src/versions.ts | 2 +- .../transforms/update-organisation-name.js | 2 +- code/lib/instrumenter/package.json | 1 + .../lib/instrumenter/src/instrumenter.test.ts | 2 +- code/lib/instrumenter/src/instrumenter.ts | 2 +- code/lib/postinstall/src/frameworks.test.ts | 2 +- code/lib/preview-api/package.json | 1 + code/lib/preview-api/src/index.ts | 7 ++++ code/package.json | 1 + code/renderers/html/package.json | 1 + .../html/src/docs/sourceDecorator.test.ts | 4 +-- .../html/src/docs/sourceDecorator.ts | 2 +- code/renderers/preact/package.json | 1 + code/renderers/react/package.json | 1 + .../react/src/__test__/internals.test.tsx | 2 +- .../react/src/docs/jsxDecorator.test.tsx | 4 +-- .../renderers/react/src/docs/jsxDecorator.tsx | 2 +- code/renderers/server/package.json | 1 + code/renderers/svelte/package.json | 1 + .../svelte/src/docs/sourceDecorator.ts | 2 +- code/renderers/vue/package.json | 1 + .../renderers/vue/src/docs/sourceDecorator.ts | 2 +- code/renderers/vue3/package.json | 1 + code/renderers/web-components/package.json | 1 + .../src/docs/sourceDecorator.test.ts | 4 +-- .../src/docs/sourceDecorator.ts | 2 +- code/ui/.storybook/manager.ts | 2 +- code/ui/blocks/package.json | 1 + code/ui/manager/package.json | 1 + code/ui/manager/paths.js | 2 +- code/ui/manager/src/FakeProvider.tsx | 2 +- .../components/preview/preview.mockdata.tsx | 2 +- .../src/components/preview/tools/addons.tsx | 2 +- .../src/components/preview/tools/copy.tsx | 2 +- .../src/components/preview/tools/eject.tsx | 2 +- .../src/components/preview/tools/menu.tsx | 2 +- .../src/components/preview/tools/remount.tsx | 2 +- .../src/components/preview/tools/zoom.tsx | 2 +- code/ui/manager/src/globals/exports.ts | 32 ++++++++++++++--- code/ui/manager/src/globals/runtime.ts | 4 +-- code/ui/manager/src/globals/types.ts | 2 +- code/ui/manager/src/runtime.ts | 4 +-- code/yarn.lock | 33 +++++++++++++++++- .../component-story-highlight-addon.ts.mdx | 2 +- ...addon-consume-and-update-globaltype.js.mdx | 2 +- .../my-addon-initial-panel-state.js.mdx | 2 +- .../storybook-addon-panel-example.js.mdx | 2 +- .../storybook-addon-panel-initial.js.mdx | 2 +- .../common/storybook-addon-tab-example.js.mdx | 2 +- .../storybook-addon-toolbar-example.js.mdx | 2 +- .../storybook-addons-api-imports.js.mdx | 2 +- .../storybook-addons-api-makedecorator.js.mdx | 2 +- .../storybook-addons-api-register.js.mdx | 2 +- .../common/storybook-config-layout.js.mdx | 2 +- .../storybook-manager-custom-theme.js.mdx | 2 +- .../storybook-manager-dark-theme.js.mdx | 2 +- .../storybook-manager-disable-roots.js.mdx | 2 +- ...rybook-manager-render-label-stories.js.mdx | 2 +- .../component-story-highlight-addon.js.mdx | 2 +- .../component-story-highlight-addon.js.mdx | 2 +- .../component-story-highlight-addon.js.mdx | 2 +- 124 files changed, 246 insertions(+), 155 deletions(-) diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index 8c6d1d8e168..e94ab68c0f4 100644 --- a/code/addons/a11y/package.json +++ b/code/addons/a11y/package.json @@ -69,6 +69,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "axe-core": "^4.2.0", diff --git a/code/addons/a11y/src/a11yRunner.test.ts b/code/addons/a11y/src/a11yRunner.test.ts index 47d9dac7d20..c1662d39369 100644 --- a/code/addons/a11y/src/a11yRunner.test.ts +++ b/code/addons/a11y/src/a11yRunner.test.ts @@ -1,7 +1,7 @@ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { EVENTS } from './constants'; -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); const mockedAddons = addons as jest.Mocked; describe('a11yRunner', () => { diff --git a/code/addons/a11y/src/a11yRunner.ts b/code/addons/a11y/src/a11yRunner.ts index 1f1c24b6ebe..88dd78a6466 100644 --- a/code/addons/a11y/src/a11yRunner.ts +++ b/code/addons/a11y/src/a11yRunner.ts @@ -1,5 +1,5 @@ import global from 'global'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { EVENTS } from './constants'; import type { A11yParameters } from './params'; diff --git a/code/addons/a11y/src/manager.test.tsx b/code/addons/a11y/src/manager.test.tsx index ff6c90a4452..25729475f15 100644 --- a/code/addons/a11y/src/manager.test.tsx +++ b/code/addons/a11y/src/manager.test.tsx @@ -1,10 +1,10 @@ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import * as api from '@storybook/api'; import { PANEL_ID } from './constants'; import './manager'; jest.mock('@storybook/api'); -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); const mockedApi = api as unknown as jest.Mocked; mockedApi.getAddonState = jest.fn(); const mockedAddons = addons as jest.Mocked; diff --git a/code/addons/a11y/src/manager.tsx b/code/addons/a11y/src/manager.tsx index 3d863b3eb1b..f7ae42e5243 100644 --- a/code/addons/a11y/src/manager.tsx +++ b/code/addons/a11y/src/manager.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { ADDON_ID, PANEL_ID, PARAM_KEY } from './constants'; import { VisionSimulator } from './components/VisionSimulator'; import { A11YPanel } from './components/A11YPanel'; diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index 91b57e0027e..85297dd35e1 100644 --- a/code/addons/actions/package.json +++ b/code/addons/actions/package.json @@ -68,6 +68,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "dequal": "^2.0.2", diff --git a/code/addons/actions/src/decorator.ts b/code/addons/actions/src/decorator.ts index 4b5d2f8e944..5a1ba2b3deb 100644 --- a/code/addons/actions/src/decorator.ts +++ b/code/addons/actions/src/decorator.ts @@ -1,5 +1,5 @@ import global from 'global'; -import { useEffect, makeDecorator } from '@storybook/addons'; +import { useEffect, makeDecorator } from '@storybook/preview-api'; import { actions } from './runtime/actions'; import { PARAM_KEY } from './constants'; diff --git a/code/addons/actions/src/manager.tsx b/code/addons/actions/src/manager.tsx index bd024620ac5..75e288ac907 100644 --- a/code/addons/actions/src/manager.tsx +++ b/code/addons/actions/src/manager.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { STORY_CHANGED } from '@storybook/core-events'; import ActionLogger from './containers/ActionLogger'; import { ADDON_ID, EVENT_ID, PANEL_ID, PARAM_KEY } from './constants'; diff --git a/code/addons/actions/src/runtime/__tests__/action.test.js b/code/addons/actions/src/runtime/__tests__/action.test.js index d89b120476b..4f8f8676106 100644 --- a/code/addons/actions/src/runtime/__tests__/action.test.js +++ b/code/addons/actions/src/runtime/__tests__/action.test.js @@ -1,7 +1,7 @@ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { action, configureActions } from '../..'; -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); const createChannel = () => { const channel = { emit: jest.fn() }; diff --git a/code/addons/actions/src/runtime/__tests__/actions.test.js b/code/addons/actions/src/runtime/__tests__/actions.test.js index a9cd65c80ed..b3e1ae2779a 100644 --- a/code/addons/actions/src/runtime/__tests__/actions.test.js +++ b/code/addons/actions/src/runtime/__tests__/actions.test.js @@ -1,7 +1,7 @@ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { actions } from '../..'; -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); const createChannel = () => { const channel = { emit: jest.fn() }; diff --git a/code/addons/actions/src/runtime/action.ts b/code/addons/actions/src/runtime/action.ts index d56a290192f..3a0fc25e9cd 100644 --- a/code/addons/actions/src/runtime/action.ts +++ b/code/addons/actions/src/runtime/action.ts @@ -1,5 +1,5 @@ import uuidv4 from 'uuid-browser/v4'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { EVENT_ID } from '../constants'; import type { ActionDisplay, ActionOptions, HandlerFunction } from '../models'; import { config } from './configureActions'; diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index 12124cdcd4c..983fcde295f 100644 --- a/code/addons/backgrounds/package.json +++ b/code/addons/backgrounds/package.json @@ -67,6 +67,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0", diff --git a/code/addons/backgrounds/src/decorators/withBackground.ts b/code/addons/backgrounds/src/decorators/withBackground.ts index 306f06398a3..c814dc3a2d6 100644 --- a/code/addons/backgrounds/src/decorators/withBackground.ts +++ b/code/addons/backgrounds/src/decorators/withBackground.ts @@ -1,4 +1,4 @@ -import { useMemo, useEffect } from '@storybook/addons'; +import { useMemo, useEffect } from '@storybook/preview-api'; import type { AnyFramework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; import { PARAM_KEY as BACKGROUNDS_PARAM_KEY } from '../constants'; diff --git a/code/addons/backgrounds/src/decorators/withGrid.ts b/code/addons/backgrounds/src/decorators/withGrid.ts index 2aafc186c1e..1285bea764c 100644 --- a/code/addons/backgrounds/src/decorators/withGrid.ts +++ b/code/addons/backgrounds/src/decorators/withGrid.ts @@ -1,4 +1,4 @@ -import { useMemo, useEffect } from '@storybook/addons'; +import { useMemo, useEffect } from '@storybook/preview-api'; import type { AnyFramework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; import { clearStyles, addGridStyle } from '../helpers'; diff --git a/code/addons/backgrounds/src/manager.tsx b/code/addons/backgrounds/src/manager.tsx index d3b8d095ec9..0ca6932cd83 100644 --- a/code/addons/backgrounds/src/manager.tsx +++ b/code/addons/backgrounds/src/manager.tsx @@ -1,5 +1,5 @@ import React, { Fragment } from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { ADDON_ID } from './constants'; import { BackgroundSelector } from './containers/BackgroundSelector'; diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index 18adadb1e42..e25c3108c8a 100644 --- a/code/addons/controls/package.json +++ b/code/addons/controls/package.json @@ -64,6 +64,7 @@ "@storybook/components": "7.0.0-alpha.47", "@storybook/core-common": "7.0.0-alpha.47", "@storybook/node-logger": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", diff --git a/code/addons/controls/src/manager.tsx b/code/addons/controls/src/manager.tsx index f76dfaf83e9..64e2c1a541a 100644 --- a/code/addons/controls/src/manager.tsx +++ b/code/addons/controls/src/manager.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { AddonPanel } from '@storybook/components'; import { type API, useArgTypes } from '@storybook/api'; import { ControlsPanel } from './ControlsPanel'; diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index 0bdef57c666..99c471cf85f 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -64,6 +64,7 @@ "@storybook/mdx2-csf": "next", "@storybook/node-logger": "7.0.0-alpha.47", "@storybook/postinstall": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/preview-web": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index 114f34133fe..b89535214c2 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -54,6 +54,7 @@ "@storybook/api": "7.0.0-alpha.47", "@storybook/core-common": "7.0.0-alpha.47", "@storybook/node-logger": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "ts-dedent": "^2.0.0" }, "devDependencies": { diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 4d11f001001..fbc71b0658c 100644 --- a/code/addons/highlight/package.json +++ b/code/addons/highlight/package.json @@ -52,6 +52,7 @@ "dependencies": { "@storybook/addons": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "global": "^4.4.0" }, "devDependencies": { diff --git a/code/addons/highlight/src/highlight.ts b/code/addons/highlight/src/highlight.ts index b3bf0acfaa7..36e486b90f7 100644 --- a/code/addons/highlight/src/highlight.ts +++ b/code/addons/highlight/src/highlight.ts @@ -1,6 +1,6 @@ /* eslint-env browser */ import global from 'global'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { STORY_CHANGED } from '@storybook/core-events'; import { HIGHLIGHT, RESET_HIGHLIGHT, HIGHLIGHT_STYLE_ID } from './constants'; diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index aaf19034814..0e9abf41334 100644 --- a/code/addons/interactions/package.json +++ b/code/addons/interactions/package.json @@ -66,6 +66,7 @@ "@storybook/core-common": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", "@storybook/instrumenter": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0", diff --git a/code/addons/interactions/src/manager.tsx b/code/addons/interactions/src/manager.tsx index 454945d6c44..bd36869a9c5 100644 --- a/code/addons/interactions/src/manager.tsx +++ b/code/addons/interactions/src/manager.tsx @@ -1,4 +1,4 @@ -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { ADDON_ID, PANEL_ID } from './constants'; import { Panel } from './Panel'; diff --git a/code/addons/interactions/src/preset/preview.ts b/code/addons/interactions/src/preset/preview.ts index 9faae0eefe7..84e215cd317 100644 --- a/code/addons/interactions/src/preset/preview.ts +++ b/code/addons/interactions/src/preset/preview.ts @@ -1,6 +1,6 @@ /// -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { FORCE_REMOUNT, STORY_RENDER_PHASE_CHANGED } from '@storybook/core-events'; import type { AnyFramework, diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index bb6a5b226ee..10f3dddb881 100644 --- a/code/addons/jest/package.json +++ b/code/addons/jest/package.json @@ -64,6 +64,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", "global": "^4.4.0", "react-sizeme": "^3.0.1", diff --git a/code/addons/jest/src/index.ts b/code/addons/jest/src/index.ts index 2e8b0715121..5b68c9d9a9a 100644 --- a/code/addons/jest/src/index.ts +++ b/code/addons/jest/src/index.ts @@ -1,6 +1,6 @@ /// -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { normalize, sep } from 'upath'; import { ADD_TESTS, defineJestParameter } from './shared'; diff --git a/code/addons/jest/src/manager.tsx b/code/addons/jest/src/manager.tsx index 19a1e46f115..c5a5cd26ae6 100644 --- a/code/addons/jest/src/manager.tsx +++ b/code/addons/jest/src/manager.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { ADDON_ID, PANEL_ID, PARAM_KEY } from './shared'; import Panel from './components/Panel'; diff --git a/code/addons/links/package.json b/code/addons/links/package.json index 45d083b1e68..d6dccd92bb4 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -67,6 +67,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", "@storybook/csf": "next", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/router": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0", diff --git a/code/addons/links/src/manager.ts b/code/addons/links/src/manager.ts index 98b7feca38f..bf7b59d9940 100644 --- a/code/addons/links/src/manager.ts +++ b/code/addons/links/src/manager.ts @@ -1,4 +1,4 @@ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import EVENTS, { ADDON_ID } from './constants'; diff --git a/code/addons/links/src/react/components/link.test.tsx b/code/addons/links/src/react/components/link.test.tsx index 664670baa26..0057264b14a 100644 --- a/code/addons/links/src/react/components/link.test.tsx +++ b/code/addons/links/src/react/components/link.test.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { SELECT_STORY } from '@storybook/core-events'; import LinkTo from './link'; -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); jest.mock('global', () => ({ document: { location: { diff --git a/code/addons/links/src/utils.test.ts b/code/addons/links/src/utils.test.ts index 44388665381..1b78ebc1b20 100644 --- a/code/addons/links/src/utils.test.ts +++ b/code/addons/links/src/utils.test.ts @@ -1,9 +1,9 @@ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { SELECT_STORY } from '@storybook/core-events'; import { linkTo, hrefTo } from './utils'; -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); jest.mock('global', () => ({ // @ts-expect-error (Converted from ts-ignore) document: global.document, diff --git a/code/addons/links/src/utils.ts b/code/addons/links/src/utils.ts index b4ece3c80fe..82494c60bb5 100644 --- a/code/addons/links/src/utils.ts +++ b/code/addons/links/src/utils.ts @@ -1,5 +1,5 @@ import global from 'global'; -import { addons, makeDecorator } from '@storybook/addons'; +import { addons, makeDecorator } from '@storybook/preview-api'; import { STORY_CHANGED, SELECT_STORY } from '@storybook/core-events'; import type { StoryId, StoryName, ComponentTitle } from '@storybook/types'; import { toId } from '@storybook/csf'; diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index 8b2d88c0bb0..cc8ca1723b6 100644 --- a/code/addons/measure/package.json +++ b/code/addons/measure/package.json @@ -66,6 +66,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0" }, diff --git a/code/addons/measure/src/manager.tsx b/code/addons/measure/src/manager.tsx index 162e7ce43ec..026c530a1f6 100644 --- a/code/addons/measure/src/manager.tsx +++ b/code/addons/measure/src/manager.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { ADDON_ID, TOOL_ID } from './constants'; import { Tool } from './Tool'; diff --git a/code/addons/measure/src/withMeasure.ts b/code/addons/measure/src/withMeasure.ts index e68e8f4d79e..51eb5976812 100644 --- a/code/addons/measure/src/withMeasure.ts +++ b/code/addons/measure/src/withMeasure.ts @@ -1,5 +1,5 @@ /* eslint-env browser */ -import { useEffect } from '@storybook/addons'; +import { useEffect } from '@storybook/preview-api'; import type { AnyFramework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; import { drawSelectedElement } from './box-model/visualizer'; import { init, rescale, destroy } from './box-model/canvas'; diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index ca64da59d95..1b780d03c4f 100644 --- a/code/addons/outline/package.json +++ b/code/addons/outline/package.json @@ -69,6 +69,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0", "ts-dedent": "^2.0.0" diff --git a/code/addons/outline/src/manager.tsx b/code/addons/outline/src/manager.tsx index 3f3f96ae3b0..b0bf0f20ca5 100644 --- a/code/addons/outline/src/manager.tsx +++ b/code/addons/outline/src/manager.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { ADDON_ID } from './constants'; import { OutlineSelector } from './OutlineSelector'; diff --git a/code/addons/outline/src/withOutline.ts b/code/addons/outline/src/withOutline.ts index 037c8eb090e..513c9cf75cd 100644 --- a/code/addons/outline/src/withOutline.ts +++ b/code/addons/outline/src/withOutline.ts @@ -1,4 +1,4 @@ -import { useMemo, useEffect } from '@storybook/addons'; +import { useMemo, useEffect } from '@storybook/preview-api'; import type { AnyFramework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/types'; import { clearStyles, addOutlineStyles } from './helpers'; diff --git a/code/addons/storyshots/storyshots-core/package.json b/code/addons/storyshots/storyshots-core/package.json index 5d47cb1d359..750805bcb49 100644 --- a/code/addons/storyshots/storyshots-core/package.json +++ b/code/addons/storyshots/storyshots-core/package.json @@ -44,6 +44,7 @@ "@storybook/core-client": "7.0.0-alpha.47", "@storybook/core-common": "7.0.0-alpha.47", "@storybook/core-webpack": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "@types/glob": "^7.1.3", "@types/jest": "^26.0.16", diff --git a/code/addons/storyshots/storyshots-core/src/api/index.ts b/code/addons/storyshots/storyshots-core/src/api/index.ts index ae22540ccc9..c05c2f23a21 100644 --- a/code/addons/storyshots/storyshots-core/src/api/index.ts +++ b/code/addons/storyshots/storyshots-core/src/api/index.ts @@ -1,5 +1,5 @@ import global from 'global'; -import { addons, mockChannel } from '@storybook/addons'; +import { addons, mockChannel } from '@storybook/preview-api'; import ensureOptionsDefaults from './ensureOptionsDefaults'; import snapshotsTests from './snapshotsTestsTemplate'; import integrityTest from './integrityTestTemplate'; diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index b99a34b22e4..f76156c368f 100644 --- a/code/addons/storysource/package.json +++ b/code/addons/storysource/package.json @@ -57,6 +57,7 @@ "@storybook/api": "7.0.0-alpha.47", "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/router": "7.0.0-alpha.47", "@storybook/source-loader": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", diff --git a/code/addons/storysource/src/manager.tsx b/code/addons/storysource/src/manager.tsx index 7de7e8845f0..8c4f04dc8a6 100644 --- a/code/addons/storysource/src/manager.tsx +++ b/code/addons/storysource/src/manager.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { StoryPanel } from './StoryPanel'; import { ADDON_ID, PANEL_ID } from './index'; diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index e2f62ba9de7..5fb8051c8a3 100644 --- a/code/addons/toolbars/package.json +++ b/code/addons/toolbars/package.json @@ -61,6 +61,7 @@ "@storybook/api": "7.0.0-alpha.47", "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47" }, "devDependencies": { diff --git a/code/addons/toolbars/src/manager.tsx b/code/addons/toolbars/src/manager.tsx index c6681e98935..54b233c57f4 100644 --- a/code/addons/toolbars/src/manager.tsx +++ b/code/addons/toolbars/src/manager.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { ToolbarManager } from './components/ToolbarManager'; import { ADDON_ID } from './constants'; diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index 4a7bd33a2b6..b12736014bf 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -64,6 +64,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", "global": "^4.4.0", "memoizerific": "^1.11.3", diff --git a/code/addons/viewport/src/manager.tsx b/code/addons/viewport/src/manager.tsx index 81b1b17e588..e5a4810a073 100644 --- a/code/addons/viewport/src/manager.tsx +++ b/code/addons/viewport/src/manager.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { ADDON_ID } from './constants'; diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 756aa89192d..36e4f3cba12 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -45,6 +45,7 @@ "@storybook/core-webpack": "7.0.0-alpha.47", "@storybook/docs-tools": "7.0.0-alpha.47", "@storybook/node-logger": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "@types/node": "^16.0.0", diff --git a/code/frameworks/angular/src/client/angular-beta/DocsRenderer.ts b/code/frameworks/angular/src/client/angular-beta/DocsRenderer.ts index 3f9d94ac8b3..0e1de248988 100644 --- a/code/frameworks/angular/src/client/angular-beta/DocsRenderer.ts +++ b/code/frameworks/angular/src/client/angular-beta/DocsRenderer.ts @@ -1,4 +1,4 @@ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { DOCS_RENDERED, STORY_CHANGED } from '@storybook/core-events'; import { AbstractRenderer } from './AbstractRenderer'; import { StoryFnAngularReturnType, Parameters } from '../types'; diff --git a/code/frameworks/angular/src/client/docs/sourceDecorator.ts b/code/frameworks/angular/src/client/docs/sourceDecorator.ts index 605112b11b2..112c2e533e8 100644 --- a/code/frameworks/angular/src/client/docs/sourceDecorator.ts +++ b/code/frameworks/angular/src/client/docs/sourceDecorator.ts @@ -1,4 +1,4 @@ -import { addons, useEffect } from '@storybook/addons'; +import { addons, useEffect } from '@storybook/preview-api'; import { PartialStoryFn } from '@storybook/types'; import { SNIPPET_RENDERED, SourceType } from '@storybook/docs-tools'; import { StoryContext, AngularFramework } from '../types'; diff --git a/code/frameworks/angular/src/server/framework-preset-angular-cli.test.ts b/code/frameworks/angular/src/server/framework-preset-angular-cli.test.ts index f61bb6ef600..c7b933627f6 100644 --- a/code/frameworks/angular/src/server/framework-preset-angular-cli.test.ts +++ b/code/frameworks/angular/src/server/framework-preset-angular-cli.test.ts @@ -815,7 +815,7 @@ const newWebpackConfiguration = ( modules: ['node_modules'], mainFields: ['browser', 'main'], alias: { - '@storybook/addons': '/Users/joe/storybook/lib/addons', + '@storybook/preview-api': '/Users/joe/storybook/lib/addons', '@storybook/api': '/Users/joe/storybook/lib/api', '@storybook/channels': '/Users/joe/storybook/lib/channels', '@storybook/channel-postmessage': '/Users/joe/storybook/lib/channel-postmessage', diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index 88b421ada87..5f6304fff97 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -65,6 +65,7 @@ "@storybook/core-common": "7.0.0-alpha.47", "@storybook/node-logger": "7.0.0-alpha.47", "@storybook/preset-react-webpack": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/react": "7.0.0-alpha.47", "@types/node": "^14.14.20 || ^16.0.0", "find-up": "^5.0.0", diff --git a/code/frameworks/react-vite/src/index.ts b/code/frameworks/react-vite/src/index.ts index a814c5bd240..14382e06236 100644 --- a/code/frameworks/react-vite/src/index.ts +++ b/code/frameworks/react-vite/src/index.ts @@ -1,7 +1,7 @@ // exports for builder-vite export { createChannel as createPostMessageChannel } from '@storybook/channel-postmessage'; export { createChannel as createWebSocketChannel } from '@storybook/channel-websocket'; -export { addons } from '@storybook/addons'; +export { addons } from '@storybook/preview-api'; export { composeConfigs, PreviewWeb } from '@storybook/preview-web'; export { ClientApi } from '@storybook/preview-api'; diff --git a/code/frameworks/svelte-vite/src/index.ts b/code/frameworks/svelte-vite/src/index.ts index a814c5bd240..14382e06236 100644 --- a/code/frameworks/svelte-vite/src/index.ts +++ b/code/frameworks/svelte-vite/src/index.ts @@ -1,7 +1,7 @@ // exports for builder-vite export { createChannel as createPostMessageChannel } from '@storybook/channel-postmessage'; export { createChannel as createWebSocketChannel } from '@storybook/channel-websocket'; -export { addons } from '@storybook/addons'; +export { addons } from '@storybook/preview-api'; export { composeConfigs, PreviewWeb } from '@storybook/preview-web'; export { ClientApi } from '@storybook/preview-api'; diff --git a/code/frameworks/vue-vite/src/index.ts b/code/frameworks/vue-vite/src/index.ts index a814c5bd240..14382e06236 100644 --- a/code/frameworks/vue-vite/src/index.ts +++ b/code/frameworks/vue-vite/src/index.ts @@ -1,7 +1,7 @@ // exports for builder-vite export { createChannel as createPostMessageChannel } from '@storybook/channel-postmessage'; export { createChannel as createWebSocketChannel } from '@storybook/channel-websocket'; -export { addons } from '@storybook/addons'; +export { addons } from '@storybook/preview-api'; export { composeConfigs, PreviewWeb } from '@storybook/preview-web'; export { ClientApi } from '@storybook/preview-api'; diff --git a/code/frameworks/vue3-vite/src/index.ts b/code/frameworks/vue3-vite/src/index.ts index a814c5bd240..14382e06236 100644 --- a/code/frameworks/vue3-vite/src/index.ts +++ b/code/frameworks/vue3-vite/src/index.ts @@ -1,7 +1,7 @@ // exports for builder-vite export { createChannel as createPostMessageChannel } from '@storybook/channel-postmessage'; export { createChannel as createWebSocketChannel } from '@storybook/channel-websocket'; -export { addons } from '@storybook/addons'; +export { addons } from '@storybook/preview-api'; export { composeConfigs, PreviewWeb } from '@storybook/preview-web'; export { ClientApi } from '@storybook/preview-api'; diff --git a/code/frameworks/web-components-vite/src/index.ts b/code/frameworks/web-components-vite/src/index.ts index a814c5bd240..14382e06236 100644 --- a/code/frameworks/web-components-vite/src/index.ts +++ b/code/frameworks/web-components-vite/src/index.ts @@ -1,7 +1,7 @@ // exports for builder-vite export { createChannel as createPostMessageChannel } from '@storybook/channel-postmessage'; export { createChannel as createWebSocketChannel } from '@storybook/channel-websocket'; -export { addons } from '@storybook/addons'; +export { addons } from '@storybook/preview-api'; export { composeConfigs, PreviewWeb } from '@storybook/preview-web'; export { ClientApi } from '@storybook/preview-api'; diff --git a/code/lib/builder-vite/src/optimizeDeps.ts b/code/lib/builder-vite/src/optimizeDeps.ts index d3c43e40aae..3c193368265 100644 --- a/code/lib/builder-vite/src/optimizeDeps.ts +++ b/code/lib/builder-vite/src/optimizeDeps.ts @@ -13,7 +13,7 @@ const INCLUDE_CANDIDATES = [ '@mdx-js/react', '@storybook/addon-docs > acorn-jsx', '@storybook/addon-docs', - '@storybook/addons', + '@storybook/preview-api', '@storybook/channel-postmessage', '@storybook/channel-websocket', '@storybook/client-api', diff --git a/code/lib/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars b/code/lib/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars index 4917d4c2843..d95a7bf460a 100644 --- a/code/lib/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars +++ b/code/lib/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars @@ -3,7 +3,7 @@ import global from 'global'; import { PreviewWeb } from '@storybook/preview-web'; import { composeConfigs } from '@storybook/store'; import { ClientApi } from '@storybook/preview-api'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { createChannel as createPostMessageChannel } from '@storybook/channel-postmessage'; import { createChannel as createWebSocketChannel } from '@storybook/channel-websocket'; diff --git a/code/lib/cli/src/js-package-manager/JsPackageManager.ts b/code/lib/cli/src/js-package-manager/JsPackageManager.ts index bb8739fd7cb..cc617b28bb7 100644 --- a/code/lib/cli/src/js-package-manager/JsPackageManager.ts +++ b/code/lib/cli/src/js-package-manager/JsPackageManager.ts @@ -132,7 +132,7 @@ export abstract class JsPackageManager { * `@storybook/react@${storybookVersion}`, * `@storybook/addon-actions@${actionsVersion}`, * `@storybook/addon-links@${linksVersion}`, - * `@storybook/addons@${addonsVersion}`, + * `@storybook/preview-api@${addonsVersion}`, * ]); */ public addDependencies( diff --git a/code/lib/cli/src/js-package-manager/NPMProxy.test.ts b/code/lib/cli/src/js-package-manager/NPMProxy.test.ts index b622e2caaa8..64ccc474802 100644 --- a/code/lib/cli/src/js-package-manager/NPMProxy.test.ts +++ b/code/lib/cli/src/js-package-manager/NPMProxy.test.ts @@ -63,27 +63,27 @@ describe('NPM Proxy', () => { describe('addDependencies', () => { describe('npm6', () => { - it('with devDep it should run `npm install -D @storybook/addons`', () => { + it('with devDep it should run `npm install -D @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(npmProxy, 'executeCommand').mockReturnValue('6.0.0'); - npmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/addons']); + npmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenLastCalledWith( 'npm', - ['install', '-D', '@storybook/addons'], + ['install', '-D', '@storybook/preview-api'], expect.any(String) ); }); }); describe('npm7', () => { - it('with devDep it should run `npm install -D @storybook/addons`', () => { + it('with devDep it should run `npm install -D @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(npmProxy, 'executeCommand').mockReturnValue('7.0.0'); - npmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/addons']); + npmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenLastCalledWith( 'npm', - ['install', '--legacy-peer-deps', '-D', '@storybook/addons'], + ['install', '--legacy-peer-deps', '-D', '@storybook/preview-api'], expect.any(String) ); }); @@ -92,27 +92,27 @@ describe('NPM Proxy', () => { describe('removeDependencies', () => { describe('npm6', () => { - it('with devDep it should run `npm uninstall @storybook/addons`', () => { + it('with devDep it should run `npm uninstall @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(npmProxy, 'executeCommand').mockReturnValue('6.0.0'); - npmProxy.removeDependencies({}, ['@storybook/addons']); + npmProxy.removeDependencies({}, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenLastCalledWith( 'npm', - ['uninstall', '@storybook/addons'], + ['uninstall', '@storybook/preview-api'], expect.any(String) ); }); }); describe('npm7', () => { - it('with devDep it should run `npm uninstall @storybook/addons`', () => { + it('with devDep it should run `npm uninstall @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(npmProxy, 'executeCommand').mockReturnValue('7.0.0'); - npmProxy.removeDependencies({}, ['@storybook/addons']); + npmProxy.removeDependencies({}, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenLastCalledWith( 'npm', - ['uninstall', '--legacy-peer-deps', '@storybook/addons'], + ['uninstall', '--legacy-peer-deps', '@storybook/preview-api'], expect.any(String) ); }); @@ -151,11 +151,11 @@ describe('NPM Proxy', () => { it('without constraint it returns the latest version', async () => { const executeCommandSpy = jest.spyOn(npmProxy, 'executeCommand').mockReturnValue('"5.3.19"'); - const version = await npmProxy.latestVersion('@storybook/addons'); + const version = await npmProxy.latestVersion('@storybook/preview-api'); expect(executeCommandSpy).toHaveBeenCalledWith('npm', [ 'info', - '@storybook/addons', + '@storybook/preview-api', 'version', '--json', ]); @@ -167,11 +167,11 @@ describe('NPM Proxy', () => { .spyOn(npmProxy, 'executeCommand') .mockReturnValue('["4.25.3","5.3.19","6.0.0-beta.23"]'); - const version = await npmProxy.latestVersion('@storybook/addons', '5.X'); + const version = await npmProxy.latestVersion('@storybook/preview-api', '5.X'); expect(executeCommandSpy).toHaveBeenCalledWith('npm', [ 'info', - '@storybook/addons', + '@storybook/preview-api', 'versions', '--json', ]); @@ -181,7 +181,7 @@ describe('NPM Proxy', () => { it('throws an error if command output is not a valid JSON', async () => { jest.spyOn(npmProxy, 'executeCommand').mockReturnValue('NOT A JSON'); - await expect(npmProxy.latestVersion('@storybook/addons')).rejects.toThrow(); + await expect(npmProxy.latestVersion('@storybook/preview-api')).rejects.toThrow(); }); }); diff --git a/code/lib/cli/src/js-package-manager/PNPMProxy.test.ts b/code/lib/cli/src/js-package-manager/PNPMProxy.test.ts index 17ebaffad8b..d501e5aa307 100644 --- a/code/lib/cli/src/js-package-manager/PNPMProxy.test.ts +++ b/code/lib/cli/src/js-package-manager/PNPMProxy.test.ts @@ -47,28 +47,28 @@ describe('NPM Proxy', () => { }); describe('addDependencies', () => { - it('with devDep it should run `pnpm add -D @storybook/addons`', () => { + it('with devDep it should run `pnpm add -D @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(pnpmProxy, 'executeCommand').mockReturnValue('6.0.0'); - pnpmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/addons']); + pnpmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenLastCalledWith( 'pnpm', - ['add', '-D', '@storybook/addons'], + ['add', '-D', '@storybook/preview-api'], expect.any(String) ); }); }); describe('removeDependencies', () => { - it('with devDep it should run `npm uninstall @storybook/addons`', () => { + it('with devDep it should run `npm uninstall @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(pnpmProxy, 'executeCommand').mockReturnValue('6.0.0'); - pnpmProxy.removeDependencies({}, ['@storybook/addons']); + pnpmProxy.removeDependencies({}, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenLastCalledWith( 'pnpm', - ['remove', '@storybook/addons'], + ['remove', '@storybook/preview-api'], expect.any(String) ); }); @@ -107,11 +107,11 @@ describe('NPM Proxy', () => { it('without constraint it returns the latest version', async () => { const executeCommandSpy = jest.spyOn(pnpmProxy, 'executeCommand').mockReturnValue('"5.3.19"'); - const version = await pnpmProxy.latestVersion('@storybook/addons'); + const version = await pnpmProxy.latestVersion('@storybook/preview-api'); expect(executeCommandSpy).toHaveBeenCalledWith('pnpm', [ 'info', - '@storybook/addons', + '@storybook/preview-api', 'version', '--json', ]); @@ -123,11 +123,11 @@ describe('NPM Proxy', () => { .spyOn(pnpmProxy, 'executeCommand') .mockReturnValue('["4.25.3","5.3.19","6.0.0-beta.23"]'); - const version = await pnpmProxy.latestVersion('@storybook/addons', '5.X'); + const version = await pnpmProxy.latestVersion('@storybook/preview-api', '5.X'); expect(executeCommandSpy).toHaveBeenCalledWith('pnpm', [ 'info', - '@storybook/addons', + '@storybook/preview-api', 'versions', '--json', ]); @@ -137,7 +137,7 @@ describe('NPM Proxy', () => { it('throws an error if command output is not a valid JSON', async () => { jest.spyOn(pnpmProxy, 'executeCommand').mockReturnValue('NOT A JSON'); - await expect(pnpmProxy.latestVersion('@storybook/addons')).rejects.toThrow(); + await expect(pnpmProxy.latestVersion('@storybook/preview-api')).rejects.toThrow(); }); }); diff --git a/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts b/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts index 9128506f842..7d8fd5ad11e 100644 --- a/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts +++ b/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts @@ -47,28 +47,28 @@ describe('Yarn 1 Proxy', () => { }); describe('addDependencies', () => { - it('with devDep it should run `yarn install -D --ignore-workspace-root-check @storybook/addons`', () => { + it('with devDep it should run `yarn install -D --ignore-workspace-root-check @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(yarn1Proxy, 'executeCommand').mockReturnValue(''); - yarn1Proxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/addons']); + yarn1Proxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenCalledWith( 'yarn', - ['add', '-D', '--ignore-workspace-root-check', '@storybook/addons'], + ['add', '-D', '--ignore-workspace-root-check', '@storybook/preview-api'], expect.any(String) ); }); }); describe('removeDependencies', () => { - it('should run `yarn remove --ignore-workspace-root-check @storybook/addons`', () => { + it('should run `yarn remove --ignore-workspace-root-check @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(yarn1Proxy, 'executeCommand').mockReturnValue(''); - yarn1Proxy.removeDependencies({}, ['@storybook/addons']); + yarn1Proxy.removeDependencies({}, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenCalledWith( 'yarn', - ['remove', '--ignore-workspace-root-check', '@storybook/addons'], + ['remove', '--ignore-workspace-root-check', '@storybook/preview-api'], expect.any(String) ); }); @@ -107,11 +107,11 @@ describe('Yarn 1 Proxy', () => { .spyOn(yarn1Proxy, 'executeCommand') .mockReturnValue('{"type":"inspect","data":"5.3.19"}'); - const version = await yarn1Proxy.latestVersion('@storybook/addons'); + const version = await yarn1Proxy.latestVersion('@storybook/preview-api'); expect(executeCommandSpy).toHaveBeenCalledWith('yarn', [ 'info', - '@storybook/addons', + '@storybook/preview-api', 'version', '--json', ]); @@ -123,11 +123,11 @@ describe('Yarn 1 Proxy', () => { .spyOn(yarn1Proxy, 'executeCommand') .mockReturnValue('{"type":"inspect","data":["4.25.3","5.3.19","6.0.0-beta.23"]}'); - const version = await yarn1Proxy.latestVersion('@storybook/addons', '5.X'); + const version = await yarn1Proxy.latestVersion('@storybook/preview-api', '5.X'); expect(executeCommandSpy).toHaveBeenCalledWith('yarn', [ 'info', - '@storybook/addons', + '@storybook/preview-api', 'versions', '--json', ]); @@ -137,7 +137,7 @@ describe('Yarn 1 Proxy', () => { it('throws an error if command output is not a valid JSON', async () => { jest.spyOn(yarn1Proxy, 'executeCommand').mockReturnValue('NOT A JSON'); - await expect(yarn1Proxy.latestVersion('@storybook/addons')).rejects.toThrow(); + await expect(yarn1Proxy.latestVersion('@storybook/preview-api')).rejects.toThrow(); }); }); diff --git a/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts b/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts index 581c48d9d52..8c7cb184f43 100644 --- a/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts +++ b/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts @@ -47,28 +47,28 @@ describe('Yarn 2 Proxy', () => { }); describe('addDependencies', () => { - it('with devDep it should run `yarn install -D @storybook/addons`', () => { + it('with devDep it should run `yarn install -D @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(yarn2Proxy, 'executeCommand').mockReturnValue(''); - yarn2Proxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/addons']); + yarn2Proxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenCalledWith( 'yarn', - ['add', '-D', '@storybook/addons'], + ['add', '-D', '@storybook/preview-api'], expect.any(String) ); }); }); describe('removeDependencies', () => { - it('should run `yarn remove @storybook/addons`', () => { + it('should run `yarn remove @storybook/preview-api`', () => { const executeCommandSpy = jest.spyOn(yarn2Proxy, 'executeCommand').mockReturnValue(''); - yarn2Proxy.removeDependencies({}, ['@storybook/addons']); + yarn2Proxy.removeDependencies({}, ['@storybook/preview-api']); expect(executeCommandSpy).toHaveBeenCalledWith( 'yarn', - ['remove', '@storybook/addons'], + ['remove', '@storybook/preview-api'], expect.any(String) ); }); @@ -105,14 +105,14 @@ describe('Yarn 2 Proxy', () => { it('without constraint it returns the latest version', async () => { const executeCommandSpy = jest .spyOn(yarn2Proxy, 'executeCommand') - .mockReturnValue('{"name":"@storybook/addons","version":"5.3.19"}'); + .mockReturnValue('{"name":"@storybook/preview-api","version":"5.3.19"}'); - const version = await yarn2Proxy.latestVersion('@storybook/addons'); + const version = await yarn2Proxy.latestVersion('@storybook/preview-api'); expect(executeCommandSpy).toHaveBeenCalledWith('yarn', [ 'npm', 'info', - '@storybook/addons', + '@storybook/preview-api', '--fields', 'version', '--json', @@ -124,15 +124,15 @@ describe('Yarn 2 Proxy', () => { const executeCommandSpy = jest .spyOn(yarn2Proxy, 'executeCommand') .mockReturnValue( - '{"name":"@storybook/addons","versions":["4.25.3","5.3.19","6.0.0-beta.23"]}' + '{"name":"@storybook/preview-api","versions":["4.25.3","5.3.19","6.0.0-beta.23"]}' ); - const version = await yarn2Proxy.latestVersion('@storybook/addons', '5.X'); + const version = await yarn2Proxy.latestVersion('@storybook/preview-api', '5.X'); expect(executeCommandSpy).toHaveBeenCalledWith('yarn', [ 'npm', 'info', - '@storybook/addons', + '@storybook/preview-api', '--fields', 'versions', '--json', @@ -143,7 +143,7 @@ describe('Yarn 2 Proxy', () => { it('throws an error if command output is not a valid JSON', async () => { jest.spyOn(yarn2Proxy, 'executeCommand').mockReturnValue('NOT A JSON'); - await expect(yarn2Proxy.latestVersion('@storybook/addons')).rejects.toThrow(); + await expect(yarn2Proxy.latestVersion('@storybook/preview-api')).rejects.toThrow(); }); }); diff --git a/code/lib/cli/src/versions.ts b/code/lib/cli/src/versions.ts index 94364df670b..80ee1493729 100644 --- a/code/lib/cli/src/versions.ts +++ b/code/lib/cli/src/versions.ts @@ -17,7 +17,7 @@ export default { '@storybook/addon-storysource': '7.0.0-alpha.47', '@storybook/addon-toolbars': '7.0.0-alpha.47', '@storybook/addon-viewport': '7.0.0-alpha.47', - '@storybook/addons': '7.0.0-alpha.47', + '@storybook/preview-api': '7.0.0-alpha.47', '@storybook/angular': '7.0.0-alpha.47', '@storybook/api': '7.0.0-alpha.47', '@storybook/blocks': '7.0.0-alpha.47', diff --git a/code/lib/codemod/src/transforms/update-organisation-name.js b/code/lib/codemod/src/transforms/update-organisation-name.js index 6e4ca34a523..4774df6538f 100644 --- a/code/lib/codemod/src/transforms/update-organisation-name.js +++ b/code/lib/codemod/src/transforms/update-organisation-name.js @@ -1,6 +1,6 @@ export const packageNames = { '@kadira/react-storybook-decorator-centered': '@storybook/addon-centered', - '@kadira/storybook-addons': '@storybook/addons', + '@kadira/storybook-addons': '@storybook/preview-api', '@kadira/storybook-addon-actions': '@storybook/addon-actions', '@kadira/storybook-addon-comments': '@storybook/addon-comments', '@kadira/storybook-addon-graphql': '@storybook/addon-graphql', diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index 52201a05a34..b71f450df9a 100644 --- a/code/lib/instrumenter/package.json +++ b/code/lib/instrumenter/package.json @@ -46,6 +46,7 @@ "@storybook/channels": "7.0.0-alpha.47", "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "core-js": "^3.8.2", "global": "^4.4.0" }, diff --git a/code/lib/instrumenter/src/instrumenter.test.ts b/code/lib/instrumenter/src/instrumenter.test.ts index 647dbedb148..6ac0827c851 100644 --- a/code/lib/instrumenter/src/instrumenter.test.ts +++ b/code/lib/instrumenter/src/instrumenter.test.ts @@ -1,7 +1,7 @@ /// ; /* eslint-disable no-underscore-dangle */ -import { addons, mockChannel } from '@storybook/addons'; +import { addons, mockChannel } from '@storybook/preview-api'; import { logger } from '@storybook/client-logger'; import { FORCE_REMOUNT, diff --git a/code/lib/instrumenter/src/instrumenter.ts b/code/lib/instrumenter/src/instrumenter.ts index 05aed24fb5e..8085f16b1f2 100644 --- a/code/lib/instrumenter/src/instrumenter.ts +++ b/code/lib/instrumenter/src/instrumenter.ts @@ -1,6 +1,6 @@ /* eslint-disable no-underscore-dangle */ import type { Channel } from '@storybook/channels'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import type { StoryId } from '@storybook/types'; import { once, logger } from '@storybook/client-logger'; import { diff --git a/code/lib/postinstall/src/frameworks.test.ts b/code/lib/postinstall/src/frameworks.test.ts index 32192dacfca..6b498477e19 100644 --- a/code/lib/postinstall/src/frameworks.test.ts +++ b/code/lib/postinstall/src/frameworks.test.ts @@ -9,7 +9,7 @@ const VUE = { }; const NONE = { - '@storybook/addons': '5.2.5', + '@storybook/preview-api': '5.2.5', lodash: '^4.17.15', }; diff --git a/code/lib/preview-api/package.json b/code/lib/preview-api/package.json index 5e7698b1be7..b09bd46cc70 100644 --- a/code/lib/preview-api/package.json +++ b/code/lib/preview-api/package.json @@ -45,6 +45,7 @@ "@storybook/addons": "7.0.0-alpha.47", "@storybook/client-api": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/preview-web": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47" }, diff --git a/code/lib/preview-api/src/index.ts b/code/lib/preview-api/src/index.ts index 50a38f1a20d..b7c88bef35e 100644 --- a/code/lib/preview-api/src/index.ts +++ b/code/lib/preview-api/src/index.ts @@ -19,6 +19,7 @@ export const { useRef, useState, useStoryContext, + applyHooks, HooksContext, } = ADDONS; @@ -27,6 +28,12 @@ export const { */ export const { makeDecorator } = ADDONS; +/** + * ADDON API + * @deprecated + */ +export const { addons } = ADDONS; + /** * STORIES API */ diff --git a/code/package.json b/code/package.json index 041f52e6755..51ba3cb1e67 100644 --- a/code/package.json +++ b/code/package.json @@ -209,6 +209,7 @@ "@storybook/preset-vue-webpack": "workspace:*", "@storybook/preset-vue3-webpack": "workspace:*", "@storybook/preset-web-components-webpack": "workspace:*", + "@storybook/preview-api": "workspace:*", "@storybook/preview-web": "workspace:*", "@storybook/react": "workspace:*", "@storybook/react-vite": "workspace:*", diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index 5fa591cd8b8..be12c642534 100644 --- a/code/renderers/html/package.json +++ b/code/renderers/html/package.json @@ -54,6 +54,7 @@ "@storybook/addons": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", "@storybook/docs-tools": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/preview-web": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", diff --git a/code/renderers/html/src/docs/sourceDecorator.test.ts b/code/renderers/html/src/docs/sourceDecorator.test.ts index b5e85126e72..06534288bf7 100644 --- a/code/renderers/html/src/docs/sourceDecorator.test.ts +++ b/code/renderers/html/src/docs/sourceDecorator.test.ts @@ -1,9 +1,9 @@ import { SNIPPET_RENDERED } from '@storybook/docs-tools'; -import { addons, useEffect } from '@storybook/addons'; +import { addons, useEffect } from '@storybook/preview-api'; import { sourceDecorator } from './sourceDecorator'; import type { StoryContext } from '../types'; -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); const mockedAddons = addons as jest.Mocked; const mockedUseEffect = useEffect as jest.Mocked; diff --git a/code/renderers/html/src/docs/sourceDecorator.ts b/code/renderers/html/src/docs/sourceDecorator.ts index 419013e7372..711c0a83a5c 100644 --- a/code/renderers/html/src/docs/sourceDecorator.ts +++ b/code/renderers/html/src/docs/sourceDecorator.ts @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle */ /* global window */ import { SNIPPET_RENDERED, SourceType } from '@storybook/docs-tools'; -import { addons, useEffect } from '@storybook/addons'; +import { addons, useEffect } from '@storybook/preview-api'; import type { PartialStoryFn } from '@storybook/types'; import { dedent } from 'ts-dedent'; diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index 690ec7da696..f3f3961367c 100644 --- a/code/renderers/preact/package.json +++ b/code/renderers/preact/package.json @@ -53,6 +53,7 @@ "dependencies": { "@storybook/addons": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0", diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index 6abb292ed5c..df7bfc6d211 100644 --- a/code/renderers/react/package.json +++ b/code/renderers/react/package.json @@ -56,6 +56,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", "@storybook/docs-tools": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "@types/estree": "^0.0.51", diff --git a/code/renderers/react/src/__test__/internals.test.tsx b/code/renderers/react/src/__test__/internals.test.tsx index dd4eb1b86ed..40cdb069f49 100644 --- a/code/renderers/react/src/__test__/internals.test.tsx +++ b/code/renderers/react/src/__test__/internals.test.tsx @@ -1,7 +1,7 @@ /// ; /* eslint-disable @typescript-eslint/no-non-null-assertion */ import React from 'react'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { render, screen } from '@testing-library/react'; import { composeStories, composeStory } from '..'; diff --git a/code/renderers/react/src/docs/jsxDecorator.test.tsx b/code/renderers/react/src/docs/jsxDecorator.test.tsx index cbc163f1384..9adeea67d5e 100644 --- a/code/renderers/react/src/docs/jsxDecorator.test.tsx +++ b/code/renderers/react/src/docs/jsxDecorator.test.tsx @@ -2,11 +2,11 @@ import type { FC, PropsWithChildren } from 'react'; import React, { createElement, Profiler } from 'react'; import PropTypes from 'prop-types'; -import { addons, useEffect } from '@storybook/addons'; +import { addons, useEffect } from '@storybook/preview-api'; import { SNIPPET_RENDERED } from '@storybook/docs-tools'; import { renderJsx, jsxDecorator } from './jsxDecorator'; -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); const mockedAddons = addons as jest.Mocked; const mockedUseEffect = useEffect as jest.Mocked; diff --git a/code/renderers/react/src/docs/jsxDecorator.tsx b/code/renderers/react/src/docs/jsxDecorator.tsx index 75e9d461697..a1cfadd69be 100644 --- a/code/renderers/react/src/docs/jsxDecorator.tsx +++ b/code/renderers/react/src/docs/jsxDecorator.tsx @@ -4,7 +4,7 @@ import React, { createElement } from 'react'; import type { Options } from 'react-element-to-jsx-string'; import reactElementToJSXString from 'react-element-to-jsx-string'; -import { addons, useEffect } from '@storybook/addons'; +import { addons, useEffect } from '@storybook/preview-api'; import type { StoryContext, ArgsStoryFn, PartialStoryFn } from '@storybook/types'; import { SourceType, SNIPPET_RENDERED, getDocgenSection } from '@storybook/docs-tools'; import { logger } from '@storybook/client-logger'; diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index fe56f38fd9c..538f2a58fcd 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -53,6 +53,7 @@ "dependencies": { "@storybook/addons": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/preview-web": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 6c4187f5a24..64f734e99df 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -59,6 +59,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", "@storybook/docs-tools": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0", diff --git a/code/renderers/svelte/src/docs/sourceDecorator.ts b/code/renderers/svelte/src/docs/sourceDecorator.ts index 229ceb87662..1ed7909d194 100644 --- a/code/renderers/svelte/src/docs/sourceDecorator.ts +++ b/code/renderers/svelte/src/docs/sourceDecorator.ts @@ -1,5 +1,5 @@ /* eslint-disable no-underscore-dangle */ -import { addons, useEffect } from '@storybook/addons'; +import { addons, useEffect } from '@storybook/preview-api'; import { deprecate } from '@storybook/client-logger'; import type { ArgTypes, Args, StoryContext, AnyFramework } from '@storybook/types'; diff --git a/code/renderers/vue/package.json b/code/renderers/vue/package.json index 8a3043975ac..a9b4566ffbe 100644 --- a/code/renderers/vue/package.json +++ b/code/renderers/vue/package.json @@ -55,6 +55,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", "@storybook/docs-tools": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0", diff --git a/code/renderers/vue/src/docs/sourceDecorator.ts b/code/renderers/vue/src/docs/sourceDecorator.ts index 3e3b79cda26..8c9839acb13 100644 --- a/code/renderers/vue/src/docs/sourceDecorator.ts +++ b/code/renderers/vue/src/docs/sourceDecorator.ts @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle */ /* eslint no-underscore-dangle: ["error", { "allow": ["_vnode"] }] */ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { logger } from '@storybook/client-logger'; import { SourceType, SNIPPET_RENDERED } from '@storybook/docs-tools'; import type { ComponentOptions } from 'vue'; diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index c2bba2f61ab..10be0b9ef75 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/package.json @@ -54,6 +54,7 @@ "@storybook/addons": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", "@storybook/docs-tools": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", "global": "^4.4.0", diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index e14b64898c3..f124202f5ae 100644 --- a/code/renderers/web-components/package.json +++ b/code/renderers/web-components/package.json @@ -58,6 +58,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/core-client": "7.0.0-alpha.47", "@storybook/docs-tools": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/preview-web": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", diff --git a/code/renderers/web-components/src/docs/sourceDecorator.test.ts b/code/renderers/web-components/src/docs/sourceDecorator.test.ts index bbf7975ef5d..e659f4f5e22 100644 --- a/code/renderers/web-components/src/docs/sourceDecorator.test.ts +++ b/code/renderers/web-components/src/docs/sourceDecorator.test.ts @@ -1,12 +1,12 @@ /* eslint-disable import/extensions */ import { html } from 'lit-html'; import { styleMap } from 'lit-html/directives/style-map.js'; -import { addons, useEffect } from '@storybook/addons'; +import { addons, useEffect } from '@storybook/preview-api'; import { SNIPPET_RENDERED } from '@storybook/docs-tools'; import type { StoryContext } from '../types'; import { sourceDecorator } from './sourceDecorator'; -jest.mock('@storybook/addons'); +jest.mock('@storybook/preview-api'); const mockedAddons = addons as jest.Mocked; const mockedUseEffect = useEffect as jest.Mock; diff --git a/code/renderers/web-components/src/docs/sourceDecorator.ts b/code/renderers/web-components/src/docs/sourceDecorator.ts index 8436dab16fc..aef73e12ee6 100644 --- a/code/renderers/web-components/src/docs/sourceDecorator.ts +++ b/code/renderers/web-components/src/docs/sourceDecorator.ts @@ -2,7 +2,7 @@ /* global window */ import { render } from 'lit-html'; import type { ArgsStoryFn, PartialStoryFn, StoryContext } from '@storybook/types'; -import { addons, useEffect } from '@storybook/addons'; +import { addons, useEffect } from '@storybook/preview-api'; import { SNIPPET_RENDERED, SourceType } from '@storybook/docs-tools'; import type { WebComponentsFramework } from '../types'; diff --git a/code/ui/.storybook/manager.ts b/code/ui/.storybook/manager.ts index ece01ccdfae..76b9e19f9d7 100644 --- a/code/ui/.storybook/manager.ts +++ b/code/ui/.storybook/manager.ts @@ -1,4 +1,4 @@ -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import startCase from 'lodash/startCase'; addons.setConfig({ diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index 0251187b4c6..ad08e009516 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -67,6 +67,7 @@ "devDependencies": { "@storybook/addon-actions": "7.0.0-alpha.47", "@storybook/addons": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@types/color-convert": "^2.0.0" }, "peerDependencies": { diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json index e0293adbcaf..ed900398e98 100644 --- a/code/ui/manager/package.json +++ b/code/ui/manager/package.json @@ -61,6 +61,7 @@ "@storybook/client-logger": "7.0.0-alpha.47", "@storybook/components": "7.0.0-alpha.47", "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/preview-api": "7.0.0-alpha.47", "@storybook/router": "7.0.0-alpha.47", "@storybook/theming": "7.0.0-alpha.47", "@storybook/types": "7.0.0-alpha.47", diff --git a/code/ui/manager/paths.js b/code/ui/manager/paths.js index 47098e2f940..2e5037b0301 100644 --- a/code/ui/manager/paths.js +++ b/code/ui/manager/paths.js @@ -6,7 +6,7 @@ const resolve = resolveFrom.bind(null, __dirname); // These paths need to be aliased in the manager webpack config to ensure that all // code running inside the manager uses the *same* version of react[-dom] that we use. module.exports = { - '@storybook/addons': dirname(resolve('@storybook/addons/package.json')), + '@storybook/preview-api': dirname(resolve('@storybook/preview-api/package.json')), '@storybook/api': dirname(resolve('@storybook/api/package.json')), '@storybook/channels': dirname(resolve('@storybook/channels/package.json')), '@storybook/components': dirname(resolve('@storybook/components/package.json')), diff --git a/code/ui/manager/src/FakeProvider.tsx b/code/ui/manager/src/FakeProvider.tsx index a1abbbaca0d..5f009340e96 100644 --- a/code/ui/manager/src/FakeProvider.tsx +++ b/code/ui/manager/src/FakeProvider.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { styled } from '@storybook/theming'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import Provider from './provider'; export class FakeProvider extends Provider { diff --git a/code/ui/manager/src/components/preview/preview.mockdata.tsx b/code/ui/manager/src/components/preview/preview.mockdata.tsx index f4f172766c6..639a6026ce6 100644 --- a/code/ui/manager/src/components/preview/preview.mockdata.tsx +++ b/code/ui/manager/src/components/preview/preview.mockdata.tsx @@ -1,4 +1,4 @@ -import { types, type Addon } from '@storybook/addons'; +import { types, type Addon } from '@storybook/preview-api'; import type { API, State } from '@storybook/api'; import type { PreviewProps } from './utils/types'; diff --git a/code/ui/manager/src/components/preview/tools/addons.tsx b/code/ui/manager/src/components/preview/tools/addons.tsx index 1bd66a22ac8..88f61fec22d 100644 --- a/code/ui/manager/src/components/preview/tools/addons.tsx +++ b/code/ui/manager/src/components/preview/tools/addons.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { IconButton, Icons } from '@storybook/components'; import { Consumer, type Combo } from '@storybook/api'; -import type { Addon } from '@storybook/addons'; +import type { Addon } from '@storybook/preview-api'; const menuMapper = ({ api, state }: Combo) => ({ isVisible: state.layout.showPanel, diff --git a/code/ui/manager/src/components/preview/tools/copy.tsx b/code/ui/manager/src/components/preview/tools/copy.tsx index aa8c48f8d33..306ec458f6c 100644 --- a/code/ui/manager/src/components/preview/tools/copy.tsx +++ b/code/ui/manager/src/components/preview/tools/copy.tsx @@ -3,7 +3,7 @@ import React from 'react'; import copy from 'copy-to-clipboard'; import { getStoryHref, IconButton, Icons } from '@storybook/components'; import { Consumer, type Combo } from '@storybook/api'; -import type { Addon } from '@storybook/addons'; +import type { Addon } from '@storybook/preview-api'; const { PREVIEW_URL, document } = global; diff --git a/code/ui/manager/src/components/preview/tools/eject.tsx b/code/ui/manager/src/components/preview/tools/eject.tsx index 1a28a84c16b..33629f1006e 100644 --- a/code/ui/manager/src/components/preview/tools/eject.tsx +++ b/code/ui/manager/src/components/preview/tools/eject.tsx @@ -2,7 +2,7 @@ import global from 'global'; import React from 'react'; import { getStoryHref, IconButton, Icons } from '@storybook/components'; import { Consumer, type Combo } from '@storybook/api'; -import type { Addon } from '@storybook/addons'; +import type { Addon } from '@storybook/preview-api'; const { PREVIEW_URL } = global; diff --git a/code/ui/manager/src/components/preview/tools/menu.tsx b/code/ui/manager/src/components/preview/tools/menu.tsx index d5f4daea381..4156a3e7096 100644 --- a/code/ui/manager/src/components/preview/tools/menu.tsx +++ b/code/ui/manager/src/components/preview/tools/menu.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { IconButton, Icons, Separator } from '@storybook/components'; import { Consumer, type Combo } from '@storybook/api'; -import type { Addon } from '@storybook/addons'; +import type { Addon } from '@storybook/preview-api'; const menuMapper = ({ api, state }: Combo) => ({ isVisible: state.layout.showNav, diff --git a/code/ui/manager/src/components/preview/tools/remount.tsx b/code/ui/manager/src/components/preview/tools/remount.tsx index d56616bcdd5..f8b0e1b6730 100644 --- a/code/ui/manager/src/components/preview/tools/remount.tsx +++ b/code/ui/manager/src/components/preview/tools/remount.tsx @@ -2,7 +2,7 @@ import type { ComponentProps } from 'react'; import React, { useState } from 'react'; import { IconButton, Icons } from '@storybook/components'; import { Consumer, type Combo } from '@storybook/api'; -import type { Addon } from '@storybook/addons'; +import type { Addon } from '@storybook/preview-api'; import { styled } from '@storybook/theming'; import { FORCE_REMOUNT } from '@storybook/core-events'; diff --git a/code/ui/manager/src/components/preview/tools/zoom.tsx b/code/ui/manager/src/components/preview/tools/zoom.tsx index 1ab5cc879e9..dc9196bbc8e 100644 --- a/code/ui/manager/src/components/preview/tools/zoom.tsx +++ b/code/ui/manager/src/components/preview/tools/zoom.tsx @@ -2,7 +2,7 @@ import type { SyntheticEvent, MouseEventHandler } from 'react'; import React, { Component, useCallback } from 'react'; import { Icons, IconButton, Separator } from '@storybook/components'; -import type { Addon } from '@storybook/addons'; +import type { Addon } from '@storybook/preview-api'; const initialZoom = 1 as const; diff --git a/code/ui/manager/src/globals/exports.ts b/code/ui/manager/src/globals/exports.ts index 5ebf5209712..ee5851f1031 100644 --- a/code/ui/manager/src/globals/exports.ts +++ b/code/ui/manager/src/globals/exports.ts @@ -216,15 +216,37 @@ export default { 'useStorybookApi', 'useStorybookState', ], - '@storybook/addons': [ - 'AddonStore', + '@storybook/preview-api': [ + 'ClientApi', 'HooksContext', + 'Preview', + 'PreviewWeb', + 'StoryStore', + 'addArgTypes', + 'addArgTypesEnhancer', + 'addArgs', + 'addArgsEnhancer', + 'addDecorator', + 'addLoader', + 'addParameters', + 'addStepRunner', 'addons', 'applyHooks', - 'isSupportedType', + 'combineArgs', + 'combineParameters', + 'composeConfigs', + 'composeStepRunners', + 'composeStories', + 'composeStory', + 'decorateStory', + 'defaultDecorateStory', + 'getQueryParam', + 'getQueryParams', 'makeDecorator', - 'mockChannel', - 'types', + 'normalizeStory', + 'prepareStory', + 'setGlobalRender', + 'start', 'useArgs', 'useCallback', 'useChannel', diff --git a/code/ui/manager/src/globals/runtime.ts b/code/ui/manager/src/globals/runtime.ts index e8890929e0a..e41240a3ce8 100644 --- a/code/ui/manager/src/globals/runtime.ts +++ b/code/ui/manager/src/globals/runtime.ts @@ -7,7 +7,7 @@ import * as STORYBOOKEVENTS from '@storybook/core-events'; import * as STORYBOOKROUTER from '@storybook/router'; import * as STORYBOOKTHEMING from '@storybook/theming'; import * as STORYBOOKAPI from '@storybook/api'; -import * as STORYBOOKADDONS from '@storybook/addons'; +import * as STORYBOOKADDONS from '@storybook/preview-api'; import * as STORYBOOKCLIENTLOGGER from '@storybook/client-logger'; import type { Keys } from './types'; @@ -22,6 +22,6 @@ export const values: Required> = { '@storybook/router': STORYBOOKROUTER, '@storybook/theming': STORYBOOKTHEMING, '@storybook/api': STORYBOOKAPI, - '@storybook/addons': STORYBOOKADDONS, + '@storybook/preview-api': STORYBOOKADDONS, '@storybook/client-logger': STORYBOOKCLIENTLOGGER, }; diff --git a/code/ui/manager/src/globals/types.ts b/code/ui/manager/src/globals/types.ts index cee0c83b1af..0c3a8bb56a7 100644 --- a/code/ui/manager/src/globals/types.ts +++ b/code/ui/manager/src/globals/types.ts @@ -10,7 +10,7 @@ export enum Keys { '@storybook/router' = '__STORYBOOKROUTER__', '@storybook/theming' = '__STORYBOOKTHEMING__', '@storybook/api' = '__STORYBOOKAPI__', - '@storybook/addons' = '__STORYBOOKADDONS__', + '@storybook/preview-api' = '__STORYBOOKADDONS__', '@storybook/client-logger' = '__STORYBOOKCLIENTLOGGER__', } diff --git a/code/ui/manager/src/runtime.ts b/code/ui/manager/src/runtime.ts index 81754fd9967..2fd9d4a72c2 100644 --- a/code/ui/manager/src/runtime.ts +++ b/code/ui/manager/src/runtime.ts @@ -1,8 +1,8 @@ import global from 'global'; import type { Channel } from '@storybook/channels'; -import type { AddonStore } from '@storybook/addons'; -import { addons } from '@storybook/addons'; +import type { AddonStore } from '@storybook/preview-api'; +import { addons } from '@storybook/preview-api'; import type { Addon_Types, Addon_Config } from '@storybook/types'; import * as postMessage from '@storybook/channel-postmessage'; import * as webSocket from '@storybook/channel-websocket'; diff --git a/code/yarn.lock b/code/yarn.lock index b3d4edd0c93..8fe83332bf2 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5388,6 +5388,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 "@testing-library/react": ^11.2.2 @@ -5416,6 +5417,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 "@types/lodash": ^4.14.167 @@ -5449,6 +5451,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 @@ -5477,6 +5480,7 @@ __metadata: "@storybook/components": 7.0.0-alpha.47 "@storybook/core-common": 7.0.0-alpha.47 "@storybook/node-logger": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 @@ -5513,6 +5517,7 @@ __metadata: "@storybook/mdx2-csf": next "@storybook/node-logger": 7.0.0-alpha.47 "@storybook/postinstall": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/preview-web": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 @@ -5553,6 +5558,7 @@ __metadata: "@storybook/api": 7.0.0-alpha.47 "@storybook/core-common": 7.0.0-alpha.47 "@storybook/node-logger": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/vue": 7.0.0-alpha.47 "@types/jest": ^26.0.16 ts-dedent: ^2.0.0 @@ -5593,6 +5599,7 @@ __metadata: dependencies: "@storybook/addons": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@types/webpack-env": ^1.16.0 global: ^4.4.0 typescript: ~4.6.3 @@ -5612,6 +5619,7 @@ __metadata: "@storybook/core-events": 7.0.0-alpha.47 "@storybook/instrumenter": 7.0.0-alpha.47 "@storybook/jest": ^0.0.10 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/testing-library": 0.0.14-next.0 "@storybook/theming": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 @@ -5642,6 +5650,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 global: ^4.4.0 react-sizeme: ^3.0.1 @@ -5666,6 +5675,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 "@storybook/csf": next + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/router": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 @@ -5692,6 +5702,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 typescript: ~4.6.3 @@ -5715,6 +5726,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 ts-dedent: ^2.0.0 @@ -5767,6 +5779,7 @@ __metadata: "@storybook/core-client": 7.0.0-alpha.47 "@storybook/core-common": 7.0.0-alpha.47 "@storybook/core-webpack": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/react": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 "@storybook/vue": 7.0.0-alpha.47 @@ -5849,6 +5862,7 @@ __metadata: "@storybook/api": 7.0.0-alpha.47 "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/router": 7.0.0-alpha.47 "@storybook/source-loader": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 @@ -5893,6 +5907,7 @@ __metadata: "@storybook/api": 7.0.0-alpha.47 "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 typescript: ~4.6.3 peerDependencies: @@ -5915,6 +5930,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 global: ^4.4.0 memoizerific: ^1.11.3 @@ -5998,6 +6014,7 @@ __metadata: "@storybook/core-webpack": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 "@storybook/node-logger": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 "@types/node": ^16.0.0 @@ -6133,6 +6150,7 @@ __metadata: "@storybook/core-events": 7.0.0-alpha.47 "@storybook/csf": next "@storybook/docs-tools": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/preview-web": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 @@ -6778,6 +6796,7 @@ __metadata: "@storybook/addons": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/preview-web": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 @@ -6799,6 +6818,7 @@ __metadata: "@storybook/channels": 7.0.0-alpha.47 "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 core-js: ^3.8.2 global: ^4.4.0 typescript: ~4.6.3 @@ -6898,6 +6918,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/router": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 @@ -6956,6 +6977,7 @@ __metadata: "@storybook/core-common": 7.0.0-alpha.47 "@storybook/node-logger": 7.0.0-alpha.47 "@storybook/preset-react-webpack": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/react": 7.0.0-alpha.47 "@types/loader-utils": ^2.0.3 "@types/node": ^14.14.20 || ^16.0.0 @@ -7040,6 +7062,7 @@ __metadata: dependencies: "@storybook/addons": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 @@ -7235,13 +7258,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-api@7.0.0-alpha.47, @storybook/preview-api@workspace:lib/preview-api": +"@storybook/preview-api@7.0.0-alpha.47, @storybook/preview-api@workspace:*, @storybook/preview-api@workspace:lib/preview-api": version: 0.0.0-use.local resolution: "@storybook/preview-api@workspace:lib/preview-api" dependencies: "@storybook/addons": 7.0.0-alpha.47 "@storybook/client-api": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/preview-web": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 languageName: unknown @@ -7384,6 +7408,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 "@types/estree": ^0.0.51 @@ -7506,6 +7531,7 @@ __metadata: "@storybook/preset-vue-webpack": "workspace:*" "@storybook/preset-vue3-webpack": "workspace:*" "@storybook/preset-web-components-webpack": "workspace:*" + "@storybook/preview-api": "workspace:*" "@storybook/preview-web": "workspace:*" "@storybook/react": "workspace:*" "@storybook/react-vite": "workspace:*" @@ -7747,6 +7773,7 @@ __metadata: dependencies: "@storybook/addons": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/preview-web": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 @@ -7856,6 +7883,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 expect-type: ^0.14.2 @@ -8060,6 +8088,7 @@ __metadata: "@storybook/addons": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 @@ -8088,6 +8117,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 @@ -8158,6 +8188,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 + "@storybook/preview-api": 7.0.0-alpha.47 "@storybook/preview-web": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 diff --git a/docs/snippets/angular/component-story-highlight-addon.ts.mdx b/docs/snippets/angular/component-story-highlight-addon.ts.mdx index 79282658faf..a7ad93a6d31 100644 --- a/docs/snippets/angular/component-story-highlight-addon.ts.mdx +++ b/docs/snippets/angular/component-story-highlight-addon.ts.mdx @@ -2,7 +2,7 @@ // Card.stories.ts import { componentWrapperDecorator, Meta, Story } from '@storybook/angular'; -import { useChannel } from '@storybook/addons'; +import { useChannel } from '@storybook/preview-api'; import { HIGHLIGHT, RESET_HIGHLIGHT } from '@storybook/addon-highlight'; import { Card } form './card.component'; diff --git a/docs/snippets/common/addon-consume-and-update-globaltype.js.mdx b/docs/snippets/common/addon-consume-and-update-globaltype.js.mdx index 96a8a5a57b1..92fbb34bbee 100644 --- a/docs/snippets/common/addon-consume-and-update-globaltype.js.mdx +++ b/docs/snippets/common/addon-consume-and-update-globaltype.js.mdx @@ -8,7 +8,7 @@ import { useGlobals } from '@storybook/api'; import { IconButton, Icons } from '@storybook/components'; -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; const ExampleToolbar = () => { const [globals, updateGlobals] = useGlobals(); diff --git a/docs/snippets/common/my-addon-initial-panel-state.js.mdx b/docs/snippets/common/my-addon-initial-panel-state.js.mdx index 8009d61ac4f..0e67a5444f8 100644 --- a/docs/snippets/common/my-addon-initial-panel-state.js.mdx +++ b/docs/snippets/common/my-addon-initial-panel-state.js.mdx @@ -3,7 +3,7 @@ import React from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { AddonPanel } from '@storybook/components'; diff --git a/docs/snippets/common/storybook-addon-panel-example.js.mdx b/docs/snippets/common/storybook-addon-panel-example.js.mdx index 29d8a1ab9d4..5c80a0dea42 100644 --- a/docs/snippets/common/storybook-addon-panel-example.js.mdx +++ b/docs/snippets/common/storybook-addon-panel-example.js.mdx @@ -5,7 +5,7 @@ import React from 'react'; import { AddonPanel } from '@storybook/components'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { useGlobals } from '@storybook/api'; diff --git a/docs/snippets/common/storybook-addon-panel-initial.js.mdx b/docs/snippets/common/storybook-addon-panel-initial.js.mdx index 9f9e6b6c05f..93c63e16d00 100644 --- a/docs/snippets/common/storybook-addon-panel-initial.js.mdx +++ b/docs/snippets/common/storybook-addon-panel-initial.js.mdx @@ -3,7 +3,7 @@ import React from 'react'; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { AddonPanel } from '@storybook/components'; diff --git a/docs/snippets/common/storybook-addon-tab-example.js.mdx b/docs/snippets/common/storybook-addon-tab-example.js.mdx index 6f471c7c675..29f77891c62 100644 --- a/docs/snippets/common/storybook-addon-tab-example.js.mdx +++ b/docs/snippets/common/storybook-addon-tab-example.js.mdx @@ -3,7 +3,7 @@ import React from 'react'; -import { addons, type types } from '@storybook/addons'; +import { addons, type types } from '@storybook/preview-api'; addons.register('my/tab', () => { addons.add('my-panel-addon/tab', { diff --git a/docs/snippets/common/storybook-addon-toolbar-example.js.mdx b/docs/snippets/common/storybook-addon-toolbar-example.js.mdx index 869c9df49ad..11220e3a01f 100644 --- a/docs/snippets/common/storybook-addon-toolbar-example.js.mdx +++ b/docs/snippets/common/storybook-addon-toolbar-example.js.mdx @@ -3,7 +3,7 @@ import React from "react"; -import { addons, types } from '@storybook/addons'; +import { addons, types } from '@storybook/preview-api'; import { Icons, IconButton } from '@storybook/components'; diff --git a/docs/snippets/common/storybook-addons-api-imports.js.mdx b/docs/snippets/common/storybook-addons-api-imports.js.mdx index e44d88ab048..2290d7cfd2f 100644 --- a/docs/snippets/common/storybook-addons-api-imports.js.mdx +++ b/docs/snippets/common/storybook-addons-api-imports.js.mdx @@ -1,5 +1,5 @@ ```js // .storybook/my-addon/manager.js -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; ``` \ No newline at end of file diff --git a/docs/snippets/common/storybook-addons-api-makedecorator.js.mdx b/docs/snippets/common/storybook-addons-api-makedecorator.js.mdx index 3c9617bfa19..dae89b20b20 100644 --- a/docs/snippets/common/storybook-addons-api-makedecorator.js.mdx +++ b/docs/snippets/common/storybook-addons-api-makedecorator.js.mdx @@ -1,7 +1,7 @@ ```js // .storybook/my-addon/manager.js -import { makeDecorator } from '@storybook/addons'; +import { makeDecorator } from '@storybook/preview-api'; export makeDecorator({ name: 'withSomething', diff --git a/docs/snippets/common/storybook-addons-api-register.js.mdx b/docs/snippets/common/storybook-addons-api-register.js.mdx index 3c044eebd8c..5ce4f9f848d 100644 --- a/docs/snippets/common/storybook-addons-api-register.js.mdx +++ b/docs/snippets/common/storybook-addons-api-register.js.mdx @@ -1,7 +1,7 @@ ```js // .storybook/my-addon/manager.js -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; // Register the addon with a unique name. addons.register('my-organisation/my-addon', (api) => {}); diff --git a/docs/snippets/common/storybook-config-layout.js.mdx b/docs/snippets/common/storybook-config-layout.js.mdx index c36446aebea..73f69aa9334 100644 --- a/docs/snippets/common/storybook-config-layout.js.mdx +++ b/docs/snippets/common/storybook-config-layout.js.mdx @@ -1,7 +1,7 @@ ```js // .storybook/manager.js -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; addons.setConfig({ isFullscreen: false, diff --git a/docs/snippets/common/storybook-manager-custom-theme.js.mdx b/docs/snippets/common/storybook-manager-custom-theme.js.mdx index be5df4a7d45..45bf92e29e3 100644 --- a/docs/snippets/common/storybook-manager-custom-theme.js.mdx +++ b/docs/snippets/common/storybook-manager-custom-theme.js.mdx @@ -1,7 +1,7 @@ ```js // .storybook/manager.js -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import yourTheme from './YourTheme'; addons.setConfig({ diff --git a/docs/snippets/common/storybook-manager-dark-theme.js.mdx b/docs/snippets/common/storybook-manager-dark-theme.js.mdx index ab37efb2de8..39a73477cfc 100644 --- a/docs/snippets/common/storybook-manager-dark-theme.js.mdx +++ b/docs/snippets/common/storybook-manager-dark-theme.js.mdx @@ -1,7 +1,7 @@ ```js // .storybook/manager.js -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import { themes } from '@storybook/theming'; addons.setConfig({ diff --git a/docs/snippets/common/storybook-manager-disable-roots.js.mdx b/docs/snippets/common/storybook-manager-disable-roots.js.mdx index 952d363c23d..2d3bc31de8c 100644 --- a/docs/snippets/common/storybook-manager-disable-roots.js.mdx +++ b/docs/snippets/common/storybook-manager-disable-roots.js.mdx @@ -1,7 +1,7 @@ ```js // ./storybook/manager.js -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; addons.setConfig({ sidebar: { diff --git a/docs/snippets/common/storybook-manager-render-label-stories.js.mdx b/docs/snippets/common/storybook-manager-render-label-stories.js.mdx index a40abfbadc9..f6444aa6a1f 100644 --- a/docs/snippets/common/storybook-manager-render-label-stories.js.mdx +++ b/docs/snippets/common/storybook-manager-render-label-stories.js.mdx @@ -1,7 +1,7 @@ ```js // .storybook/manager.js -import { addons } from '@storybook/addons'; +import { addons } from '@storybook/preview-api'; import startCase from 'lodash/startCase'; diff --git a/docs/snippets/react/component-story-highlight-addon.js.mdx b/docs/snippets/react/component-story-highlight-addon.js.mdx index 0c68f53d98a..db3e9abfe4c 100644 --- a/docs/snippets/react/component-story-highlight-addon.js.mdx +++ b/docs/snippets/react/component-story-highlight-addon.js.mdx @@ -2,7 +2,7 @@ // Card.stories.js|jsx import React, { useEffect } from 'react'; -import { useChannel } from '@storybook/addons'; +import { useChannel } from '@storybook/preview-api'; import { HIGHLIGHT, RESET_HIGHLIGHT } from '@storybook/addon-highlight'; import { Card } form './Card'; diff --git a/docs/snippets/vue/component-story-highlight-addon.js.mdx b/docs/snippets/vue/component-story-highlight-addon.js.mdx index 3bb3d0f30b6..9acba2faa66 100644 --- a/docs/snippets/vue/component-story-highlight-addon.js.mdx +++ b/docs/snippets/vue/component-story-highlight-addon.js.mdx @@ -1,7 +1,7 @@ ```js // Card.stories.js -import { useChannel } from '@storybook/addons'; +import { useChannel } from '@storybook/preview-api'; import { HIGHLIGHT, RESET_HIGHLIGHT } from '@storybook/addon-highlight'; import { Card } form './Card.vue'; diff --git a/docs/snippets/web-components/component-story-highlight-addon.js.mdx b/docs/snippets/web-components/component-story-highlight-addon.js.mdx index 4a8f436b4e4..2509855d6ca 100644 --- a/docs/snippets/web-components/component-story-highlight-addon.js.mdx +++ b/docs/snippets/web-components/component-story-highlight-addon.js.mdx @@ -2,7 +2,7 @@ // card-component.stories.js import { html } from 'lit-html'; -import { useChannel } from '@storybook/addons'; +import { useChannel } from '@storybook/preview-api'; import { HIGHLIGHT, RESET_HIGHLIGHT } from '@storybook/addon-highlight'; import './card-component';