From d462df5ce94b8bfdbe5ffab48fb7c04c88af006f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 10 Jul 2023 15:14:51 +0200 Subject: [PATCH] remove references to `api` and the 2 deprecated channel packages --- code/builders/builder-vite/src/optimizeDeps.ts | 2 -- code/builders/builder-webpack5/package.json | 2 -- code/frameworks/html-vite/package.json | 1 - .../cli/src/automigrate/helpers/getMigrationSummary.ts | 6 +++--- code/lib/preview-api/package.json | 1 - code/lib/preview/src/globals/runtime.ts | 4 ++-- code/lib/preview/src/globals/types.ts | 4 ++-- code/ui/manager/package.json | 2 -- code/yarn.lock | 10 ++-------- test-storybooks/ember-cli/package.json | 3 --- test-storybooks/external-docs/package.json | 2 -- test-storybooks/server-kitchen-sink/package.json | 3 --- test-storybooks/standalone-preview/package.json | 3 --- 13 files changed, 9 insertions(+), 34 deletions(-) diff --git a/code/builders/builder-vite/src/optimizeDeps.ts b/code/builders/builder-vite/src/optimizeDeps.ts index e9639782547..43c64f34a7e 100644 --- a/code/builders/builder-vite/src/optimizeDeps.ts +++ b/code/builders/builder-vite/src/optimizeDeps.ts @@ -14,8 +14,6 @@ const INCLUDE_CANDIDATES = [ '@storybook/addon-docs', '@storybook/addon-essentials/docs/mdx-react-shim', '@storybook/channels', - '@storybook/channel-postmessage', - '@storybook/channel-websocket', '@storybook/client-api', '@storybook/client-logger', '@storybook/core/client', diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json index 8c9922a5f01..a4cb9b9d3c1 100644 --- a/code/builders/builder-webpack5/package.json +++ b/code/builders/builder-webpack5/package.json @@ -57,8 +57,6 @@ "dependencies": { "@babel/core": "^7.22.0", "@storybook/addons": "7.1.0-beta.2", - "@storybook/api": "7.1.0-beta.2", - "@storybook/channel-postmessage": "7.1.0-beta.2", "@storybook/channels": "7.1.0-beta.2", "@storybook/client-api": "7.1.0-beta.2", "@storybook/client-logger": "7.1.0-beta.2", diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index 2974dd12afd..4cdee9e3052 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -49,7 +49,6 @@ "dependencies": { "@storybook/addons": "7.1.0-beta.2", "@storybook/builder-vite": "7.1.0-beta.2", - "@storybook/channel-postmessage": "7.1.0-beta.2", "@storybook/client-api": "7.1.0-beta.2", "@storybook/core-server": "7.1.0-beta.2", "@storybook/html": "7.1.0-beta.2", diff --git a/code/lib/cli/src/automigrate/helpers/getMigrationSummary.ts b/code/lib/cli/src/automigrate/helpers/getMigrationSummary.ts index 5cfa0122a1b..9e9d60df35c 100644 --- a/code/lib/cli/src/automigrate/helpers/getMigrationSummary.ts +++ b/code/lib/cli/src/automigrate/helpers/getMigrationSummary.ts @@ -108,8 +108,8 @@ const allowList = [ '@storybook/csf', // see this file for more info: code/lib/preview/src/globals/types.ts '@storybook/addons', - '@storybook/channel-postmessage', - '@storybook/channel-websocket', + '@storybook/channel-postmessage', // @deprecated: remove in 8.0 + '@storybook/channel-websocket', // @deprecated: remove in 8.0 '@storybook/channels', '@storybook/client-api', '@storybook/client-logger', @@ -123,7 +123,7 @@ const allowList = [ '@storybook/components', '@storybook/router', '@storybook/theming', - '@storybook/api', + '@storybook/api', // @deprecated: remove in 8.0 '@storybook/manager-api', ]; diff --git a/code/lib/preview-api/package.json b/code/lib/preview-api/package.json index 2d6277039da..b331cf89fb6 100644 --- a/code/lib/preview-api/package.json +++ b/code/lib/preview-api/package.json @@ -67,7 +67,6 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channel-postmessage": "7.1.0-beta.2", "@storybook/channels": "7.1.0-beta.2", "@storybook/client-logger": "7.1.0-beta.2", "@storybook/core-events": "7.1.0-beta.2", diff --git a/code/lib/preview/src/globals/runtime.ts b/code/lib/preview/src/globals/runtime.ts index b299eea8f69..6aec0edd155 100644 --- a/code/lib/preview/src/globals/runtime.ts +++ b/code/lib/preview/src/globals/runtime.ts @@ -16,8 +16,8 @@ import type { globals } from './types'; // Here we map the name of a module to their VALUE in the global scope. export const values: Required> = { - '@storybook/channel-postmessage': CHANNEL_POSTMESSAGE, - '@storybook/channel-websocket': CHANNEL_WEBSOCKET, + '@storybook/channel-postmessage': CHANNEL_POSTMESSAGE, // @deprecated: remove in 8.0 + '@storybook/channel-websocket': CHANNEL_WEBSOCKET, // @deprecated: remove in 8.0 '@storybook/channels': CHANNELS, '@storybook/client-logger': CLIENT_LOGGER, '@storybook/core-events': CORE_EVENTS, diff --git a/code/lib/preview/src/globals/types.ts b/code/lib/preview/src/globals/types.ts index 182e384604e..afd90b8bf56 100644 --- a/code/lib/preview/src/globals/types.ts +++ b/code/lib/preview/src/globals/types.ts @@ -1,8 +1,8 @@ // Here we map the name of a module to their NAME in the global scope. export const globals = { '@storybook/addons': '__STORYBOOK_MODULE_ADDONS__', - '@storybook/channel-postmessage': '__STORYBOOK_MODULE_CHANNEL_POSTMESSAGE__', - '@storybook/channel-websocket': '__STORYBOOK_MODULE_CHANNEL_WEBSOCKET__', + '@storybook/channel-postmessage': '__STORYBOOK_MODULE_CHANNEL_POSTMESSAGE__', // @deprecated: remove in 8.0 + '@storybook/channel-websocket': '__STORYBOOK_MODULE_CHANNEL_WEBSOCKET__', // @deprecated: remove in 8.0 '@storybook/channels': '__STORYBOOK_MODULE_CHANNELS__', '@storybook/client-api': '__STORYBOOK_MODULE_CLIENT_API__', '@storybook/client-logger': '__STORYBOOK_MODULE_CLIENT_LOGGER__', diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json index 4674a01f834..acfade3ba8e 100644 --- a/code/ui/manager/package.json +++ b/code/ui/manager/package.json @@ -53,8 +53,6 @@ "@fal-works/esbuild-plugin-global-externals": "^2.1.2", "@storybook/addon-designs": "^7.0.0", "@storybook/addons": "7.1.0-beta.2", - "@storybook/api": "7.1.0-beta.2", - "@storybook/channel-postmessage": "7.1.0-beta.2", "@storybook/channels": "7.1.0-beta.2", "@storybook/client-logger": "7.1.0-beta.2", "@storybook/components": "7.1.0-beta.2", diff --git a/code/yarn.lock b/code/yarn.lock index ef1c71b726f..5fa1feef641 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5778,7 +5778,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/api@7.1.0-beta.2, @storybook/api@workspace:*, @storybook/api@workspace:deprecated/manager-api-shim": +"@storybook/api@workspace:*, @storybook/api@workspace:deprecated/manager-api-shim": version: 0.0.0-use.local resolution: "@storybook/api@workspace:deprecated/manager-api-shim" dependencies: @@ -5937,8 +5937,6 @@ __metadata: dependencies: "@babel/core": ^7.22.0 "@storybook/addons": 7.1.0-beta.2 - "@storybook/api": 7.1.0-beta.2 - "@storybook/channel-postmessage": 7.1.0-beta.2 "@storybook/channels": 7.1.0-beta.2 "@storybook/client-api": 7.1.0-beta.2 "@storybook/client-logger": 7.1.0-beta.2 @@ -5997,7 +5995,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/channel-postmessage@7.1.0-beta.2, @storybook/channel-postmessage@workspace:*, @storybook/channel-postmessage@workspace:deprecated/channel-postmessage": +"@storybook/channel-postmessage@workspace:*, @storybook/channel-postmessage@workspace:deprecated/channel-postmessage": version: 0.0.0-use.local resolution: "@storybook/channel-postmessage@workspace:deprecated/channel-postmessage" dependencies: @@ -6427,7 +6425,6 @@ __metadata: dependencies: "@storybook/addons": 7.1.0-beta.2 "@storybook/builder-vite": 7.1.0-beta.2 - "@storybook/channel-postmessage": 7.1.0-beta.2 "@storybook/client-api": 7.1.0-beta.2 "@storybook/core-server": 7.1.0-beta.2 "@storybook/html": 7.1.0-beta.2 @@ -6562,8 +6559,6 @@ __metadata: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 "@storybook/addon-designs": ^7.0.0 "@storybook/addons": 7.1.0-beta.2 - "@storybook/api": 7.1.0-beta.2 - "@storybook/channel-postmessage": 7.1.0-beta.2 "@storybook/channels": 7.1.0-beta.2 "@storybook/client-logger": 7.1.0-beta.2 "@storybook/components": 7.1.0-beta.2 @@ -6940,7 +6935,6 @@ __metadata: resolution: "@storybook/preview-api@workspace:lib/preview-api" dependencies: "@jest/globals": ^29.5.0 - "@storybook/channel-postmessage": 7.1.0-beta.2 "@storybook/channels": 7.1.0-beta.2 "@storybook/client-logger": 7.1.0-beta.2 "@storybook/core-common": 7.1.0-beta.2 diff --git a/test-storybooks/ember-cli/package.json b/test-storybooks/ember-cli/package.json index a5914ff7344..638a9adb8b4 100644 --- a/test-storybooks/ember-cli/package.json +++ b/test-storybooks/ember-cli/package.json @@ -30,13 +30,10 @@ "@storybook/addon-viewport": "portal:../../code/addons/viewport", "@storybook/addons": "portal:../../code/deprecated/addons", "@storybook/angular": "portal:../../code/frameworks/angular", - "@storybook/api": "portal:../../code/lib/api", "@storybook/blocks": "portal:../../code/lib/blocks", "@storybook/builder-manager": "portal:../../code/builders/builder-manager", "@storybook/builder-vite": "portal:../../code/builders/builder-vite", "@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5", - "@storybook/channel-postmessage": "portal:../../code/lib/channel-postmessage", - "@storybook/channel-websocket": "portal:../../code/lib/channel-websocket", "@storybook/channels": "portal:../../code/lib/channels", "@storybook/cli": "portal:../../code/lib/cli", "@storybook/client-api": "portal:../../code/deprecated/client-api", diff --git a/test-storybooks/external-docs/package.json b/test-storybooks/external-docs/package.json index 3bf8e47fc38..85041e47180 100644 --- a/test-storybooks/external-docs/package.json +++ b/test-storybooks/external-docs/package.json @@ -34,8 +34,6 @@ "@storybook/builder-manager": "portal:../../code/builders/builder-manager", "@storybook/builder-vite": "portal:../../code/builders/builder-vite", "@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5", - "@storybook/channel-postmessage": "portal:../../code/lib/channel-postmessage", - "@storybook/channel-websocket": "portal:../../code/lib/channel-websocket", "@storybook/channels": "portal:../../code/lib/channels", "@storybook/cli": "portal:../../code/lib/cli", "@storybook/client-api": "portal:../../code/deprecated/client-api", diff --git a/test-storybooks/server-kitchen-sink/package.json b/test-storybooks/server-kitchen-sink/package.json index 0421848268a..d35e02a6c76 100644 --- a/test-storybooks/server-kitchen-sink/package.json +++ b/test-storybooks/server-kitchen-sink/package.json @@ -33,13 +33,10 @@ "@storybook/addon-viewport": "portal:../../code/addons/viewport", "@storybook/addons": "portal:../../code/deprecated/addons", "@storybook/angular": "portal:../../code/frameworks/angular", - "@storybook/api": "portal:../../code/lib/api", "@storybook/blocks": "portal:../../code/lib/blocks", "@storybook/builder-manager": "portal:../../code/builders/builder-manager", "@storybook/builder-vite": "portal:../../code/builders/builder-vite", "@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5", - "@storybook/channel-postmessage": "portal:../../code/lib/channel-postmessage", - "@storybook/channel-websocket": "portal:../../code/lib/channel-websocket", "@storybook/channels": "portal:../../code/lib/channels", "@storybook/cli": "portal:../../code/lib/cli", "@storybook/client-api": "portal:../../code/deprecated/client-api", diff --git a/test-storybooks/standalone-preview/package.json b/test-storybooks/standalone-preview/package.json index 1cc475ca07d..255f7d0e8d4 100644 --- a/test-storybooks/standalone-preview/package.json +++ b/test-storybooks/standalone-preview/package.json @@ -26,13 +26,10 @@ "@storybook/addon-viewport": "portal:../../code/addons/viewport", "@storybook/addons": "portal:../../code/deprecated/addons", "@storybook/angular": "portal:../../code/frameworks/angular", - "@storybook/api": "portal:../../code/lib/api", "@storybook/blocks": "portal:../../code/lib/blocks", "@storybook/builder-manager": "portal:../../code/builders/builder-manager", "@storybook/builder-vite": "portal:../../code/builders/builder-vite", "@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5", - "@storybook/channel-postmessage": "portal:../../code/lib/channel-postmessage", - "@storybook/channel-websocket": "portal:../../code/lib/channel-websocket", "@storybook/channels": "portal:../../code/lib/channels", "@storybook/cli": "portal:../../code/lib/cli", "@storybook/client-api": "portal:../../code/deprecated/client-api",