storybookjs · ndelangen · Nov 24, 2022 · Nov 23, 2022 · Nov 23, 2022 · Nov 23, 2022
diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
@@ -64,11 +64,11 @@
   "dependencies": {
     "@storybook/addon-highlight": "7.0.0-alpha.52",
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/channels": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52",
     "@storybook/types": "7.0.0-alpha.52",

diff --git a/code/addons/a11y/src/components/A11YPanel.test.tsx b/code/addons/a11y/src/components/A11YPanel.test.tsx
@@ -2,12 +2,12 @@ import React from 'react';
 import { render, waitFor, fireEvent, act } from '@testing-library/react';
 
 import { ThemeProvider, themes, convert } from '@storybook/theming';
-import * as api from '@storybook/api';
+import * as api from '@storybook/manager-api';
 
 import { A11YPanel } from './A11YPanel';
 import { EVENTS } from '../constants';
 
-jest.mock('@storybook/api');
+jest.mock('@storybook/manager-api');
 const mockedApi = api as jest.Mocked<typeof api>;
 
 const axeResult = {

diff --git a/code/addons/a11y/src/components/A11YPanel.tsx b/code/addons/a11y/src/components/A11YPanel.tsx
@@ -5,7 +5,7 @@ import { styled } from '@storybook/theming';
 import { ActionBar, Icons, ScrollArea } from '@storybook/components';
 
 import type { AxeResults } from 'axe-core';
-import { useChannel, useParameter, useStorybookState } from '@storybook/api';
+import { useChannel, useParameter, useStorybookState } from '@storybook/manager-api';
 
 import { Report } from './Report';
 

diff --git a/code/addons/a11y/src/components/A11yContext.test.tsx b/code/addons/a11y/src/components/A11yContext.test.tsx
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import type { AxeResults } from 'axe-core';
 import { render, act } from '@testing-library/react';
-import * as api from '@storybook/api';
+import * as api from '@storybook/manager-api';
 import { STORY_CHANGED } from '@storybook/core-events';
 import { HIGHLIGHT } from '@storybook/addon-highlight';
 
 import { A11yContextProvider, useA11yContext } from './A11yContext';
 import { EVENTS } from '../constants';
 
-jest.mock('@storybook/api');
+jest.mock('@storybook/manager-api');
 const mockedApi = api as jest.Mocked<typeof api>;
 
 const storyId = 'jest';

diff --git a/code/addons/a11y/src/components/A11yContext.tsx b/code/addons/a11y/src/components/A11yContext.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { themes, convert } from '@storybook/theming';
 import type { Result } from 'axe-core';
-import { useChannel, useAddonState, useStorybookApi } from '@storybook/api';
+import { useChannel, useAddonState, useStorybookApi } from '@storybook/manager-api';
 import { STORY_CHANGED, STORY_RENDERED } from '@storybook/core-events';
 import { HIGHLIGHT } from '@storybook/addon-highlight';
 import { ADDON_ID, EVENTS } from '../constants';

diff --git a/code/addons/a11y/src/manager.test.tsx b/code/addons/a11y/src/manager.test.tsx
@@ -1,9 +1,9 @@
 import { addons } from '@storybook/addons';
-import * as api from '@storybook/api';
+import * as api from '@storybook/manager-api';
 import { PANEL_ID } from './constants';
 import './manager';
 
-jest.mock('@storybook/api');
+jest.mock('@storybook/manager-api');
 jest.mock('@storybook/addons');
 const mockedApi = api as unknown as jest.Mocked<api.API>;
 mockedApi.getAddonState = jest.fn();

diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json
@@ -77,10 +77,10 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52",
     "@storybook/types": "7.0.0-alpha.52",

diff --git a/code/addons/actions/src/containers/ActionLogger/index.tsx b/code/addons/actions/src/containers/ActionLogger/index.tsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { dequal as deepEqual } from 'dequal';
 
-import type { API } from '@storybook/api';
+import type { API } from '@storybook/manager-api';
 import { STORY_CHANGED } from '@storybook/core-events';
 
 import { ActionLogger as ActionLoggerComponent } from '../../components/ActionLogger';

diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json
@@ -76,10 +76,10 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52",
     "@storybook/types": "7.0.0-alpha.52",

diff --git a/code/addons/backgrounds/src/containers/BackgroundSelector.tsx b/code/addons/backgrounds/src/containers/BackgroundSelector.tsx
@@ -2,7 +2,7 @@ import type { FC } from 'react';
 import React, { Fragment, useCallback, useMemo, memo } from 'react';
 import memoize from 'memoizerific';
 
-import { useParameter, useGlobals } from '@storybook/api';
+import { useParameter, useGlobals } from '@storybook/manager-api';
 import { logger } from '@storybook/client-logger';
 import { Icons, IconButton, WithTooltip, TooltipLinkList } from '@storybook/components';
 

diff --git a/code/addons/backgrounds/src/containers/GridSelector.tsx b/code/addons/backgrounds/src/containers/GridSelector.tsx
@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import React, { memo } from 'react';
 
-import { useGlobals, useParameter } from '@storybook/api';
+import { useGlobals, useParameter } from '@storybook/manager-api';
 import { Icons, IconButton } from '@storybook/components';
 
 import { PARAM_KEY as BACKGROUNDS_PARAM_KEY } from '../constants';

diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json
@@ -68,11 +68,11 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/blocks": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-common": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/node-logger": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52",

diff --git a/code/addons/controls/src/ControlsPanel.tsx b/code/addons/controls/src/ControlsPanel.tsx
@@ -1,6 +1,12 @@
 import type { FC } from 'react';
 import React from 'react';
-import { useArgs, useGlobals, useArgTypes, useParameter, useStorybookState } from '@storybook/api';
+import {
+  useArgs,
+  useGlobals,
+  useArgTypes,
+  useParameter,
+  useStorybookState,
+} from '@storybook/manager-api';
 import {
   PureArgsTable as ArgsTable,
   NoControlsWarning,

diff --git a/code/addons/controls/src/manager.tsx b/code/addons/controls/src/manager.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { addons, types } from '@storybook/addons';
 import { AddonPanel } from '@storybook/components';
-import { type API, useArgTypes } from '@storybook/api';
+import { type API, useArgTypes } from '@storybook/manager-api';
 import { ControlsPanel } from './ControlsPanel';
 import { ADDON_ID, PARAM_KEY } from './constants';
 

diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json
@@ -121,8 +121,8 @@
     "@storybook/addon-toolbars": "7.0.0-alpha.52",
     "@storybook/addon-viewport": "7.0.0-alpha.52",
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/core-common": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/node-logger": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "ts-dedent": "^2.0.0"

diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
@@ -73,12 +73,12 @@
   "dependencies": {
     "@devtools-ds/object-inspector": "^1.1.2",
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-common": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
     "@storybook/instrumenter": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52",
     "@storybook/types": "7.0.0-alpha.52",

diff --git a/code/addons/interactions/src/Panel.tsx b/code/addons/interactions/src/Panel.tsx
@@ -1,6 +1,6 @@
 import global from 'global';
 import * as React from 'react';
-import { useChannel, useParameter } from '@storybook/api';
+import { useChannel, useParameter } from '@storybook/manager-api';
 import {
   FORCE_REMOUNT,
   IGNORED_EXCEPTION,

diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json
@@ -70,10 +70,10 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52",
     "global": "^4.4.0",

diff --git a/code/addons/jest/src/hoc/provideJestResult.tsx b/code/addons/jest/src/hoc/provideJestResult.tsx
@@ -1,7 +1,7 @@
 import type { ComponentType } from 'react';
 import React, { Component as ReactComponent } from 'react';
 import { STORY_CHANGED } from '@storybook/core-events';
-import type { API } from '@storybook/api';
+import type { API } from '@storybook/manager-api';
 import { ADD_TESTS } from '../shared';
 
 // TODO: import type from @types/jest

diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json
@@ -75,10 +75,10 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/types": "7.0.0-alpha.52",
     "global": "^4.4.0"

diff --git a/code/addons/measure/src/Tool.tsx b/code/addons/measure/src/Tool.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { useGlobals, useStorybookApi } from '@storybook/api';
+import { useGlobals, useStorybookApi } from '@storybook/manager-api';
 import { Icons, IconButton } from '@storybook/components';
 import { TOOL_ID, ADDON_ID } from './constants';
 

diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json
@@ -78,10 +78,10 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/types": "7.0.0-alpha.52",
     "global": "^4.4.0",

diff --git a/code/addons/outline/src/OutlineSelector.tsx b/code/addons/outline/src/OutlineSelector.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useEffect } from 'react';
-import { useGlobals, useStorybookApi } from '@storybook/api';
+import { useGlobals, useStorybookApi } from '@storybook/manager-api';
 import { Icons, IconButton } from '@storybook/components';
 import { ADDON_ID, PARAM_KEY } from './constants';
 

diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json
@@ -54,9 +54,9 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/router": "7.0.0-alpha.52",
     "@storybook/source-loader": "7.0.0-alpha.52",

diff --git a/code/addons/storysource/src/StoryPanel.tsx b/code/addons/storysource/src/StoryPanel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { type API, useParameter } from '@storybook/api';
+import { type API, useParameter } from '@storybook/manager-api';
 import { styled } from '@storybook/theming';
 import { Link } from '@storybook/router';
 import {

diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json
@@ -68,9 +68,9 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52"
   },

diff --git a/code/addons/toolbars/src/components/ToolbarManager.tsx b/code/addons/toolbars/src/components/ToolbarManager.tsx
@@ -1,6 +1,6 @@
 import type { FC } from 'react';
 import React from 'react';
-import { useGlobalTypes } from '@storybook/api';
+import { useGlobalTypes } from '@storybook/manager-api';
 import { Separator } from '@storybook/components';
 import { ToolbarMenuList } from './ToolbarMenuList';
 import { normalizeArgType } from '../utils/normalize-toolbar-arg-type';

diff --git a/code/addons/toolbars/src/components/ToolbarMenuList.tsx b/code/addons/toolbars/src/components/ToolbarMenuList.tsx
@@ -1,6 +1,6 @@
 import type { FC, ReactNode } from 'react';
 import React, { useCallback } from 'react';
-import { useGlobals } from '@storybook/api';
+import { useGlobals } from '@storybook/manager-api';
 import { deprecate } from '@storybook/client-logger';
 import { WithTooltip, TooltipLinkList } from '@storybook/components';
 import { ToolbarMenuButton } from './ToolbarMenuButton';

diff --git a/code/addons/toolbars/src/hoc/withKeyboardCycle.tsx b/code/addons/toolbars/src/hoc/withKeyboardCycle.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useEffect, useCallback } from 'react';
-import { useGlobals, useStorybookApi } from '@storybook/api';
+import { useGlobals, useStorybookApi } from '@storybook/manager-api';
 import { createCycleValueArray } from '../utils/create-cycle-value-array';
 import { registerShortcuts } from '../utils/register-shortcuts';
 import type { ToolbarMenuProps } from '../types';

diff --git a/code/addons/toolbars/src/utils/register-shortcuts.ts b/code/addons/toolbars/src/utils/register-shortcuts.ts
@@ -1,4 +1,4 @@
-import type { API } from '@storybook/api';
+import type { API } from '@storybook/manager-api';
 import { ADDON_ID } from '../constants';
 import type { ToolbarShortcutConfig } from '../types';
 

diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json
@@ -73,10 +73,10 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/components": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52",
     "global": "^4.4.0",

diff --git a/code/addons/viewport/src/Tool.tsx b/code/addons/viewport/src/Tool.tsx
@@ -7,7 +7,7 @@ import { styled, Global, type Theme, withTheme } from '@storybook/theming';
 
 import { Icons, IconButton, WithTooltip, TooltipLinkList } from '@storybook/components';
 
-import { useStorybookApi, useParameter, useAddonState } from '@storybook/api';
+import { useStorybookApi, useParameter, useAddonState } from '@storybook/manager-api';
 import { registerShortcuts } from './shortcuts';
 import { PARAM_KEY, ADDON_ID } from './constants';
 import { MINIMAL_VIEWPORTS } from './defaults';

diff --git a/code/addons/viewport/src/shortcuts.ts b/code/addons/viewport/src/shortcuts.ts
@@ -1,4 +1,4 @@
-import type { API } from '@storybook/api';
+import type { API } from '@storybook/manager-api';
 import { ADDON_ID } from './constants';
 
 type State = {

diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json
@@ -35,7 +35,6 @@
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.52",
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/builder-webpack5": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/core-client": "7.0.0-alpha.52",
@@ -44,6 +43,7 @@
     "@storybook/core-server": "7.0.0-alpha.52",
     "@storybook/core-webpack": "7.0.0-alpha.52",
     "@storybook/docs-tools": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/node-logger": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",
     "@storybook/types": "7.0.0-alpha.52",

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
@@ -816,7 +816,7 @@ const newWebpackConfiguration = (
       mainFields: ['browser', 'main'],
       alias: {
         '@storybook/preview-api': '/Users/joe/storybook/lib/addons',
-        '@storybook/api': '/Users/joe/storybook/lib/api',
+        '@storybook/manager-api': '/Users/joe/storybook/lib/api',
         '@storybook/channels': '/Users/joe/storybook/lib/channels',
         '@storybook/channel-postmessage': '/Users/joe/storybook/lib/channel-postmessage',
         '@storybook/components': '/Users/joe/storybook/ui/components',

diff --git a/code/lib/addons/package.json b/code/lib/addons/package.json
@@ -42,10 +42,10 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/api": "7.0.0-alpha.52",
     "@storybook/channels": "7.0.0-alpha.52",
     "@storybook/client-logger": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/router": "7.0.0-alpha.52",
     "@storybook/theming": "7.0.0-alpha.52",
     "@storybook/types": "7.0.0-alpha.52",

diff --git a/code/lib/addons/src/main.ts b/code/lib/addons/src/main.ts
@@ -2,7 +2,7 @@ import global from 'global';
 
 import type { Channel } from '@storybook/channels';
 import { SET_CONFIG } from '@storybook/core-events';
-import type { API } from '@storybook/api';
+import type { API } from '@storybook/manager-api';
 import type {
   Addon_Collection,
   Addon_Config,

diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json
@@ -65,6 +65,7 @@
     "@storybook/core-common": "7.0.0-alpha.52",
     "@storybook/core-events": "7.0.0-alpha.52",
     "@storybook/core-webpack": "7.0.0-alpha.52",
+    "@storybook/manager-api": "7.0.0-alpha.52",
     "@storybook/node-logger": "7.0.0-alpha.52",
     "@storybook/preview": "7.0.0-alpha.52",
     "@storybook/preview-api": "7.0.0-alpha.52",

diff --git a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -28,6 +28,7 @@ const storybookPaths: Record<string, string> = {
   ...[
     // these packages are not pre-bundled because of react dependencies
     'api',
+    'manager-api',
     'components',
     'router',
     'theming',