From 447caec091b077cd86a4d0c07fb9d68eec9219a3 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 2 Jan 2025 12:33:36 +0100 Subject: [PATCH 1/9] add bin to core --- code/core/bin/index.cjs | 26 +++++++ code/core/package.json | 67 ++++++++++--------- code/core/scripts/entries.ts | 1 + .../helpers/generatePackageJsonFile.ts | 2 +- code/core/src/bin/index.ts | 22 ++++++ code/lib/cli/core/bin/index.cjs | 1 + code/lib/cli/core/bin/index.js | 1 + code/lib/cli/package.json | 4 ++ code/yarn.lock | 2 + 9 files changed, 94 insertions(+), 32 deletions(-) create mode 100755 code/core/bin/index.cjs create mode 100644 code/core/src/bin/index.ts create mode 100644 code/lib/cli/core/bin/index.cjs create mode 100644 code/lib/cli/core/bin/index.js diff --git a/code/core/bin/index.cjs b/code/core/bin/index.cjs new file mode 100755 index 000000000000..ce13973e4eb9 --- /dev/null +++ b/code/core/bin/index.cjs @@ -0,0 +1,26 @@ +#!/usr/bin/env node + +const majorNodeVersion = parseInt(process.versions.node, 10); +if (majorNodeVersion < 18) { + console.error('To run Storybook you need to have Node.js 18 or higher'); + process.exit(1); +} + +// The Storybook CLI has a catch block for all of its commands, but if an error +// occurs before the command even runs, for instance, if an import fails, then +// such error will fall under the uncaughtException handler. +// This is the earliest moment we can catch such errors. +process.once('uncaughtException', (error) => { + if (error.message.includes('string-width')) { + console.error( + [ + '🔴 Error: It looks like you are having a known issue with package hoisting.', + 'Please check the following issue for details and solutions: https://github.com/storybookjs/storybook/issues/22431#issuecomment-1630086092\n\n', + ].join('\n') + ); + } + + throw error; +}); + +require('../dist/bin/index.cjs'); diff --git a/code/core/package.json b/code/core/package.json index db2394d2401b..180861f922ed 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -27,150 +27,154 @@ "import": "./dist/index.js", "require": "./dist/index.cjs" }, - "./node-logger": { + "./internal/node-logger": { "types": "./dist/node-logger/index.d.ts", "import": "./dist/node-logger/index.js", "require": "./dist/node-logger/index.cjs" }, - "./client-logger": { + "./internal/client-logger": { "types": "./dist/client-logger/index.d.ts", "import": "./dist/client-logger/index.js", "require": "./dist/client-logger/index.cjs" }, - "./theming": { + "./internal/theming": { "types": "./dist/theming/index.d.ts", "import": "./dist/theming/index.js", "require": "./dist/theming/index.cjs" }, - "./theming/create": { + "./internal/theming/create": { "types": "./dist/theming/create.d.ts", "import": "./dist/theming/create.js", "require": "./dist/theming/create.cjs" }, - "./core-server": { + "./internal/core-server": { "types": "./dist/core-server/index.d.ts", "import": "./dist/core-server/index.js", "require": "./dist/core-server/index.cjs" }, - "./core-server/presets/common-preset": { + "./internal/core-server/presets/common-preset": { "import": "./dist/core-server/presets/common-preset.js", "require": "./dist/core-server/presets/common-preset.cjs" }, - "./core-server/presets/common-manager": { + "./internal/core-server/presets/common-manager": { "import": "./dist/core-server/presets/common-manager.js" }, - "./core-server/presets/common-override-preset": { + "./internal/core-server/presets/common-override-preset": { "import": "./dist/core-server/presets/common-override-preset.js", "require": "./dist/core-server/presets/common-override-preset.cjs" }, - "./core-events": { + "./internal/core-events": { "types": "./dist/core-events/index.d.ts", "import": "./dist/core-events/index.js", "require": "./dist/core-events/index.cjs" }, - "./manager-errors": { + "./internal/manager-errors": { "types": "./dist/manager-errors.d.ts", "import": "./dist/manager-errors.js" }, - "./preview-errors": { + "./internal/preview-errors": { "types": "./dist/preview-errors.d.ts", "import": "./dist/preview-errors.js", "require": "./dist/preview-errors.cjs" }, - "./server-errors": { + "./internal/server-errors": { "types": "./dist/server-errors.d.ts", "import": "./dist/server-errors.js", "require": "./dist/server-errors.cjs" }, - "./channels": { + "./internal/channels": { "types": "./dist/channels/index.d.ts", "import": "./dist/channels/index.js", "require": "./dist/channels/index.cjs" }, - "./types": { + "./internal/types": { "types": "./dist/types/index.d.ts", "import": "./dist/types/index.js", "require": "./dist/types/index.cjs" }, - "./csf-tools": { + "./internal/csf-tools": { "types": "./dist/csf-tools/index.d.ts", "import": "./dist/csf-tools/index.js", "require": "./dist/csf-tools/index.cjs" }, - "./common": { + "./internal/common": { "types": "./dist/common/index.d.ts", "import": "./dist/common/index.js", "require": "./dist/common/index.cjs" }, - "./builder-manager": { + "./internal/builder-manager": { "types": "./dist/builder-manager/index.d.ts", "import": "./dist/builder-manager/index.js", "require": "./dist/builder-manager/index.cjs" }, - "./telemetry": { + "./internal/telemetry": { "types": "./dist/telemetry/index.d.ts", "import": "./dist/telemetry/index.js", "require": "./dist/telemetry/index.cjs" }, - "./preview-api": { + "./internal/preview-api": { "types": "./dist/preview-api/index.d.ts", "import": "./dist/preview-api/index.js", "require": "./dist/preview-api/index.cjs" }, - "./manager-api": { + "./internal/manager-api": { "types": "./dist/manager-api/index.d.ts", "import": "./dist/manager-api/index.js", "require": "./dist/manager-api/index.cjs" }, - "./router": { + "./internal/router": { "types": "./dist/router/index.d.ts", "import": "./dist/router/index.js", "require": "./dist/router/index.cjs" }, - "./components": { + "./internal/components": { "types": "./dist/components/index.d.ts", "import": "./dist/components/index.js", "require": "./dist/components/index.cjs" }, - "./docs-tools": { + "./internal/docs-tools": { "types": "./dist/docs-tools/index.d.ts", "import": "./dist/docs-tools/index.js", "require": "./dist/docs-tools/index.cjs" }, - "./manager/globals-module-info": { + "./internal/manager/globals-module-info": { "types": "./dist/manager/globals-module-info.d.ts", "import": "./dist/manager/globals-module-info.js", "require": "./dist/manager/globals-module-info.cjs" }, - "./manager/globals": { + "./internal/manager/globals": { "types": "./dist/manager/globals.d.ts", "import": "./dist/manager/globals.js", "require": "./dist/manager/globals.cjs" }, - "./preview/globals": { + "./internal/preview/globals": { "types": "./dist/preview/globals.d.ts", "import": "./dist/preview/globals.js", "require": "./dist/preview/globals.cjs" }, - "./cli": { + "./internal/cli": { "types": "./dist/cli/index.d.ts", "import": "./dist/cli/index.js", "require": "./dist/cli/index.cjs" }, - "./babel": { + "./internal/babel": { "types": "./dist/babel/index.d.ts", "import": "./dist/babel/index.js", "require": "./dist/babel/index.cjs" }, - "./cli/bin": { + "./internal/cli/bin": { "types": "./dist/cli/bin/index.d.ts", "import": "./dist/cli/bin/index.js", "require": "./dist/cli/bin/index.cjs" }, - "./preview/runtime": { + "./internal/bin": { + "import": "./dist/bin/index.js", + "require": "./dist/bin/index.cjs" + }, + "./internal/preview/runtime": { "import": "./dist/preview/runtime.js" }, - "./manager/globals-runtime": { + "./internal/manager/globals-runtime": { "import": "./dist/manager/globals-runtime.js" }, "./package.json": "./package.json" @@ -263,6 +267,7 @@ ] } }, + "bin": "./bin/index.cjs", "files": [ "dist/**/*", "assets/**/*", diff --git a/code/core/scripts/entries.ts b/code/core/scripts/entries.ts index bcd1d1b94572..6d38ef48d7ac 100644 --- a/code/core/scripts/entries.ts +++ b/code/core/scripts/entries.ts @@ -46,6 +46,7 @@ export const getEntries = (cwd: string) => { define('src/cli/index.ts', ['node'], true), define('src/babel/index.ts', ['node'], true), define('src/cli/bin/index.ts', ['node'], true), + define('src/bin/index.ts', ['node'], false), ]; }; diff --git a/code/core/scripts/helpers/generatePackageJsonFile.ts b/code/core/scripts/helpers/generatePackageJsonFile.ts index c805fe6294a2..8868700a2b3b 100644 --- a/code/core/scripts/helpers/generatePackageJsonFile.ts +++ b/code/core/scripts/helpers/generatePackageJsonFile.ts @@ -40,7 +40,7 @@ export async function generatePackageJsonFile(entries: ReturnType { + if (code != null) { + process.exit(code); + } + process.exit(1); + }); +} diff --git a/code/lib/cli/core/bin/index.cjs b/code/lib/cli/core/bin/index.cjs new file mode 100644 index 000000000000..025637e335d7 --- /dev/null +++ b/code/lib/cli/core/bin/index.cjs @@ -0,0 +1 @@ +module.exports = require('@storybook/core/bin'); diff --git a/code/lib/cli/core/bin/index.js b/code/lib/cli/core/bin/index.js new file mode 100644 index 000000000000..4ba0fd70532a --- /dev/null +++ b/code/lib/cli/core/bin/index.js @@ -0,0 +1 @@ +export * from '@storybook/core/bin'; diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 9aa43e3a444a..3e830a2240ea 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -193,6 +193,10 @@ }, "./internal/preview/runtime": { "import": "./core/preview/runtime.js" + }, + "./internal/bin": { + "import": "./core/bin/index.js", + "require": "./core/bin/index.cjs" } }, "main": "dist/index.cjs", diff --git a/code/yarn.lock b/code/yarn.lock index 13e798756fd5..37f5a5b12899 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6314,6 +6314,8 @@ __metadata: peerDependenciesMeta: prettier: optional: true + bin: + core: ./bin/index.cjs languageName: unknown linkType: soft From ac6e73b9d8ce31dd9acc80999c8d7c22a111f3cc Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 2 Jan 2025 13:35:54 +0100 Subject: [PATCH 2/9] add bin to core --- .../test/src/node/boot-test-runner.test.ts | 5 +- .../addons/test/src/node/test-manager.test.ts | 4 +- code/addons/test/src/postinstall.ts | 5 +- code/core/package.json | 54 ++-- code/core/scripts/dts.ts | 36 +-- .../helpers/generatePackageJsonFile.ts | 2 +- code/core/scripts/helpers/sourcefiles.ts | 1 + code/core/scripts/prep.ts | 6 +- code/core/src/bin/index.ts | 4 +- code/core/src/builder-manager/index.ts | 11 +- code/core/src/builder-manager/types.ts | 2 +- code/core/src/builder-manager/utils/data.ts | 4 +- .../src/builder-manager/utils/framework.ts | 7 +- .../builder-manager/utils/managerEntries.ts | 2 +- .../src/builder-manager/utils/template.ts | 4 +- .../channels/postmessage/getEventSourceUrl.ts | 2 +- code/core/src/channels/postmessage/index.ts | 6 +- code/core/src/channels/websocket/index.ts | 4 +- code/core/src/cli/angular/helpers.ts | 4 +- code/core/src/cli/bin/index.ts | 7 +- code/core/src/cli/build.ts | 5 +- code/core/src/cli/detect.test.ts | 7 +- code/core/src/cli/detect.ts | 7 +- code/core/src/cli/dev.ts | 9 +- code/core/src/cli/dirs.ts | 6 +- code/core/src/cli/eslintPlugin.ts | 7 +- code/core/src/cli/helpers.test.ts | 2 +- code/core/src/cli/helpers.ts | 6 +- code/core/src/cli/project_types.ts | 2 +- code/core/src/client-logger/README.md | 2 +- .../src/common/js-package-manager/BUNProxy.ts | 4 +- .../js-package-manager/NPMProxy.test.ts | 34 +- .../src/common/js-package-manager/NPMProxy.ts | 4 +- .../js-package-manager/PNPMProxy.test.ts | 22 +- .../common/js-package-manager/PNPMProxy.ts | 2 +- .../common/js-package-manager/PackageJson.ts | 2 +- .../js-package-manager/Yarn1Proxy.test.ts | 22 +- .../common/js-package-manager/Yarn1Proxy.ts | 2 +- .../js-package-manager/Yarn2Proxy.test.ts | 26 +- .../common/js-package-manager/Yarn2Proxy.ts | 2 +- code/core/src/common/presets.test.ts | 4 +- code/core/src/common/presets.ts | 7 +- .../utils/__tests__/check-addon-order.test.ts | 5 +- .../utils/__tests__/normalize-stories.test.ts | 2 +- .../common/utils/__tests__/template.test.ts | 2 +- .../src/common/utils/check-addon-order.ts | 5 +- code/core/src/common/utils/cli.test.ts | 2 +- .../src/common/utils/framework-to-renderer.ts | 4 +- .../src/common/utils/get-builder-options.ts | 2 +- .../src/common/utils/get-framework-name.ts | 2 +- .../src/common/utils/get-renderer-name.ts | 2 +- code/core/src/common/utils/get-story-id.ts | 8 +- .../src/common/utils/get-storybook-info.ts | 4 +- .../src/common/utils/get-storybook-refs.ts | 5 +- .../src/common/utils/load-custom-presets.ts | 2 +- .../core/src/common/utils/load-main-config.ts | 8 +- .../utils/load-manager-or-addons-file.ts | 2 +- .../src/common/utils/normalize-stories.ts | 5 +- code/core/src/common/utils/remove.ts | 2 +- code/core/src/common/utils/template.ts | 4 +- code/core/src/common/utils/validate-config.ts | 2 +- .../utils/validate-configuration-files.ts | 4 +- code/core/src/common/versions.ts | 4 +- code/core/src/components/brand/SideBySide.tsx | 2 +- .../src/components/brand/colorpalette.mdx | 2 +- code/core/src/components/brand/typography.mdx | 2 +- .../components/ActionBar/ActionBar.tsx | 2 +- .../src/components/components/Badge/Badge.tsx | 2 +- .../components/components/Button/Button.tsx | 5 +- .../ErrorFormatter/ErrorFormatter.tsx | 3 +- .../components/components/Loader/Loader.tsx | 3 +- .../components/Modal/Modal.styled.tsx | 3 +- .../ProgressSpinner/ProgressSpinner.tsx | 2 +- .../ScrollArea/ScrollArea.stories.tsx | 2 +- .../components/ScrollArea/ScrollArea.tsx | 2 +- .../components/Zoom/ZoomElement.tsx | 2 +- .../src/components/components/bar/bar.tsx | 2 +- .../src/components/components/bar/button.tsx | 2 +- .../components/components/bar/separator.tsx | 2 +- .../components/clipboard/ClipboardCode.tsx | 2 +- .../components/form/field/field.tsx | 2 +- .../components/form/form.stories.tsx | 2 +- .../src/components/components/form/index.tsx | 2 +- .../components/form/input/input.tsx | 4 +- .../components/icon/icon.stories.tsx | 2 +- .../src/components/components/icon/icon.tsx | 6 +- .../components/placeholder/placeholder.tsx | 2 +- .../components/components/shared/animation.ts | 2 +- .../components/spaced/Spaced.stories.tsx | 2 +- .../components/components/spaced/Spaced.tsx | 2 +- .../syntaxhighlighter.stories.tsx | 2 +- .../syntaxhighlighter/syntaxhighlighter.tsx | 6 +- .../tabs/EmptyTabContent.stories.tsx | 3 +- .../components/tabs/EmptyTabContent.tsx | 2 +- .../components/tabs/tabs.helpers.tsx | 4 +- .../components/components/tabs/tabs.hooks.tsx | 3 +- .../src/components/components/tabs/tabs.tsx | 5 +- .../components/tooltip/ListItem.tsx | 2 +- .../components/tooltip/Tooltip.stories.tsx | 2 +- .../components/components/tooltip/Tooltip.tsx | 2 +- .../components/tooltip/TooltipLinkList.tsx | 2 +- .../components/tooltip/TooltipMessage.tsx | 2 +- .../components/tooltip/TooltipNote.tsx | 2 +- .../tooltip/WithTooltip.stories.tsx | 3 +- .../components/tooltip/WithTooltip.tsx | 3 +- .../components/typography/DocumentWrapper.tsx | 2 +- .../components/typography/ResetWrapper.tsx | 2 +- .../components/typography/elements/A.tsx | 2 +- .../typography/elements/Blockquote.tsx | 2 +- .../components/typography/elements/Code.tsx | 2 +- .../components/typography/elements/DL.tsx | 2 +- .../components/typography/elements/Div.tsx | 2 +- .../components/typography/elements/H1.tsx | 2 +- .../components/typography/elements/H2.tsx | 2 +- .../components/typography/elements/H3.tsx | 2 +- .../components/typography/elements/H4.tsx | 2 +- .../components/typography/elements/H5.tsx | 2 +- .../components/typography/elements/H6.tsx | 2 +- .../components/typography/elements/HR.tsx | 2 +- .../components/typography/elements/Img.tsx | 2 +- .../components/typography/elements/LI.tsx | 4 +- .../components/typography/elements/OL.tsx | 4 +- .../components/typography/elements/P.tsx | 4 +- .../components/typography/elements/Pre.tsx | 2 +- .../components/typography/elements/Span.tsx | 2 +- .../components/typography/elements/TT.tsx | 2 +- .../components/typography/elements/Table.tsx | 2 +- .../components/typography/elements/UL.tsx | 4 +- .../components/typography/lib/common.tsx | 2 +- .../components/typography/link/link.test.tsx | 2 +- .../components/typography/link/link.tsx | 3 +- .../src/core-events/data/testing-module.ts | 2 +- code/core/src/core-server/build-dev.ts | 18 +- code/core/src/core-server/build-static.ts | 20 +- code/core/src/core-server/dev-server.ts | 9 +- code/core/src/core-server/index.ts | 2 +- code/core/src/core-server/load.ts | 13 +- .../src/core-server/presets/common-manager.ts | 4 +- .../presets/common-override-preset.ts | 2 +- .../src/core-server/presets/common-preset.ts | 17 +- .../src/core-server/presets/favicon.test.ts | 6 +- .../create-new-story-channel.test.ts | 13 +- .../create-new-story-channel.ts | 13 +- .../file-search-channel.test.ts | 16 +- .../server-channel/file-search-channel.ts | 13 +- code/core/src/core-server/standalone.ts | 2 +- code/core/src/core-server/typings.d.ts | 4 +- .../utils/StoryIndexGenerator.test.ts | 16 +- .../core-server/utils/StoryIndexGenerator.ts | 12 +- .../utils/__tests__/index-extraction.test.ts | 6 +- .../__tests__/remove-mdx-stories.test.ts | 4 +- .../utils/__tests__/server-channel.test.ts | 2 +- code/core/src/core-server/utils/autoName.ts | 2 +- .../src/core-server/utils/build-or-throw.ts | 2 +- code/core/src/core-server/utils/constants.ts | 2 +- .../utils/copy-all-static-files.ts | 5 +- .../core/src/core-server/utils/doTelemetry.ts | 4 +- .../src/core-server/utils/get-builders.ts | 7 +- .../utils/get-new-story-file.test.ts | 4 +- .../core-server/utils/get-new-story-file.ts | 7 +- .../core-server/utils/get-server-channel.ts | 4 +- .../utils/getStoryIndexGenerator.ts | 4 +- code/core/src/core-server/utils/metadata.ts | 2 +- .../src/core-server/utils/open-in-browser.ts | 2 +- .../utils/output-startup-information.ts | 5 +- .../src/core-server/utils/output-stats.ts | 5 +- .../utils/parser/generic-parser.ts | 2 +- .../src/core-server/utils/parser/index.ts | 2 +- .../core-server/utils/remove-mdx-entries.ts | 4 +- .../duplicate-story-with-new-name.test.ts | 2 +- .../duplicate-story-with-new-name.ts | 5 +- .../utils/save-story/save-story.ts | 20 +- .../update-args-in-csf-file.test.ts | 2 +- .../save-story/update-args-in-csf-file.ts | 2 +- .../utils/save-story/valueToAST.ts | 2 +- .../core-server/utils/server-address.test.ts | 2 +- .../src/core-server/utils/server-address.ts | 2 +- .../core/src/core-server/utils/server-init.ts | 2 +- .../src/core-server/utils/server-statics.ts | 7 +- .../core-server/utils/stories-json.test.ts | 7 +- .../src/core-server/utils/stories-json.ts | 5 +- .../src/core-server/utils/summarizeIndex.ts | 4 +- .../src/core-server/utils/summarizeStats.ts | 2 +- .../src/core-server/utils/update-check.ts | 7 +- .../src/core-server/utils/versionStatus.ts | 2 +- .../utils/warnOnIncompatibleAddons.ts | 2 +- .../utils/warnWhenUsingArgTypesRegex.ts | 7 +- .../utils/watch-story-specifiers.test.ts | 2 +- .../utils/watch-story-specifiers.ts | 4 +- .../core/src/core-server/utils/watchConfig.ts | 2 +- code/core/src/core-server/utils/whats-new.ts | 17 +- .../src/core-server/withTelemetry.test.ts | 8 +- code/core/src/core-server/withTelemetry.ts | 11 +- code/core/src/csf-tools/ConfigFile.test.ts | 2 +- code/core/src/csf-tools/ConfigFile.ts | 2 +- code/core/src/csf-tools/CsfFile.ts | 5 +- code/core/src/csf-tools/enrichCsf.ts | 2 +- .../src/csf-tools/findVarInitialization.ts | 2 +- .../src/csf-tools/getStorySortParameter.ts | 2 +- code/core/src/csf-tools/index.ts | 2 +- .../vitest-plugin/transformer.test.ts | 6 +- .../csf-tools/vitest-plugin/transformer.ts | 7 +- .../argTypes/convert/convert.test.ts | 2 +- .../argTypes/convert/flow/convert.ts | 5 +- .../argTypes/convert/proptypes/convert.ts | 2 +- .../argTypes/convert/typescript/convert.ts | 5 +- .../src/docs-tools/argTypes/docgen/types.ts | 2 +- .../argTypes/enhanceArgTypes.test.ts | 2 +- .../docs-tools/argTypes/enhanceArgTypes.ts | 5 +- code/core/src/docs-tools/hasDocsOrControls.ts | 2 +- code/core/src/manager-api/lib/addons.ts | 12 +- code/core/src/manager-api/lib/events.ts | 5 +- code/core/src/manager-api/lib/merge.ts | 2 +- .../src/manager-api/lib/request-response.ts | 5 +- code/core/src/manager-api/lib/stories.test.ts | 2 +- code/core/src/manager-api/lib/stories.ts | 3 +- .../manager-api/lib/storybook-channel-mock.ts | 2 +- code/core/src/manager-api/lib/types.tsx | 4 +- code/core/src/manager-api/modules/addons.ts | 4 +- code/core/src/manager-api/modules/channel.ts | 4 +- .../modules/experimental_testmodule.ts | 5 +- code/core/src/manager-api/modules/globals.ts | 7 +- code/core/src/manager-api/modules/layout.ts | 10 +- .../src/manager-api/modules/notifications.ts | 2 +- code/core/src/manager-api/modules/provider.ts | 2 +- code/core/src/manager-api/modules/refs.ts | 3 +- code/core/src/manager-api/modules/settings.ts | 2 +- .../core/src/manager-api/modules/shortcuts.ts | 6 +- code/core/src/manager-api/modules/stories.ts | 46 +-- code/core/src/manager-api/modules/url.ts | 12 +- code/core/src/manager-api/modules/versions.ts | 3 +- .../core/src/manager-api/modules/whatsnew.tsx | 10 +- code/core/src/manager-api/root.tsx | 21 +- .../core/src/manager-api/tests/addons.test.js | 2 +- .../src/manager-api/tests/globals.test.ts | 9 +- .../core/src/manager-api/tests/layout.test.ts | 6 +- .../manager-api/tests/mockStoriesEntries.ts | 2 +- code/core/src/manager-api/tests/refs.test.ts | 3 +- .../src/manager-api/tests/stories.test.ts | 8 +- code/core/src/manager-api/tests/url.test.js | 4 +- .../src/manager-api/tests/versions.test.js | 4 +- code/core/src/manager-api/typings.d.ts | 4 +- code/core/src/manager/App.tsx | 4 +- code/core/src/manager/FakeProvider.tsx | 5 +- .../components/layout/Layout.stories.tsx | 5 +- .../src/manager/components/layout/Layout.tsx | 6 +- .../mobile/about/MobileAbout.stories.tsx | 4 +- .../components/mobile/about/MobileAbout.tsx | 5 +- .../mobile/navigation/MobileAddonsDrawer.tsx | 2 +- .../mobile/navigation/MobileMenuDrawer.tsx | 2 +- .../navigation/MobileNavigation.stories.tsx | 4 +- .../mobile/navigation/MobileNavigation.tsx | 8 +- .../NotificationItem.stories.tsx | 3 +- .../notifications/NotificationItem.tsx | 12 +- .../NotificationList.stories.tsx | 3 +- .../notifications/NotificationList.tsx | 5 +- .../components/panel/Panel.stories.tsx | 7 +- .../src/manager/components/panel/Panel.tsx | 12 +- .../components/preview/FramesRenderer.tsx | 11 +- .../src/manager/components/preview/Iframe.tsx | 4 +- .../manager/components/preview/Preview.tsx | 10 +- .../manager/components/preview/Toolbar.tsx | 12 +- .../manager/components/preview/Wrappers.tsx | 4 +- .../components/preview/tools/addons.tsx | 10 +- .../manager/components/preview/tools/copy.tsx | 10 +- .../components/preview/tools/eject.tsx | 10 +- .../manager/components/preview/tools/menu.tsx | 10 +- .../components/preview/tools/remount.tsx | 14 +- .../manager/components/preview/tools/zoom.tsx | 8 +- .../components/preview/utils/components.ts | 4 +- .../components/preview/utils/types.tsx | 5 +- .../src/manager/components/sidebar/Brand.tsx | 4 +- .../components/sidebar/ContextMenu.tsx | 14 +- .../sidebar/CreateNewStoryFileModal.tsx | 32 +- .../manager/components/sidebar/FileList.tsx | 2 +- .../components/sidebar/FileSearchList.tsx | 10 +- .../sidebar/FileSearchListSkeleton.tsx | 2 +- .../components/sidebar/FileSearchModal.tsx | 5 +- .../components/sidebar/FilterToggle.tsx | 4 +- .../components/sidebar/Heading.stories.tsx | 5 +- .../manager/components/sidebar/Heading.tsx | 6 +- .../components/sidebar/HighlightStyles.tsx | 2 +- .../components/sidebar/IconSymbols.tsx | 2 +- .../components/sidebar/LegacyRender.tsx | 10 +- .../src/manager/components/sidebar/Loader.tsx | 2 +- .../components/sidebar/Menu.stories.tsx | 8 +- .../src/manager/components/sidebar/Menu.tsx | 7 +- .../manager/components/sidebar/RefBlocks.tsx | 8 +- .../components/sidebar/RefIndicator.tsx | 10 +- .../components/sidebar/Refs.stories.tsx | 4 +- .../src/manager/components/sidebar/Refs.tsx | 7 +- .../components/sidebar/Search.stories.tsx | 6 +- .../src/manager/components/sidebar/Search.tsx | 8 +- .../sidebar/SearchResults.stories.tsx | 2 +- .../components/sidebar/SearchResults.tsx | 10 +- .../components/sidebar/Sidebar.stories.tsx | 8 +- .../manager/components/sidebar/Sidebar.tsx | 10 +- .../sidebar/SidebarBottom.stories.tsx | 6 +- .../components/sidebar/SidebarBottom.tsx | 9 +- .../components/sidebar/StatusButton.tsx | 5 +- .../components/sidebar/StatusContext.tsx | 4 +- .../manager/components/sidebar/TagsFilter.tsx | 8 +- .../components/sidebar/TagsFilterPanel.tsx | 8 +- .../sidebar/TestingModule.stories.tsx | 12 +- .../components/sidebar/TestingModule.tsx | 12 +- .../components/sidebar/Tree.stories.tsx | 8 +- .../src/manager/components/sidebar/Tree.tsx | 28 +- .../manager/components/sidebar/TreeNode.tsx | 2 +- .../sidebar/__tests__/Sidebar.test.tsx | 9 +- .../sidebar/components/CollapseIcon.tsx | 2 +- .../manager/components/sidebar/mockdata.ts | 2 +- .../src/manager/components/sidebar/types.ts | 5 +- .../manager/components/sidebar/useExpanded.ts | 8 +- .../components/sidebar/useHighlighted.ts | 6 +- .../upgrade/UpgradeBlock.stories.tsx | 4 +- .../components/upgrade/UpgradeBlock.tsx | 7 +- .../src/manager/container/Menu.stories.tsx | 3 +- code/core/src/manager/container/Menu.tsx | 12 +- .../src/manager/container/Notifications.tsx | 4 +- code/core/src/manager/container/Panel.tsx | 7 +- code/core/src/manager/container/Preview.tsx | 10 +- code/core/src/manager/container/Sidebar.tsx | 7 +- code/core/src/manager/globals-runtime.ts | 4 +- code/core/src/manager/globals/exports.ts | 163 +--------- code/core/src/manager/globals/globals.ts | 11 +- code/core/src/manager/globals/runtime.ts | 33 +- code/core/src/manager/index.tsx | 14 +- code/core/src/manager/provider.ts | 2 +- code/core/src/manager/runtime.ts | 14 +- code/core/src/manager/settings/About.tsx | 5 +- code/core/src/manager/settings/AboutPage.tsx | 2 +- .../src/manager/settings/SettingsFooter.tsx | 4 +- .../src/manager/settings/ShortcutsPage.tsx | 2 +- .../src/manager/settings/defaultShortcuts.tsx | 2 +- code/core/src/manager/settings/index.tsx | 12 +- code/core/src/manager/settings/shortcuts.tsx | 10 +- code/core/src/manager/settings/whats_new.tsx | 8 +- code/core/src/manager/typings.d.ts | 2 +- .../src/manager/utils/prepareForTelemetry.ts | 4 +- code/core/src/manager/utils/status.tsx | 5 +- code/core/src/manager/utils/tree.ts | 4 +- code/core/src/node-logger/README.md | 2 +- .../src/preview-api/modules/addons/hooks.ts | 20 +- .../src/preview-api/modules/addons/main.ts | 3 +- .../modules/addons/make-decorator.test.ts | 2 +- .../modules/addons/make-decorator.ts | 2 +- .../modules/addons/storybook-channel-mock.ts | 2 +- .../modules/preview-web/Preview.tsx | 54 ++-- .../PreviewWeb.integration.test.ts | 23 +- .../preview-web/PreviewWeb.mockdata.ts | 17 +- .../modules/preview-web/PreviewWeb.test.ts | 12 +- .../modules/preview-web/PreviewWeb.tsx | 5 +- .../preview-web/PreviewWithSelection.tsx | 13 +- .../modules/preview-web/SelectionStore.ts | 2 +- .../modules/preview-web/UrlStore.ts | 3 +- .../preview-api/modules/preview-web/View.ts | 2 +- .../modules/preview-web/WebView.ts | 6 +- .../docs-context/DocsContext.test.ts | 4 +- .../preview-web/docs-context/DocsContext.ts | 4 +- .../docs-context/DocsContextProps.ts | 2 +- .../docs-context/DocsRenderFunction.ts | 2 +- .../preview-web/docs-context/test-utils.ts | 2 +- .../preview-api/modules/preview-web/index.ts | 2 +- .../preview-web/parseArgsParam.test.ts | 2 +- .../modules/preview-web/parseArgsParam.ts | 5 +- .../preview-web/render/CsfDocsRender.test.ts | 4 +- .../preview-web/render/CsfDocsRender.ts | 13 +- .../preview-web/render/MdxDocsRender.test.ts | 4 +- .../preview-web/render/MdxDocsRender.ts | 13 +- .../modules/preview-web/render/Render.ts | 4 +- .../preview-web/render/StoryRender.test.ts | 10 +- .../modules/preview-web/render/StoryRender.ts | 26 +- .../modules/preview-web/render/mount-utils.ts | 2 +- .../modules/store/ArgsStore.test.ts | 2 +- .../preview-api/modules/store/ArgsStore.ts | 4 +- .../modules/store/GlobalsStore.test.ts | 2 +- .../preview-api/modules/store/GlobalsStore.ts | 5 +- .../modules/store/StoryIndexStore.test.ts | 2 +- .../modules/store/StoryIndexStore.ts | 7 +- .../modules/store/StoryStore.test.ts | 4 +- .../preview-api/modules/store/StoryStore.ts | 18 +- .../preview-api/modules/store/args.test.ts | 7 +- .../src/preview-api/modules/store/args.ts | 5 +- .../modules/store/autoTitle.test.ts | 2 +- .../preview-api/modules/store/autoTitle.ts | 5 +- .../modules/store/csf/composeConfigs.ts | 5 +- .../store/csf/getValuesFromArgTypes.ts | 2 +- .../csf/normalizeComponentAnnotations.ts | 5 +- .../modules/store/csf/normalizeInputTypes.ts | 2 +- .../store/csf/normalizeProjectAnnotations.ts | 5 +- .../modules/store/csf/normalizeStory.test.ts | 4 +- .../modules/store/csf/normalizeStory.ts | 8 +- .../store/csf/portable-stories.test.ts | 3 +- .../modules/store/csf/portable-stories.ts | 6 +- .../modules/store/csf/prepareStory.test.ts | 3 +- .../modules/store/csf/prepareStory.ts | 8 +- .../modules/store/csf/processCSFFile.ts | 12 +- .../modules/store/csf/stepRunners.test.ts | 2 +- .../modules/store/csf/stepRunners.ts | 2 +- .../modules/store/decorators.test.ts | 2 +- .../preview-api/modules/store/decorators.ts | 2 +- .../modules/store/filterArgTypes.ts | 2 +- .../preview-api/modules/store/hooks.test.ts | 7 +- .../modules/store/inferArgTypes.test.ts | 4 +- .../modules/store/inferArgTypes.ts | 5 +- .../modules/store/inferControls.test.ts | 5 +- .../modules/store/inferControls.ts | 5 +- .../preview-api/modules/store/parameters.ts | 2 +- .../preview-api/modules/store/sortStories.ts | 7 +- .../modules/store/storySort.test.ts | 2 +- .../preview-api/modules/store/storySort.ts | 4 +- code/core/src/preview/globals/globals.ts | 6 - code/core/src/preview/globals/runtime.ts | 20 +- code/core/src/preview/runtime.ts | 4 +- code/core/src/router/utils.test.ts | 2 +- code/core/src/router/utils.ts | 2 +- code/core/src/telemetry/anonymous-id.ts | 2 +- code/core/src/telemetry/event-cache.ts | 2 +- .../src/telemetry/get-chromatic-version.ts | 2 +- .../src/telemetry/get-framework-info.test.ts | 2 +- code/core/src/telemetry/get-framework-info.ts | 4 +- .../src/telemetry/get-monorepo-type.test.ts | 4 +- code/core/src/telemetry/get-monorepo-type.ts | 4 +- code/core/src/telemetry/index.ts | 2 +- code/core/src/telemetry/notify.ts | 2 +- code/core/src/telemetry/session-id.test.ts | 6 +- code/core/src/telemetry/session-id.ts | 2 +- .../src/telemetry/storybook-metadata.test.ts | 6 +- code/core/src/telemetry/storybook-metadata.ts | 7 +- code/core/src/telemetry/types.ts | 2 +- code/core/src/theming/ensure.ts | 2 +- code/core/src/theming/utils.ts | 4 +- code/core/src/types/modules/addons.ts | 2 +- code/core/src/types/modules/docs.ts | 2 +- .../template/stories/argMapping.stories.ts | 3 +- .../core/template/stories/argTypes.stories.ts | 3 +- code/core/template/stories/args.stories.ts | 10 +- .../template/stories/autotitle.stories.ts | 3 +- .../stories/component-play.stories.ts | 3 +- .../template/stories/decorators.stories.ts | 16 +- code/core/template/stories/globals.stories.ts | 3 +- code/core/template/stories/hooks.stories.ts | 6 +- code/core/template/stories/indexer.stories.ts | 3 +- code/core/template/stories/loaders.stories.ts | 3 +- code/core/template/stories/names.stories.ts | 3 +- .../template/stories/parameters.stories.ts | 3 +- code/core/template/stories/preview.ts | 2 +- .../template/stories/rendering.stories.ts | 10 +- .../template/stories/shortcuts.stories.ts | 4 +- .../core/template/stories/tags-add.stories.ts | 3 +- .../template/stories/tags-config.stories.ts | 3 +- .../template/stories/tags-remove.stories.ts | 3 +- code/core/template/stories/title.stories.ts | 3 +- .../missing-storybook-dependencies.test.ts | 4 +- .../fixes/missing-storybook-dependencies.ts | 4 +- .../src/automigrate/index.test.ts | 2 +- .../src/doctor/getDuplicatedDepsWarnings.ts | 1 - code/lib/cli-storybook/src/upgrade.test.ts | 4 - .../cli-storybook/test/default/cli.test.cjs | 18 +- code/lib/cli-storybook/test/helpers.cjs | 2 +- code/lib/cli/core/babel/index.cjs | 2 +- code/lib/cli/core/babel/index.d.ts | 4 +- code/lib/cli/core/babel/index.js | 2 +- code/lib/cli/core/bin/index.cjs | 2 +- code/lib/cli/core/bin/index.js | 2 +- code/lib/cli/core/builder-manager/index.cjs | 2 +- code/lib/cli/core/builder-manager/index.d.ts | 4 +- code/lib/cli/core/builder-manager/index.js | 2 +- code/lib/cli/core/channels/index.cjs | 2 +- code/lib/cli/core/channels/index.d.ts | 4 +- code/lib/cli/core/channels/index.js | 2 +- code/lib/cli/core/cli/bin/index.cjs | 2 +- code/lib/cli/core/cli/bin/index.d.ts | 4 +- code/lib/cli/core/cli/bin/index.js | 2 +- code/lib/cli/core/cli/index.cjs | 2 +- code/lib/cli/core/cli/index.d.ts | 4 +- code/lib/cli/core/cli/index.js | 2 +- code/lib/cli/core/client-logger/index.cjs | 2 +- code/lib/cli/core/client-logger/index.d.ts | 4 +- code/lib/cli/core/client-logger/index.js | 2 +- code/lib/cli/core/common/index.cjs | 2 +- code/lib/cli/core/common/index.d.ts | 4 +- code/lib/cli/core/common/index.js | 2 +- code/lib/cli/core/components/index.cjs | 2 +- code/lib/cli/core/components/index.d.ts | 4 +- code/lib/cli/core/components/index.js | 2 +- code/lib/cli/core/core-events/index.cjs | 2 +- code/lib/cli/core/core-events/index.d.ts | 4 +- code/lib/cli/core/core-events/index.js | 2 +- code/lib/cli/core/core-server/index.cjs | 2 +- code/lib/cli/core/core-server/index.d.ts | 4 +- code/lib/cli/core/core-server/index.js | 2 +- .../core-server/presets/common-manager.js | 2 +- .../presets/common-override-preset.cjs | 2 +- .../presets/common-override-preset.js | 2 +- .../core-server/presets/common-preset.cjs | 2 +- .../core/core-server/presets/common-preset.js | 2 +- code/lib/cli/core/csf-tools/index.cjs | 2 +- code/lib/cli/core/csf-tools/index.d.ts | 4 +- code/lib/cli/core/csf-tools/index.js | 2 +- code/lib/cli/core/docs-tools/index.cjs | 2 +- code/lib/cli/core/docs-tools/index.d.ts | 4 +- code/lib/cli/core/docs-tools/index.js | 2 +- code/lib/cli/core/index.cjs | 2 +- code/lib/cli/core/index.d.ts | 4 +- code/lib/cli/core/index.js | 2 +- code/lib/cli/core/manager-api/index.cjs | 2 +- code/lib/cli/core/manager-api/index.d.ts | 4 +- code/lib/cli/core/manager-api/index.js | 2 +- code/lib/cli/core/manager-errors.d.ts | 4 +- code/lib/cli/core/manager-errors.js | 2 +- .../cli/core/manager/globals-module-info.cjs | 2 +- .../cli/core/manager/globals-module-info.d.ts | 4 +- .../cli/core/manager/globals-module-info.js | 2 +- code/lib/cli/core/manager/globals-runtime.js | 2 +- code/lib/cli/core/manager/globals.cjs | 2 +- code/lib/cli/core/manager/globals.d.ts | 4 +- code/lib/cli/core/manager/globals.js | 2 +- code/lib/cli/core/node-logger/index.cjs | 2 +- code/lib/cli/core/node-logger/index.d.ts | 4 +- code/lib/cli/core/node-logger/index.js | 2 +- code/lib/cli/core/preview-api/index.cjs | 2 +- code/lib/cli/core/preview-api/index.d.ts | 4 +- code/lib/cli/core/preview-api/index.js | 2 +- code/lib/cli/core/preview-errors.cjs | 2 +- code/lib/cli/core/preview-errors.d.ts | 4 +- code/lib/cli/core/preview-errors.js | 2 +- code/lib/cli/core/preview/globals.cjs | 2 +- code/lib/cli/core/preview/globals.d.ts | 4 +- code/lib/cli/core/preview/globals.js | 2 +- code/lib/cli/core/preview/runtime.js | 2 +- code/lib/cli/core/router/index.cjs | 2 +- code/lib/cli/core/router/index.d.ts | 4 +- code/lib/cli/core/router/index.js | 2 +- code/lib/cli/core/server-errors.cjs | 2 +- code/lib/cli/core/server-errors.d.ts | 4 +- code/lib/cli/core/server-errors.js | 2 +- code/lib/cli/core/telemetry/index.cjs | 2 +- code/lib/cli/core/telemetry/index.d.ts | 4 +- code/lib/cli/core/telemetry/index.js | 2 +- code/lib/cli/core/theming/create.cjs | 2 +- code/lib/cli/core/theming/create.d.ts | 4 +- code/lib/cli/core/theming/create.js | 2 +- code/lib/cli/core/theming/index.cjs | 2 +- code/lib/cli/core/theming/index.d.ts | 4 +- code/lib/cli/core/theming/index.js | 2 +- code/lib/cli/core/types/index.cjs | 2 +- code/lib/cli/core/types/index.d.ts | 4 +- code/lib/cli/core/types/index.js | 2 +- code/lib/cli/package.json | 206 ++++++++++-- code/lib/cli/project.json | 2 +- code/lib/cli/scripts/utils.ts | 8 +- code/lib/cli/src/core-path.ts | 2 +- code/lib/cli/src/index.ts | 2 +- code/lib/cli/src/proxy.ts | 4 +- code/lib/codemod/package.json | 2 +- .../transforms/__tests__/transforms.tests.js | 2 +- code/lib/codemod/src/transforms/csf-2-to-3.ts | 9 +- .../src/transforms/find-implicit-spies.ts | 2 +- code/lib/codemod/src/transforms/mdx-to-csf.ts | 2 +- .../src/transforms/migrate-to-test-package.ts | 5 +- .../src/transforms/storiesof-to-csf.js | 4 +- .../transforms/upgrade-deprecated-types.ts | 5 +- .../src/generators/SVELTE/index.test.ts | 2 +- code/package.json | 1 - code/sandbox/angular-cli-15-ts/project.json | 1 - .../angular-cli-default-ts/project.json | 1 - .../angular-cli-prerelease/project.json | 1 - .../project.json | 1 - .../project.json | 1 - .../bench-react-vite-default-ts/project.json | 1 - .../project.json | 1 - .../bench-react-webpack-18-ts/project.json | 1 - code/sandbox/cra-default-js/project.json | 1 - code/sandbox/cra-default-ts/project.json | 1 - code/sandbox/ember-3-js/project.json | 1 - code/sandbox/ember-default-js/project.json | 1 - .../project.json | 1 - .../sandbox/html-vite-default-js/project.json | 1 - .../sandbox/html-vite-default-ts/project.json | 1 - .../sandbox/html-webpack-default/project.json | 1 - .../internal-react16-webpack/project.json | 1 - .../project.json | 1 - .../internal-server-webpack5/project.json | 1 - code/sandbox/lit-vite-default-js/project.json | 1 - code/sandbox/lit-vite-default-ts/project.json | 1 - code/sandbox/nextjs-13-ts/project.json | 1 - code/sandbox/nextjs-default-js/project.json | 1 - code/sandbox/nextjs-default-ts/project.json | 1 - code/sandbox/nextjs-prerelease/project.json | 1 - .../sandbox/nuxt-vite-default-ts/project.json | 1 - .../preact-vite-default-js/project.json | 1 - .../preact-vite-default-ts/project.json | 1 - .../sandbox/qwik-vite-default-ts/project.json | 1 - .../react-vite-default-js/project.json | 1 - .../react-vite-default-ts/project.json | 1 - code/sandbox/react-webpack-17-ts/project.json | 1 - code/sandbox/react-webpack-18-ts/project.json | 1 - .../solid-vite-default-js/project.json | 1 - .../solid-vite-default-ts/project.json | 1 - .../svelte-kit-prerelease-ts/project.json | 1 - .../svelte-kit-skeleton-js/project.json | 1 - .../svelte-kit-skeleton-ts/project.json | 1 - .../svelte-vite-default-js/project.json | 1 - .../svelte-vite-default-ts/project.json | 1 - code/sandbox/vue-cli-default-js/project.json | 1 - .../sandbox/vue3-vite-default-js/project.json | 1 - .../sandbox/vue3-vite-default-ts/project.json | 1 - code/yarn.lock | 301 +++++++++--------- .../storybook-monorepo-imports.js | 24 +- scripts/release/is-version-published.ts | 2 +- scripts/release/publish.ts | 2 +- scripts/tasks/sandbox-parts.ts | 2 +- test-storybooks/ember-cli/package.json | 7 +- test-storybooks/external-docs/package.json | 5 +- .../nextjs/package.json | 7 +- .../react/package.json | 7 +- .../svelte/package.json | 7 +- .../vue3/package.json | 5 +- .../server-kitchen-sink/package.json | 5 +- .../standalone-preview/package.json | 5 +- 621 files changed, 1800 insertions(+), 1897 deletions(-) diff --git a/code/addons/test/src/node/boot-test-runner.test.ts b/code/addons/test/src/node/boot-test-runner.test.ts index f5d9fde5bf28..e7171cf95df0 100644 --- a/code/addons/test/src/node/boot-test-runner.test.ts +++ b/code/addons/test/src/node/boot-test-runner.test.ts @@ -1,13 +1,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { Channel, type ChannelTransport } from '@storybook/core/channels'; - +import { Channel, type ChannelTransport } from 'storybook/internal/channels'; import { TESTING_MODULE_CANCEL_TEST_RUN_REQUEST, TESTING_MODULE_PROGRESS_REPORT, TESTING_MODULE_RUN_REQUEST, TESTING_MODULE_WATCH_MODE_REQUEST, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; // eslint-disable-next-line depend/ban-dependencies import { execaNode } from 'execa'; diff --git a/code/addons/test/src/node/test-manager.test.ts b/code/addons/test/src/node/test-manager.test.ts index 985f74c97595..27fc8d931c78 100644 --- a/code/addons/test/src/node/test-manager.test.ts +++ b/code/addons/test/src/node/test-manager.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it, vi } from 'vitest'; import { createVitest as actualCreateVitest } from 'vitest/node'; -import { Channel, type ChannelTransport } from '@storybook/core/channels'; -import type { StoryIndex } from '@storybook/types'; +import { Channel, type ChannelTransport } from 'storybook/internal/channels'; +import type { StoryIndex } from 'storybook/internal/types'; import path from 'pathe'; diff --git a/code/addons/test/src/postinstall.ts b/code/addons/test/src/postinstall.ts index b3c3dba95943..0f68424a5369 100644 --- a/code/addons/test/src/postinstall.ts +++ b/code/addons/test/src/postinstall.ts @@ -289,8 +289,7 @@ export default async function postInstall(options: PostinstallOptions) { args: ['playwright', 'install', 'chromium', '--with-deps'], }); - const fileExtension = - allDeps['typescript'] || (await findFile('tsconfig', ['.json'])) ? 'ts' : 'js'; + const fileExtension = allDeps.typescript || (await findFile('tsconfig', ['.json'])) ? 'ts' : 'js'; const vitestSetupFile = resolve(options.configDir, `vitest.setup.${fileExtension}`); if (existsSync(vitestSetupFile)) { @@ -542,7 +541,7 @@ async function getStorybookInfo({ configDir, packageManager: pkgMgr }: Postinsta const presets = await loadAllPresets({ corePresets: [join(frameworkName, 'preset')], overridePresets: [ - require.resolve('@storybook/core/core-server/presets/common-override-preset'), + require.resolve('storybook/internal/core-server/presets/common-override-preset'), ], configDir, packageJson, diff --git a/code/core/package.json b/code/core/package.json index 180861f922ed..a53babfe9dca 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/core", + "name": "storybook", "version": "8.5.0-beta.7", "description": "Storybook framework-agnostic API", "keywords": [ @@ -187,82 +187,82 @@ "*": [ "./dist/index.d.ts" ], - "node-logger": [ + "internal/node-logger": [ "./dist/node-logger/index.d.ts" ], - "client-logger": [ + "internal/client-logger": [ "./dist/client-logger/index.d.ts" ], - "theming": [ + "internal/theming": [ "./dist/theming/index.d.ts" ], - "theming/create": [ + "internal/theming/create": [ "./dist/theming/create.d.ts" ], - "core-server": [ + "internal/core-server": [ "./dist/core-server/index.d.ts" ], - "core-events": [ + "internal/core-events": [ "./dist/core-events/index.d.ts" ], - "manager-errors": [ + "internal/manager-errors": [ "./dist/manager-errors.d.ts" ], - "preview-errors": [ + "internal/preview-errors": [ "./dist/preview-errors.d.ts" ], - "server-errors": [ + "internal/server-errors": [ "./dist/server-errors.d.ts" ], - "channels": [ + "internal/channels": [ "./dist/channels/index.d.ts" ], - "types": [ + "internal/types": [ "./dist/types/index.d.ts" ], - "csf-tools": [ + "internal/csf-tools": [ "./dist/csf-tools/index.d.ts" ], - "common": [ + "internal/common": [ "./dist/common/index.d.ts" ], - "builder-manager": [ + "internal/builder-manager": [ "./dist/builder-manager/index.d.ts" ], - "telemetry": [ + "internal/telemetry": [ "./dist/telemetry/index.d.ts" ], - "preview-api": [ + "internal/preview-api": [ "./dist/preview-api/index.d.ts" ], - "manager-api": [ + "internal/manager-api": [ "./dist/manager-api/index.d.ts" ], - "router": [ + "internal/router": [ "./dist/router/index.d.ts" ], - "components": [ + "internal/components": [ "./dist/components/index.d.ts" ], - "docs-tools": [ + "internal/docs-tools": [ "./dist/docs-tools/index.d.ts" ], - "manager/globals-module-info": [ + "internal/manager/globals-module-info": [ "./dist/manager/globals-module-info.d.ts" ], - "manager/globals": [ + "internal/manager/globals": [ "./dist/manager/globals.d.ts" ], - "preview/globals": [ + "internal/preview/globals": [ "./dist/preview/globals.d.ts" ], - "cli": [ + "internal/cli": [ "./dist/cli/index.d.ts" ], - "babel": [ + "internal/babel": [ "./dist/babel/index.d.ts" ], - "cli/bin": [ + "internal/cli/bin": [ "./dist/cli/bin/index.d.ts" ] } diff --git a/code/core/scripts/dts.ts b/code/core/scripts/dts.ts index 93458c07dfac..31b7cee0a982 100644 --- a/code/core/scripts/dts.ts +++ b/code/core/scripts/dts.ts @@ -17,24 +17,24 @@ async function run() { ...Object.keys((pkg as any).peerDependencies || {}), ...nodeInternals, 'typescript', - '@storybook/core', - - '@storybook/core/builder-manager', - '@storybook/core/channels', - '@storybook/core/client-logger', - '@storybook/core/common', - '@storybook/core/components', - '@storybook/core/core-events', - '@storybook/core/core-server', - '@storybook/core/csf-tools', - '@storybook/core/docs-tools', - '@storybook/core/manager-api', - '@storybook/core/node-logger', - '@storybook/core/preview-api', - '@storybook/core/router', - '@storybook/core/telemetry', - '@storybook/core/theming', - '@storybook/core/types', + 'storybook', + + 'storybook/internal/builder-manager', + 'storybook/internal/channels', + 'storybook/internal/client-logger', + 'storybook/internal/common', + 'storybook/internal/components', + 'storybook/internal/core-events', + 'storybook/internal/core-server', + 'storybook/internal/csf-tools', + 'storybook/internal/docs-tools', + 'storybook/internal/manager-api', + 'storybook/internal/node-logger', + 'storybook/internal/preview-api', + 'storybook/internal/router', + 'storybook/internal/telemetry', + 'storybook/internal/theming', + 'storybook/internal/types', ]; const all = entries.filter((e) => e.dts); diff --git a/code/core/scripts/helpers/generatePackageJsonFile.ts b/code/core/scripts/helpers/generatePackageJsonFile.ts index 8868700a2b3b..020724b8113e 100644 --- a/code/core/scripts/helpers/generatePackageJsonFile.ts +++ b/code/core/scripts/helpers/generatePackageJsonFile.ts @@ -73,7 +73,7 @@ export async function generatePackageJsonFile(entries: ReturnType { diff --git a/code/core/scripts/prep.ts b/code/core/scripts/prep.ts index 895b8f049d32..6bf0edde8206 100644 --- a/code/core/scripts/prep.ts +++ b/code/core/scripts/prep.ts @@ -94,7 +94,7 @@ async function run() { assetNames: 'assets/[name]-[hash]', bundle: true, chunkNames: 'chunks/[name]-[hash]', - external: ['@storybook/core', ...external], + external: ['storybook', ...external], keepNames: true, legalComments: 'none', lineLimit: 140, @@ -192,7 +192,7 @@ async function run() { outExtension: { '.js': '.js' }, alias: { ...browserAliases, - '@storybook/core': join(cwd, 'src'), + 'storybook/internal': join(cwd, 'src'), react: dirname(require.resolve('react/package.json')), 'react-dom': dirname(require.resolve('react-dom/package.json')), 'react-dom/client': join( @@ -217,7 +217,7 @@ async function run() { esbuild.context( merge(browserEsbuildOptions, { alias: { - '@storybook/core': join(cwd, 'src'), + 'storybook/internal': join(cwd, 'src'), react: dirname(require.resolve('react/package.json')), 'react-dom': dirname(require.resolve('react-dom/package.json')), 'react-dom/client': join( diff --git a/code/core/src/bin/index.ts b/code/core/src/bin/index.ts index 12cac7558ae5..08376c5fef5b 100644 --- a/code/core/src/bin/index.ts +++ b/code/core/src/bin/index.ts @@ -1,11 +1,11 @@ -import { versions } from '@storybook/core/common'; +import { versions } from 'storybook/internal/common'; import { spawn } from 'child_process'; const args = process.argv.slice(2); if (['dev', 'build'].includes(args[0])) { - require('@storybook/core/cli/bin'); + require('storybook/internal/cli/bin'); } else { const proxiedArgs = args[0] === 'init' diff --git a/code/core/src/builder-manager/index.ts b/code/core/src/builder-manager/index.ts index faad0a288acf..b1cddcbe8048 100644 --- a/code/core/src/builder-manager/index.ts +++ b/code/core/src/builder-manager/index.ts @@ -1,10 +1,9 @@ import { cp, rm, writeFile } from 'node:fs/promises'; import { dirname, join, parse } from 'node:path'; -import { stringifyProcessEnvs } from '@storybook/core/common'; - -import { globalsModuleInfoMap } from '@storybook/core/manager/globals-module-info'; -import { logger } from '@storybook/core/node-logger'; +import { stringifyProcessEnvs } from 'storybook/internal/common'; +import { globalsModuleInfoMap } from 'storybook/internal/manager/globals-module-info'; +import { logger } from 'storybook/internal/node-logger'; import { globalExternals } from '@fal-works/esbuild-plugin-global-externals'; import { pnpPlugin } from '@yarnpkg/esbuild-plugin-pnp'; @@ -161,7 +160,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({ yield; const coreDirOrigin = join( - dirname(require.resolve('@storybook/core/package.json')), + dirname(require.resolve('storybook/internal/kage.json')), 'dist', 'manager' ); @@ -260,7 +259,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime, const addonsDir = config.outdir; const coreDirOrigin = join( - dirname(require.resolve('@storybook/core/package.json')), + dirname(require.resolve('storybook/internal/kage.json')), 'dist', 'manager' ); diff --git a/code/core/src/builder-manager/types.ts b/code/core/src/builder-manager/types.ts index e7541dced4bc..276083b198b1 100644 --- a/code/core/src/builder-manager/types.ts +++ b/code/core/src/builder-manager/types.ts @@ -3,7 +3,7 @@ import type { BuilderStats, Builder_Unpromise, Builder_WithRequiredProperty, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; import type { BuildOptions, BuildResult } from 'esbuild'; diff --git a/code/core/src/builder-manager/utils/data.ts b/code/core/src/builder-manager/utils/data.ts index 233d3186c38e..7defc2da7739 100644 --- a/code/core/src/builder-manager/utils/data.ts +++ b/code/core/src/builder-manager/utils/data.ts @@ -1,7 +1,7 @@ import { basename } from 'node:path'; -import { getRefs } from '@storybook/core/common'; -import type { Options } from '@storybook/core/types'; +import { getRefs } from 'storybook/internal/common'; +import type { Options } from 'storybook/internal/types'; import { executor, getConfig } from '../index'; import { readTemplate } from './template'; diff --git a/code/core/src/builder-manager/utils/framework.ts b/code/core/src/builder-manager/utils/framework.ts index d399494c049c..085fe63587dd 100644 --- a/code/core/src/builder-manager/utils/framework.ts +++ b/code/core/src/builder-manager/utils/framework.ts @@ -1,7 +1,10 @@ import { sep } from 'node:path'; -import { extractProperRendererNameFromFramework, getFrameworkName } from '@storybook/core/common'; -import type { Options } from '@storybook/core/types'; +import { + extractProperRendererNameFromFramework, + getFrameworkName, +} from 'storybook/internal/common'; +import type { Options } from 'storybook/internal/types'; interface PropertyObject { name: string; diff --git a/code/core/src/builder-manager/utils/managerEntries.ts b/code/core/src/builder-manager/utils/managerEntries.ts index 787116d05c0e..5edba8b6170e 100644 --- a/code/core/src/builder-manager/utils/managerEntries.ts +++ b/code/core/src/builder-manager/utils/managerEntries.ts @@ -2,7 +2,7 @@ import { existsSync } from 'node:fs'; import { mkdir, writeFile } from 'node:fs/promises'; import { dirname, join, parse, relative, sep } from 'node:path'; -import { resolvePathInStorybookCache } from '@storybook/core/common'; +import { resolvePathInStorybookCache } from 'storybook/internal/common'; import slash from 'slash'; diff --git a/code/core/src/builder-manager/utils/template.ts b/code/core/src/builder-manager/utils/template.ts index 1ca99e07e2e6..e9fc0eb93ce7 100644 --- a/code/core/src/builder-manager/utils/template.ts +++ b/code/core/src/builder-manager/utils/template.ts @@ -1,12 +1,12 @@ import { readFile } from 'node:fs/promises'; import { dirname, join } from 'node:path'; -import type { DocsOptions, Options, Ref, TagsOptions } from '@storybook/core/types'; +import type { DocsOptions, Options, Ref, TagsOptions } from 'storybook/internal/types'; import { render } from 'ejs'; export const getTemplatePath = async (template: string) => { - return join(dirname(require.resolve('@storybook/core/package.json')), 'assets/server', template); + return join(dirname(require.resolve('storybook/package.json')), 'assets/server', template); }; export const readTemplate = async (template: string) => { diff --git a/code/core/src/channels/postmessage/getEventSourceUrl.ts b/code/core/src/channels/postmessage/getEventSourceUrl.ts index 630002d38dfe..1be3c5742772 100644 --- a/code/core/src/channels/postmessage/getEventSourceUrl.ts +++ b/code/core/src/channels/postmessage/getEventSourceUrl.ts @@ -1,4 +1,4 @@ -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; export const getEventSourceUrl = (event: MessageEvent) => { const frames: HTMLIFrameElement[] = Array.from( diff --git a/code/core/src/channels/postmessage/index.ts b/code/core/src/channels/postmessage/index.ts index f7ae1d72b1a5..48506794229d 100644 --- a/code/core/src/channels/postmessage/index.ts +++ b/code/core/src/channels/postmessage/index.ts @@ -1,8 +1,8 @@ /// -import { global } from '@storybook/global'; +import { logger, pretty } from 'storybook/internal/client-logger'; +import * as EVENTS from 'storybook/internal/core-events'; -import { logger, pretty } from '@storybook/core/client-logger'; -import * as EVENTS from '@storybook/core/core-events'; +import { global } from '@storybook/global'; import { isJSON, parse, stringify } from 'telejson'; import invariant from 'tiny-invariant'; diff --git a/code/core/src/channels/websocket/index.ts b/code/core/src/channels/websocket/index.ts index 15033296512b..2867208938e2 100644 --- a/code/core/src/channels/websocket/index.ts +++ b/code/core/src/channels/websocket/index.ts @@ -1,7 +1,7 @@ /// -import { global } from '@storybook/global'; +import * as EVENTS from 'storybook/internal/core-events'; -import * as EVENTS from '@storybook/core/core-events'; +import { global } from '@storybook/global'; import { isJSON, parse, stringify } from 'telejson'; import invariant from 'tiny-invariant'; diff --git a/code/core/src/cli/angular/helpers.ts b/code/core/src/cli/angular/helpers.ts index 78ef8836996f..8c85756901e5 100644 --- a/code/core/src/cli/angular/helpers.ts +++ b/code/core/src/cli/angular/helpers.ts @@ -1,8 +1,8 @@ import { existsSync, readFileSync, writeFileSync } from 'node:fs'; import { join } from 'node:path'; -import { logger } from '@storybook/core/node-logger'; -import { MissingAngularJsonError } from '@storybook/core/server-errors'; +import { logger } from 'storybook/internal/node-logger'; +import { MissingAngularJsonError } from 'storybook/internal/server-errors'; import boxen from 'boxen'; import prompts from 'prompts'; diff --git a/code/core/src/cli/bin/index.ts b/code/core/src/cli/bin/index.ts index 060879635d61..d4a85724aef2 100644 --- a/code/core/src/cli/bin/index.ts +++ b/code/core/src/cli/bin/index.ts @@ -1,7 +1,6 @@ -import { getEnvConfig, parseList, versions } from '@storybook/core/common'; -import { addToGlobalContext } from '@storybook/core/telemetry'; - -import { logger } from '@storybook/core/node-logger'; +import { getEnvConfig, parseList, versions } from 'storybook/internal/common'; +import { logger } from 'storybook/internal/node-logger'; +import { addToGlobalContext } from 'storybook/internal/telemetry'; import { program } from 'commander'; import { findPackageSync } from 'fd-package-json'; diff --git a/code/core/src/cli/build.ts b/code/core/src/cli/build.ts index 2a8594cf76ed..a27fe6f27139 100644 --- a/code/core/src/cli/build.ts +++ b/code/core/src/cli/build.ts @@ -1,6 +1,5 @@ -import { cache } from '@storybook/core/common'; - -import { buildStaticStandalone, withTelemetry } from '@storybook/core/core-server'; +import { cache } from 'storybook/internal/common'; +import { buildStaticStandalone, withTelemetry } from 'storybook/internal/core-server'; import { findPackage } from 'fd-package-json'; import invariant from 'tiny-invariant'; diff --git a/code/core/src/cli/detect.test.ts b/code/core/src/cli/detect.test.ts index 409cf92effa7..f8ee8831ce67 100644 --- a/code/core/src/cli/detect.test.ts +++ b/code/core/src/cli/detect.test.ts @@ -2,9 +2,8 @@ import { existsSync } from 'node:fs'; import { afterEach, describe, expect, it, vi } from 'vitest'; -import type { JsPackageManager, PackageJsonWithMaybeDeps } from '@storybook/core/common'; - -import { logger } from '@storybook/core/node-logger'; +import type { JsPackageManager, PackageJsonWithMaybeDeps } from 'storybook/internal/common'; +import { logger } from 'storybook/internal/node-logger'; import { detect, detectFrameworkPreset, detectLanguage } from './detect'; import { ProjectType, SupportedLanguage } from './project_types'; @@ -27,7 +26,7 @@ vi.mock('fs', () => ({ mkdirSync: vi.fn(), })); -vi.mock('@storybook/core/node-logger'); +vi.mock('storybook/internal/node-logger'); const MOCK_FRAMEWORK_FILES: { name: string; diff --git a/code/core/src/cli/detect.ts b/code/core/src/cli/detect.ts index a771f6476f8c..b0ae0ffc7a41 100644 --- a/code/core/src/cli/detect.ts +++ b/code/core/src/cli/detect.ts @@ -1,10 +1,9 @@ import { existsSync } from 'node:fs'; import { resolve } from 'node:path'; -import type { JsPackageManager, PackageJsonWithMaybeDeps } from '@storybook/core/common'; -import { HandledError, commandLog } from '@storybook/core/common'; - -import { logger } from '@storybook/core/node-logger'; +import type { JsPackageManager, PackageJsonWithMaybeDeps } from 'storybook/internal/common'; +import { HandledError, commandLog } from 'storybook/internal/common'; +import { logger } from 'storybook/internal/node-logger'; import { findUpSync } from 'find-up'; import prompts from 'prompts'; diff --git a/code/core/src/cli/dev.ts b/code/core/src/cli/dev.ts index 26ff6250f3a8..7e96cc91b4ba 100644 --- a/code/core/src/cli/dev.ts +++ b/code/core/src/cli/dev.ts @@ -1,8 +1,7 @@ -import { cache } from '@storybook/core/common'; -import type { CLIOptions } from '@storybook/core/types'; - -import { buildDevStandalone, withTelemetry } from '@storybook/core/core-server'; -import { logger, instance as npmLog } from '@storybook/core/node-logger'; +import { cache } from 'storybook/internal/common'; +import { buildDevStandalone, withTelemetry } from 'storybook/internal/core-server'; +import { logger, instance as npmLog } from 'storybook/internal/node-logger'; +import type { CLIOptions } from 'storybook/internal/types'; import { findPackage } from 'fd-package-json'; import invariant from 'tiny-invariant'; diff --git a/code/core/src/cli/dirs.ts b/code/core/src/cli/dirs.ts index 6e6867e38d57..2feded6216c5 100644 --- a/code/core/src/cli/dirs.ts +++ b/code/core/src/cli/dirs.ts @@ -1,8 +1,8 @@ import { dirname, join } from 'node:path'; -import type { JsPackageManager } from '@storybook/core/common'; -import { temporaryDirectory, versions } from '@storybook/core/common'; -import type { SupportedFrameworks } from '@storybook/core/types'; +import { temporaryDirectory, versions } from 'storybook/internal/common'; +import type { JsPackageManager } from 'storybook/internal/common'; +import type { SupportedFrameworks } from 'storybook/internal/es'; import downloadTarballDefault from '@ndelangen/get-tarball'; import getNpmTarballUrlDefault from 'get-npm-tarball-url'; diff --git a/code/core/src/cli/eslintPlugin.ts b/code/core/src/cli/eslintPlugin.ts index 24903afc35cd..3ed59cfbf02b 100644 --- a/code/core/src/cli/eslintPlugin.ts +++ b/code/core/src/cli/eslintPlugin.ts @@ -1,10 +1,9 @@ import { existsSync } from 'node:fs'; import { readFile, writeFile } from 'node:fs/promises'; -import type { JsPackageManager } from '@storybook/core/common'; -import { paddedLog } from '@storybook/core/common'; - -import { readConfig, writeConfig } from '@storybook/core/csf-tools'; +import type { JsPackageManager } from 'storybook/internal/common'; +import { paddedLog } from 'storybook/internal/common'; +import { readConfig, writeConfig } from 'storybook/internal/csf-tools'; import detectIndent from 'detect-indent'; import picocolors from 'picocolors'; diff --git a/code/core/src/cli/helpers.test.ts b/code/core/src/cli/helpers.test.ts index 03e85ccc941d..ed13b7905a2c 100644 --- a/code/core/src/cli/helpers.test.ts +++ b/code/core/src/cli/helpers.test.ts @@ -3,7 +3,7 @@ import fsp from 'node:fs/promises'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; import { sep } from 'path'; diff --git a/code/core/src/cli/helpers.ts b/code/core/src/cli/helpers.ts index d5ebb9b65a2d..74e7a98b9a7a 100644 --- a/code/core/src/cli/helpers.ts +++ b/code/core/src/cli/helpers.ts @@ -7,9 +7,9 @@ import { type JsPackageManager, type PackageJson, type PackageJsonWithDepsAndDevDeps, -} from '@storybook/core/common'; -import { versions as storybookMonorepoPackages } from '@storybook/core/common'; -import type { SupportedFrameworks, SupportedRenderers } from '@storybook/core/types'; +} from 'storybook/internal/common'; +import { versions as storybookMonorepoPackages } from 'storybook/internal/common'; +import type { SupportedFrameworks, SupportedRenderers } from 'storybook/internal/es'; import { findUpSync } from 'find-up'; import picocolors from 'picocolors'; diff --git a/code/core/src/cli/project_types.ts b/code/core/src/cli/project_types.ts index d9ca64e25345..588ac3d14880 100644 --- a/code/core/src/cli/project_types.ts +++ b/code/core/src/cli/project_types.ts @@ -1,7 +1,7 @@ import type { SupportedRenderers as CoreSupportedRenderers, SupportedFrameworks, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; import { minVersion, validRange } from 'semver'; diff --git a/code/core/src/client-logger/README.md b/code/core/src/client-logger/README.md index 69ac1dbe5e23..5f04a63e34e5 100644 --- a/code/core/src/client-logger/README.md +++ b/code/core/src/client-logger/README.md @@ -5,7 +5,7 @@ Any client-side logging that is done through storybook should be done through th Examples: ```js -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; logger.info('Info message'); logger.warn('Warning message'); diff --git a/code/core/src/common/js-package-manager/BUNProxy.ts b/code/core/src/common/js-package-manager/BUNProxy.ts index 01ede64cfa5a..9cfbea194813 100644 --- a/code/core/src/common/js-package-manager/BUNProxy.ts +++ b/code/core/src/common/js-package-manager/BUNProxy.ts @@ -2,8 +2,8 @@ import { existsSync, readFileSync } from 'node:fs'; import { platform } from 'node:os'; import { join } from 'node:path'; -import { logger } from '@storybook/core/node-logger'; -import { FindPackageVersionsError } from '@storybook/core/server-errors'; +import { logger } from 'storybook/internal/node-logger'; +import { FindPackageVersionsError } from 'storybook/internal/server-errors'; import { findUp } from 'find-up'; import sort from 'semver/functions/sort.js'; diff --git a/code/core/src/common/js-package-manager/NPMProxy.test.ts b/code/core/src/common/js-package-manager/NPMProxy.test.ts index 11f34a986bf1..753b345f03c2 100644 --- a/code/core/src/common/js-package-manager/NPMProxy.test.ts +++ b/code/core/src/common/js-package-manager/NPMProxy.test.ts @@ -101,33 +101,33 @@ describe('NPM Proxy', () => { describe('addDependencies', () => { describe('npm6', () => { - it('with devDep it should run `npm install -D @storybook/core`', async () => { + it('with devDep it should run `npm install -D storybook`', async () => { const executeCommandSpy = vi .spyOn(npmProxy, 'executeCommand') .mockResolvedValueOnce('6.0.0'); - await npmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/core']); + await npmProxy.addDependencies({ installAsDevDependencies: true }, ['storybook']); expect(executeCommandSpy).toHaveBeenLastCalledWith( expect.objectContaining({ command: 'npm', - args: ['install', '-D', '@storybook/core'], + args: ['install', '-D', 'storybook'], }) ); }); }); describe('npm7', () => { - it('with devDep it should run `npm install -D @storybook/core`', async () => { + it('with devDep it should run `npm install -D storybook`', async () => { const executeCommandSpy = vi .spyOn(npmProxy, 'executeCommand') .mockResolvedValueOnce('7.0.0'); - await npmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/core']); + await npmProxy.addDependencies({ installAsDevDependencies: true }, ['storybook']); expect(executeCommandSpy).toHaveBeenLastCalledWith( expect.objectContaining({ command: 'npm', - args: ['install', '-D', '@storybook/core'], + args: ['install', '-D', 'storybook'], }) ); }); @@ -136,33 +136,33 @@ describe('NPM Proxy', () => { describe('removeDependencies', () => { describe('npm6', () => { - it('with devDep it should run `npm uninstall @storybook/core`', async () => { + it('with devDep it should run `npm uninstall storybook`', async () => { const executeCommandSpy = vi .spyOn(npmProxy, 'executeCommand') .mockResolvedValueOnce('6.0.0'); - npmProxy.removeDependencies({}, ['@storybook/core']); + npmProxy.removeDependencies({}, ['storybook']); expect(executeCommandSpy).toHaveBeenLastCalledWith( expect.objectContaining({ command: 'npm', - args: ['uninstall', '@storybook/core'], + args: ['uninstall', 'storybook'], }) ); }); }); describe('npm7', () => { - it('with devDep it should run `npm uninstall @storybook/core`', async () => { + it('with devDep it should run `npm uninstall storybook`', async () => { const executeCommandSpy = vi .spyOn(npmProxy, 'executeCommand') .mockResolvedValueOnce('7.0.0'); - await npmProxy.removeDependencies({}, ['@storybook/core']); + await npmProxy.removeDependencies({}, ['storybook']); expect(executeCommandSpy).toHaveBeenLastCalledWith( expect.objectContaining({ command: 'npm', - args: ['uninstall', '@storybook/core'], + args: ['uninstall', 'storybook'], }) ); }); @@ -205,12 +205,12 @@ describe('NPM Proxy', () => { .spyOn(npmProxy, 'executeCommand') .mockResolvedValueOnce('"5.3.19"'); - const version = await npmProxy.latestVersion('@storybook/core'); + const version = await npmProxy.latestVersion('storybook'); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'npm', - args: ['info', '@storybook/core', 'version', '--json'], + args: ['info', 'storybook', 'version', '--json'], }) ); expect(version).toEqual('5.3.19'); @@ -221,12 +221,12 @@ describe('NPM Proxy', () => { .spyOn(npmProxy, 'executeCommand') .mockResolvedValueOnce('["4.25.3","5.3.19","6.0.0-beta.23"]'); - const version = await npmProxy.latestVersion('@storybook/core', '5.X'); + const version = await npmProxy.latestVersion('storybook', '5.X'); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'npm', - args: ['info', '@storybook/core', 'versions', '--json'], + args: ['info', 'storybook', 'versions', '--json'], }) ); expect(version).toEqual('5.3.19'); @@ -235,7 +235,7 @@ describe('NPM Proxy', () => { it('throws an error if command output is not a valid JSON', async () => { vi.spyOn(npmProxy, 'executeCommand').mockResolvedValueOnce('NOT A JSON'); - await expect(npmProxy.latestVersion('@storybook/core')).rejects.toThrow(); + await expect(npmProxy.latestVersion('storybook')).rejects.toThrow(); }); }); diff --git a/code/core/src/common/js-package-manager/NPMProxy.ts b/code/core/src/common/js-package-manager/NPMProxy.ts index 5acc1a4dd18c..f8e0c6e928aa 100644 --- a/code/core/src/common/js-package-manager/NPMProxy.ts +++ b/code/core/src/common/js-package-manager/NPMProxy.ts @@ -2,8 +2,8 @@ import { existsSync, readFileSync } from 'node:fs'; import { platform } from 'node:os'; import { join } from 'node:path'; -import { logger } from '@storybook/core/node-logger'; -import { FindPackageVersionsError } from '@storybook/core/server-errors'; +import { logger } from 'storybook/internal/node-logger'; +import { FindPackageVersionsError } from 'storybook/internal/server-errors'; import { findUp } from 'find-up'; import sort from 'semver/functions/sort.js'; diff --git a/code/core/src/common/js-package-manager/PNPMProxy.test.ts b/code/core/src/common/js-package-manager/PNPMProxy.test.ts index f869dcb8181d..915fdc74415b 100644 --- a/code/core/src/common/js-package-manager/PNPMProxy.test.ts +++ b/code/core/src/common/js-package-manager/PNPMProxy.test.ts @@ -57,34 +57,34 @@ describe('PNPM Proxy', () => { }); describe('addDependencies', () => { - it('with devDep it should run `pnpm add -D @storybook/core`', async () => { + it('with devDep it should run `pnpm add -D storybook`', async () => { const executeCommandSpy = vi .spyOn(pnpmProxy, 'executeCommand') .mockResolvedValueOnce('6.0.0'); - await pnpmProxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/core']); + await pnpmProxy.addDependencies({ installAsDevDependencies: true }, ['storybook']); expect(executeCommandSpy).toHaveBeenLastCalledWith( expect.objectContaining({ command: 'pnpm', - args: ['add', '-D', '@storybook/core'], + args: ['add', '-D', 'storybook'], }) ); }); }); describe('removeDependencies', () => { - it('with devDep it should run `npm uninstall @storybook/core`', async () => { + it('with devDep it should run `npm uninstall storybook`', async () => { const executeCommandSpy = vi .spyOn(pnpmProxy, 'executeCommand') .mockResolvedValueOnce('6.0.0'); - await pnpmProxy.removeDependencies({}, ['@storybook/core']); + await pnpmProxy.removeDependencies({}, ['storybook']); expect(executeCommandSpy).toHaveBeenLastCalledWith( expect.objectContaining({ command: 'pnpm', - args: ['remove', '@storybook/core'], + args: ['remove', 'storybook'], }) ); }); @@ -127,12 +127,12 @@ describe('PNPM Proxy', () => { .spyOn(pnpmProxy, 'executeCommand') .mockResolvedValueOnce('"5.3.19"'); - const version = await pnpmProxy.latestVersion('@storybook/core'); + const version = await pnpmProxy.latestVersion('storybook'); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'pnpm', - args: ['info', '@storybook/core', 'version', '--json'], + args: ['info', 'storybook', 'version', '--json'], }) ); expect(version).toEqual('5.3.19'); @@ -143,12 +143,12 @@ describe('PNPM Proxy', () => { .spyOn(pnpmProxy, 'executeCommand') .mockResolvedValueOnce('["4.25.3","5.3.19","6.0.0-beta.23"]'); - const version = await pnpmProxy.latestVersion('@storybook/core', '5.X'); + const version = await pnpmProxy.latestVersion('storybook', '5.X'); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'pnpm', - args: ['info', '@storybook/core', 'versions', '--json'], + args: ['info', 'storybook', 'versions', '--json'], }) ); expect(version).toEqual('5.3.19'); @@ -157,7 +157,7 @@ describe('PNPM Proxy', () => { it('throws an error if command output is not a valid JSON', async () => { vi.spyOn(pnpmProxy, 'executeCommand').mockResolvedValueOnce('NOT A JSON'); - await expect(pnpmProxy.latestVersion('@storybook/core')).rejects.toThrow(); + await expect(pnpmProxy.latestVersion('storybook')).rejects.toThrow(); }); }); diff --git a/code/core/src/common/js-package-manager/PNPMProxy.ts b/code/core/src/common/js-package-manager/PNPMProxy.ts index 4149682c490b..a20eb4d488b1 100644 --- a/code/core/src/common/js-package-manager/PNPMProxy.ts +++ b/code/core/src/common/js-package-manager/PNPMProxy.ts @@ -1,7 +1,7 @@ import { existsSync, readFileSync } from 'node:fs'; import { join } from 'node:path'; -import { FindPackageVersionsError } from '@storybook/core/server-errors'; +import { FindPackageVersionsError } from 'storybook/internal/server-errors'; import { findUpSync } from 'find-up'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/common/js-package-manager/PackageJson.ts b/code/core/src/common/js-package-manager/PackageJson.ts index 0247740c807f..ba26248eee8d 100644 --- a/code/core/src/common/js-package-manager/PackageJson.ts +++ b/code/core/src/common/js-package-manager/PackageJson.ts @@ -1,4 +1,4 @@ -import type { PackageJson } from '@storybook/core/types'; +import type { PackageJson } from 'storybook/internal/types'; export type PackageJsonWithDepsAndDevDeps = PackageJson & Required>; diff --git a/code/core/src/common/js-package-manager/Yarn1Proxy.test.ts b/code/core/src/common/js-package-manager/Yarn1Proxy.test.ts index 69bbc046aaf0..b7905e25a75a 100644 --- a/code/core/src/common/js-package-manager/Yarn1Proxy.test.ts +++ b/code/core/src/common/js-package-manager/Yarn1Proxy.test.ts @@ -57,30 +57,30 @@ describe('Yarn 1 Proxy', () => { }); describe('addDependencies', () => { - it('with devDep it should run `yarn install -D --ignore-workspace-root-check @storybook/core`', async () => { + it('with devDep it should run `yarn install -D --ignore-workspace-root-check storybook`', async () => { const executeCommandSpy = vi.spyOn(yarn1Proxy, 'executeCommand').mockResolvedValueOnce(''); - await yarn1Proxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/core']); + await yarn1Proxy.addDependencies({ installAsDevDependencies: true }, ['storybook']); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'yarn', - args: ['add', '--ignore-workspace-root-check', '-D', '@storybook/core'], + args: ['add', '--ignore-workspace-root-check', '-D', 'storybook'], }) ); }); }); describe('removeDependencies', () => { - it('should run `yarn remove --ignore-workspace-root-check @storybook/core`', async () => { + it('should run `yarn remove --ignore-workspace-root-check storybook`', async () => { const executeCommandSpy = vi.spyOn(yarn1Proxy, 'executeCommand').mockResolvedValueOnce(''); - yarn1Proxy.removeDependencies({}, ['@storybook/core']); + yarn1Proxy.removeDependencies({}, ['storybook']); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'yarn', - args: ['remove', '--ignore-workspace-root-check', '@storybook/core'], + args: ['remove', '--ignore-workspace-root-check', 'storybook'], }) ); }); @@ -121,12 +121,12 @@ describe('Yarn 1 Proxy', () => { .spyOn(yarn1Proxy, 'executeCommand') .mockResolvedValueOnce('{"type":"inspect","data":"5.3.19"}'); - const version = await yarn1Proxy.latestVersion('@storybook/core'); + const version = await yarn1Proxy.latestVersion('storybook'); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'yarn', - args: ['info', '@storybook/core', 'version', '--json'], + args: ['info', 'storybook', 'version', '--json'], }) ); expect(version).toEqual('5.3.19'); @@ -137,12 +137,12 @@ describe('Yarn 1 Proxy', () => { .spyOn(yarn1Proxy, 'executeCommand') .mockResolvedValueOnce('{"type":"inspect","data":["4.25.3","5.3.19","6.0.0-beta.23"]}'); - const version = await yarn1Proxy.latestVersion('@storybook/core', '5.X'); + const version = await yarn1Proxy.latestVersion('storybook', '5.X'); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'yarn', - args: ['info', '@storybook/core', 'versions', '--json'], + args: ['info', 'storybook', 'versions', '--json'], }) ); expect(version).toEqual('5.3.19'); @@ -151,7 +151,7 @@ describe('Yarn 1 Proxy', () => { it('throws an error if command output is not a valid JSON', async () => { vi.spyOn(yarn1Proxy, 'executeCommand').mockResolvedValueOnce('NOT A JSON'); - await expect(yarn1Proxy.latestVersion('@storybook/core')).rejects.toThrow(); + await expect(yarn1Proxy.latestVersion('storybook')).rejects.toThrow(); }); }); diff --git a/code/core/src/common/js-package-manager/Yarn1Proxy.ts b/code/core/src/common/js-package-manager/Yarn1Proxy.ts index 72860a209a9a..699f817573f7 100644 --- a/code/core/src/common/js-package-manager/Yarn1Proxy.ts +++ b/code/core/src/common/js-package-manager/Yarn1Proxy.ts @@ -1,7 +1,7 @@ import { existsSync, readFileSync } from 'node:fs'; import { join } from 'node:path'; -import { FindPackageVersionsError } from '@storybook/core/server-errors'; +import { FindPackageVersionsError } from 'storybook/internal/server-errors'; import { findUp } from 'find-up'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/common/js-package-manager/Yarn2Proxy.test.ts b/code/core/src/common/js-package-manager/Yarn2Proxy.test.ts index fad7e829d180..d1bdf117313e 100644 --- a/code/core/src/common/js-package-manager/Yarn2Proxy.test.ts +++ b/code/core/src/common/js-package-manager/Yarn2Proxy.test.ts @@ -55,30 +55,30 @@ describe('Yarn 2 Proxy', () => { }); describe('addDependencies', () => { - it('with devDep it should run `yarn install -D @storybook/core`', async () => { + it('with devDep it should run `yarn install -D storybook`', async () => { const executeCommandSpy = vi.spyOn(yarn2Proxy, 'executeCommand').mockResolvedValueOnce(''); - await yarn2Proxy.addDependencies({ installAsDevDependencies: true }, ['@storybook/core']); + await yarn2Proxy.addDependencies({ installAsDevDependencies: true }, ['storybook']); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'yarn', - args: ['add', '-D', '@storybook/core'], + args: ['add', '-D', 'storybook'], }) ); }); }); describe('removeDependencies', () => { - it('should run `yarn remove @storybook/core`', async () => { + it('should run `yarn remove storybook`', async () => { const executeCommandSpy = vi.spyOn(yarn2Proxy, 'executeCommand').mockResolvedValueOnce(''); - await yarn2Proxy.removeDependencies({}, ['@storybook/core']); + await yarn2Proxy.removeDependencies({}, ['storybook']); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'yarn', - args: ['remove', '@storybook/core'], + args: ['remove', 'storybook'], }) ); }); @@ -117,14 +117,14 @@ describe('Yarn 2 Proxy', () => { it('without constraint it returns the latest version', async () => { const executeCommandSpy = vi .spyOn(yarn2Proxy, 'executeCommand') - .mockResolvedValueOnce('{"name":"@storybook/core","version":"5.3.19"}'); + .mockResolvedValueOnce('{"name":"storybook","version":"5.3.19"}'); - const version = await yarn2Proxy.latestVersion('@storybook/core'); + const version = await yarn2Proxy.latestVersion('storybook'); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'yarn', - args: ['npm', 'info', '@storybook/core', '--fields', 'version', '--json'], + args: ['npm', 'info', 'storybook', '--fields', 'version', '--json'], }) ); expect(version).toEqual('5.3.19'); @@ -134,15 +134,15 @@ describe('Yarn 2 Proxy', () => { const executeCommandSpy = vi .spyOn(yarn2Proxy, 'executeCommand') .mockResolvedValueOnce( - '{"name":"@storybook/core","versions":["4.25.3","5.3.19","6.0.0-beta.23"]}' + '{"name":"storybook","versions":["4.25.3","5.3.19","6.0.0-beta.23"]}' ); - const version = await yarn2Proxy.latestVersion('@storybook/core', '5.X'); + const version = await yarn2Proxy.latestVersion('storybook', '5.X'); expect(executeCommandSpy).toHaveBeenCalledWith( expect.objectContaining({ command: 'yarn', - args: ['npm', 'info', '@storybook/core', '--fields', 'versions', '--json'], + args: ['npm', 'info', 'storybook', '--fields', 'versions', '--json'], }) ); expect(version).toEqual('5.3.19'); @@ -151,7 +151,7 @@ describe('Yarn 2 Proxy', () => { it('throws an error if command output is not a valid JSON', async () => { vi.spyOn(yarn2Proxy, 'executeCommand').mockResolvedValueOnce('NOT A JSON'); - await expect(yarn2Proxy.latestVersion('@storybook/core')).rejects.toThrow(); + await expect(yarn2Proxy.latestVersion('storybook')).rejects.toThrow(); }); }); diff --git a/code/core/src/common/js-package-manager/Yarn2Proxy.ts b/code/core/src/common/js-package-manager/Yarn2Proxy.ts index 75b5b5878ba6..1bd8a44f5457 100644 --- a/code/core/src/common/js-package-manager/Yarn2Proxy.ts +++ b/code/core/src/common/js-package-manager/Yarn2Proxy.ts @@ -1,7 +1,7 @@ import { existsSync, readFileSync } from 'node:fs'; import { join } from 'node:path'; -import { FindPackageVersionsError } from '@storybook/core/server-errors'; +import { FindPackageVersionsError } from 'storybook/internal/server-errors'; import { PosixFS, VirtualFS, ZipOpenFS } from '@yarnpkg/fslib'; import { getLibzipSync } from '@yarnpkg/libzip'; diff --git a/code/core/src/common/presets.test.ts b/code/core/src/common/presets.test.ts index 565abe4521f4..3a9a6c701a3f 100644 --- a/code/core/src/common/presets.test.ts +++ b/code/core/src/common/presets.test.ts @@ -2,7 +2,7 @@ import { normalize } from 'node:path'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import mockRequire from 'mock-require'; @@ -19,7 +19,7 @@ function mockPreset(name: string, mockPresetObject: any) { mockRequire(name, mockPresetObject); } -vi.mock('@storybook/core/node-logger', () => ({ +vi.mock('storybook/internal/node-logger', () => ({ logger: { info: vi.fn(), warn: vi.fn(), diff --git a/code/core/src/common/presets.ts b/code/core/src/common/presets.ts index b85b35d62b77..aa5f2c605aa0 100644 --- a/code/core/src/common/presets.ts +++ b/code/core/src/common/presets.ts @@ -1,5 +1,7 @@ import { join, parse } from 'node:path'; +import { logger } from 'storybook/internal/node-logger'; +import { CriticalPresetLoadError } from 'storybook/internal/server-errors'; import type { BuilderOptions, CLIOptions, @@ -10,10 +12,7 @@ import type { PresetConfig, Presets, StorybookConfigRaw, -} from '@storybook/core/types'; - -import { logger } from '@storybook/core/node-logger'; -import { CriticalPresetLoadError } from '@storybook/core/server-errors'; +} from 'storybook/internal/types'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/common/utils/__tests__/check-addon-order.test.ts b/code/core/src/common/utils/__tests__/check-addon-order.test.ts index 5e7c0a43a106..ed603d4609c2 100644 --- a/code/core/src/common/utils/__tests__/check-addon-order.test.ts +++ b/code/core/src/common/utils/__tests__/check-addon-order.test.ts @@ -1,12 +1,11 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; +import { logger } from 'storybook/internal/node-logger'; import type { CoreCommon_AddonEntry, CoreCommon_AddonInfo, CoreCommon_OptionsEntry, -} from '@storybook/core/types'; - -import { logger } from '@storybook/core/node-logger'; +} from 'storybook/internal/types'; import { checkAddonOrder } from '../check-addon-order'; diff --git a/code/core/src/common/utils/__tests__/normalize-stories.test.ts b/code/core/src/common/utils/__tests__/normalize-stories.test.ts index 26e5f1bcc3c8..c104114f7e3f 100644 --- a/code/core/src/common/utils/__tests__/normalize-stories.test.ts +++ b/code/core/src/common/utils/__tests__/normalize-stories.test.ts @@ -3,7 +3,7 @@ import { sep } from 'node:path'; import { describe, expect, it, vi } from 'vitest'; -import { InvalidStoriesEntryError } from '@storybook/core/server-errors'; +import { InvalidStoriesEntryError } from 'storybook/internal/server-errors'; import { getDirectoryFromWorkingDir, diff --git a/code/core/src/common/utils/__tests__/template.test.ts b/code/core/src/common/utils/__tests__/template.test.ts index 93fdf7a8ed87..649db2c7b722 100644 --- a/code/core/src/common/utils/__tests__/template.test.ts +++ b/code/core/src/common/utils/__tests__/template.test.ts @@ -18,7 +18,7 @@ const BASE_HTML_CONTENTS = ''; const BASE_BODY_HTML_CONTENTS = '
story contents
'; const BODY_HTML_CONTENTS = '
custom body contents
'; -const base = dirname(require.resolve('@storybook/core/package.json')); +const base = dirname(require.resolve('storybook/package.json')); describe('server.getPreviewHeadHtml', () => { afterEach(() => { diff --git a/code/core/src/common/utils/check-addon-order.ts b/code/core/src/common/utils/check-addon-order.ts index 9d8f72669e0f..505376b5398f 100644 --- a/code/core/src/common/utils/check-addon-order.ts +++ b/code/core/src/common/utils/check-addon-order.ts @@ -1,10 +1,9 @@ +import { logger } from 'storybook/internal/node-logger'; import type { CoreCommon_AddonEntry, CoreCommon_AddonInfo, CoreCommon_OptionsEntry, -} from '@storybook/core/types'; - -import { logger } from '@storybook/core/node-logger'; +} from 'storybook/internal/types'; interface Options { before: CoreCommon_AddonInfo; diff --git a/code/core/src/common/utils/cli.test.ts b/code/core/src/common/utils/cli.test.ts index eecfcc648889..4c6d1e574e1d 100644 --- a/code/core/src/common/utils/cli.test.ts +++ b/code/core/src/common/utils/cli.test.ts @@ -6,7 +6,7 @@ describe('UTILS', () => { describe.each([ ['@storybook/react', true], ['@storybook/node-logger', true], - ['@storybook/core', true], + ['storybook', true], ['@storybook/linter-config', false], ['@storybook/design-system', false], ['@storybook/addon-styling', false], diff --git a/code/core/src/common/utils/framework-to-renderer.ts b/code/core/src/common/utils/framework-to-renderer.ts index 72cb4c1e2484..e77434a73898 100644 --- a/code/core/src/common/utils/framework-to-renderer.ts +++ b/code/core/src/common/utils/framework-to-renderer.ts @@ -1,5 +1,5 @@ -import type { SupportedFrameworks } from '@storybook/core/types'; -import type { SupportedRenderers } from '@storybook/core/types'; +import type { SupportedRenderers } from 'storybook/internal/types'; +import type { SupportedFrameworks } from 'storybook/internal/types'; export const frameworkToRenderer: Record< SupportedFrameworks | SupportedRenderers, diff --git a/code/core/src/common/utils/get-builder-options.ts b/code/core/src/common/utils/get-builder-options.ts index 99f39f766719..55ddc565ad63 100644 --- a/code/core/src/common/utils/get-builder-options.ts +++ b/code/core/src/common/utils/get-builder-options.ts @@ -1,4 +1,4 @@ -import type { Options } from '@storybook/core/types'; +import type { Options } from 'storybook/internal/types'; /** * Builder options can be specified in `core.builder.options` or `framework.options.builder`. diff --git a/code/core/src/common/utils/get-framework-name.ts b/code/core/src/common/utils/get-framework-name.ts index 25b45b772bd9..ba9d52c8d54e 100644 --- a/code/core/src/common/utils/get-framework-name.ts +++ b/code/core/src/common/utils/get-framework-name.ts @@ -1,4 +1,4 @@ -import type { Options } from '@storybook/core/types'; +import type { Options } from 'storybook/internal/types'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/common/utils/get-renderer-name.ts b/code/core/src/common/utils/get-renderer-name.ts index 75e95f76411f..8dab8e11e554 100644 --- a/code/core/src/common/utils/get-renderer-name.ts +++ b/code/core/src/common/utils/get-renderer-name.ts @@ -1,4 +1,4 @@ -import type { Options } from '@storybook/core/types'; +import type { Options } from 'storybook/internal/types'; import { frameworkToRenderer } from './framework-to-renderer'; import { extractProperFrameworkName, getFrameworkName } from './get-framework-name'; diff --git a/code/core/src/common/utils/get-story-id.ts b/code/core/src/common/utils/get-story-id.ts index 2275cdfcf8ce..1f5ab3827cfe 100644 --- a/code/core/src/common/utils/get-story-id.ts +++ b/code/core/src/common/utils/get-story-id.ts @@ -1,10 +1,10 @@ import { relative } from 'node:path'; -import { normalizeStories, normalizeStoryPath } from '@storybook/core/common'; -import type { Options, StoriesEntry } from '@storybook/core/types'; -import { sanitize, storyNameFromExport, toId } from '@storybook/csf'; +import { normalizeStories, normalizeStoryPath } from 'storybook/internal/common'; +import { userOrAutoTitleFromSpecifier } from 'storybook/internal/preview-api'; +import type { Options, StoriesEntry } from 'storybook/internal/types'; -import { userOrAutoTitleFromSpecifier } from '@storybook/core/preview-api'; +import { sanitize, storyNameFromExport, toId } from '@storybook/csf'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/common/utils/get-storybook-info.ts b/code/core/src/common/utils/get-storybook-info.ts index ce6d5670f7f1..e9160cef489b 100644 --- a/code/core/src/common/utils/get-storybook-info.ts +++ b/code/core/src/common/utils/get-storybook-info.ts @@ -1,8 +1,8 @@ import { existsSync } from 'node:fs'; import { join } from 'node:path'; -import type { SupportedFrameworks } from '@storybook/core/types'; -import type { CoreCommon_StorybookInfo, PackageJson } from '@storybook/core/types'; +import type { SupportedFrameworks } from 'storybook/internal/types'; +import type { CoreCommon_StorybookInfo, PackageJson } from 'storybook/internal/types'; import { getStorybookConfiguration } from './get-storybook-configuration'; diff --git a/code/core/src/common/utils/get-storybook-refs.ts b/code/core/src/common/utils/get-storybook-refs.ts index 4108ba969412..0b615b60a572 100644 --- a/code/core/src/common/utils/get-storybook-refs.ts +++ b/code/core/src/common/utils/get-storybook-refs.ts @@ -1,9 +1,8 @@ import { readFile } from 'node:fs/promises'; import { dirname, join } from 'node:path'; -import type { Options, Ref } from '@storybook/core/types'; - -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; +import type { Options, Ref } from 'storybook/internal/types'; import { findUp } from 'find-up'; import resolveFrom from 'resolve-from'; diff --git a/code/core/src/common/utils/load-custom-presets.ts b/code/core/src/common/utils/load-custom-presets.ts index dcb104351703..c5e2b272daef 100644 --- a/code/core/src/common/utils/load-custom-presets.ts +++ b/code/core/src/common/utils/load-custom-presets.ts @@ -1,6 +1,6 @@ import { resolve } from 'node:path'; -import type { PresetConfig } from '@storybook/core/types'; +import type { PresetConfig } from 'storybook/internal/types'; import { serverRequire, serverResolve } from './interpret-require'; import { validateConfigurationFiles } from './validate-configuration-files'; diff --git a/code/core/src/common/utils/load-main-config.ts b/code/core/src/common/utils/load-main-config.ts index e594a380d6f8..7403829e10ea 100644 --- a/code/core/src/common/utils/load-main-config.ts +++ b/code/core/src/common/utils/load-main-config.ts @@ -1,9 +1,11 @@ import { readFile } from 'node:fs/promises'; import { relative, resolve } from 'node:path'; -import type { StorybookConfig } from '@storybook/core/types'; - -import { MainFileESMOnlyImportError, MainFileEvaluationError } from '@storybook/core/server-errors'; +import { + MainFileESMOnlyImportError, + MainFileEvaluationError, +} from 'storybook/internal/server-errors'; +import type { StorybookConfig } from 'storybook/internal/types'; import { serverRequire, serverResolve } from './interpret-require'; import { validateConfigurationFiles } from './validate-configuration-files'; diff --git a/code/core/src/common/utils/load-manager-or-addons-file.ts b/code/core/src/common/utils/load-manager-or-addons-file.ts index a60fd6daf9ec..cb9d20261bd0 100644 --- a/code/core/src/common/utils/load-manager-or-addons-file.ts +++ b/code/core/src/common/utils/load-manager-or-addons-file.ts @@ -1,6 +1,6 @@ import { resolve } from 'node:path'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/common/utils/normalize-stories.ts b/code/core/src/common/utils/normalize-stories.ts index a001209f401b..cfdf5a52a67a 100644 --- a/code/core/src/common/utils/normalize-stories.ts +++ b/code/core/src/common/utils/normalize-stories.ts @@ -1,9 +1,8 @@ import { lstatSync } from 'node:fs'; import { basename, dirname, relative, resolve } from 'node:path'; -import type { NormalizedStoriesSpecifier, StoriesEntry } from '@storybook/core/types'; - -import { InvalidStoriesEntryError } from '@storybook/core/server-errors'; +import { InvalidStoriesEntryError } from 'storybook/internal/server-errors'; +import type { NormalizedStoriesSpecifier, StoriesEntry } from 'storybook/internal/types'; import * as pico from 'picomatch'; import slash from 'slash'; diff --git a/code/core/src/common/utils/remove.ts b/code/core/src/common/utils/remove.ts index 24879cf36169..91dda44dc357 100644 --- a/code/core/src/common/utils/remove.ts +++ b/code/core/src/common/utils/remove.ts @@ -1,4 +1,4 @@ -import { readConfig, writeConfig } from '@storybook/core/csf-tools'; +import { readConfig, writeConfig } from 'storybook/internal/csf-tools'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/common/utils/template.ts b/code/core/src/common/utils/template.ts index eb32545b7ea2..a92120c671ab 100644 --- a/code/core/src/common/utils/template.ts +++ b/code/core/src/common/utils/template.ts @@ -8,7 +8,7 @@ export function getPreviewBodyTemplate( configDirPath: string, interpolations?: Record ) { - const packageDir = dirname(require.resolve('@storybook/core/package.json')); + const packageDir = dirname(require.resolve('storybook/package.json')); const base = readFileSync(`${packageDir}/assets/server/base-preview-body.html`, 'utf8'); const bodyHtmlPath = resolve(configDirPath, 'preview-body.html'); @@ -25,7 +25,7 @@ export function getPreviewHeadTemplate( configDirPath: string, interpolations?: Record ) { - const packageDir = dirname(require.resolve('@storybook/core/package.json')); + const packageDir = dirname(require.resolve('storybook/package.json')); const base = readFileSync(`${packageDir}/assets/server/base-preview-head.html`, 'utf8'); const headHtmlPath = resolve(configDirPath, 'preview-head.html'); diff --git a/code/core/src/common/utils/validate-config.ts b/code/core/src/common/utils/validate-config.ts index 221ea9235522..388d915de105 100644 --- a/code/core/src/common/utils/validate-config.ts +++ b/code/core/src/common/utils/validate-config.ts @@ -4,7 +4,7 @@ import { CouldNotEvaluateFrameworkError, InvalidFrameworkNameError, MissingFrameworkFieldError, -} from '@storybook/core/server-errors'; +} from 'storybook/internal/server-errors'; import { frameworkPackages } from './get-storybook-info'; diff --git a/code/core/src/common/utils/validate-configuration-files.ts b/code/core/src/common/utils/validate-configuration-files.ts index ccd0dba864ea..735342881b82 100644 --- a/code/core/src/common/utils/validate-configuration-files.ts +++ b/code/core/src/common/utils/validate-configuration-files.ts @@ -1,7 +1,7 @@ import { resolve } from 'node:path'; -import { once } from '@storybook/core/node-logger'; -import { MainFileMissingError } from '@storybook/core/server-errors'; +import { once } from 'storybook/internal/node-logger'; +import { MainFileMissingError } from 'storybook/internal/server-errors'; // eslint-disable-next-line depend/ban-dependencies import { glob } from 'glob'; diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts index a422b03fabdd..622595339dca 100644 --- a/code/core/src/common/versions.ts +++ b/code/core/src/common/versions.ts @@ -21,7 +21,7 @@ export default { '@storybook/addon-viewport': '8.5.0-beta.7', '@storybook/builder-vite': '8.5.0-beta.7', '@storybook/builder-webpack5': '8.5.0-beta.7', - '@storybook/core': '8.5.0-beta.7', + storybook: '8.5.0-beta.7', '@storybook/builder-manager': '8.5.0-beta.7', '@storybook/channels': '8.5.0-beta.7', '@storybook/client-logger': '8.5.0-beta.7', @@ -60,7 +60,7 @@ export default { '@storybook/web-components-vite': '8.5.0-beta.7', '@storybook/web-components-webpack5': '8.5.0-beta.7', '@storybook/blocks': '8.5.0-beta.7', - storybook: '8.5.0-beta.7', + 'storybook-renamed': '8.5.0-beta.7', sb: '8.5.0-beta.7', '@storybook/cli': '8.5.0-beta.7', '@storybook/codemod': '8.5.0-beta.7', diff --git a/code/core/src/components/brand/SideBySide.tsx b/code/core/src/components/brand/SideBySide.tsx index a766c7c7d953..3ecc08dbc02e 100644 --- a/code/core/src/components/brand/SideBySide.tsx +++ b/code/core/src/components/brand/SideBySide.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; export const SideBySide = styled.div({ display: 'grid', diff --git a/code/core/src/components/brand/colorpalette.mdx b/code/core/src/components/brand/colorpalette.mdx index 582013002dac..6bdb70b69db6 100644 --- a/code/core/src/components/brand/colorpalette.mdx +++ b/code/core/src/components/brand/colorpalette.mdx @@ -1,6 +1,6 @@ import { Meta, ColorPalette, ColorItem } from '@storybook/blocks'; -import { themes, ThemeProvider, convert, ensure } from '@storybook/core/theming'; +import { themes, ThemeProvider, convert, ensure } from 'storybook/internal/theming'; import { SideBySide } from './SideBySide'; diff --git a/code/core/src/components/brand/typography.mdx b/code/core/src/components/brand/typography.mdx index 8e07423757c7..43b582aee66a 100644 --- a/code/core/src/components/brand/typography.mdx +++ b/code/core/src/components/brand/typography.mdx @@ -1,4 +1,4 @@ -import { typography } from '@storybook/core/theming'; +import { typography } from 'storybook/internal/theming'; import { Meta, Typeset } from '@storybook/blocks'; export const fontSizes = ['l3', 'l2', 'l1', 'm3', 'm2', 'm1', 's3', 's2', 's1'].map( diff --git a/code/core/src/components/components/ActionBar/ActionBar.tsx b/code/core/src/components/components/ActionBar/ActionBar.tsx index 6e3d15077e41..d509642a3ff5 100644 --- a/code/core/src/components/components/ActionBar/ActionBar.tsx +++ b/code/core/src/components/components/ActionBar/ActionBar.tsx @@ -1,7 +1,7 @@ import type { MouseEvent, ReactElement } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; const Container = styled.div(({ theme }) => ({ position: 'absolute', diff --git a/code/core/src/components/components/Badge/Badge.tsx b/code/core/src/components/components/Badge/Badge.tsx index a76cbd1121cc..e29ad43738ea 100644 --- a/code/core/src/components/components/Badge/Badge.tsx +++ b/code/core/src/components/components/Badge/Badge.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { transparentize } from 'polished'; diff --git a/code/core/src/components/components/Button/Button.tsx b/code/core/src/components/components/Button/Button.tsx index a1804ebac153..e6e6fb96ac08 100644 --- a/code/core/src/components/components/Button/Button.tsx +++ b/code/core/src/components/components/Button/Button.tsx @@ -1,9 +1,8 @@ import type { ButtonHTMLAttributes, SyntheticEvent } from 'react'; import React, { forwardRef, useEffect, useState } from 'react'; -import { isPropValid, styled } from '@storybook/core/theming'; - -import { deprecate } from '@storybook/core/client-logger'; +import { deprecate } from 'storybook/internal/client-logger'; +import { isPropValid, styled } from 'storybook/internal/theming'; import { Slot } from '@radix-ui/react-slot'; import { darken, lighten, rgba, transparentize } from 'polished'; diff --git a/code/core/src/components/components/ErrorFormatter/ErrorFormatter.tsx b/code/core/src/components/components/ErrorFormatter/ErrorFormatter.tsx index b33a4c2f4040..f04746aa9a5c 100644 --- a/code/core/src/components/components/ErrorFormatter/ErrorFormatter.tsx +++ b/code/core/src/components/components/ErrorFormatter/ErrorFormatter.tsx @@ -1,6 +1,7 @@ import React, { Fragment } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; + import { global } from '@storybook/global'; const { document } = global; diff --git a/code/core/src/components/components/Loader/Loader.tsx b/code/core/src/components/components/Loader/Loader.tsx index dace42a9b351..a1f48f4ffbce 100644 --- a/code/core/src/components/components/Loader/Loader.tsx +++ b/code/core/src/components/components/Loader/Loader.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { keyframes, styled } from '@storybook/core/theming'; +import { keyframes, styled } from 'storybook/internal/theming'; + import { LightningOffIcon } from '@storybook/icons'; import { transparentize } from 'polished'; diff --git a/code/core/src/components/components/Modal/Modal.styled.tsx b/code/core/src/components/components/Modal/Modal.styled.tsx index 37bb8be84404..24ca5cc0a252 100644 --- a/code/core/src/components/components/Modal/Modal.styled.tsx +++ b/code/core/src/components/components/Modal/Modal.styled.tsx @@ -1,7 +1,8 @@ import type { ComponentProps } from 'react'; import React from 'react'; -import { keyframes, styled } from '@storybook/core/theming'; +import { keyframes, styled } from 'storybook/internal/theming'; + import { CrossIcon } from '@storybook/icons'; import * as Dialog from '@radix-ui/react-dialog'; diff --git a/code/core/src/components/components/ProgressSpinner/ProgressSpinner.tsx b/code/core/src/components/components/ProgressSpinner/ProgressSpinner.tsx index 02f81ab6d344..99cb591c3083 100644 --- a/code/core/src/components/components/ProgressSpinner/ProgressSpinner.tsx +++ b/code/core/src/components/components/ProgressSpinner/ProgressSpinner.tsx @@ -1,6 +1,6 @@ import React, { type ComponentProps } from 'react'; -import { keyframes, styled } from '@storybook/core/theming'; +import { keyframes, styled } from 'storybook/internal/theming'; const XMLNS = 'http://www.w3.org/2000/svg'; diff --git a/code/core/src/components/components/ScrollArea/ScrollArea.stories.tsx b/code/core/src/components/components/ScrollArea/ScrollArea.stories.tsx index 134088a66eda..0fd154f1349c 100644 --- a/code/core/src/components/components/ScrollArea/ScrollArea.stories.tsx +++ b/code/core/src/components/components/ScrollArea/ScrollArea.stories.tsx @@ -1,7 +1,7 @@ import type { ReactElement } from 'react'; import React, { Fragment } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { ScrollArea } from './ScrollArea'; diff --git a/code/core/src/components/components/ScrollArea/ScrollArea.tsx b/code/core/src/components/components/ScrollArea/ScrollArea.tsx index 195f70d68b06..bffed73ab311 100644 --- a/code/core/src/components/components/ScrollArea/ScrollArea.tsx +++ b/code/core/src/components/components/ScrollArea/ScrollArea.tsx @@ -1,6 +1,6 @@ import React, { forwardRef } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area'; diff --git a/code/core/src/components/components/Zoom/ZoomElement.tsx b/code/core/src/components/components/Zoom/ZoomElement.tsx index 7fb8068a3d60..092ec91be700 100644 --- a/code/core/src/components/components/Zoom/ZoomElement.tsx +++ b/code/core/src/components/components/Zoom/ZoomElement.tsx @@ -1,7 +1,7 @@ import type { ReactElement } from 'react'; import React, { useCallback, useEffect, useRef, useState } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import type { ResizeHandler } from 'use-resize-observer'; import useResizeObserver from 'use-resize-observer'; diff --git a/code/core/src/components/components/bar/bar.tsx b/code/core/src/components/components/bar/bar.tsx index 571d84016620..96520daea99c 100644 --- a/code/core/src/components/components/bar/bar.tsx +++ b/code/core/src/components/components/bar/bar.tsx @@ -1,7 +1,7 @@ import type { ComponentProps } from 'react'; import React, { Children } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import type { ScrollAreaProps } from '../ScrollArea/ScrollArea'; import { ScrollArea } from '../ScrollArea/ScrollArea'; diff --git a/code/core/src/components/components/bar/button.tsx b/code/core/src/components/components/bar/button.tsx index dc1727d10b57..4a8a326e528e 100644 --- a/code/core/src/components/components/bar/button.tsx +++ b/code/core/src/components/components/bar/button.tsx @@ -9,7 +9,7 @@ import type { } from 'react'; import React, { forwardRef } from 'react'; -import { isPropValid, styled } from '@storybook/core/theming'; +import { isPropValid, styled } from 'storybook/internal/theming'; interface ButtonProps extends DetailedHTMLProps, HTMLButtonElement> { diff --git a/code/core/src/components/components/bar/separator.tsx b/code/core/src/components/components/bar/separator.tsx index dd06697e9af0..e72ed7e37f1d 100644 --- a/code/core/src/components/components/bar/separator.tsx +++ b/code/core/src/components/components/bar/separator.tsx @@ -1,6 +1,6 @@ import React, { Fragment } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; export interface SeparatorProps { force?: boolean; diff --git a/code/core/src/components/components/clipboard/ClipboardCode.tsx b/code/core/src/components/components/clipboard/ClipboardCode.tsx index bb9ffd1bf736..1ca8264cc9d7 100644 --- a/code/core/src/components/components/clipboard/ClipboardCode.tsx +++ b/code/core/src/components/components/clipboard/ClipboardCode.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { color, styled, typography } from '@storybook/core/theming'; +import { color, styled, typography } from 'storybook/internal/theming'; const Code = styled.pre` line-height: 18px; diff --git a/code/core/src/components/components/form/field/field.tsx b/code/core/src/components/components/form/field/field.tsx index ad43a1388781..388e8cb81c40 100644 --- a/code/core/src/components/components/form/field/field.tsx +++ b/code/core/src/components/components/form/field/field.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; const Wrapper = styled.label(({ theme }) => ({ display: 'flex', diff --git a/code/core/src/components/components/form/form.stories.tsx b/code/core/src/components/components/form/form.stories.tsx index a081368f6db9..1a2ba432cb70 100644 --- a/code/core/src/components/components/form/form.stories.tsx +++ b/code/core/src/components/components/form/form.stories.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { action } from '@storybook/addon-actions'; diff --git a/code/core/src/components/components/form/index.tsx b/code/core/src/components/components/form/index.tsx index 4eba4e779f11..ef6f9e9f5f93 100644 --- a/code/core/src/components/components/form/index.tsx +++ b/code/core/src/components/components/form/index.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { Button } from '../Button/Button'; import { Field } from './field/field'; diff --git a/code/core/src/components/components/form/input/input.tsx b/code/core/src/components/components/form/input/input.tsx index b32381ff107d..d684be0cd694 100644 --- a/code/core/src/components/components/form/input/input.tsx +++ b/code/core/src/components/components/form/input/input.tsx @@ -1,8 +1,8 @@ import type { HTMLProps, SelectHTMLAttributes } from 'react'; import React, { forwardRef } from 'react'; -import type { CSSObject, StorybookTheme } from '@storybook/core/theming'; -import { styled } from '@storybook/core/theming'; +import type { CSSObject, StorybookTheme } from 'storybook/internal/theming'; +import { styled } from 'storybook/internal/theming'; import TextareaAutoResize from 'react-textarea-autosize'; diff --git a/code/core/src/components/components/icon/icon.stories.tsx b/code/core/src/components/components/icon/icon.stories.tsx index acafe6af4425..522af78a6d60 100644 --- a/code/core/src/components/components/icon/icon.stories.tsx +++ b/code/core/src/components/components/icon/icon.stories.tsx @@ -1,7 +1,7 @@ import type { ComponentProps } from 'react'; import React from 'react'; -import { css, styled } from '@storybook/core/theming'; +import { css, styled } from 'storybook/internal/theming'; import type { IconType } from './icon'; import { Icons, icons } from './icon'; diff --git a/code/core/src/components/components/icon/icon.tsx b/code/core/src/components/components/icon/icon.tsx index bc9d447bec97..ea3b58ce4664 100644 --- a/code/core/src/components/components/icon/icon.tsx +++ b/code/core/src/components/components/icon/icon.tsx @@ -1,10 +1,10 @@ import type { ComponentProps } from 'react'; import React, { memo } from 'react'; -import { styled } from '@storybook/core/theming'; -import * as StorybookIcons from '@storybook/icons'; +import { deprecate, logger } from 'storybook/internal/client-logger'; +import { styled } from 'storybook/internal/theming'; -import { deprecate, logger } from '@storybook/core/client-logger'; +import * as StorybookIcons from '@storybook/icons'; export type IconType = keyof typeof icons; type NewIconTypes = (typeof icons)[IconType]; diff --git a/code/core/src/components/components/placeholder/placeholder.tsx b/code/core/src/components/components/placeholder/placeholder.tsx index faa7d1df78b7..b5bd178d9441 100644 --- a/code/core/src/components/components/placeholder/placeholder.tsx +++ b/code/core/src/components/components/placeholder/placeholder.tsx @@ -1,6 +1,6 @@ import React, { Children } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; const Title = styled.div(({ theme }) => ({ fontWeight: theme.typography.weight.bold, diff --git a/code/core/src/components/components/shared/animation.ts b/code/core/src/components/components/shared/animation.ts index 7838d880b93d..bf3f53d0d0e6 100644 --- a/code/core/src/components/components/shared/animation.ts +++ b/code/core/src/components/components/shared/animation.ts @@ -1,4 +1,4 @@ -import { keyframes } from '@storybook/core/theming'; +import { keyframes } from 'storybook/internal/theming'; export const rotate360 = keyframes` from { diff --git a/code/core/src/components/components/spaced/Spaced.stories.tsx b/code/core/src/components/components/spaced/Spaced.stories.tsx index 3f342022e3b5..0c5f98bad331 100644 --- a/code/core/src/components/components/spaced/Spaced.stories.tsx +++ b/code/core/src/components/components/spaced/Spaced.stories.tsx @@ -1,7 +1,7 @@ import type { ComponentProps } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { Spaced } from './Spaced'; diff --git a/code/core/src/components/components/spaced/Spaced.tsx b/code/core/src/components/components/spaced/Spaced.tsx index 4c0afcfb9bfd..1658eb123afc 100644 --- a/code/core/src/components/components/spaced/Spaced.tsx +++ b/code/core/src/components/components/spaced/Spaced.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { ignoreSsrWarning, styled } from '@storybook/core/theming'; +import { ignoreSsrWarning, styled } from 'storybook/internal/theming'; const toNumber = (input: any) => (typeof input === 'number' ? input : Number(input)); diff --git a/code/core/src/components/components/syntaxhighlighter/syntaxhighlighter.stories.tsx b/code/core/src/components/components/syntaxhighlighter/syntaxhighlighter.stories.tsx index 712b329ce2f0..25367395b9c7 100644 --- a/code/core/src/components/components/syntaxhighlighter/syntaxhighlighter.stories.tsx +++ b/code/core/src/components/components/syntaxhighlighter/syntaxhighlighter.stories.tsx @@ -1,7 +1,7 @@ import type { ComponentProps } from 'react'; import React from 'react'; -import { ThemeProvider, ensure, themes } from '@storybook/core/theming'; +import { ThemeProvider, ensure, themes } from 'storybook/internal/theming'; import { SyntaxHighlighter } from './lazy-syntaxhighlighter'; diff --git a/code/core/src/components/components/syntaxhighlighter/syntaxhighlighter.tsx b/code/core/src/components/components/syntaxhighlighter/syntaxhighlighter.tsx index aecec066f27d..958979dce261 100644 --- a/code/core/src/components/components/syntaxhighlighter/syntaxhighlighter.tsx +++ b/code/core/src/components/components/syntaxhighlighter/syntaxhighlighter.tsx @@ -1,10 +1,10 @@ import type { MouseEvent } from 'react'; import React, { useCallback, useEffect, useState } from 'react'; -import { styled } from '@storybook/core/theming'; -import { global } from '@storybook/global'; +import { logger } from 'storybook/internal/client-logger'; +import { styled } from 'storybook/internal/theming'; -import { logger } from '@storybook/core/client-logger'; +import { global } from '@storybook/global'; import memoize from 'memoizerific'; // @ts-expect-error (Converted from ts-ignore) diff --git a/code/core/src/components/components/tabs/EmptyTabContent.stories.tsx b/code/core/src/components/components/tabs/EmptyTabContent.stories.tsx index 9c291b9e6299..fa4b90e709c4 100644 --- a/code/core/src/components/components/tabs/EmptyTabContent.stories.tsx +++ b/code/core/src/components/components/tabs/EmptyTabContent.stories.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { Link } from '@storybook/core/components'; +import { Link } from 'storybook/internal/components'; + import { DocumentIcon } from '@storybook/icons'; import type { Meta, StoryObj } from '@storybook/react'; diff --git a/code/core/src/components/components/tabs/EmptyTabContent.tsx b/code/core/src/components/components/tabs/EmptyTabContent.tsx index cdb191e59716..61673616f8d7 100644 --- a/code/core/src/components/components/tabs/EmptyTabContent.tsx +++ b/code/core/src/components/components/tabs/EmptyTabContent.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; const Wrapper = styled.div(({ theme }) => ({ height: '100%', diff --git a/code/core/src/components/components/tabs/tabs.helpers.tsx b/code/core/src/components/components/tabs/tabs.helpers.tsx index 90ae4c2c10ab..da08e63a2ab1 100644 --- a/code/core/src/components/components/tabs/tabs.helpers.tsx +++ b/code/core/src/components/components/tabs/tabs.helpers.tsx @@ -1,8 +1,8 @@ import type { FC, PropsWithChildren, ReactChild, ReactElement, ReactNode } from 'react'; import React, { Children } from 'react'; -import { styled } from '@storybook/core/theming'; -import type { Addon_RenderOptions } from '@storybook/core/types'; +import { styled } from 'storybook/internal/theming'; +import type { Addon_RenderOptions } from 'storybook/internal/types'; import type { TabsProps } from './tabs'; diff --git a/code/core/src/components/components/tabs/tabs.hooks.tsx b/code/core/src/components/components/tabs/tabs.hooks.tsx index be3a8f2060a7..6725188c4172 100644 --- a/code/core/src/components/components/tabs/tabs.hooks.tsx +++ b/code/core/src/components/components/tabs/tabs.hooks.tsx @@ -1,6 +1,7 @@ import React, { useCallback, useLayoutEffect, useRef, useState } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; + import { sanitize } from '@storybook/csf'; import useResizeObserver from 'use-resize-observer'; diff --git a/code/core/src/components/components/tabs/tabs.tsx b/code/core/src/components/components/tabs/tabs.tsx index 3c8c46c45c1b..ae681d43a900 100644 --- a/code/core/src/components/components/tabs/tabs.tsx +++ b/code/core/src/components/components/tabs/tabs.tsx @@ -1,8 +1,9 @@ import type { FC, PropsWithChildren, ReactElement, ReactNode, SyntheticEvent } from 'react'; import React, { Component, memo, useMemo } from 'react'; -import { styled } from '@storybook/core/theming'; -import type { Addon_RenderOptions } from '@storybook/core/types'; +import { styled } from 'storybook/internal/theming'; +import type { Addon_RenderOptions } from 'storybook/internal/types'; + import { sanitize } from '@storybook/csf'; import { FlexBar } from '../bar/bar'; diff --git a/code/core/src/components/components/tooltip/ListItem.tsx b/code/core/src/components/components/tooltip/ListItem.tsx index 10e513cc1b6b..d3596cc9f16c 100644 --- a/code/core/src/components/components/tooltip/ListItem.tsx +++ b/code/core/src/components/components/tooltip/ListItem.tsx @@ -1,7 +1,7 @@ import type { ComponentProps, ReactNode, SyntheticEvent } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import memoize from 'memoizerific'; import { transparentize } from 'polished'; diff --git a/code/core/src/components/components/tooltip/Tooltip.stories.tsx b/code/core/src/components/components/tooltip/Tooltip.stories.tsx index 35385c1b447f..b255bb815b33 100644 --- a/code/core/src/components/components/tooltip/Tooltip.stories.tsx +++ b/code/core/src/components/components/tooltip/Tooltip.stories.tsx @@ -1,7 +1,7 @@ import type { ComponentProps } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { Tooltip } from './Tooltip'; diff --git a/code/core/src/components/components/tooltip/Tooltip.tsx b/code/core/src/components/components/tooltip/Tooltip.tsx index ef053f1baf5b..1d55dc303bad 100644 --- a/code/core/src/components/components/tooltip/Tooltip.tsx +++ b/code/core/src/components/components/tooltip/Tooltip.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { type Color, lighten, styled } from '@storybook/core/theming'; +import { type Color, lighten, styled } from 'storybook/internal/theming'; import memoize from 'memoizerific'; diff --git a/code/core/src/components/components/tooltip/TooltipLinkList.tsx b/code/core/src/components/components/tooltip/TooltipLinkList.tsx index 91e86eae71af..c2ac48aa780e 100644 --- a/code/core/src/components/components/tooltip/TooltipLinkList.tsx +++ b/code/core/src/components/components/tooltip/TooltipLinkList.tsx @@ -1,7 +1,7 @@ import type { ComponentProps, ReactNode, SyntheticEvent } from 'react'; import React, { Fragment, useCallback } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import type { LinkWrapperType, ListItemProps } from './ListItem'; import ListItem from './ListItem'; diff --git a/code/core/src/components/components/tooltip/TooltipMessage.tsx b/code/core/src/components/components/tooltip/TooltipMessage.tsx index 3882e428fab7..da15b0421369 100644 --- a/code/core/src/components/components/tooltip/TooltipMessage.tsx +++ b/code/core/src/components/components/tooltip/TooltipMessage.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { Link } from '../typography/link/link'; diff --git a/code/core/src/components/components/tooltip/TooltipNote.tsx b/code/core/src/components/components/tooltip/TooltipNote.tsx index 6bfde56693d6..a605040ba5bf 100644 --- a/code/core/src/components/components/tooltip/TooltipNote.tsx +++ b/code/core/src/components/components/tooltip/TooltipNote.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; const Note = styled.div(({ theme }) => ({ padding: '2px 6px', diff --git a/code/core/src/components/components/tooltip/WithTooltip.stories.tsx b/code/core/src/components/components/tooltip/WithTooltip.stories.tsx index e5651c50bf7e..952dceeaf510 100644 --- a/code/core/src/components/components/tooltip/WithTooltip.stories.tsx +++ b/code/core/src/components/components/tooltip/WithTooltip.stories.tsx @@ -1,7 +1,8 @@ import type { ComponentProps, FunctionComponent } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; + import type { StoryObj } from '@storybook/react'; import { expect, screen } from '@storybook/test'; diff --git a/code/core/src/components/components/tooltip/WithTooltip.tsx b/code/core/src/components/components/tooltip/WithTooltip.tsx index c6bddae93795..304603367c23 100644 --- a/code/core/src/components/components/tooltip/WithTooltip.tsx +++ b/code/core/src/components/components/tooltip/WithTooltip.tsx @@ -2,7 +2,8 @@ import type { ComponentProps, ReactNode } from 'react'; import React, { useCallback, useEffect, useState } from 'react'; import ReactDOM from 'react-dom'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; + import { global } from '@storybook/global'; import type { PopperOptions, Config as ReactPopperTooltipConfig } from 'react-popper-tooltip'; diff --git a/code/core/src/components/components/typography/DocumentWrapper.tsx b/code/core/src/components/components/typography/DocumentWrapper.tsx index 8a3a8329d78b..81e65ad95344 100644 --- a/code/core/src/components/components/typography/DocumentWrapper.tsx +++ b/code/core/src/components/components/typography/DocumentWrapper.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; export const DocumentWrapper = styled.div(({ theme }) => ({ fontSize: `${theme.typography.size.s2}px`, diff --git a/code/core/src/components/components/typography/ResetWrapper.tsx b/code/core/src/components/components/typography/ResetWrapper.tsx index 652cb41754f1..c83edaf56483 100644 --- a/code/core/src/components/components/typography/ResetWrapper.tsx +++ b/code/core/src/components/components/typography/ResetWrapper.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { withReset } from './lib/common'; diff --git a/code/core/src/components/components/typography/elements/A.tsx b/code/core/src/components/components/typography/elements/A.tsx index 2eb9cdb4d87a..914b6ecbdbca 100644 --- a/code/core/src/components/components/typography/elements/A.tsx +++ b/code/core/src/components/components/typography/elements/A.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { withReset } from '../lib/common'; import { Link } from './Link'; diff --git a/code/core/src/components/components/typography/elements/Blockquote.tsx b/code/core/src/components/components/typography/elements/Blockquote.tsx index b4e06b210ed0..b430027a03db 100644 --- a/code/core/src/components/components/typography/elements/Blockquote.tsx +++ b/code/core/src/components/components/typography/elements/Blockquote.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { withMargin, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/Code.tsx b/code/core/src/components/components/typography/elements/Code.tsx index e22b3cca9134..e8360dc8184d 100644 --- a/code/core/src/components/components/typography/elements/Code.tsx +++ b/code/core/src/components/components/typography/elements/Code.tsx @@ -1,7 +1,7 @@ import type { ComponentProps } from 'react'; import React, { Children } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { SyntaxHighlighter } from '../../syntaxhighlighter/syntaxhighlighter'; import type { SupportedLanguage } from '../../syntaxhighlighter/syntaxhighlighter-types'; diff --git a/code/core/src/components/components/typography/elements/DL.tsx b/code/core/src/components/components/typography/elements/DL.tsx index 840dbc0bbede..7957323031ce 100644 --- a/code/core/src/components/components/typography/elements/DL.tsx +++ b/code/core/src/components/components/typography/elements/DL.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { withMargin, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/Div.tsx b/code/core/src/components/components/typography/elements/Div.tsx index 7e8b9b6765d4..69f87f323f2b 100644 --- a/code/core/src/components/components/typography/elements/Div.tsx +++ b/code/core/src/components/components/typography/elements/Div.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/H1.tsx b/code/core/src/components/components/typography/elements/H1.tsx index 6ede5882351d..b9bcd975b499 100644 --- a/code/core/src/components/components/typography/elements/H1.tsx +++ b/code/core/src/components/components/typography/elements/H1.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { headerCommon, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/H2.tsx b/code/core/src/components/components/typography/elements/H2.tsx index f2c070827ede..8aff4b6410fb 100644 --- a/code/core/src/components/components/typography/elements/H2.tsx +++ b/code/core/src/components/components/typography/elements/H2.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { headerCommon, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/H3.tsx b/code/core/src/components/components/typography/elements/H3.tsx index 150474aa427e..45caf5b602d9 100644 --- a/code/core/src/components/components/typography/elements/H3.tsx +++ b/code/core/src/components/components/typography/elements/H3.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { headerCommon, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/H4.tsx b/code/core/src/components/components/typography/elements/H4.tsx index f0933727d8ca..89b9b47641d8 100644 --- a/code/core/src/components/components/typography/elements/H4.tsx +++ b/code/core/src/components/components/typography/elements/H4.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { headerCommon, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/H5.tsx b/code/core/src/components/components/typography/elements/H5.tsx index 637b64cad8f2..349189c31112 100644 --- a/code/core/src/components/components/typography/elements/H5.tsx +++ b/code/core/src/components/components/typography/elements/H5.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { headerCommon, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/H6.tsx b/code/core/src/components/components/typography/elements/H6.tsx index b862026ede75..41df58909ae3 100644 --- a/code/core/src/components/components/typography/elements/H6.tsx +++ b/code/core/src/components/components/typography/elements/H6.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { headerCommon, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/HR.tsx b/code/core/src/components/components/typography/elements/HR.tsx index c5f054a36ec7..ac80ed84c437 100644 --- a/code/core/src/components/components/typography/elements/HR.tsx +++ b/code/core/src/components/components/typography/elements/HR.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; export const HR = styled.hr(({ theme }) => ({ border: '0 none', diff --git a/code/core/src/components/components/typography/elements/Img.tsx b/code/core/src/components/components/typography/elements/Img.tsx index ccd1cf1eb8e6..6dcd8e7d622f 100644 --- a/code/core/src/components/components/typography/elements/Img.tsx +++ b/code/core/src/components/components/typography/elements/Img.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; export const Img = styled.img({ maxWidth: '100%', diff --git a/code/core/src/components/components/typography/elements/LI.tsx b/code/core/src/components/components/typography/elements/LI.tsx index 9361defda4e3..58fac5d874c6 100644 --- a/code/core/src/components/components/typography/elements/LI.tsx +++ b/code/core/src/components/components/typography/elements/LI.tsx @@ -1,5 +1,5 @@ -import type { CSSObject } from '@storybook/core/theming'; -import { styled } from '@storybook/core/theming'; +import type { CSSObject } from 'storybook/internal/theming'; +import { styled } from 'storybook/internal/theming'; import { codeCommon, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/OL.tsx b/code/core/src/components/components/typography/elements/OL.tsx index dd6c328c72ba..251006eca977 100644 --- a/code/core/src/components/components/typography/elements/OL.tsx +++ b/code/core/src/components/components/typography/elements/OL.tsx @@ -1,5 +1,5 @@ -import { styled } from '@storybook/core/theming'; -import type { Interpolation } from '@storybook/core/theming'; +import type { Interpolation } from 'storybook/internal/theming'; +import { styled } from 'storybook/internal/theming'; import { withMargin, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/P.tsx b/code/core/src/components/components/typography/elements/P.tsx index 3039d8592270..a390fcbc9228 100644 --- a/code/core/src/components/components/typography/elements/P.tsx +++ b/code/core/src/components/components/typography/elements/P.tsx @@ -1,5 +1,5 @@ -import type { CSSObject } from '@storybook/core/theming'; -import { styled } from '@storybook/core/theming'; +import type { CSSObject } from 'storybook/internal/theming'; +import { styled } from 'storybook/internal/theming'; import { codeCommon, withMargin, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/Pre.tsx b/code/core/src/components/components/typography/elements/Pre.tsx index d2c3a1258cc4..cc10e8c8cd67 100644 --- a/code/core/src/components/components/typography/elements/Pre.tsx +++ b/code/core/src/components/components/typography/elements/Pre.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { withMargin, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/Span.tsx b/code/core/src/components/components/typography/elements/Span.tsx index 35d9e45bd609..4e81d8a65c53 100644 --- a/code/core/src/components/components/typography/elements/Span.tsx +++ b/code/core/src/components/components/typography/elements/Span.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/TT.tsx b/code/core/src/components/components/typography/elements/TT.tsx index 4544a0b6ded1..9ed77bbc157e 100644 --- a/code/core/src/components/components/typography/elements/TT.tsx +++ b/code/core/src/components/components/typography/elements/TT.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { codeCommon } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/Table.tsx b/code/core/src/components/components/typography/elements/Table.tsx index 262adddd3f36..125890817cc3 100644 --- a/code/core/src/components/components/typography/elements/Table.tsx +++ b/code/core/src/components/components/typography/elements/Table.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { withMargin, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/elements/UL.tsx b/code/core/src/components/components/typography/elements/UL.tsx index 1aeb5b10bb66..1eeb32cfb25f 100644 --- a/code/core/src/components/components/typography/elements/UL.tsx +++ b/code/core/src/components/components/typography/elements/UL.tsx @@ -1,5 +1,5 @@ -import { styled } from '@storybook/core/theming'; -import type { Interpolation } from '@storybook/core/theming'; +import type { Interpolation } from 'storybook/internal/theming'; +import { styled } from 'storybook/internal/theming'; import { withMargin, withReset } from '../lib/common'; diff --git a/code/core/src/components/components/typography/lib/common.tsx b/code/core/src/components/components/typography/lib/common.tsx index fc0d32f128b1..d5ce3f625cb9 100644 --- a/code/core/src/components/components/typography/lib/common.tsx +++ b/code/core/src/components/components/typography/lib/common.tsx @@ -1,4 +1,4 @@ -import type { CSSObject, FunctionInterpolation } from '@storybook/core/theming'; +import type { CSSObject, FunctionInterpolation } from 'storybook/internal/theming'; import { transparentize } from 'polished'; diff --git a/code/core/src/components/components/typography/link/link.test.tsx b/code/core/src/components/components/typography/link/link.test.tsx index 5e0af1da2096..97e1317b111a 100644 --- a/code/core/src/components/components/typography/link/link.test.tsx +++ b/code/core/src/components/components/typography/link/link.test.tsx @@ -6,7 +6,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; import type { AnchorHTMLAttributes } from 'react'; import React from 'react'; -import { ThemeProvider, convert, themes } from '@storybook/core/theming'; +import { ThemeProvider, convert, themes } from 'storybook/internal/theming'; import type { LinkProps } from './link'; import { Link } from './link'; diff --git a/code/core/src/components/components/typography/link/link.tsx b/code/core/src/components/components/typography/link/link.tsx index 2ce80ec9612e..02f94544dca9 100644 --- a/code/core/src/components/components/typography/link/link.tsx +++ b/code/core/src/components/components/typography/link/link.tsx @@ -1,7 +1,8 @@ import type { AnchorHTMLAttributes, MouseEvent } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; + import { ChevronRightIcon } from '@storybook/icons'; import { darken } from 'polished'; diff --git a/code/core/src/core-events/data/testing-module.ts b/code/core/src/core-events/data/testing-module.ts index ad843450723b..52a14a0f032b 100644 --- a/code/core/src/core-events/data/testing-module.ts +++ b/code/core/src/core-events/data/testing-module.ts @@ -1,4 +1,4 @@ -import type { Addon_TestProviderState, Addon_TestProviderType } from '@storybook/core/types'; +import type { Addon_TestProviderState, Addon_TestProviderType } from 'storybook/internal/types'; type DateNow = number; diff --git a/code/core/src/core-server/build-dev.ts b/code/core/src/core-server/build-dev.ts index c8b336a22e09..ecedb1d62d80 100644 --- a/code/core/src/core-server/build-dev.ts +++ b/code/core/src/core-server/build-dev.ts @@ -11,13 +11,13 @@ import { serverResolve, validateFrameworkName, versions, -} from '@storybook/core/common'; -import { oneWayHash, telemetry } from '@storybook/core/telemetry'; -import type { BuilderOptions, CLIOptions, LoadOptions, Options } from '@storybook/core/types'; -import { global } from '@storybook/global'; +} from 'storybook/internal/common'; +import { deprecate } from 'storybook/internal/node-logger'; +import { MissingBuilderError, NoStatsForViteDevError } from 'storybook/internal/server-errors'; +import { oneWayHash, telemetry } from 'storybook/internal/telemetry'; +import type { BuilderOptions, CLIOptions, LoadOptions, Options } from 'storybook/internal/types'; -import { deprecate } from '@storybook/core/node-logger'; -import { MissingBuilderError, NoStatsForViteDevError } from '@storybook/core/server-errors'; +import { global } from '@storybook/global'; import prompts from 'prompts'; import invariant from 'tiny-invariant'; @@ -123,7 +123,7 @@ export async function buildDevStandalone( let presets = await loadAllPresets({ corePresets, overridePresets: [ - require.resolve('@storybook/core/core-server/presets/common-override-preset'), + require.resolve('storybook/internal/core-server/presets/common-override-preset'), ], ...options, isCritical: true, @@ -170,7 +170,7 @@ export async function buildDevStandalone( // Load second pass: all presets are applied in order presets = await loadAllPresets({ corePresets: [ - require.resolve('@storybook/core/core-server/presets/common-preset'), + require.resolve('storybook/internal/core-server/presets/common-preset'), ...(managerBuilder.corePresets || []), ...(previewBuilder.corePresets || []), ...(resolvedRenderer ? [resolvedRenderer] : []), @@ -178,7 +178,7 @@ export async function buildDevStandalone( ], overridePresets: [ ...(previewBuilder.overridePresets || []), - require.resolve('@storybook/core/core-server/presets/common-override-preset'), + require.resolve('storybook/internal/core-server/presets/common-override-preset'), ], ...options, }); diff --git a/code/core/src/core-server/build-static.ts b/code/core/src/core-server/build-static.ts index ab0d979acaf5..f8b90fa7fb55 100644 --- a/code/core/src/core-server/build-static.ts +++ b/code/core/src/core-server/build-static.ts @@ -9,12 +9,12 @@ import { logConfig, normalizeStories, resolveAddonName, -} from '@storybook/core/common'; -import { getPrecedingUpgrade, telemetry } from '@storybook/core/telemetry'; -import type { BuilderOptions, CLIOptions, LoadOptions, Options } from '@storybook/core/types'; -import { global } from '@storybook/global'; +} from 'storybook/internal/common'; +import { logger } from 'storybook/internal/node-logger'; +import { getPrecedingUpgrade, telemetry } from 'storybook/internal/telemetry'; +import type { BuilderOptions, CLIOptions, LoadOptions, Options } from 'storybook/internal/types'; -import { logger } from '@storybook/core/node-logger'; +import { global } from '@storybook/global'; import picocolors from 'picocolors'; @@ -64,11 +64,11 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption logger.info('=> Loading presets'); let presets = await loadAllPresets({ corePresets: [ - require.resolve('@storybook/core/core-server/presets/common-preset'), + require.resolve('storybook/internal/core-server/presets/common-preset'), ...corePresets, ], overridePresets: [ - require.resolve('@storybook/core/core-server/presets/common-override-preset'), + require.resolve('storybook/internal/core-server/presets/common-override-preset'), ], isCritical: true, ...options, @@ -83,7 +83,7 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption : undefined; presets = await loadAllPresets({ corePresets: [ - require.resolve('@storybook/core/core-server/presets/common-preset'), + require.resolve('storybook/internal/core-server/presets/common-preset'), ...(managerBuilder.corePresets || []), ...(previewBuilder.corePresets || []), ...(resolvedRenderer ? [resolvedRenderer] : []), @@ -91,7 +91,7 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption ], overridePresets: [ ...(previewBuilder.overridePresets || []), - require.resolve('@storybook/core/core-server/presets/common-override-preset'), + require.resolve('storybook/internal/core-server/presets/common-override-preset'), ], ...options, build, @@ -128,7 +128,7 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption } const coreServerPublicDir = join( - dirname(require.resolve('@storybook/core/package.json')), + dirname(require.resolve('storybook/package.json')), 'assets/browser' ); effects.push(cp(coreServerPublicDir, options.outputDir, { recursive: true })); diff --git a/code/core/src/core-server/dev-server.ts b/code/core/src/core-server/dev-server.ts index 325d33366514..ee6dfcaffe6a 100644 --- a/code/core/src/core-server/dev-server.ts +++ b/code/core/src/core-server/dev-server.ts @@ -1,8 +1,7 @@ -import { logConfig } from '@storybook/core/common'; -import type { Options } from '@storybook/core/types'; - -import { logger } from '@storybook/core/node-logger'; -import { MissingBuilderError } from '@storybook/core/server-errors'; +import { logConfig } from 'storybook/internal/common'; +import { logger } from 'storybook/internal/node-logger'; +import { MissingBuilderError } from 'storybook/internal/server-errors'; +import type { Options } from 'storybook/internal/types'; import compression from '@polka/compression'; import polka from 'polka'; diff --git a/code/core/src/core-server/index.ts b/code/core/src/core-server/index.ts index 5a74e0056c17..23c4a42ecc31 100644 --- a/code/core/src/core-server/index.ts +++ b/code/core/src/core-server/index.ts @@ -1,6 +1,6 @@ /// -export { getPreviewHeadTemplate, getPreviewBodyTemplate } from '@storybook/core/common'; +export { getPreviewHeadTemplate, getPreviewBodyTemplate } from 'storybook/internal/common'; export * from './build-static'; export * from './build-dev'; diff --git a/code/core/src/core-server/load.ts b/code/core/src/core-server/load.ts index cb03ceb5ca7a..a9c4321abe51 100644 --- a/code/core/src/core-server/load.ts +++ b/code/core/src/core-server/load.ts @@ -6,9 +6,10 @@ import { loadMainConfig, resolveAddonName, validateFrameworkName, -} from '@storybook/core/common'; -import { oneWayHash } from '@storybook/core/telemetry'; -import type { BuilderOptions, CLIOptions, LoadOptions, Options } from '@storybook/core/types'; +} from 'storybook/internal/common'; +import { oneWayHash } from 'storybook/internal/telemetry'; +import type { BuilderOptions, CLIOptions, LoadOptions, Options } from 'storybook/internal/types'; + import { global } from '@storybook/global'; export async function loadStorybook( @@ -49,7 +50,7 @@ export async function loadStorybook( let presets = await loadAllPresets({ corePresets, overridePresets: [ - require.resolve('@storybook/core/core-server/presets/common-override-preset'), + require.resolve('storybook/internal/core-server/presets/common-override-preset'), ], ...options, isCritical: true, @@ -62,12 +63,12 @@ export async function loadStorybook( presets = await loadAllPresets({ corePresets: [ - require.resolve('@storybook/core/core-server/presets/common-preset'), + require.resolve('storybook/internal/core-server/presets/common-preset'), ...(resolvedRenderer ? [resolvedRenderer] : []), ...corePresets, ], overridePresets: [ - require.resolve('@storybook/core/core-server/presets/common-override-preset'), + require.resolve('storybook/internal/core-server/presets/common-override-preset'), ], ...options, }); diff --git a/code/core/src/core-server/presets/common-manager.ts b/code/core/src/core-server/presets/common-manager.ts index 0bdf7cde0031..ef24236ebbbf 100644 --- a/code/core/src/core-server/presets/common-manager.ts +++ b/code/core/src/core-server/presets/common-manager.ts @@ -1,6 +1,6 @@ -import { global } from '@storybook/global'; +import { addons } from 'storybook/internal/manager-api'; -import { addons } from '@storybook/core/manager-api'; +import { global } from '@storybook/global'; const TAG_FILTERS = 'tag-filters'; const STATIC_FILTER = 'static-filter'; diff --git a/code/core/src/core-server/presets/common-override-preset.ts b/code/core/src/core-server/presets/common-override-preset.ts index 2566bee53593..4c2a1ec96ba7 100644 --- a/code/core/src/core-server/presets/common-override-preset.ts +++ b/code/core/src/core-server/presets/common-override-preset.ts @@ -1,4 +1,4 @@ -import type { PresetProperty, TestBuildFlags } from '@storybook/core/types'; +import type { PresetProperty, TestBuildFlags } from 'storybook/internal/types'; import { removeMDXEntries } from '../utils/remove-mdx-entries'; diff --git a/code/core/src/core-server/presets/common-preset.ts b/code/core/src/core-server/presets/common-preset.ts index 34b852cbb7bc..d1597a2e2a0b 100644 --- a/code/core/src/core-server/presets/common-preset.ts +++ b/code/core/src/core-server/presets/common-preset.ts @@ -2,15 +2,17 @@ import { existsSync } from 'node:fs'; import { readFile } from 'node:fs/promises'; import { dirname, isAbsolute, join } from 'node:path'; -import type { Channel } from '@storybook/core/channels'; +import type { Channel } from 'storybook/internal/channels'; import { getDirectoryFromWorkingDir, getPreviewBodyTemplate, getPreviewHeadTemplate, loadEnvs, removeAddon as removeAddonBase, -} from '@storybook/core/common'; -import { telemetry } from '@storybook/core/telemetry'; +} from 'storybook/internal/common'; +import { readCsf } from 'storybook/internal/csf-tools'; +import { logger } from 'storybook/internal/node-logger'; +import { telemetry } from 'storybook/internal/telemetry'; import type { CLIOptions, CoreConfig, @@ -18,10 +20,7 @@ import type { Options, PresetProperty, PresetPropertyFn, -} from '@storybook/core/types'; - -import { readCsf } from '@storybook/core/csf-tools'; -import { logger } from '@storybook/core/node-logger'; +} from 'storybook/internal/types'; import { dedent } from 'ts-dedent'; @@ -45,7 +44,7 @@ const interpolate = (string: string, data: Record = {}) => Object.entries(data).reduce((acc, [k, v]) => acc.replace(new RegExp(`%${k}%`, 'g'), v), string); const defaultFavicon = join( - dirname(require.resolve('@storybook/core/package.json')), + dirname(require.resolve('storybook/package.json')), '/assets/browser/favicon.svg' ); @@ -372,7 +371,7 @@ export const tags = async (existing: any) => { export const managerEntries = async (existing: any, options: Options) => { return [ join( - dirname(require.resolve('@storybook/core/package.json')), + dirname(require.resolve('storybook/package.json')), 'dist/core-server/presets/common-manager.js' ), ...(existing || []), diff --git a/code/core/src/core-server/presets/favicon.test.ts b/code/core/src/core-server/presets/favicon.test.ts index 4e6c72cc0618..d98fef009537 100644 --- a/code/core/src/core-server/presets/favicon.test.ts +++ b/code/core/src/core-server/presets/favicon.test.ts @@ -3,12 +3,12 @@ import { dirname, join } from 'node:path'; import { expect, it, vi } from 'vitest'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import * as m from './common-preset'; const defaultFavicon = join( - dirname(require.resolve('@storybook/core/package.json')), + dirname(require.resolve('storybook/package.json')), '/assets/browser/favicon.svg' ); @@ -29,7 +29,7 @@ const createOptions = (locations: string[]): Parameters[1] => }, }); -vi.mock('@storybook/core/node-logger', () => { +vi.mock('storybook/internal/node-logger', () => { return { logger: { warn: vi.fn(() => {}), diff --git a/code/core/src/core-server/server-channel/create-new-story-channel.test.ts b/code/core/src/core-server/server-channel/create-new-story-channel.test.ts index 23fa28dbc870..ac94659f27a8 100644 --- a/code/core/src/core-server/server-channel/create-new-story-channel.test.ts +++ b/code/core/src/core-server/server-channel/create-new-story-channel.test.ts @@ -2,19 +2,18 @@ import { join } from 'node:path'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { ChannelTransport } from '@storybook/core/channels'; -import { Channel } from '@storybook/core/channels'; - -import type { CreateNewStoryRequestPayload, RequestData } from '@storybook/core/core-events'; +import type { ChannelTransport } from 'storybook/internal/channels'; +import { Channel } from 'storybook/internal/channels'; +import type { CreateNewStoryRequestPayload, RequestData } from 'storybook/internal/core-events'; import { CREATE_NEW_STORYFILE_REQUEST, CREATE_NEW_STORYFILE_RESPONSE, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; import { initCreateNewStoryChannel } from './create-new-story-channel'; -vi.mock('@storybook/core/common', async (importOriginal) => { - const actual = await importOriginal(); +vi.mock('storybook/internal/common', async (importOriginal) => { + const actual = await importOriginal(); return { ...actual, getProjectRoot: vi.fn().mockReturnValue(process.cwd()), diff --git a/code/core/src/core-server/server-channel/create-new-story-channel.ts b/code/core/src/core-server/server-channel/create-new-story-channel.ts index a1e3b77239d0..92179ff92a90 100644 --- a/code/core/src/core-server/server-channel/create-new-story-channel.ts +++ b/code/core/src/core-server/server-channel/create-new-story-channel.ts @@ -2,22 +2,21 @@ import { existsSync } from 'node:fs'; import { writeFile } from 'node:fs/promises'; import { relative } from 'node:path'; -import type { Channel } from '@storybook/core/channels'; -import { getStoryId } from '@storybook/core/common'; -import { telemetry } from '@storybook/core/telemetry'; -import type { CoreConfig, Options } from '@storybook/core/types'; - +import type { Channel } from 'storybook/internal/channels'; +import { getStoryId } from 'storybook/internal/common'; import type { CreateNewStoryErrorPayload, CreateNewStoryRequestPayload, CreateNewStoryResponsePayload, RequestData, ResponseData, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; import { CREATE_NEW_STORYFILE_REQUEST, CREATE_NEW_STORYFILE_RESPONSE, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import { telemetry } from 'storybook/internal/telemetry'; +import type { CoreConfig, Options } from 'storybook/internal/types'; import { getNewStoryFile } from '../utils/get-new-story-file'; diff --git a/code/core/src/core-server/server-channel/file-search-channel.test.ts b/code/core/src/core-server/server-channel/file-search-channel.test.ts index 64728b142e88..1a8c24697bea 100644 --- a/code/core/src/core-server/server-channel/file-search-channel.test.ts +++ b/code/core/src/core-server/server-channel/file-search-channel.test.ts @@ -1,19 +1,21 @@ // @vitest-environment happy-dom import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { ChannelTransport } from '@storybook/core/channels'; -import { Channel } from '@storybook/core/channels'; +import { Channel } from 'storybook/internal/channels'; +import type { ChannelTransport } from 'storybook/internal/channels'; import { extractProperRendererNameFromFramework, getFrameworkName, getProjectRoot, -} from '@storybook/core/common'; - -import type { FileComponentSearchRequestPayload, RequestData } from '@storybook/core/core-events'; +} from 'storybook/internal/common'; +import type { + FileComponentSearchRequestPayload, + RequestData, +} from 'storybook/internal/core-events'; import { FILE_COMPONENT_SEARCH_REQUEST, FILE_COMPONENT_SEARCH_RESPONSE, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; import { searchFiles } from '../utils/search-files'; import { initFileSearchChannel } from './file-search-channel'; @@ -22,7 +24,7 @@ vi.mock(import('../utils/search-files'), async (importOriginal) => ({ searchFiles: vi.fn((await importOriginal()).searchFiles), })); -vi.mock('@storybook/core/common'); +vi.mock('storybook/internal/common'); beforeEach(() => { vi.restoreAllMocks(); diff --git a/code/core/src/core-server/server-channel/file-search-channel.ts b/code/core/src/core-server/server-channel/file-search-channel.ts index d9e67ed1804e..5343dcb387e1 100644 --- a/code/core/src/core-server/server-channel/file-search-channel.ts +++ b/code/core/src/core-server/server-channel/file-search-channel.ts @@ -1,25 +1,24 @@ import { readFile } from 'node:fs/promises'; import { dirname, join } from 'node:path'; -import type { Channel } from '@storybook/core/channels'; +import type { Channel } from 'storybook/internal/channels'; import { extractProperRendererNameFromFramework, getFrameworkName, getProjectRoot, -} from '@storybook/core/common'; -import { telemetry } from '@storybook/core/telemetry'; -import type { CoreConfig, Options, SupportedRenderers } from '@storybook/core/types'; - +} from 'storybook/internal/common'; import type { FileComponentSearchRequestPayload, FileComponentSearchResponsePayload, RequestData, ResponseData, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; import { FILE_COMPONENT_SEARCH_REQUEST, FILE_COMPONENT_SEARCH_RESPONSE, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import { telemetry } from 'storybook/internal/telemetry'; +import type { CoreConfig, Options, SupportedRenderers } from 'storybook/internal/types'; import { doesStoryFileExist, getStoryMetadata } from '../utils/get-new-story-file'; import { getParser } from '../utils/parser'; diff --git a/code/core/src/core-server/standalone.ts b/code/core/src/core-server/standalone.ts index d79463578146..ad5b641d46fa 100644 --- a/code/core/src/core-server/standalone.ts +++ b/code/core/src/core-server/standalone.ts @@ -5,7 +5,7 @@ import { buildStaticStandalone } from './build-static'; async function build(options: any = {}, frameworkOptions: any = {}) { const { mode = 'dev' } = options; - const packageJsonDir = dirname(require.resolve('@storybook/core/package.json')); + const packageJsonDir = dirname(require.resolve('storybook/package.json')); const packageJson = JSON.parse(require('fs').readFileSync(`${packageJsonDir}/package.json`)); const commonOptions = { diff --git a/code/core/src/core-server/typings.d.ts b/code/core/src/core-server/typings.d.ts index 1dfb2f3e1917..3f3cb6881312 100644 --- a/code/core/src/core-server/typings.d.ts +++ b/code/core/src/core-server/typings.d.ts @@ -6,5 +6,5 @@ declare module '@aw-web-design/x-default-browser'; declare module '@discoveryjs/json-ext'; declare module 'watchpack'; -declare var FEATURES: import('@storybook/core/types').StorybookConfigRaw['features']; -declare var TAGS_OPTIONS: import('@storybook/core/types').TagsOptions; +declare var FEATURES: import('storybook/internal/types').StorybookConfigRaw['features']; +declare var TAGS_OPTIONS: import('storybook/internal/types').TagsOptions; diff --git a/code/core/src/core-server/utils/StoryIndexGenerator.test.ts b/code/core/src/core-server/utils/StoryIndexGenerator.test.ts index f199c05cfe7f..c1277bf794f2 100644 --- a/code/core/src/core-server/utils/StoryIndexGenerator.test.ts +++ b/code/core/src/core-server/utils/StoryIndexGenerator.test.ts @@ -3,12 +3,12 @@ import { join } from 'node:path'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { normalizeStoriesEntry } from '@storybook/core/common'; -import type { NormalizedStoriesSpecifier, StoryIndexEntry } from '@storybook/core/types'; -import { toId } from '@storybook/csf'; +import { normalizeStoriesEntry } from 'storybook/internal/common'; +import { getStorySortParameter, readCsf } from 'storybook/internal/csf-tools'; +import { logger, once } from 'storybook/internal/node-logger'; +import type { NormalizedStoriesSpecifier, StoryIndexEntry } from 'storybook/internal/types'; -import { getStorySortParameter, readCsf } from '@storybook/core/csf-tools'; -import { logger, once } from '@storybook/core/node-logger'; +import { toId } from '@storybook/csf'; import { csfIndexer } from '../presets/common-preset'; import type { StoryIndexGeneratorOptions } from './StoryIndexGenerator'; @@ -22,11 +22,11 @@ vi.mock('@storybook/csf', async (importOriginal) => { }; }); -vi.mock('@storybook/core/node-logger'); +vi.mock('storybook/internal/node-logger'); const toIdMock = vi.mocked(toId); -vi.mock('@storybook/core/csf-tools', async (importOriginal) => { - const csfTools = await importOriginal(); +vi.mock('storybook/internal/csf-tools', async (importOriginal) => { + const csfTools = await importOriginal(); return { ...csfTools, readCsf: vi.fn(csfTools.readCsf), diff --git a/code/core/src/core-server/utils/StoryIndexGenerator.ts b/code/core/src/core-server/utils/StoryIndexGenerator.ts index 164613d7e4c2..4b0c69a05ae1 100644 --- a/code/core/src/core-server/utils/StoryIndexGenerator.ts +++ b/code/core/src/core-server/utils/StoryIndexGenerator.ts @@ -3,7 +3,10 @@ import { existsSync } from 'node:fs'; import { readFile } from 'node:fs/promises'; import { dirname, extname, join, normalize, relative, resolve, sep } from 'node:path'; -import { commonGlobOptions, normalizeStoryPath } from '@storybook/core/common'; +import { commonGlobOptions, normalizeStoryPath } from 'storybook/internal/common'; +import { getStorySortParameter, loadConfig } from 'storybook/internal/csf-tools'; +import { logger, once } from 'storybook/internal/node-logger'; +import { sortStoriesV7, userOrAutoTitleFromSpecifier } from 'storybook/internal/preview-api'; import type { DocsIndexEntry, DocsOptions, @@ -16,12 +19,9 @@ import type { StoryIndexEntry, StorybookConfigRaw, Tag, -} from '@storybook/core/types'; -import { combineTags, storyNameFromExport, toId } from '@storybook/csf'; +} from 'storybook/internal/types'; -import { getStorySortParameter, loadConfig } from '@storybook/core/csf-tools'; -import { logger, once } from '@storybook/core/node-logger'; -import { sortStoriesV7, userOrAutoTitleFromSpecifier } from '@storybook/core/preview-api'; +import { combineTags, storyNameFromExport, toId } from '@storybook/csf'; import { findUp } from 'find-up'; import picocolors from 'picocolors'; diff --git a/code/core/src/core-server/utils/__tests__/index-extraction.test.ts b/code/core/src/core-server/utils/__tests__/index-extraction.test.ts index 8377cdb18e2d..a6c9dd01ba47 100644 --- a/code/core/src/core-server/utils/__tests__/index-extraction.test.ts +++ b/code/core/src/core-server/utils/__tests__/index-extraction.test.ts @@ -2,13 +2,13 @@ import { join } from 'node:path'; import { describe, expect, it, vi } from 'vitest'; -import { normalizeStoriesEntry } from '@storybook/core/common'; -import type { NormalizedStoriesSpecifier } from '@storybook/core/types'; +import { normalizeStoriesEntry } from 'storybook/internal/common'; +import type { NormalizedStoriesSpecifier } from 'storybook/internal/types'; import type { StoryIndexGeneratorOptions } from '../StoryIndexGenerator'; import { AUTODOCS_TAG, StoryIndexGenerator } from '../StoryIndexGenerator'; -vi.mock('@storybook/core/node-logger'); +vi.mock('storybook/internal/node-logger'); const options: StoryIndexGeneratorOptions = { configDir: join(__dirname, '..', '__mockdata__'), diff --git a/code/core/src/core-server/utils/__tests__/remove-mdx-stories.test.ts b/code/core/src/core-server/utils/__tests__/remove-mdx-stories.test.ts index 7aa3621c2893..3f8258f012f3 100644 --- a/code/core/src/core-server/utils/__tests__/remove-mdx-stories.test.ts +++ b/code/core/src/core-server/utils/__tests__/remove-mdx-stories.test.ts @@ -2,8 +2,8 @@ import { join } from 'node:path'; import { describe, expect, it, vi } from 'vitest'; -import { normalizeStoriesEntry } from '@storybook/core/common'; -import { type StoriesEntry } from '@storybook/core/types'; +import { normalizeStoriesEntry } from 'storybook/internal/common'; +import { type StoriesEntry } from 'storybook/internal/types'; // eslint-disable-next-line depend/ban-dependencies import { glob as globOriginal } from 'glob'; diff --git a/code/core/src/core-server/utils/__tests__/server-channel.test.ts b/code/core/src/core-server/utils/__tests__/server-channel.test.ts index c43955bd5886..a25571593f20 100644 --- a/code/core/src/core-server/utils/__tests__/server-channel.test.ts +++ b/code/core/src/core-server/utils/__tests__/server-channel.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import { Channel } from '@storybook/core/channels'; +import { Channel } from 'storybook/internal/channels'; import { EventEmitter } from 'events'; import type { Server } from 'http'; diff --git a/code/core/src/core-server/utils/autoName.ts b/code/core/src/core-server/utils/autoName.ts index 6256a3a76f32..b4cd26bb68a7 100644 --- a/code/core/src/core-server/utils/autoName.ts +++ b/code/core/src/core-server/utils/autoName.ts @@ -1,6 +1,6 @@ import { basename } from 'node:path'; -import type { Path } from '@storybook/core/types'; +import type { Path } from 'storybook/internal/types'; /** * Calculate a name to use for a docs entry if not specified. The rule is: diff --git a/code/core/src/core-server/utils/build-or-throw.ts b/code/core/src/core-server/utils/build-or-throw.ts index a2dade3725c3..288f80571418 100644 --- a/code/core/src/core-server/utils/build-or-throw.ts +++ b/code/core/src/core-server/utils/build-or-throw.ts @@ -1,4 +1,4 @@ -import { NoMatchingExportError } from '@storybook/core/server-errors'; +import { NoMatchingExportError } from 'storybook/internal/server-errors'; export async function buildOrThrow(callback: () => Promise): Promise { try { diff --git a/code/core/src/core-server/utils/constants.ts b/code/core/src/core-server/utils/constants.ts index 5363b78cdcb9..636c7b66495a 100644 --- a/code/core/src/core-server/utils/constants.ts +++ b/code/core/src/core-server/utils/constants.ts @@ -4,7 +4,7 @@ export const DEBOUNCE = 100; export const defaultStaticDirs = [ { - from: join(dirname(require.resolve('@storybook/core/package.json')), 'assets', 'browser'), + from: join(dirname(require.resolve('storybook/package.json')), 'assets', 'browser'), to: '/sb-common-assets', }, ]; diff --git a/code/core/src/core-server/utils/copy-all-static-files.ts b/code/core/src/core-server/utils/copy-all-static-files.ts index 2518fa82338c..699e284e4e3e 100644 --- a/code/core/src/core-server/utils/copy-all-static-files.ts +++ b/code/core/src/core-server/utils/copy-all-static-files.ts @@ -1,9 +1,8 @@ import { cp } from 'node:fs/promises'; import { join, relative } from 'node:path'; -import { getDirectoryFromWorkingDir } from '@storybook/core/common'; - -import { logger } from '@storybook/core/node-logger'; +import { getDirectoryFromWorkingDir } from 'storybook/internal/common'; +import { logger } from 'storybook/internal/node-logger'; import picocolors from 'picocolors'; diff --git a/code/core/src/core-server/utils/doTelemetry.ts b/code/core/src/core-server/utils/doTelemetry.ts index 0e9b48b8c8f5..1d2ef54d3076 100644 --- a/code/core/src/core-server/utils/doTelemetry.ts +++ b/code/core/src/core-server/utils/doTelemetry.ts @@ -1,5 +1,5 @@ -import { getPrecedingUpgrade, telemetry } from '@storybook/core/telemetry'; -import type { CoreConfig, Options } from '@storybook/core/types'; +import { getPrecedingUpgrade, telemetry } from 'storybook/internal/telemetry'; +import type { CoreConfig, Options } from 'storybook/internal/types'; import type Polka from 'polka'; import invariant from 'tiny-invariant'; diff --git a/code/core/src/core-server/utils/get-builders.ts b/code/core/src/core-server/utils/get-builders.ts index 5b654a14c955..6ffe6250e72b 100644 --- a/code/core/src/core-server/utils/get-builders.ts +++ b/code/core/src/core-server/utils/get-builders.ts @@ -1,11 +1,10 @@ import { pathToFileURL } from 'node:url'; -import type { Builder, Options } from '@storybook/core/types'; - -import { MissingBuilderError } from '@storybook/core/server-errors'; +import { MissingBuilderError } from 'storybook/internal/server-errors'; +import type { Builder, Options } from 'storybook/internal/types'; export async function getManagerBuilder(): Promise> { - return import('@storybook/core/builder-manager'); + return import('storybook/internal/builder-manager'); } export async function getPreviewBuilder( diff --git a/code/core/src/core-server/utils/get-new-story-file.test.ts b/code/core/src/core-server/utils/get-new-story-file.test.ts index 6144927e478e..be2265f329da 100644 --- a/code/core/src/core-server/utils/get-new-story-file.test.ts +++ b/code/core/src/core-server/utils/get-new-story-file.test.ts @@ -4,8 +4,8 @@ import { describe, expect, it, vi } from 'vitest'; import { getNewStoryFile } from './get-new-story-file'; -vi.mock('@storybook/core/common', async (importOriginal) => { - const actual = await importOriginal(); +vi.mock('storybook/internal/common', async (importOriginal) => { + const actual = await importOriginal(); return { ...actual, getProjectRoot: vi.fn().mockReturnValue(require('path').join(__dirname)), diff --git a/code/core/src/core-server/utils/get-new-story-file.ts b/code/core/src/core-server/utils/get-new-story-file.ts index 570ab8aecf7e..593997a291f2 100644 --- a/code/core/src/core-server/utils/get-new-story-file.ts +++ b/code/core/src/core-server/utils/get-new-story-file.ts @@ -6,10 +6,9 @@ import { getFrameworkName, getProjectRoot, rendererPackages, -} from '@storybook/core/common'; -import type { Options } from '@storybook/core/types'; - -import type { CreateNewStoryRequestPayload } from '@storybook/core/core-events'; +} from 'storybook/internal/common'; +import type { CreateNewStoryRequestPayload } from 'storybook/internal/core-events'; +import type { Options } from 'storybook/internal/types'; import { getJavaScriptTemplateForNewStoryFile } from './new-story-templates/javascript'; import { getTypeScriptTemplateForNewStoryFile } from './new-story-templates/typescript'; diff --git a/code/core/src/core-server/utils/get-server-channel.ts b/code/core/src/core-server/utils/get-server-channel.ts index b7f86328292b..e1e4705000e2 100644 --- a/code/core/src/core-server/utils/get-server-channel.ts +++ b/code/core/src/core-server/utils/get-server-channel.ts @@ -1,5 +1,5 @@ -import type { ChannelHandler } from '@storybook/core/channels'; -import { Channel } from '@storybook/core/channels'; +import type { ChannelHandler } from 'storybook/internal/channels'; +import { Channel } from 'storybook/internal/channels'; import { isJSON, parse, stringify } from 'telejson'; import WebSocket, { WebSocketServer } from 'ws'; diff --git a/code/core/src/core-server/utils/getStoryIndexGenerator.ts b/code/core/src/core-server/utils/getStoryIndexGenerator.ts index d91373d825cf..0559055808e2 100644 --- a/code/core/src/core-server/utils/getStoryIndexGenerator.ts +++ b/code/core/src/core-server/utils/getStoryIndexGenerator.ts @@ -1,5 +1,5 @@ -import { normalizeStories } from '@storybook/core/common'; -import type { DocsOptions, Options } from '@storybook/core/types'; +import { normalizeStories } from 'storybook/internal/common'; +import type { DocsOptions, Options } from 'storybook/internal/types'; import type Polka from 'polka'; diff --git a/code/core/src/core-server/utils/metadata.ts b/code/core/src/core-server/utils/metadata.ts index a9a2ebb337ba..a0c53c3ccd0d 100644 --- a/code/core/src/core-server/utils/metadata.ts +++ b/code/core/src/core-server/utils/metadata.ts @@ -1,6 +1,6 @@ import { writeFile } from 'node:fs/promises'; -import { getStorybookMetadata } from '@storybook/core/telemetry'; +import { getStorybookMetadata } from 'storybook/internal/telemetry'; import type Polka from 'polka'; diff --git a/code/core/src/core-server/utils/open-in-browser.ts b/code/core/src/core-server/utils/open-in-browser.ts index aa5f745b8ce6..2a8789171f49 100644 --- a/code/core/src/core-server/utils/open-in-browser.ts +++ b/code/core/src/core-server/utils/open-in-browser.ts @@ -1,4 +1,4 @@ -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import getDefaultBrowser from '@aw-web-design/x-default-browser'; import betterOpn from 'better-opn'; diff --git a/code/core/src/core-server/utils/output-startup-information.ts b/code/core/src/core-server/utils/output-startup-information.ts index 411e3e80be46..8d8973a0d247 100644 --- a/code/core/src/core-server/utils/output-startup-information.ts +++ b/code/core/src/core-server/utils/output-startup-information.ts @@ -1,6 +1,5 @@ -import type { VersionCheck } from '@storybook/core/types'; - -import { colors } from '@storybook/core/node-logger'; +import { colors } from 'storybook/internal/node-logger'; +import type { VersionCheck } from 'storybook/internal/types'; import boxen from 'boxen'; import Table from 'cli-table3'; diff --git a/code/core/src/core-server/utils/output-stats.ts b/code/core/src/core-server/utils/output-stats.ts index 24c736147f1e..a852c2766e0c 100644 --- a/code/core/src/core-server/utils/output-stats.ts +++ b/code/core/src/core-server/utils/output-stats.ts @@ -1,9 +1,8 @@ import { createWriteStream } from 'node:fs'; import { join } from 'node:path'; -import type { Stats } from '@storybook/core/types'; - -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; +import type { Stats } from 'storybook/internal/types'; import { stringifyStream } from '@discoveryjs/json-ext'; import picocolors from 'picocolors'; diff --git a/code/core/src/core-server/utils/parser/generic-parser.ts b/code/core/src/core-server/utils/parser/generic-parser.ts index b4229b726636..4b28fdbbb56d 100644 --- a/code/core/src/core-server/utils/parser/generic-parser.ts +++ b/code/core/src/core-server/utils/parser/generic-parser.ts @@ -1,4 +1,4 @@ -import { parser, types as t } from '@storybook/core/babel'; +import { parser, types as t } from 'storybook/internal/babel'; import type { Parser, ParserResult } from './types'; diff --git a/code/core/src/core-server/utils/parser/index.ts b/code/core/src/core-server/utils/parser/index.ts index 384811650086..61feeb8790e3 100644 --- a/code/core/src/core-server/utils/parser/index.ts +++ b/code/core/src/core-server/utils/parser/index.ts @@ -1,4 +1,4 @@ -import type { SupportedRenderers } from '@storybook/core/types'; +import type { SupportedRenderers } from 'storybook/internal/types'; import { GenericParser } from './generic-parser'; import type { Parser } from './types'; diff --git a/code/core/src/core-server/utils/remove-mdx-entries.ts b/code/core/src/core-server/utils/remove-mdx-entries.ts index da431155016a..9d2237bf98ae 100644 --- a/code/core/src/core-server/utils/remove-mdx-entries.ts +++ b/code/core/src/core-server/utils/remove-mdx-entries.ts @@ -1,7 +1,7 @@ import { isAbsolute, join, relative } from 'node:path'; -import { commonGlobOptions, normalizeStories } from '@storybook/core/common'; -import type { Options, StoriesEntry } from '@storybook/core/types'; +import { commonGlobOptions, normalizeStories } from 'storybook/internal/common'; +import type { Options, StoriesEntry } from 'storybook/internal/types'; // eslint-disable-next-line depend/ban-dependencies import { glob } from 'glob'; diff --git a/code/core/src/core-server/utils/save-story/duplicate-story-with-new-name.test.ts b/code/core/src/core-server/utils/save-story/duplicate-story-with-new-name.test.ts index 549c74337ca9..e145c7638208 100644 --- a/code/core/src/core-server/utils/save-story/duplicate-story-with-new-name.test.ts +++ b/code/core/src/core-server/utils/save-story/duplicate-story-with-new-name.test.ts @@ -4,7 +4,7 @@ import { join } from 'node:path'; import { describe, expect, test } from 'vitest'; -import { printCsf, readCsf } from '@storybook/core/csf-tools'; +import { printCsf, readCsf } from 'storybook/internal/csf-tools'; import { format } from 'prettier'; diff --git a/code/core/src/core-server/utils/save-story/duplicate-story-with-new-name.ts b/code/core/src/core-server/utils/save-story/duplicate-story-with-new-name.ts index fe85e2cb6aa0..f6f415481d3a 100644 --- a/code/core/src/core-server/utils/save-story/duplicate-story-with-new-name.ts +++ b/code/core/src/core-server/utils/save-story/duplicate-story-with-new-name.ts @@ -1,7 +1,6 @@ /* eslint-disable no-underscore-dangle */ -import { types as t, traverse } from '@storybook/core/babel'; - -import type { CsfFile } from '@storybook/core/csf-tools'; +import { types as t, traverse } from 'storybook/internal/babel'; +import type { CsfFile } from 'storybook/internal/csf-tools'; import { SaveStoryError } from './utils'; diff --git a/code/core/src/core-server/utils/save-story/save-story.ts b/code/core/src/core-server/utils/save-story/save-story.ts index 9131107fdc0c..baefa376494d 100644 --- a/code/core/src/core-server/utils/save-story/save-story.ts +++ b/code/core/src/core-server/utils/save-story/save-story.ts @@ -2,25 +2,25 @@ import { writeFile } from 'node:fs/promises'; import { basename, join } from 'node:path'; -import type { Channel } from '@storybook/core/channels'; -import { formatFileContent } from '@storybook/core/common'; -import { isExampleStoryId, telemetry } from '@storybook/core/telemetry'; -import type { CoreConfig, Options } from '@storybook/core/types'; -import { storyNameFromExport, toId } from '@storybook/csf'; - +import type { Channel } from 'storybook/internal/channels'; +import { formatFileContent } from 'storybook/internal/common'; import type { RequestData, ResponseData, SaveStoryRequestPayload, SaveStoryResponsePayload, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; import { SAVE_STORY_REQUEST, SAVE_STORY_RESPONSE, STORY_RENDERED, -} from '@storybook/core/core-events'; -import { printCsf, readCsf } from '@storybook/core/csf-tools'; -import { logger } from '@storybook/core/node-logger'; +} from 'storybook/internal/core-events'; +import { printCsf, readCsf } from 'storybook/internal/csf-tools'; +import { logger } from 'storybook/internal/node-logger'; +import { isExampleStoryId, telemetry } from 'storybook/internal/telemetry'; +import type { CoreConfig, Options } from 'storybook/internal/types'; + +import { storyNameFromExport, toId } from '@storybook/csf'; import { duplicateStoryWithNewName } from './duplicate-story-with-new-name'; import { updateArgsInCsfFile } from './update-args-in-csf-file'; diff --git a/code/core/src/core-server/utils/save-story/update-args-in-csf-file.test.ts b/code/core/src/core-server/utils/save-story/update-args-in-csf-file.test.ts index 43bc049fc58b..30426f2773ff 100644 --- a/code/core/src/core-server/utils/save-story/update-args-in-csf-file.test.ts +++ b/code/core/src/core-server/utils/save-story/update-args-in-csf-file.test.ts @@ -4,7 +4,7 @@ import { join } from 'node:path'; import { describe, expect, test } from 'vitest'; -import { printCsf, readCsf } from '@storybook/core/csf-tools'; +import { printCsf, readCsf } from 'storybook/internal/csf-tools'; import { format } from 'prettier'; diff --git a/code/core/src/core-server/utils/save-story/update-args-in-csf-file.ts b/code/core/src/core-server/utils/save-story/update-args-in-csf-file.ts index 7e1f30e7e961..f6ecaed1a38c 100644 --- a/code/core/src/core-server/utils/save-story/update-args-in-csf-file.ts +++ b/code/core/src/core-server/utils/save-story/update-args-in-csf-file.ts @@ -1,4 +1,4 @@ -import { types as t, traverse } from '@storybook/core/babel'; +import { types as t, traverse } from 'storybook/internal/babel'; import { SaveStoryError } from './utils'; import { valueToAST } from './valueToAST'; diff --git a/code/core/src/core-server/utils/save-story/valueToAST.ts b/code/core/src/core-server/utils/save-story/valueToAST.ts index 48aa0952cb25..72fe823aad31 100644 --- a/code/core/src/core-server/utils/save-story/valueToAST.ts +++ b/code/core/src/core-server/utils/save-story/valueToAST.ts @@ -1,4 +1,4 @@ -import { parser, types as t } from '@storybook/core/babel'; +import { parser, types as t } from 'storybook/internal/babel'; export function valueToAST(literal: T): any { if (literal === null) { diff --git a/code/core/src/core-server/utils/server-address.test.ts b/code/core/src/core-server/utils/server-address.test.ts index a2c5475dc2e6..fa714b9e7bbb 100644 --- a/code/core/src/core-server/utils/server-address.test.ts +++ b/code/core/src/core-server/utils/server-address.test.ts @@ -8,7 +8,7 @@ vi.mock('node:os', () => ({ default: { release: () => '' }, })); vi.mock('detect-port'); -vi.mock('@storybook/core/node-logger'); +vi.mock('storybook/internal/node-logger'); describe('getServerAddresses', () => { const port = 3000; diff --git a/code/core/src/core-server/utils/server-address.ts b/code/core/src/core-server/utils/server-address.ts index 7bbc6970a9c2..89e826aa4804 100644 --- a/code/core/src/core-server/utils/server-address.ts +++ b/code/core/src/core-server/utils/server-address.ts @@ -1,6 +1,6 @@ import os from 'node:os'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import detectFreePort from 'detect-port'; diff --git a/code/core/src/core-server/utils/server-init.ts b/code/core/src/core-server/utils/server-init.ts index d06c3421e7bc..6dc78f1422ef 100644 --- a/code/core/src/core-server/utils/server-init.ts +++ b/code/core/src/core-server/utils/server-init.ts @@ -1,6 +1,6 @@ import { readFile } from 'node:fs/promises'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import http from 'http'; import https from 'https'; diff --git a/code/core/src/core-server/utils/server-statics.ts b/code/core/src/core-server/utils/server-statics.ts index 470d14ceb153..85455ebf5371 100644 --- a/code/core/src/core-server/utils/server-statics.ts +++ b/code/core/src/core-server/utils/server-statics.ts @@ -1,10 +1,9 @@ import { existsSync } from 'node:fs'; import { basename, isAbsolute, posix, resolve, sep, win32 } from 'node:path'; -import { getDirectoryFromWorkingDir } from '@storybook/core/common'; -import type { Options, StorybookConfigRaw } from '@storybook/core/types'; - -import { logger } from '@storybook/core/node-logger'; +import { getDirectoryFromWorkingDir } from 'storybook/internal/common'; +import { logger } from 'storybook/internal/node-logger'; +import type { Options, StorybookConfigRaw } from 'storybook/internal/types'; import picocolors from 'picocolors'; import type Polka from 'polka'; diff --git a/code/core/src/core-server/utils/stories-json.test.ts b/code/core/src/core-server/utils/stories-json.test.ts index 4868c149b724..360b218d9943 100644 --- a/code/core/src/core-server/utils/stories-json.test.ts +++ b/code/core/src/core-server/utils/stories-json.test.ts @@ -2,9 +2,8 @@ import { join } from 'node:path'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { normalizeStoriesEntry } from '@storybook/core/common'; - -import { STORY_INDEX_INVALIDATED } from '@storybook/core/core-events'; +import { normalizeStoriesEntry } from 'storybook/internal/common'; +import { STORY_INDEX_INVALIDATED } from 'storybook/internal/core-events'; import { debounce } from 'es-toolkit/compat'; import type Polka from 'polka'; @@ -18,7 +17,7 @@ import { DEBOUNCE, useStoriesJson } from './stories-json'; vi.mock('watchpack'); vi.mock('es-toolkit/compat'); -vi.mock('@storybook/core/node-logger'); +vi.mock('storybook/internal/node-logger'); const workingDir = join(__dirname, '__mockdata__'); const normalizedStories = [ diff --git a/code/core/src/core-server/utils/stories-json.ts b/code/core/src/core-server/utils/stories-json.ts index a33e12eb0393..f94a0c542ff2 100644 --- a/code/core/src/core-server/utils/stories-json.ts +++ b/code/core/src/core-server/utils/stories-json.ts @@ -1,9 +1,8 @@ import { writeFile } from 'node:fs/promises'; import { basename } from 'node:path'; -import type { NormalizedStoriesSpecifier, StoryIndex } from '@storybook/core/types'; - -import { STORY_INDEX_INVALIDATED } from '@storybook/core/core-events'; +import { STORY_INDEX_INVALIDATED } from 'storybook/internal/core-events'; +import type { NormalizedStoriesSpecifier, StoryIndex } from 'storybook/internal/types'; import { debounce } from 'es-toolkit/compat'; import type Polka from 'polka'; diff --git a/code/core/src/core-server/utils/summarizeIndex.ts b/code/core/src/core-server/utils/summarizeIndex.ts index 92932939d476..9d880825e949 100644 --- a/code/core/src/core-server/utils/summarizeIndex.ts +++ b/code/core/src/core-server/utils/summarizeIndex.ts @@ -1,5 +1,5 @@ -import { isExampleStoryId } from '@storybook/core/telemetry'; -import type { IndexEntry, StoryIndex } from '@storybook/core/types'; +import { isExampleStoryId } from 'storybook/internal/telemetry'; +import type { IndexEntry, StoryIndex } from 'storybook/internal/types'; import { AUTODOCS_TAG, PLAY_FN_TAG, isMdxEntry } from './StoryIndexGenerator'; diff --git a/code/core/src/core-server/utils/summarizeStats.ts b/code/core/src/core-server/utils/summarizeStats.ts index 0120e7eac32a..ccad35146615 100644 --- a/code/core/src/core-server/utils/summarizeStats.ts +++ b/code/core/src/core-server/utils/summarizeStats.ts @@ -1,4 +1,4 @@ -import type { IndexInputStats } from '@storybook/core/types'; +import type { IndexInputStats } from 'storybook/internal/types'; export type IndexStatsSummary = Record; diff --git a/code/core/src/core-server/utils/update-check.ts b/code/core/src/core-server/utils/update-check.ts index efdd6ba95510..d96bca528681 100644 --- a/code/core/src/core-server/utils/update-check.ts +++ b/code/core/src/core-server/utils/update-check.ts @@ -1,7 +1,6 @@ -import { cache } from '@storybook/core/common'; -import type { VersionCheck } from '@storybook/core/types'; - -import { colors } from '@storybook/core/node-logger'; +import { cache } from 'storybook/internal/common'; +import { colors } from 'storybook/internal/node-logger'; +import type { VersionCheck } from 'storybook/internal/types'; import picocolors from 'picocolors'; import semver from 'semver'; diff --git a/code/core/src/core-server/utils/versionStatus.ts b/code/core/src/core-server/utils/versionStatus.ts index e351d50094e7..93c924b731c4 100644 --- a/code/core/src/core-server/utils/versionStatus.ts +++ b/code/core/src/core-server/utils/versionStatus.ts @@ -1,4 +1,4 @@ -import type { VersionCheck } from '@storybook/core/types'; +import type { VersionCheck } from 'storybook/internal/types'; export const versionStatus = (versionCheck: VersionCheck) => { if (versionCheck.error) { diff --git a/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts b/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts index aaf64313fd61..30b4fd064837 100644 --- a/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts +++ b/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts @@ -1,4 +1,4 @@ -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import { getIncompatiblePackagesSummary, diff --git a/code/core/src/core-server/utils/warnWhenUsingArgTypesRegex.ts b/code/core/src/core-server/utils/warnWhenUsingArgTypesRegex.ts index ea28dbfc9c00..87d5d601dcd8 100644 --- a/code/core/src/core-server/utils/warnWhenUsingArgTypesRegex.ts +++ b/code/core/src/core-server/utils/warnWhenUsingArgTypesRegex.ts @@ -1,9 +1,8 @@ import { readFile } from 'node:fs/promises'; -import { type BabelFile, core } from '@storybook/core/babel'; -import type { StorybookConfig } from '@storybook/core/types'; - -import { babelParse } from '@storybook/core/csf-tools'; +import { type BabelFile, core } from 'storybook/internal/babel'; +import { babelParse } from 'storybook/internal/csf-tools'; +import type { StorybookConfig } from 'storybook/internal/types'; import picocolors from 'picocolors'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/core-server/utils/watch-story-specifiers.test.ts b/code/core/src/core-server/utils/watch-story-specifiers.test.ts index 9142af5aeb22..476db312e4cd 100644 --- a/code/core/src/core-server/utils/watch-story-specifiers.test.ts +++ b/code/core/src/core-server/utils/watch-story-specifiers.test.ts @@ -2,7 +2,7 @@ import { join } from 'node:path'; import { afterEach, describe, expect, it, vi } from 'vitest'; -import { normalizeStoriesEntry } from '@storybook/core/common'; +import { normalizeStoriesEntry } from 'storybook/internal/common'; import Watchpack from 'watchpack'; diff --git a/code/core/src/core-server/utils/watch-story-specifiers.ts b/code/core/src/core-server/utils/watch-story-specifiers.ts index 6fa8d3e83a6f..33c678767134 100644 --- a/code/core/src/core-server/utils/watch-story-specifiers.ts +++ b/code/core/src/core-server/utils/watch-story-specifiers.ts @@ -1,8 +1,8 @@ import { type Dirent, lstatSync, readdirSync } from 'node:fs'; import { basename, join, relative, resolve } from 'node:path'; -import { commonGlobOptions } from '@storybook/core/common'; -import type { NormalizedStoriesSpecifier, Path } from '@storybook/core/types'; +import { commonGlobOptions } from 'storybook/internal/common'; +import type { NormalizedStoriesSpecifier, Path } from 'storybook/internal/types'; import slash from 'slash'; import Watchpack from 'watchpack'; diff --git a/code/core/src/core-server/utils/watchConfig.ts b/code/core/src/core-server/utils/watchConfig.ts index 073d3bc6c2df..c3b993d04b1d 100644 --- a/code/core/src/core-server/utils/watchConfig.ts +++ b/code/core/src/core-server/utils/watchConfig.ts @@ -1,4 +1,4 @@ -import type { Path } from '@storybook/core/types'; +import type { Path } from 'storybook/internal/types'; import Watchpack from 'watchpack'; diff --git a/code/core/src/core-server/utils/whats-new.ts b/code/core/src/core-server/utils/whats-new.ts index 71c71984cb12..07ba73af330d 100644 --- a/code/core/src/core-server/utils/whats-new.ts +++ b/code/core/src/core-server/utils/whats-new.ts @@ -1,21 +1,20 @@ /* eslint-disable no-underscore-dangle */ import { writeFile } from 'node:fs/promises'; -import type { Channel } from '@storybook/core/channels'; -import { findConfigFile, loadMainConfig } from '@storybook/core/common'; -import { telemetry } from '@storybook/core/telemetry'; -import type { CoreConfig, Options } from '@storybook/core/types'; - -import type { WhatsNewCache, WhatsNewData } from '@storybook/core/core-events'; +import type { Channel } from 'storybook/internal/channels'; +import { findConfigFile, loadMainConfig } from 'storybook/internal/common'; +import type { WhatsNewCache, WhatsNewData } from 'storybook/internal/core-events'; import { REQUEST_WHATS_NEW_DATA, RESULT_WHATS_NEW_DATA, SET_WHATS_NEW_CACHE, TELEMETRY_ERROR, TOGGLE_WHATS_NEW_NOTIFICATIONS, -} from '@storybook/core/core-events'; -import { printConfig, readConfig } from '@storybook/core/csf-tools'; -import { logger } from '@storybook/core/node-logger'; +} from 'storybook/internal/core-events'; +import { printConfig, readConfig } from 'storybook/internal/csf-tools'; +import { logger } from 'storybook/internal/node-logger'; +import { telemetry } from 'storybook/internal/telemetry'; +import type { CoreConfig, Options } from 'storybook/internal/types'; import invariant from 'tiny-invariant'; diff --git a/code/core/src/core-server/withTelemetry.test.ts b/code/core/src/core-server/withTelemetry.test.ts index 6c0628ec4e1e..27843b3f73fa 100644 --- a/code/core/src/core-server/withTelemetry.test.ts +++ b/code/core/src/core-server/withTelemetry.test.ts @@ -1,15 +1,15 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { cache, loadAllPresets } from '@storybook/core/common'; -import { oneWayHash, telemetry } from '@storybook/core/telemetry'; +import { cache, loadAllPresets } from 'storybook/internal/common'; +import { oneWayHash, telemetry } from 'storybook/internal/telemetry'; import prompts from 'prompts'; import { getErrorLevel, sendTelemetryError, withTelemetry } from './withTelemetry'; vi.mock('prompts'); -vi.mock('@storybook/core/common'); -vi.mock('@storybook/core/telemetry'); +vi.mock('storybook/internal/common'); +vi.mock('storybook/internal/telemetry'); const cliOptions = {}; diff --git a/code/core/src/core-server/withTelemetry.ts b/code/core/src/core-server/withTelemetry.ts index 93475fd71e9b..94ff561b611e 100644 --- a/code/core/src/core-server/withTelemetry.ts +++ b/code/core/src/core-server/withTelemetry.ts @@ -1,9 +1,8 @@ -import { cache, loadAllPresets } from '@storybook/core/common'; -import { getPrecedingUpgrade, oneWayHash, telemetry } from '@storybook/core/telemetry'; -import type { EventType } from '@storybook/core/telemetry'; -import type { CLIOptions } from '@storybook/core/types'; - -import { logger } from '@storybook/core/node-logger'; +import { cache, loadAllPresets } from 'storybook/internal/common'; +import { logger } from 'storybook/internal/node-logger'; +import { getPrecedingUpgrade, oneWayHash, telemetry } from 'storybook/internal/telemetry'; +import type { EventType } from 'storybook/internal/telemetry'; +import type { CLIOptions } from 'storybook/internal/types'; import prompts from 'prompts'; diff --git a/code/core/src/csf-tools/ConfigFile.test.ts b/code/core/src/csf-tools/ConfigFile.test.ts index e3409d5eb681..299231718f79 100644 --- a/code/core/src/csf-tools/ConfigFile.test.ts +++ b/code/core/src/csf-tools/ConfigFile.test.ts @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle */ import { describe, expect, it } from 'vitest'; -import { babelPrint } from '@storybook/core/babel'; +import { babelPrint } from 'storybook/internal/babel'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/csf-tools/ConfigFile.ts b/code/core/src/csf-tools/ConfigFile.ts index dc9f973d5ad6..18e6af57f7b4 100644 --- a/code/core/src/csf-tools/ConfigFile.ts +++ b/code/core/src/csf-tools/ConfigFile.ts @@ -8,7 +8,7 @@ import { recast, types as t, traverse, -} from '@storybook/core/babel'; +} from 'storybook/internal/babel'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/csf-tools/CsfFile.ts b/code/core/src/csf-tools/CsfFile.ts index b953395c9abc..5cb47a6732ba 100644 --- a/code/core/src/csf-tools/CsfFile.ts +++ b/code/core/src/csf-tools/CsfFile.ts @@ -10,7 +10,7 @@ import { recast, types as t, traverse, -} from '@storybook/core/babel'; +} from 'storybook/internal/babel'; import type { ComponentAnnotations, IndexInput, @@ -18,7 +18,8 @@ import type { IndexedCSFFile, StoryAnnotations, Tag, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; + import { isExportStory, storyNameFromExport, toId } from '@storybook/csf'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/csf-tools/enrichCsf.ts b/code/core/src/csf-tools/enrichCsf.ts index aa4a205e6bf3..2af4505f08af 100644 --- a/code/core/src/csf-tools/enrichCsf.ts +++ b/code/core/src/csf-tools/enrichCsf.ts @@ -1,5 +1,5 @@ /* eslint-disable no-underscore-dangle */ -import { generate, types as t } from '@storybook/core/babel'; +import { generate, types as t } from 'storybook/internal/babel'; import type { CsfFile } from './CsfFile'; diff --git a/code/core/src/csf-tools/findVarInitialization.ts b/code/core/src/csf-tools/findVarInitialization.ts index 78a3cfe9a9f9..b933ba1ab4e4 100644 --- a/code/core/src/csf-tools/findVarInitialization.ts +++ b/code/core/src/csf-tools/findVarInitialization.ts @@ -1,4 +1,4 @@ -import { types as t } from '@storybook/core/babel'; +import { types as t } from 'storybook/internal/babel'; export const findVarInitialization = (identifier: string, program: t.Program): t.Expression => { let init: t.Expression = null as any; diff --git a/code/core/src/csf-tools/getStorySortParameter.ts b/code/core/src/csf-tools/getStorySortParameter.ts index 4615ca64ce0e..c54ad1b99a09 100644 --- a/code/core/src/csf-tools/getStorySortParameter.ts +++ b/code/core/src/csf-tools/getStorySortParameter.ts @@ -1,4 +1,4 @@ -import { babelParse, generate, types as t, traverse } from '@storybook/core/babel'; +import { babelParse, generate, types as t, traverse } from 'storybook/internal/babel'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/csf-tools/index.ts b/code/core/src/csf-tools/index.ts index 57605310e9f1..a2dcddb3cc0e 100644 --- a/code/core/src/csf-tools/index.ts +++ b/code/core/src/csf-tools/index.ts @@ -2,5 +2,5 @@ export * from './CsfFile'; export * from './ConfigFile'; export * from './getStorySortParameter'; export * from './enrichCsf'; -export { babelParse } from '@storybook/core/babel'; +export { babelParse } from 'storybook/internal/babel'; export { vitestTransform } from './vitest-plugin/transformer'; diff --git a/code/core/src/csf-tools/vitest-plugin/transformer.test.ts b/code/core/src/csf-tools/vitest-plugin/transformer.test.ts index 5b030ac19c73..c9e149e30394 100644 --- a/code/core/src/csf-tools/vitest-plugin/transformer.test.ts +++ b/code/core/src/csf-tools/vitest-plugin/transformer.test.ts @@ -1,13 +1,13 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { getStoryTitle } from '@storybook/core/common'; +import { getStoryTitle } from 'storybook/internal/common'; import { type RawSourceMap, SourceMapConsumer } from 'source-map'; import { vitestTransform as originalTransform } from './transformer'; -vi.mock('@storybook/core/common', async (importOriginal) => { - const actual = await importOriginal(); +vi.mock('storybook/internal/common', async (importOriginal) => { + const actual = await importOriginal(); return { ...actual, getStoryTitle: vi.fn(() => 'automatic/calculated/title'), diff --git a/code/core/src/csf-tools/vitest-plugin/transformer.ts b/code/core/src/csf-tools/vitest-plugin/transformer.ts index c318faa1d29e..59e7890c8de4 100644 --- a/code/core/src/csf-tools/vitest-plugin/transformer.ts +++ b/code/core/src/csf-tools/vitest-plugin/transformer.ts @@ -1,9 +1,10 @@ /* eslint-disable local-rules/no-uncategorized-errors */ /* eslint-disable no-underscore-dangle */ -import { types as t } from '@storybook/core/babel'; -import { getStoryTitle } from '@storybook/core/common'; -import type { StoriesEntry, Tag } from '@storybook/core/types'; +import { types as t } from 'storybook/internal/babel'; +import { getStoryTitle } from 'storybook/internal/common'; +import type { StoriesEntry, Tag } from 'storybook/internal/types'; + import { combineTags } from '@storybook/csf'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/docs-tools/argTypes/convert/convert.test.ts b/code/core/src/docs-tools/argTypes/convert/convert.test.ts index 11ca35291953..f04add2e7e04 100644 --- a/code/core/src/docs-tools/argTypes/convert/convert.test.ts +++ b/code/core/src/docs-tools/argTypes/convert/convert.test.ts @@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs'; import { describe, expect, it } from 'vitest'; -import { transformSync } from '@storybook/core/babel'; +import { transformSync } from 'storybook/internal/babel'; import { mapValues } from 'es-toolkit'; import requireFromString from 'require-from-string'; diff --git a/code/core/src/docs-tools/argTypes/convert/flow/convert.ts b/code/core/src/docs-tools/argTypes/convert/flow/convert.ts index 573a8da025d4..20bff516e4cf 100644 --- a/code/core/src/docs-tools/argTypes/convert/flow/convert.ts +++ b/code/core/src/docs-tools/argTypes/convert/flow/convert.ts @@ -1,6 +1,5 @@ -import type { SBType } from '@storybook/core/types'; - -import { UnknownArgTypesError } from '@storybook/core/preview-errors'; +import { UnknownArgTypesError } from 'storybook/internal/preview-errors'; +import type { SBType } from 'storybook/internal/types'; import type { FlowLiteralType, FlowSigType, FlowType } from './types'; diff --git a/code/core/src/docs-tools/argTypes/convert/proptypes/convert.ts b/code/core/src/docs-tools/argTypes/convert/proptypes/convert.ts index c3426ecfd3e2..33df39b9cb48 100644 --- a/code/core/src/docs-tools/argTypes/convert/proptypes/convert.ts +++ b/code/core/src/docs-tools/argTypes/convert/proptypes/convert.ts @@ -1,4 +1,4 @@ -import type { SBType } from '@storybook/core/types'; +import type { SBType } from 'storybook/internal/types'; import { mapValues } from 'es-toolkit'; diff --git a/code/core/src/docs-tools/argTypes/convert/typescript/convert.ts b/code/core/src/docs-tools/argTypes/convert/typescript/convert.ts index 9065c68501f4..3beaae0a3542 100644 --- a/code/core/src/docs-tools/argTypes/convert/typescript/convert.ts +++ b/code/core/src/docs-tools/argTypes/convert/typescript/convert.ts @@ -1,6 +1,5 @@ -import type { SBType } from '@storybook/core/types'; - -import { UnknownArgTypesError } from '@storybook/core/preview-errors'; +import { UnknownArgTypesError } from 'storybook/internal/preview-errors'; +import type { SBType } from 'storybook/internal/types'; import { parseLiteral } from '../utils'; import type { TSSigType, TSType } from './types'; diff --git a/code/core/src/docs-tools/argTypes/docgen/types.ts b/code/core/src/docs-tools/argTypes/docgen/types.ts index 9639be964e00..787552a6126b 100644 --- a/code/core/src/docs-tools/argTypes/docgen/types.ts +++ b/code/core/src/docs-tools/argTypes/docgen/types.ts @@ -1,4 +1,4 @@ -import type { StrictArgTypes } from '@storybook/core/types'; +import type { StrictArgTypes } from 'storybook/internal/types'; import type { Component } from '../types'; import type { PropDef } from './PropDef'; diff --git a/code/core/src/docs-tools/argTypes/enhanceArgTypes.test.ts b/code/core/src/docs-tools/argTypes/enhanceArgTypes.test.ts index 55b70ef2ea52..f269987ab8d0 100644 --- a/code/core/src/docs-tools/argTypes/enhanceArgTypes.test.ts +++ b/code/core/src/docs-tools/argTypes/enhanceArgTypes.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import type { ArgTypes, StrictInputType } from '@storybook/core/types'; +import type { ArgTypes, StrictInputType } from 'storybook/internal/types'; import { enhanceArgTypes } from './enhanceArgTypes'; diff --git a/code/core/src/docs-tools/argTypes/enhanceArgTypes.ts b/code/core/src/docs-tools/argTypes/enhanceArgTypes.ts index 96cc2ce44d67..6f7360f9b3cc 100644 --- a/code/core/src/docs-tools/argTypes/enhanceArgTypes.ts +++ b/code/core/src/docs-tools/argTypes/enhanceArgTypes.ts @@ -1,6 +1,5 @@ -import type { Renderer, StoryContextForEnhancers } from '@storybook/core/types'; - -import { combineParameters } from '@storybook/core/preview-api'; +import { combineParameters } from 'storybook/internal/preview-api'; +import type { Renderer, StoryContextForEnhancers } from 'storybook/internal/types'; export const enhanceArgTypes = ( context: StoryContextForEnhancers diff --git a/code/core/src/docs-tools/hasDocsOrControls.ts b/code/core/src/docs-tools/hasDocsOrControls.ts index 14e423dd3071..4fbb21335f69 100644 --- a/code/core/src/docs-tools/hasDocsOrControls.ts +++ b/code/core/src/docs-tools/hasDocsOrControls.ts @@ -1,4 +1,4 @@ -import type { Options } from '@storybook/core/types'; +import type { Options } from 'storybook/internal/types'; // `addons/x` is for the monorepo, `addon-x` is for normal usage const packageRe = /(addons\/|addon-|addon-essentials\/)(docs|controls)/; diff --git a/code/core/src/manager-api/lib/addons.ts b/code/core/src/manager-api/lib/addons.ts index e893dfa7b984..75486a0b25a5 100644 --- a/code/core/src/manager-api/lib/addons.ts +++ b/code/core/src/manager-api/lib/addons.ts @@ -1,4 +1,6 @@ -import type { Channel } from '@storybook/core/channels'; +import type { Channel } from 'storybook/internal/channels'; +import { logger } from 'storybook/internal/client-logger'; +import { SET_CONFIG } from 'storybook/internal/core-events'; import type { Addon_BaseType, Addon_Collection, @@ -13,12 +15,10 @@ import type { Addon_Types, Addon_TypesMapping, Addon_WrapperType, -} from '@storybook/core/types'; -import { Addon_TypesEnum } from '@storybook/core/types'; -import { global } from '@storybook/global'; +} from 'storybook/internal/types'; +import { Addon_TypesEnum } from 'storybook/internal/types'; -import { logger } from '@storybook/core/client-logger'; -import { SET_CONFIG } from '@storybook/core/core-events'; +import { global } from '@storybook/global'; import type { API } from '../root'; import { mockChannel } from './storybook-channel-mock'; diff --git a/code/core/src/manager-api/lib/events.ts b/code/core/src/manager-api/lib/events.ts index f964626ac8ef..2f3e4e92a028 100644 --- a/code/core/src/manager-api/lib/events.ts +++ b/code/core/src/manager-api/lib/events.ts @@ -1,6 +1,5 @@ -import type { API_ComposedRef } from '@storybook/core/types'; - -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; +import type { API_ComposedRef } from 'storybook/internal/types'; import { getSourceType } from '../modules/refs'; import type { API } from '../root'; diff --git a/code/core/src/manager-api/lib/merge.ts b/code/core/src/manager-api/lib/merge.ts index f00195c304b2..457331557da5 100644 --- a/code/core/src/manager-api/lib/merge.ts +++ b/code/core/src/manager-api/lib/merge.ts @@ -1,4 +1,4 @@ -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; import { isEqual, mergeWith, omitBy, pick } from 'es-toolkit'; diff --git a/code/core/src/manager-api/lib/request-response.ts b/code/core/src/manager-api/lib/request-response.ts index 6d4c07367093..00774fe086c8 100644 --- a/code/core/src/manager-api/lib/request-response.ts +++ b/code/core/src/manager-api/lib/request-response.ts @@ -1,6 +1,5 @@ -import type { Channel } from '@storybook/core/channels'; - -import type { RequestData, ResponseData } from '@storybook/core/core-events'; +import type { Channel } from 'storybook/internal/channels'; +import type { RequestData, ResponseData } from 'storybook/internal/core-events'; export class RequestResponseError | void> extends Error { payload: Payload | undefined = undefined; diff --git a/code/core/src/manager-api/lib/stories.test.ts b/code/core/src/manager-api/lib/stories.test.ts index 3f0cbe63b5be..4c1668573abe 100644 --- a/code/core/src/manager-api/lib/stories.test.ts +++ b/code/core/src/manager-api/lib/stories.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import type { API_PreparedStoryIndex, StoryIndexV2, StoryIndexV3 } from '@storybook/core/types'; +import type { API_PreparedStoryIndex, StoryIndexV2, StoryIndexV3 } from 'storybook/internal/types'; import type { State } from '../root'; import { mockEntries } from '../tests/mockStoriesEntries'; diff --git a/code/core/src/manager-api/lib/stories.ts b/code/core/src/manager-api/lib/stories.ts index b38d30000531..45ae29cfcad9 100644 --- a/code/core/src/manager-api/lib/stories.ts +++ b/code/core/src/manager-api/lib/stories.ts @@ -18,7 +18,8 @@ import type { StoryIndexV2, StoryIndexV3, Tag, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; + import { sanitize } from '@storybook/csf'; import { countBy, mapValues } from 'es-toolkit'; diff --git a/code/core/src/manager-api/lib/storybook-channel-mock.ts b/code/core/src/manager-api/lib/storybook-channel-mock.ts index 2f8abbf20b5f..23fce7c5ff8a 100644 --- a/code/core/src/manager-api/lib/storybook-channel-mock.ts +++ b/code/core/src/manager-api/lib/storybook-channel-mock.ts @@ -1,4 +1,4 @@ -import { Channel } from '@storybook/core/channels'; +import { Channel } from 'storybook/internal/channels'; export function mockChannel() { const transport = { diff --git a/code/core/src/manager-api/lib/types.tsx b/code/core/src/manager-api/lib/types.tsx index 1579954f7e17..b9fc9d9757b1 100644 --- a/code/core/src/manager-api/lib/types.tsx +++ b/code/core/src/manager-api/lib/types.tsx @@ -1,5 +1,5 @@ -import type { RouterData } from '@storybook/core/router'; -import type { API_ProviderData } from '@storybook/core/types'; +import type { RouterData } from 'storybook/internal/router'; +import type { API_ProviderData } from 'storybook/internal/types'; import type { API, State } from '../root'; import type Store from '../store'; diff --git a/code/core/src/manager-api/modules/addons.ts b/code/core/src/manager-api/modules/addons.ts index 16a35fcfc9ad..5382013b0b00 100644 --- a/code/core/src/manager-api/modules/addons.ts +++ b/code/core/src/manager-api/modules/addons.ts @@ -1,11 +1,11 @@ +import { Addon_TypesEnum } from 'storybook/internal/types'; import type { API_StateMerger, Addon_BaseType, Addon_Collection, Addon_Types, Addon_TypesMapping, -} from '@storybook/core/types'; -import { Addon_TypesEnum } from '@storybook/core/types'; +} from 'storybook/internal/types'; import type { ModuleFn } from '../lib/types'; import type { Options } from '../store'; diff --git a/code/core/src/manager-api/modules/channel.ts b/code/core/src/manager-api/modules/channel.ts index da401d78acaa..45bb76bc4af3 100644 --- a/code/core/src/manager-api/modules/channel.ts +++ b/code/core/src/manager-api/modules/channel.ts @@ -1,5 +1,5 @@ -import type { Listener } from '@storybook/core/channels'; -import type { API_Provider } from '@storybook/core/types'; +import type { Listener } from 'storybook/internal/channels'; +import type { API_Provider } from 'storybook/internal/types'; import type { ModuleFn } from '../lib/types'; import type { API } from '../root'; diff --git a/code/core/src/manager-api/modules/experimental_testmodule.ts b/code/core/src/manager-api/modules/experimental_testmodule.ts index 4058333a3b10..bfe769069a9d 100644 --- a/code/core/src/manager-api/modules/experimental_testmodule.ts +++ b/code/core/src/manager-api/modules/experimental_testmodule.ts @@ -1,5 +1,3 @@ -import { Addon_TypesEnum, type StoryId } from '@storybook/core/types'; - import { TESTING_MODULE_CANCEL_TEST_RUN_REQUEST, TESTING_MODULE_RUN_ALL_REQUEST, @@ -10,7 +8,8 @@ import { type TestProviders, type TestingModuleRunRequestPayload, type TestingModuleWatchModeRequestPayload, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import { Addon_TypesEnum, type StoryId } from 'storybook/internal/types'; import invariant from 'tiny-invariant'; diff --git a/code/core/src/manager-api/modules/globals.ts b/code/core/src/manager-api/modules/globals.ts index a61f28f57c5d..bdf5c23ebe7c 100644 --- a/code/core/src/manager-api/modules/globals.ts +++ b/code/core/src/manager-api/modules/globals.ts @@ -1,12 +1,11 @@ +import { logger } from 'storybook/internal/client-logger'; +import { GLOBALS_UPDATED, SET_GLOBALS, UPDATE_GLOBALS } from 'storybook/internal/core-events'; import type { GlobalTypes, Globals, GlobalsUpdatedPayload, SetGlobalsPayload, -} from '@storybook/core/types'; - -import { logger } from '@storybook/core/client-logger'; -import { GLOBALS_UPDATED, SET_GLOBALS, UPDATE_GLOBALS } from '@storybook/core/core-events'; +} from 'storybook/internal/types'; import { dequal as deepEqual } from 'dequal'; diff --git a/code/core/src/manager-api/modules/layout.ts b/code/core/src/manager-api/modules/layout.ts index 6687c36b1137..0b8036450f9e 100644 --- a/code/core/src/manager-api/modules/layout.ts +++ b/code/core/src/manager-api/modules/layout.ts @@ -1,9 +1,9 @@ -import type { ThemeVars } from '@storybook/core/theming'; -import { create } from '@storybook/core/theming/create'; -import type { API_Layout, API_PanelPositions, API_UI } from '@storybook/core/types'; -import { global } from '@storybook/global'; +import { SET_CONFIG } from 'storybook/internal/core-events'; +import type { ThemeVars } from 'storybook/internal/theming'; +import { create } from 'storybook/internal/theming/create'; +import type { API_Layout, API_PanelPositions, API_UI } from 'storybook/internal/types'; -import { SET_CONFIG } from '@storybook/core/core-events'; +import { global } from '@storybook/global'; import { isEqual as deepEqual, pick, toMerged } from 'es-toolkit'; diff --git a/code/core/src/manager-api/modules/notifications.ts b/code/core/src/manager-api/modules/notifications.ts index c1410cfbeb78..31431b684dd2 100644 --- a/code/core/src/manager-api/modules/notifications.ts +++ b/code/core/src/manager-api/modules/notifications.ts @@ -1,4 +1,4 @@ -import type { API_Notification } from '@storybook/core/types'; +import type { API_Notification } from 'storybook/internal/types'; import { partition } from 'es-toolkit'; diff --git a/code/core/src/manager-api/modules/provider.ts b/code/core/src/manager-api/modules/provider.ts index 0e22115369e1..40b833584742 100644 --- a/code/core/src/manager-api/modules/provider.ts +++ b/code/core/src/manager-api/modules/provider.ts @@ -1,4 +1,4 @@ -import type { API_IframeRenderer } from '@storybook/core/types'; +import type { API_IframeRenderer } from 'storybook/internal/types'; import type { ModuleFn } from '../lib/types'; diff --git a/code/core/src/manager-api/modules/refs.ts b/code/core/src/manager-api/modules/refs.ts index cb9b8916ce29..1ec0b477f2ba 100644 --- a/code/core/src/manager-api/modules/refs.ts +++ b/code/core/src/manager-api/modules/refs.ts @@ -7,7 +7,8 @@ import type { API_StoryMapper, SetStoriesStoryData, StoryIndex, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/manager-api/modules/settings.ts b/code/core/src/manager-api/modules/settings.ts index 1fe6672947e6..db83ad102a3d 100644 --- a/code/core/src/manager-api/modules/settings.ts +++ b/code/core/src/manager-api/modules/settings.ts @@ -1,4 +1,4 @@ -import type { API_Settings, StoryId } from '@storybook/core/types'; +import type { API_Settings, StoryId } from 'storybook/internal/types'; import type { ModuleFn } from '../lib/types'; diff --git a/code/core/src/manager-api/modules/shortcuts.ts b/code/core/src/manager-api/modules/shortcuts.ts index 09582c3fb1a4..39648883a69d 100644 --- a/code/core/src/manager-api/modules/shortcuts.ts +++ b/code/core/src/manager-api/modules/shortcuts.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { global } from '@storybook/global'; - import { FORCE_REMOUNT, PREVIEW_KEYDOWN, STORIES_COLLAPSE_ALL, STORIES_EXPAND_ALL, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; + +import { global } from '@storybook/global'; import type { KeyboardEventLike } from '../lib/shortcut'; import { eventToShortcut, shortcutMatchesShortcut } from '../lib/shortcut'; diff --git a/code/core/src/manager-api/modules/stories.ts b/code/core/src/manager-api/modules/stories.ts index fa295bc20567..204803e3bf33 100644 --- a/code/core/src/manager-api/modules/stories.ts +++ b/code/core/src/manager-api/modules/stories.ts @@ -1,3 +1,24 @@ +import { logger } from 'storybook/internal/client-logger'; +import { + CONFIG_ERROR, + CURRENT_STORY_WAS_SET, + DOCS_PREPARED, + PRELOAD_ENTRIES, + RESET_STORY_ARGS, + SELECT_STORY, + SET_CONFIG, + SET_CURRENT_STORY, + SET_FILTER, + SET_INDEX, + SET_STORIES, + STORY_ARGS_UPDATED, + STORY_CHANGED, + STORY_INDEX_INVALIDATED, + STORY_MISSING, + STORY_PREPARED, + STORY_SPECIFIED, + UPDATE_STORY_ARGS, +} from 'storybook/internal/core-events'; import type { API_ComposedRef, API_DocsEntry, @@ -21,32 +42,11 @@ import type { StoryKind, StoryName, StoryPreparedPayload, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; + import { sanitize, toId } from '@storybook/csf'; import { global } from '@storybook/global'; -import { logger } from '@storybook/core/client-logger'; -import { - CONFIG_ERROR, - CURRENT_STORY_WAS_SET, - DOCS_PREPARED, - PRELOAD_ENTRIES, - RESET_STORY_ARGS, - SELECT_STORY, - SET_CONFIG, - SET_CURRENT_STORY, - SET_FILTER, - SET_INDEX, - SET_STORIES, - STORY_ARGS_UPDATED, - STORY_CHANGED, - STORY_INDEX_INVALIDATED, - STORY_MISSING, - STORY_PREPARED, - STORY_SPECIFIED, - UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; - import { getEventMetadata } from '../lib/events'; import { addPreparedStories, diff --git a/code/core/src/manager-api/modules/url.ts b/code/core/src/manager-api/modules/url.ts index 1b08ba7358d4..d8667cf4ed07 100644 --- a/code/core/src/manager-api/modules/url.ts +++ b/code/core/src/manager-api/modules/url.ts @@ -1,15 +1,15 @@ -import type { NavigateOptions } from '@storybook/core/router'; -import { buildArgsParam, queryFromLocation } from '@storybook/core/router'; -import type { API_Layout, API_UI, Args } from '@storybook/core/types'; -import { global } from '@storybook/global'; - import { GLOBALS_UPDATED, NAVIGATE_URL, SET_CURRENT_STORY, STORY_ARGS_UPDATED, UPDATE_QUERY_PARAMS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import { buildArgsParam, queryFromLocation } from 'storybook/internal/router'; +import type { NavigateOptions } from 'storybook/internal/router'; +import type { API_Layout, API_UI, Args } from 'storybook/internal/types'; + +import { global } from '@storybook/global'; import { dequal as deepEqual } from 'dequal'; diff --git a/code/core/src/manager-api/modules/versions.ts b/code/core/src/manager-api/modules/versions.ts index df0712e8c638..f9cc2a36cf7d 100644 --- a/code/core/src/manager-api/modules/versions.ts +++ b/code/core/src/manager-api/modules/versions.ts @@ -1,4 +1,5 @@ -import type { API_UnknownEntries, API_Version, API_Versions } from '@storybook/core/types'; +import type { API_UnknownEntries, API_Version, API_Versions } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import memoize from 'memoizerific'; diff --git a/code/core/src/manager-api/modules/whatsnew.tsx b/code/core/src/manager-api/modules/whatsnew.tsx index 7878f5920066..6a03168e5fb4 100644 --- a/code/core/src/manager-api/modules/whatsnew.tsx +++ b/code/core/src/manager-api/modules/whatsnew.tsx @@ -1,15 +1,15 @@ import React from 'react'; -import { global } from '@storybook/global'; -import { StorybookIcon } from '@storybook/icons'; - -import type { WhatsNewCache, WhatsNewData } from '@storybook/core/core-events'; import { REQUEST_WHATS_NEW_DATA, RESULT_WHATS_NEW_DATA, SET_WHATS_NEW_CACHE, TOGGLE_WHATS_NEW_NOTIFICATIONS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { WhatsNewCache, WhatsNewData } from 'storybook/internal/core-events'; + +import { global } from '@storybook/global'; +import { StorybookIcon } from '@storybook/icons'; import type { ModuleFn } from '../lib/types'; diff --git a/code/core/src/manager-api/root.tsx b/code/core/src/manager-api/root.tsx index 0889a560c8a0..753b507f1c8d 100644 --- a/code/core/src/manager-api/root.tsx +++ b/code/core/src/manager-api/root.tsx @@ -10,8 +10,15 @@ import React, { useRef, } from 'react'; -import type { Listener } from '@storybook/core/channels'; -import type { RouterData } from '@storybook/core/router'; +import type { Listener } from 'storybook/internal/channels'; +import { deprecate } from 'storybook/internal/client-logger'; +import { + SET_STORIES, + SHARED_STATE_CHANGED, + SHARED_STATE_SET, + STORY_CHANGED, +} from 'storybook/internal/core-events'; +import type { RouterData } from 'storybook/internal/router'; import type { API_ComponentEntry, API_ComposedRef, @@ -31,15 +38,7 @@ import type { Globals, Parameters, StoryId, -} from '@storybook/core/types'; - -import { deprecate } from '@storybook/core/client-logger'; -import { - SET_STORIES, - SHARED_STATE_CHANGED, - SHARED_STATE_SET, - STORY_CHANGED, -} from '@storybook/core/core-events'; +} from 'storybook/internal/types'; import { isEqual } from 'es-toolkit'; diff --git a/code/core/src/manager-api/tests/addons.test.js b/code/core/src/manager-api/tests/addons.test.js index c4f5c46d41df..8f79b953e7c3 100644 --- a/code/core/src/manager-api/tests/addons.test.js +++ b/code/core/src/manager-api/tests/addons.test.js @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import { Addon_TypesEnum as types } from '@storybook/core/types'; +import { Addon_TypesEnum as types } from 'storybook/internal/types'; import { init as initAddons } from '../modules/addons'; diff --git a/code/core/src/manager-api/tests/globals.test.ts b/code/core/src/manager-api/tests/globals.test.ts index 96da32051f2b..8045ad2526c8 100644 --- a/code/core/src/manager-api/tests/globals.test.ts +++ b/code/core/src/manager-api/tests/globals.test.ts @@ -1,14 +1,13 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { GlobalsUpdatedPayload, SetGlobalsPayload } from '@storybook/core/types'; - -import { logger as _logger } from '@storybook/core/client-logger'; +import { logger as _logger } from 'storybook/internal/client-logger'; import { GLOBALS_UPDATED, SET_GLOBALS, SET_STORIES, UPDATE_GLOBALS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { GlobalsUpdatedPayload, SetGlobalsPayload } from 'storybook/internal/types'; import { EventEmitter } from 'events'; @@ -21,7 +20,7 @@ import type { API } from '../root'; const getEventMetadata = vi.mocked(_getEventData, true); const logger = vi.mocked(_logger, true); -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); vi.mock('../lib/events'); beforeEach(() => { getEventMetadata.mockReset().mockReturnValue({ sourceType: 'local' } as any); diff --git a/code/core/src/manager-api/tests/layout.test.ts b/code/core/src/manager-api/tests/layout.test.ts index 7b1c7361f254..067083ad5e15 100644 --- a/code/core/src/manager-api/tests/layout.test.ts +++ b/code/core/src/manager-api/tests/layout.test.ts @@ -1,8 +1,8 @@ import type { Mock } from 'vitest'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { themes } from '@storybook/core/theming'; -import type { API_Provider } from '@storybook/core/types'; +import { themes } from 'storybook/internal/theming'; +import type { API_Provider } from 'storybook/internal/types'; import EventEmitter from 'events'; @@ -25,7 +25,7 @@ describe('layout API', () => { beforeEach(() => { currentState = { ...defaultLayoutState, - selectedPanel: '@storybook/core/actions/panel', + selectedPanel: 'storybook/internal/action/panel', theme: themes.light, singleStory: false, }; diff --git a/code/core/src/manager-api/tests/mockStoriesEntries.ts b/code/core/src/manager-api/tests/mockStoriesEntries.ts index 2bccab057186..a66fd8184896 100644 --- a/code/core/src/manager-api/tests/mockStoriesEntries.ts +++ b/code/core/src/manager-api/tests/mockStoriesEntries.ts @@ -1,4 +1,4 @@ -import type { API_PreparedStoryIndex, StoryIndex } from '@storybook/core/types'; +import type { API_PreparedStoryIndex, StoryIndex } from 'storybook/internal/types'; export const mockEntries: StoryIndex['entries'] = { 'component-a--docs': { diff --git a/code/core/src/manager-api/tests/refs.test.ts b/code/core/src/manager-api/tests/refs.test.ts index b9d39ee6a88b..d743514fd3b0 100644 --- a/code/core/src/manager-api/tests/refs.test.ts +++ b/code/core/src/manager-api/tests/refs.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; -import type { StoryIndex } from '@storybook/core/types'; +import type { StoryIndex } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { transformStoryIndexToStoriesHash } from '../lib/stories'; diff --git a/code/core/src/manager-api/tests/stories.test.ts b/code/core/src/manager-api/tests/stories.test.ts index 6f480061d9ec..61f95bae4486 100644 --- a/code/core/src/manager-api/tests/stories.test.ts +++ b/code/core/src/manager-api/tests/stories.test.ts @@ -1,9 +1,6 @@ import type { Mocked } from 'vitest'; import { describe, expect, it, vi } from 'vitest'; -import type { API_StoryEntry } from '@storybook/core/types'; -import { global } from '@storybook/global'; - import { CONFIG_ERROR, CURRENT_STORY_WAS_SET, @@ -17,7 +14,10 @@ import { STORY_PREPARED, STORY_SPECIFIED, UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { API_StoryEntry } from 'storybook/internal/types'; + +import { global } from '@storybook/global'; import { EventEmitter } from 'events'; diff --git a/code/core/src/manager-api/tests/url.test.js b/code/core/src/manager-api/tests/url.test.js index 15e1c288863a..72523a24c25b 100644 --- a/code/core/src/manager-api/tests/url.test.js +++ b/code/core/src/manager-api/tests/url.test.js @@ -4,13 +4,13 @@ import { GLOBALS_UPDATED, SET_CURRENT_STORY, UPDATE_QUERY_PARAMS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; import EventEmitter from 'events'; import { init as initURL } from '../modules/url'; -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); vi.useFakeTimers(); describe('initial state', () => { diff --git a/code/core/src/manager-api/tests/versions.test.js b/code/core/src/manager-api/tests/versions.test.js index 280deaeed2ae..875c45b11624 100644 --- a/code/core/src/manager-api/tests/versions.test.js +++ b/code/core/src/manager-api/tests/versions.test.js @@ -25,7 +25,7 @@ vi.mock('@storybook/global', () => ({ }, })); -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); function createMockStore() { let state = { @@ -46,7 +46,7 @@ function createMockStore() { }; } -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); describe('versions API', () => { it('sets initial state with current version', async () => { diff --git a/code/core/src/manager-api/typings.d.ts b/code/core/src/manager-api/typings.d.ts index 2aa4cc366704..824597424def 100644 --- a/code/core/src/manager-api/typings.d.ts +++ b/code/core/src/manager-api/typings.d.ts @@ -2,8 +2,8 @@ declare var __STORYBOOK_ADDONS_MANAGER: any; declare var CONFIG_TYPE: string; -declare var FEATURES: import('@storybook/core/types').StorybookConfigRaw['features']; -declare var TAGS_OPTIONS: import('@storybook/core/types').StorybookConfigRaw['tags']; +declare var FEATURES: import('storybook/internal/types').StorybookConfigRaw['features']; +declare var TAGS_OPTIONS: import('storybook/internal/types').StorybookConfigRaw['tags']; declare var REFS: any; declare var VERSIONCHECK: any; declare var LOGLEVEL: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'silent' | undefined; diff --git a/code/core/src/manager/App.tsx b/code/core/src/manager/App.tsx index 287f9736cc71..a4cda42bf8ac 100644 --- a/code/core/src/manager/App.tsx +++ b/code/core/src/manager/App.tsx @@ -1,8 +1,8 @@ import type { ComponentProps } from 'react'; import React from 'react'; -import { Global, createGlobal } from '@storybook/core/theming'; -import type { Addon_PageType } from '@storybook/core/types'; +import { Global, createGlobal } from 'storybook/internal/theming'; +import type { Addon_PageType } from 'storybook/internal/types'; import { Layout } from './components/layout/Layout'; import { useLayout } from './components/layout/LayoutProvider'; diff --git a/code/core/src/manager/FakeProvider.tsx b/code/core/src/manager/FakeProvider.tsx index dc66dedf0f6f..ef4d87f0aecb 100644 --- a/code/core/src/manager/FakeProvider.tsx +++ b/code/core/src/manager/FakeProvider.tsx @@ -1,8 +1,7 @@ import React from 'react'; -import { styled } from '@storybook/core/theming'; - -import { addons } from '@storybook/core/manager-api'; +import { addons } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; import Provider from './provider'; diff --git a/code/core/src/manager/components/layout/Layout.stories.tsx b/code/core/src/manager/components/layout/Layout.stories.tsx index 6a133d6c492f..e3f19df412db 100644 --- a/code/core/src/manager/components/layout/Layout.stories.tsx +++ b/code/core/src/manager/components/layout/Layout.stories.tsx @@ -1,8 +1,9 @@ import type { FC, PropsWithChildren } from 'react'; import React, { useState } from 'react'; -import { LocationProvider } from '@storybook/core/router'; -import { styled } from '@storybook/core/theming'; +import { LocationProvider } from 'storybook/internal/router'; +import { styled } from 'storybook/internal/theming'; + import type { Meta, StoryObj } from '@storybook/react'; import { fn } from '@storybook/test'; diff --git a/code/core/src/manager/components/layout/Layout.tsx b/code/core/src/manager/components/layout/Layout.tsx index df9d5b86d9cb..39e992c653eb 100644 --- a/code/core/src/manager/components/layout/Layout.tsx +++ b/code/core/src/manager/components/layout/Layout.tsx @@ -1,8 +1,8 @@ import React, { useEffect, useLayoutEffect, useState } from 'react'; -import { Match } from '@storybook/core/router'; -import { styled } from '@storybook/core/theming'; -import type { API_Layout, API_ViewMode } from '@storybook/core/types'; +import { Match } from 'storybook/internal/router'; +import { styled } from 'storybook/internal/theming'; +import type { API_Layout, API_ViewMode } from 'storybook/internal/types'; import { MEDIA_DESKTOP_BREAKPOINT } from '../../constants'; import { Notifications } from '../../container/Notifications'; diff --git a/code/core/src/manager/components/mobile/about/MobileAbout.stories.tsx b/code/core/src/manager/components/mobile/about/MobileAbout.stories.tsx index e72de1787c68..36759e03950e 100644 --- a/code/core/src/manager/components/mobile/about/MobileAbout.stories.tsx +++ b/code/core/src/manager/components/mobile/about/MobileAbout.stories.tsx @@ -1,10 +1,10 @@ import React, { useEffect } from 'react'; +import { ManagerContext } from 'storybook/internal/manager-api'; + import type { Meta, StoryObj } from '@storybook/react'; import { within } from '@storybook/test'; -import { ManagerContext } from '@storybook/core/manager-api'; - import { LayoutProvider, useLayout } from '../../layout/LayoutProvider'; import { MobileAbout } from './MobileAbout'; diff --git a/code/core/src/manager/components/mobile/about/MobileAbout.tsx b/code/core/src/manager/components/mobile/about/MobileAbout.tsx index a794ba00ea9f..09379c49087b 100644 --- a/code/core/src/manager/components/mobile/about/MobileAbout.tsx +++ b/code/core/src/manager/components/mobile/about/MobileAbout.tsx @@ -1,8 +1,9 @@ import type { FC } from 'react'; import React, { useRef } from 'react'; -import { Link } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { Link } from 'storybook/internal/components'; +import { styled } from 'storybook/internal/theming'; + import { ArrowLeftIcon, GithubIcon, ShareAltIcon, StorybookIcon } from '@storybook/icons'; import { Transition, type TransitionStatus } from 'react-transition-group'; diff --git a/code/core/src/manager/components/mobile/navigation/MobileAddonsDrawer.tsx b/code/core/src/manager/components/mobile/navigation/MobileAddonsDrawer.tsx index def0c9e2bdf8..41f3c02639dd 100644 --- a/code/core/src/manager/components/mobile/navigation/MobileAddonsDrawer.tsx +++ b/code/core/src/manager/components/mobile/navigation/MobileAddonsDrawer.tsx @@ -1,7 +1,7 @@ import type { FC, ReactNode } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; interface MobileAddonsDrawerProps { children: ReactNode; diff --git a/code/core/src/manager/components/mobile/navigation/MobileMenuDrawer.tsx b/code/core/src/manager/components/mobile/navigation/MobileMenuDrawer.tsx index 7f95bb222521..01f5e7b1c2ad 100644 --- a/code/core/src/manager/components/mobile/navigation/MobileMenuDrawer.tsx +++ b/code/core/src/manager/components/mobile/navigation/MobileMenuDrawer.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React, { useRef } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { Transition } from 'react-transition-group'; import type { TransitionStatus } from 'react-transition-group/Transition'; diff --git a/code/core/src/manager/components/mobile/navigation/MobileNavigation.stories.tsx b/code/core/src/manager/components/mobile/navigation/MobileNavigation.stories.tsx index 37e18b66a1fe..3ee9be594fc7 100644 --- a/code/core/src/manager/components/mobile/navigation/MobileNavigation.stories.tsx +++ b/code/core/src/manager/components/mobile/navigation/MobileNavigation.stories.tsx @@ -1,10 +1,10 @@ import React from 'react'; +import { ManagerContext } from 'storybook/internal/manager-api'; + import type { Meta, StoryObj } from '@storybook/react'; import { within } from '@storybook/test'; -import { ManagerContext } from '@storybook/core/manager-api'; - import { startCase } from 'es-toolkit'; import { LayoutProvider, useLayout } from '../../layout/LayoutProvider'; diff --git a/code/core/src/manager/components/mobile/navigation/MobileNavigation.tsx b/code/core/src/manager/components/mobile/navigation/MobileNavigation.tsx index ddef2c0f2de4..f33ce43a783b 100644 --- a/code/core/src/manager/components/mobile/navigation/MobileNavigation.tsx +++ b/code/core/src/manager/components/mobile/navigation/MobileNavigation.tsx @@ -1,13 +1,13 @@ import type { FC } from 'react'; import React from 'react'; -import { IconButton } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { IconButton } from 'storybook/internal/components'; +import { useStorybookApi, useStorybookState } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; + import { BottomBarToggleIcon, MenuIcon } from '@storybook/icons'; import type { API_IndexHash, API_Refs } from '@storybook/types'; -import { useStorybookApi, useStorybookState } from '@storybook/core/manager-api'; - import { useLayout } from '../../layout/LayoutProvider'; import { MobileAddonsDrawer } from './MobileAddonsDrawer'; import { MobileMenuDrawer } from './MobileMenuDrawer'; diff --git a/code/core/src/manager/components/notifications/NotificationItem.stories.tsx b/code/core/src/manager/components/notifications/NotificationItem.stories.tsx index 71622e8c93a0..3af2381d945b 100644 --- a/code/core/src/manager/components/notifications/NotificationItem.stories.tsx +++ b/code/core/src/manager/components/notifications/NotificationItem.stories.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { LocationProvider } from '@storybook/core/router'; +import { LocationProvider } from 'storybook/internal/router'; + import { AccessibilityIcon as AccessibilityIconIcon, BookIcon as BookIconIcon, diff --git a/code/core/src/manager/components/notifications/NotificationItem.tsx b/code/core/src/manager/components/notifications/NotificationItem.tsx index 159fa0da137f..593a229059a8 100644 --- a/code/core/src/manager/components/notifications/NotificationItem.tsx +++ b/code/core/src/manager/components/notifications/NotificationItem.tsx @@ -1,13 +1,13 @@ import type { FC, SyntheticEvent } from 'react'; import React, { useCallback, useEffect, useRef } from 'react'; -import type { IconsProps } from '@storybook/core/components'; -import { IconButton, Icons } from '@storybook/core/components'; -import { Link } from '@storybook/core/router'; -import { keyframes, styled, useTheme } from '@storybook/core/theming'; -import { CloseAltIcon } from '@storybook/icons'; +import type { IconsProps } from 'storybook/internal/components'; +import { IconButton, Icons } from 'storybook/internal/components'; +import { type State } from 'storybook/internal/manager-api'; +import { Link } from 'storybook/internal/router'; +import { keyframes, styled, useTheme } from 'storybook/internal/theming'; -import { type State } from '@storybook/core/manager-api'; +import { CloseAltIcon } from '@storybook/icons'; import { transparentize } from 'polished'; diff --git a/code/core/src/manager/components/notifications/NotificationList.stories.tsx b/code/core/src/manager/components/notifications/NotificationList.stories.tsx index 60554232747c..d79faa6da1fa 100644 --- a/code/core/src/manager/components/notifications/NotificationList.stories.tsx +++ b/code/core/src/manager/components/notifications/NotificationList.stories.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { LocationProvider } from '@storybook/core/router'; +import { LocationProvider } from 'storybook/internal/router'; + import type { Meta, StoryObj } from '@storybook/react'; import * as itemStories from './NotificationItem.stories'; diff --git a/code/core/src/manager/components/notifications/NotificationList.tsx b/code/core/src/manager/components/notifications/NotificationList.tsx index 0e4789a28bf5..169542b48529 100644 --- a/code/core/src/manager/components/notifications/NotificationList.tsx +++ b/code/core/src/manager/components/notifications/NotificationList.tsx @@ -1,9 +1,8 @@ import type { FC } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; - -import type { State } from '@storybook/core/manager-api'; +import type { State } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; import { useLayout } from '../layout/LayoutProvider'; import NotificationItem from './NotificationItem'; diff --git a/code/core/src/manager/components/panel/Panel.stories.tsx b/code/core/src/manager/components/panel/Panel.stories.tsx index 3caa6a3c0fb1..8a8e20ff5217 100644 --- a/code/core/src/manager/components/panel/Panel.stories.tsx +++ b/code/core/src/manager/components/panel/Panel.stories.tsx @@ -1,9 +1,10 @@ import type { EventHandler, FocusEvent, MouseEvent } from 'react'; import React, { useCallback, useRef, useState } from 'react'; -import { Badge, Spaced } from '@storybook/core/components'; -import type { Addon_BaseType, Addon_Collection } from '@storybook/core/types'; -import { Addon_TypesEnum } from '@storybook/core/types'; +import { Badge, Spaced } from 'storybook/internal/components'; +import type { Addon_BaseType, Addon_Collection } from 'storybook/internal/types'; +import { Addon_TypesEnum } from 'storybook/internal/types'; + import { BellIcon } from '@storybook/icons'; import { action } from '@storybook/addon-actions'; diff --git a/code/core/src/manager/components/panel/Panel.tsx b/code/core/src/manager/components/panel/Panel.tsx index dc80c20949d2..f0d1812324dc 100644 --- a/code/core/src/manager/components/panel/Panel.tsx +++ b/code/core/src/manager/components/panel/Panel.tsx @@ -1,12 +1,12 @@ import React, { Component } from 'react'; -import { EmptyTabContent, IconButton, Link, Tabs } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; -import type { Addon_BaseType } from '@storybook/core/types'; -import { BottomBarIcon, CloseIcon, DocumentIcon, SidebarAltIcon } from '@storybook/icons'; +import { EmptyTabContent, IconButton, Link, Tabs } from 'storybook/internal/components'; +import type { State } from 'storybook/internal/manager-api'; +import { shortcutToHumanString } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; +import type { Addon_BaseType } from 'storybook/internal/types'; -import type { State } from '@storybook/core/manager-api'; -import { shortcutToHumanString } from '@storybook/core/manager-api'; +import { BottomBarIcon, CloseIcon, DocumentIcon, SidebarAltIcon } from '@storybook/icons'; import { useLayout } from '../layout/LayoutProvider'; diff --git a/code/core/src/manager/components/preview/FramesRenderer.tsx b/code/core/src/manager/components/preview/FramesRenderer.tsx index 40a42c3fbe98..748cbe6bb35f 100644 --- a/code/core/src/manager/components/preview/FramesRenderer.tsx +++ b/code/core/src/manager/components/preview/FramesRenderer.tsx @@ -1,12 +1,11 @@ import type { FC } from 'react'; import React, { Fragment, useRef } from 'react'; -import { Button, getStoryHref } from '@storybook/core/components'; -import { Global, styled } from '@storybook/core/theming'; -import type { CSSObject } from '@storybook/core/theming'; - -import type { Combo } from '@storybook/core/manager-api'; -import { Consumer } from '@storybook/core/manager-api'; +import { Button, getStoryHref } from 'storybook/internal/components'; +import type { Combo } from 'storybook/internal/manager-api'; +import { Consumer } from 'storybook/internal/manager-api'; +import { Global, styled } from 'storybook/internal/theming'; +import type { CSSObject } from 'storybook/internal/theming'; import { IFrame } from './Iframe'; import { stringifyQueryParams } from './utils/stringifyQueryParams'; diff --git a/code/core/src/manager/components/preview/Iframe.tsx b/code/core/src/manager/components/preview/Iframe.tsx index 13fd65261ec2..889986340f59 100644 --- a/code/core/src/manager/components/preview/Iframe.tsx +++ b/code/core/src/manager/components/preview/Iframe.tsx @@ -1,8 +1,8 @@ import type { IframeHTMLAttributes } from 'react'; import React from 'react'; -import { Zoom } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { Zoom } from 'storybook/internal/components'; +import { styled } from 'storybook/internal/theming'; const StyledIframe = styled.iframe(({ theme }) => ({ backgroundColor: theme.background.preview, diff --git a/code/core/src/manager/components/preview/Preview.tsx b/code/core/src/manager/components/preview/Preview.tsx index ed73a059951f..a7e30c379fef 100644 --- a/code/core/src/manager/components/preview/Preview.tsx +++ b/code/core/src/manager/components/preview/Preview.tsx @@ -1,12 +1,12 @@ import type { FC } from 'react'; import React, { Fragment, useEffect, useRef, useState } from 'react'; -import { Loader } from '@storybook/core/components'; -import type { Addon_BaseType, Addon_WrapperType } from '@storybook/core/types'; -import { global } from '@storybook/global'; +import { Loader } from 'storybook/internal/components'; +import { PREVIEW_BUILDER_PROGRESS, SET_CURRENT_STORY } from 'storybook/internal/core-events'; +import { type Combo, Consumer, addons, merge, types } from 'storybook/internal/manager-api'; +import type { Addon_BaseType, Addon_WrapperType } from 'storybook/internal/types'; -import { PREVIEW_BUILDER_PROGRESS, SET_CURRENT_STORY } from '@storybook/core/core-events'; -import { type Combo, Consumer, addons, merge, types } from '@storybook/core/manager-api'; +import { global } from '@storybook/global'; import { Helmet } from 'react-helmet-async'; diff --git a/code/core/src/manager/components/preview/Toolbar.tsx b/code/core/src/manager/components/preview/Toolbar.tsx index 05385487a804..36c3d4720f10 100644 --- a/code/core/src/manager/components/preview/Toolbar.tsx +++ b/code/core/src/manager/components/preview/Toolbar.tsx @@ -1,10 +1,6 @@ import React, { Fragment } from 'react'; -import { IconButton, Separator, TabBar, TabButton } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; -import { type Addon_BaseType, Addon_TypesEnum } from '@storybook/core/types'; -import { CloseIcon, ExpandIcon } from '@storybook/icons'; - +import { IconButton, Separator, TabBar, TabButton } from 'storybook/internal/components'; import { type API, type Combo, @@ -15,7 +11,11 @@ import { merge, shortcutToHumanString, types, -} from '@storybook/core/manager-api'; +} from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; +import { type Addon_BaseType, Addon_TypesEnum } from 'storybook/internal/types'; + +import { CloseIcon, ExpandIcon } from '@storybook/icons'; import { useLayout } from '../layout/LayoutProvider'; import { addonsTool } from './tools/addons'; diff --git a/code/core/src/manager/components/preview/Wrappers.tsx b/code/core/src/manager/components/preview/Wrappers.tsx index 299db428b1d9..c2bfa417441e 100644 --- a/code/core/src/manager/components/preview/Wrappers.tsx +++ b/code/core/src/manager/components/preview/Wrappers.tsx @@ -1,8 +1,8 @@ import type { FC, PropsWithChildren } from 'react'; import React, { Fragment } from 'react'; -import type { Addon_WrapperType } from '@storybook/core/types'; -import { Addon_TypesEnum } from '@storybook/core/types'; +import { Addon_TypesEnum } from 'storybook/internal/types'; +import type { Addon_WrapperType } from 'storybook/internal/types'; import { IframeWrapper } from './utils/components'; import type { ApplyWrappersProps } from './utils/types'; diff --git a/code/core/src/manager/components/preview/tools/addons.tsx b/code/core/src/manager/components/preview/tools/addons.tsx index 46d45f6eac07..50a08cbbf4ac 100644 --- a/code/core/src/manager/components/preview/tools/addons.tsx +++ b/code/core/src/manager/components/preview/tools/addons.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { IconButton } from '@storybook/core/components'; -import type { Addon_BaseType } from '@storybook/core/types'; -import { BottomBarIcon, SidebarAltIcon } from '@storybook/icons'; +import { IconButton } from 'storybook/internal/components'; +import { Consumer, types } from 'storybook/internal/manager-api'; +import type { Combo } from 'storybook/internal/manager-api'; +import type { Addon_BaseType } from 'storybook/internal/types'; -import { Consumer, types } from '@storybook/core/manager-api'; -import type { Combo } from '@storybook/core/manager-api'; +import { BottomBarIcon, SidebarAltIcon } from '@storybook/icons'; const menuMapper = ({ api, state }: Combo) => ({ isVisible: api.getIsPanelShown(), diff --git a/code/core/src/manager/components/preview/tools/copy.tsx b/code/core/src/manager/components/preview/tools/copy.tsx index adc36d1dac18..1b7683ee7c8f 100644 --- a/code/core/src/manager/components/preview/tools/copy.tsx +++ b/code/core/src/manager/components/preview/tools/copy.tsx @@ -1,13 +1,13 @@ import React from 'react'; -import { IconButton, getStoryHref } from '@storybook/core/components'; -import type { Addon_BaseType } from '@storybook/core/types'; +import { IconButton, getStoryHref } from 'storybook/internal/components'; +import { Consumer, types } from 'storybook/internal/manager-api'; +import type { Combo } from 'storybook/internal/manager-api'; +import type { Addon_BaseType } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { LinkIcon } from '@storybook/icons'; -import { Consumer, types } from '@storybook/core/manager-api'; -import type { Combo } from '@storybook/core/manager-api'; - import copy from 'copy-to-clipboard'; const { PREVIEW_URL, document } = global; diff --git a/code/core/src/manager/components/preview/tools/eject.tsx b/code/core/src/manager/components/preview/tools/eject.tsx index dda18c7db1f9..ddc2521d1bb8 100644 --- a/code/core/src/manager/components/preview/tools/eject.tsx +++ b/code/core/src/manager/components/preview/tools/eject.tsx @@ -1,13 +1,13 @@ import React from 'react'; -import { IconButton, getStoryHref } from '@storybook/core/components'; -import type { Addon_BaseType } from '@storybook/core/types'; +import { IconButton, getStoryHref } from 'storybook/internal/components'; +import { Consumer, types } from 'storybook/internal/manager-api'; +import type { Combo } from 'storybook/internal/manager-api'; +import type { Addon_BaseType } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { ShareAltIcon } from '@storybook/icons'; -import { Consumer, types } from '@storybook/core/manager-api'; -import type { Combo } from '@storybook/core/manager-api'; - const { PREVIEW_URL } = global; const ejectMapper = ({ state }: Combo) => { diff --git a/code/core/src/manager/components/preview/tools/menu.tsx b/code/core/src/manager/components/preview/tools/menu.tsx index f61f8955c541..b5dc0e9f2cbb 100644 --- a/code/core/src/manager/components/preview/tools/menu.tsx +++ b/code/core/src/manager/components/preview/tools/menu.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { IconButton, Separator } from '@storybook/core/components'; -import type { Addon_BaseType } from '@storybook/core/types'; -import { MenuIcon } from '@storybook/icons'; +import { IconButton, Separator } from 'storybook/internal/components'; +import { Consumer, types } from 'storybook/internal/manager-api'; +import type { Combo } from 'storybook/internal/manager-api'; +import type { Addon_BaseType } from 'storybook/internal/types'; -import { Consumer, types } from '@storybook/core/manager-api'; -import type { Combo } from '@storybook/core/manager-api'; +import { MenuIcon } from '@storybook/icons'; const menuMapper = ({ api, state }: Combo) => ({ isVisible: api.getIsNavShown(), diff --git a/code/core/src/manager/components/preview/tools/remount.tsx b/code/core/src/manager/components/preview/tools/remount.tsx index d6fcf7355ac2..c4595f7937b0 100644 --- a/code/core/src/manager/components/preview/tools/remount.tsx +++ b/code/core/src/manager/components/preview/tools/remount.tsx @@ -1,14 +1,14 @@ import type { ComponentProps } from 'react'; import React, { useState } from 'react'; -import { IconButton } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; -import type { Addon_BaseType } from '@storybook/core/types'; -import { SyncIcon } from '@storybook/icons'; +import { IconButton } from 'storybook/internal/components'; +import { FORCE_REMOUNT } from 'storybook/internal/core-events'; +import { Consumer, types } from 'storybook/internal/manager-api'; +import type { Combo } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; +import type { Addon_BaseType } from 'storybook/internal/types'; -import { FORCE_REMOUNT } from '@storybook/core/core-events'; -import { Consumer, types } from '@storybook/core/manager-api'; -import type { Combo } from '@storybook/core/manager-api'; +import { SyncIcon } from '@storybook/icons'; interface AnimatedButtonProps { animating?: boolean; diff --git a/code/core/src/manager/components/preview/tools/zoom.tsx b/code/core/src/manager/components/preview/tools/zoom.tsx index aba59a2da272..c065675e3956 100644 --- a/code/core/src/manager/components/preview/tools/zoom.tsx +++ b/code/core/src/manager/components/preview/tools/zoom.tsx @@ -1,11 +1,11 @@ import type { MouseEventHandler, PropsWithChildren, SyntheticEvent } from 'react'; import React, { Component, createContext, memo, useCallback } from 'react'; -import { IconButton, Separator } from '@storybook/core/components'; -import type { Addon_BaseType } from '@storybook/core/types'; -import { ZoomIcon, ZoomOutIcon, ZoomResetIcon } from '@storybook/icons'; +import { IconButton, Separator } from 'storybook/internal/components'; +import { types } from 'storybook/internal/manager-api'; +import type { Addon_BaseType } from 'storybook/internal/types'; -import { types } from '@storybook/core/manager-api'; +import { ZoomIcon, ZoomOutIcon, ZoomResetIcon } from '@storybook/icons'; const initialZoom = 1 as const; diff --git a/code/core/src/manager/components/preview/utils/components.ts b/code/core/src/manager/components/preview/utils/components.ts index e38f44164e51..0c6c79a81879 100644 --- a/code/core/src/manager/components/preview/utils/components.ts +++ b/code/core/src/manager/components/preview/utils/components.ts @@ -1,5 +1,5 @@ -import { Link } from '@storybook/core/router'; -import { styled } from '@storybook/core/theming'; +import { Link } from 'storybook/internal/router'; +import { styled } from 'storybook/internal/theming'; export const PreviewContainer = styled.main({ display: 'flex', diff --git a/code/core/src/manager/components/preview/utils/types.tsx b/code/core/src/manager/components/preview/utils/types.tsx index 6c18cb6bdddc..831577be8f39 100644 --- a/code/core/src/manager/components/preview/utils/types.tsx +++ b/code/core/src/manager/components/preview/utils/types.tsx @@ -1,13 +1,12 @@ import type { ReactElement } from 'react'; +import type { API, LeafEntry, State } from 'storybook/internal/manager-api'; import type { API_ViewMode, Addon_BaseType, Addon_WrapperType, StoryId, -} from '@storybook/core/types'; - -import type { API, LeafEntry, State } from '@storybook/core/manager-api'; +} from 'storybook/internal/types'; export interface PreviewProps { api: API; diff --git a/code/core/src/manager/components/sidebar/Brand.tsx b/code/core/src/manager/components/sidebar/Brand.tsx index f4ca666e0579..31f685f1bbe8 100644 --- a/code/core/src/manager/components/sidebar/Brand.tsx +++ b/code/core/src/manager/components/sidebar/Brand.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { StorybookLogo } from '@storybook/core/components'; -import { styled, withTheme } from '@storybook/core/theming'; +import { StorybookLogo } from 'storybook/internal/components'; +import { styled, withTheme } from 'storybook/internal/theming'; export const StorybookLogoStyled = styled(StorybookLogo)(({ theme }) => ({ width: 'auto', diff --git a/code/core/src/manager/components/sidebar/ContextMenu.tsx b/code/core/src/manager/components/sidebar/ContextMenu.tsx index 3392c7674eed..399fe2fc81ec 100644 --- a/code/core/src/manager/components/sidebar/ContextMenu.tsx +++ b/code/core/src/manager/components/sidebar/ContextMenu.tsx @@ -1,14 +1,14 @@ import type { ComponentProps, FC, SyntheticEvent } from 'react'; import React, { useMemo, useState } from 'react'; -import { TooltipLinkList, WithTooltip } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; -import { type API_HashEntry, Addon_TypesEnum } from '@storybook/core/types'; -import { EllipsisIcon } from '@storybook/icons'; +import { TooltipLinkList, WithTooltip } from 'storybook/internal/components'; +import { type TestProviders } from 'storybook/internal/core-events'; +import { useStorybookState } from 'storybook/internal/manager-api'; +import type { API } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; +import { type API_HashEntry, Addon_TypesEnum } from 'storybook/internal/types'; -import { type TestProviders } from '@storybook/core/core-events'; -import { useStorybookState } from '@storybook/core/manager-api'; -import type { API } from '@storybook/core/manager-api'; +import { EllipsisIcon } from '@storybook/icons'; import type { Link } from '../../../components/components/tooltip/TooltipLinkList'; import { StatusButton } from './StatusButton'; diff --git a/code/core/src/manager/components/sidebar/CreateNewStoryFileModal.tsx b/code/core/src/manager/components/sidebar/CreateNewStoryFileModal.tsx index 147727cfc0a3..930909efad82 100644 --- a/code/core/src/manager/components/sidebar/CreateNewStoryFileModal.tsx +++ b/code/core/src/manager/components/sidebar/CreateNewStoryFileModal.tsx @@ -1,7 +1,15 @@ import React, { useCallback, useDeferredValue, useEffect, useRef, useState } from 'react'; -import { CheckIcon } from '@storybook/icons'; - +import { + ARGTYPES_INFO_REQUEST, + ARGTYPES_INFO_RESPONSE, + CREATE_NEW_STORYFILE_REQUEST, + CREATE_NEW_STORYFILE_RESPONSE, + FILE_COMPONENT_SEARCH_REQUEST, + FILE_COMPONENT_SEARCH_RESPONSE, + SAVE_STORY_REQUEST, + SAVE_STORY_RESPONSE, +} from 'storybook/internal/core-events'; import type { ArgTypesRequestPayload, ArgTypesResponsePayload, @@ -14,19 +22,15 @@ import type { ResponseData, SaveStoryRequestPayload, SaveStoryResponsePayload, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { RequestResponseError } from 'storybook/internal/manager-api'; import { - ARGTYPES_INFO_REQUEST, - ARGTYPES_INFO_RESPONSE, - CREATE_NEW_STORYFILE_REQUEST, - CREATE_NEW_STORYFILE_RESPONSE, - FILE_COMPONENT_SEARCH_REQUEST, - FILE_COMPONENT_SEARCH_RESPONSE, - SAVE_STORY_REQUEST, - SAVE_STORY_RESPONSE, -} from '@storybook/core/core-events'; -import type { RequestResponseError } from '@storybook/core/manager-api'; -import { addons, experimental_requestResponse, useStorybookApi } from '@storybook/core/manager-api'; + addons, + experimental_requestResponse, + useStorybookApi, +} from 'storybook/internal/manager-api'; + +import { CheckIcon } from '@storybook/icons'; import { useDebounce } from '../../hooks/useDebounce'; import type { NewStoryPayload, SearchResult } from './FileSearchList'; diff --git a/code/core/src/manager/components/sidebar/FileList.tsx b/code/core/src/manager/components/sidebar/FileList.tsx index bc2d46eee829..e07afd7f9aca 100644 --- a/code/core/src/manager/components/sidebar/FileList.tsx +++ b/code/core/src/manager/components/sidebar/FileList.tsx @@ -1,4 +1,4 @@ -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { rgba } from 'polished'; diff --git a/code/core/src/manager/components/sidebar/FileSearchList.tsx b/code/core/src/manager/components/sidebar/FileSearchList.tsx index 3a4eacbbf03c..bb3c80cb8039 100644 --- a/code/core/src/manager/components/sidebar/FileSearchList.tsx +++ b/code/core/src/manager/components/sidebar/FileSearchList.tsx @@ -1,13 +1,13 @@ import React, { memo, useCallback, useMemo, useState } from 'react'; -import { TooltipNote, WithTooltip } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; -import { ChevronDownIcon, ChevronRightIcon, ComponentIcon } from '@storybook/icons'; - +import { TooltipNote, WithTooltip } from 'storybook/internal/components'; import type { CreateNewStoryRequestPayload, FileComponentSearchResponsePayload, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import { styled } from 'storybook/internal/theming'; + +import { ChevronDownIcon, ChevronRightIcon, ComponentIcon } from '@storybook/icons'; import type { VirtualItem } from '@tanstack/react-virtual'; import { useVirtualizer } from '@tanstack/react-virtual'; diff --git a/code/core/src/manager/components/sidebar/FileSearchListSkeleton.tsx b/code/core/src/manager/components/sidebar/FileSearchListSkeleton.tsx index 33e6e0dd890b..cd789a158890 100644 --- a/code/core/src/manager/components/sidebar/FileSearchListSkeleton.tsx +++ b/code/core/src/manager/components/sidebar/FileSearchListSkeleton.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { FileList, FileListItem } from './FileList'; diff --git a/code/core/src/manager/components/sidebar/FileSearchModal.tsx b/code/core/src/manager/components/sidebar/FileSearchModal.tsx index 043abffb5107..1a7cc6039633 100644 --- a/code/core/src/manager/components/sidebar/FileSearchModal.tsx +++ b/code/core/src/manager/components/sidebar/FileSearchModal.tsx @@ -1,7 +1,8 @@ import React, { useEffect, useState, useTransition } from 'react'; -import { Form, Modal } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { Form, Modal } from 'storybook/internal/components'; +import { styled } from 'storybook/internal/theming'; + import { CloseAltIcon, SearchIcon, SyncIcon } from '@storybook/icons'; import { useMeasure } from '../../hooks/useMeasure'; diff --git a/code/core/src/manager/components/sidebar/FilterToggle.tsx b/code/core/src/manager/components/sidebar/FilterToggle.tsx index a5d461fb1a21..5db4f3b6ff20 100644 --- a/code/core/src/manager/components/sidebar/FilterToggle.tsx +++ b/code/core/src/manager/components/sidebar/FilterToggle.tsx @@ -1,7 +1,7 @@ import React, { type ComponentProps } from 'react'; -import { Badge as BaseBadge, IconButton } from '@storybook/core/components'; -import { css, styled } from '@storybook/core/theming'; +import { Badge as BaseBadge, IconButton } from 'storybook/internal/components'; +import { css, styled } from 'storybook/internal/theming'; const Badge = styled(BaseBadge)(({ theme }) => ({ padding: '4px 8px', diff --git a/code/core/src/manager/components/sidebar/Heading.stories.tsx b/code/core/src/manager/components/sidebar/Heading.stories.tsx index 81436bfc0a1d..8e12d3eb7778 100644 --- a/code/core/src/manager/components/sidebar/Heading.stories.tsx +++ b/code/core/src/manager/components/sidebar/Heading.stories.tsx @@ -1,8 +1,9 @@ // @TODO: use addon-interactions and remove the rule disable above import React from 'react'; -import { ThemeProvider, useTheme } from '@storybook/core/theming'; -import type { Theme } from '@storybook/core/theming'; +import { ThemeProvider, useTheme } from 'storybook/internal/theming'; +import type { Theme } from 'storybook/internal/theming'; + import type { Meta, StoryFn, StoryObj } from '@storybook/react'; import { screen } from '@storybook/test'; diff --git a/code/core/src/manager/components/sidebar/Heading.tsx b/code/core/src/manager/components/sidebar/Heading.tsx index 905ae1f61081..567ad39c13a2 100644 --- a/code/core/src/manager/components/sidebar/Heading.tsx +++ b/code/core/src/manager/components/sidebar/Heading.tsx @@ -1,9 +1,9 @@ import type { ComponentProps, FC } from 'react'; import React from 'react'; -import { Button } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; -import type { Addon_SidebarTopType } from '@storybook/core/types'; +import { Button } from 'storybook/internal/components'; +import { styled } from 'storybook/internal/theming'; +import type { Addon_SidebarTopType } from 'storybook/internal/types'; import { Brand } from './Brand'; import type { MenuList, SidebarMenuProps } from './Menu'; diff --git a/code/core/src/manager/components/sidebar/HighlightStyles.tsx b/code/core/src/manager/components/sidebar/HighlightStyles.tsx index 71f853666865..899aba271fdd 100644 --- a/code/core/src/manager/components/sidebar/HighlightStyles.tsx +++ b/code/core/src/manager/components/sidebar/HighlightStyles.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React from 'react'; -import { Global } from '@storybook/core/theming'; +import { Global } from 'storybook/internal/theming'; import { transparentize } from 'polished'; diff --git a/code/core/src/manager/components/sidebar/IconSymbols.tsx b/code/core/src/manager/components/sidebar/IconSymbols.tsx index d33b357c18ac..ace76cd4a694 100644 --- a/code/core/src/manager/components/sidebar/IconSymbols.tsx +++ b/code/core/src/manager/components/sidebar/IconSymbols.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; const Svg = styled.svg` position: absolute; diff --git a/code/core/src/manager/components/sidebar/LegacyRender.tsx b/code/core/src/manager/components/sidebar/LegacyRender.tsx index 22b151c968ff..cbbf1f9b1d40 100644 --- a/code/core/src/manager/components/sidebar/LegacyRender.tsx +++ b/code/core/src/manager/components/sidebar/LegacyRender.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { Button, ProgressSpinner, TooltipNote, WithTooltip } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; -import { EyeIcon, PlayHollowIcon, StopAltIcon } from '@storybook/icons'; +import { Button, ProgressSpinner, TooltipNote, WithTooltip } from 'storybook/internal/components'; +import type { TestProviders } from 'storybook/internal/core-events'; +import { useStorybookApi } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; -import type { TestProviders } from '@storybook/core/core-events'; -import { useStorybookApi } from '@storybook/core/manager-api'; +import { EyeIcon, PlayHollowIcon, StopAltIcon } from '@storybook/icons'; const Container = styled.div({ display: 'flex', diff --git a/code/core/src/manager/components/sidebar/Loader.tsx b/code/core/src/manager/components/sidebar/Loader.tsx index 66f3a3b0f70b..b38f26530dc3 100644 --- a/code/core/src/manager/components/sidebar/Loader.tsx +++ b/code/core/src/manager/components/sidebar/Loader.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React, { Fragment } from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; const LOADER_SEQUENCE = [0, 0, 1, 1, 2, 3, 3, 3, 1, 1, 1, 2, 2, 2, 3]; diff --git a/code/core/src/manager/components/sidebar/Menu.stories.tsx b/code/core/src/manager/components/sidebar/Menu.stories.tsx index d5bf90dc2a60..858a04a2be98 100644 --- a/code/core/src/manager/components/sidebar/Menu.stories.tsx +++ b/code/core/src/manager/components/sidebar/Menu.stories.tsx @@ -1,13 +1,13 @@ import React from 'react'; -import { TooltipLinkList } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { TooltipLinkList } from 'storybook/internal/components'; +import type { State } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; + import { LinkIcon } from '@storybook/icons'; import type { Meta, StoryObj } from '@storybook/react'; import { expect, screen, userEvent, within } from '@storybook/test'; -import type { State } from '@storybook/core/manager-api'; - import { useMenu } from '../../container/Menu'; import { LayoutProvider } from '../layout/LayoutProvider'; import { type MenuList, SidebarMenu } from './Menu'; diff --git a/code/core/src/manager/components/sidebar/Menu.tsx b/code/core/src/manager/components/sidebar/Menu.tsx index aef385c2de1d..513d3a99e844 100644 --- a/code/core/src/manager/components/sidebar/Menu.tsx +++ b/code/core/src/manager/components/sidebar/Menu.tsx @@ -1,9 +1,10 @@ import type { ComponentProps, FC } from 'react'; import React, { useState } from 'react'; -import type { Button } from '@storybook/core/components'; -import { IconButton, TooltipLinkList, WithTooltip } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { IconButton, TooltipLinkList, WithTooltip } from 'storybook/internal/components'; +import type { Button } from 'storybook/internal/components'; +import { styled } from 'storybook/internal/theming'; + import { CloseIcon, CogIcon } from '@storybook/icons'; import { transparentize } from 'polished'; diff --git a/code/core/src/manager/components/sidebar/RefBlocks.tsx b/code/core/src/manager/components/sidebar/RefBlocks.tsx index 16af958a8a02..0df9c26c3ef4 100644 --- a/code/core/src/manager/components/sidebar/RefBlocks.tsx +++ b/code/core/src/manager/components/sidebar/RefBlocks.tsx @@ -1,13 +1,13 @@ import type { FC } from 'react'; import React, { Fragment, useCallback, useState } from 'react'; -import { Button, ErrorFormatter, Link, Spaced, WithTooltip } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { logger } from 'storybook/internal/client-logger'; +import { Button, ErrorFormatter, Link, Spaced, WithTooltip } from 'storybook/internal/components'; +import { styled } from 'storybook/internal/theming'; + import { global } from '@storybook/global'; import { ChevronDownIcon, LockIcon, SyncIcon } from '@storybook/icons'; -import { logger } from '@storybook/core/client-logger'; - import { Contained, Loader } from './Loader'; const { window: globalWindow } = global; diff --git a/code/core/src/manager/components/sidebar/RefIndicator.tsx b/code/core/src/manager/components/sidebar/RefIndicator.tsx index 2a2e54b37dfa..1bcf9f03ff48 100644 --- a/code/core/src/manager/components/sidebar/RefIndicator.tsx +++ b/code/core/src/manager/components/sidebar/RefIndicator.tsx @@ -1,9 +1,11 @@ import type { FC, MouseEventHandler } from 'react'; import React, { forwardRef, useCallback, useMemo } from 'react'; -import type { TooltipLinkListLink } from '@storybook/core/components'; -import { Spaced, TooltipLinkList, WithTooltip } from '@storybook/core/components'; -import { styled, useTheme } from '@storybook/core/theming'; +import type { TooltipLinkListLink } from 'storybook/internal/components'; +import { Spaced, TooltipLinkList, WithTooltip } from 'storybook/internal/components'; +import { useStorybookApi } from 'storybook/internal/manager-api'; +import { styled, useTheme } from 'storybook/internal/theming'; + import { global } from '@storybook/global'; import { AlertIcon, @@ -17,8 +19,6 @@ import { TimeIcon, } from '@storybook/icons'; -import { useStorybookApi } from '@storybook/core/manager-api'; - import { transparentize } from 'polished'; import type { NormalLink } from '../../../components/components/tooltip/TooltipLinkList'; diff --git a/code/core/src/manager/components/sidebar/Refs.stories.tsx b/code/core/src/manager/components/sidebar/Refs.stories.tsx index 3b6e37efce50..c137c252e116 100644 --- a/code/core/src/manager/components/sidebar/Refs.stories.tsx +++ b/code/core/src/manager/components/sidebar/Refs.stories.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { fn } from '@storybook/test'; +import { ManagerContext } from 'storybook/internal/manager-api'; -import { ManagerContext } from '@storybook/core/manager-api'; +import { fn } from '@storybook/test'; import { standardData as standardHeaderData } from './Heading.stories'; import { IconSymbols } from './IconSymbols'; diff --git a/code/core/src/manager/components/sidebar/Refs.tsx b/code/core/src/manager/components/sidebar/Refs.tsx index b4d2a79ca351..4aa26f53d382 100644 --- a/code/core/src/manager/components/sidebar/Refs.tsx +++ b/code/core/src/manager/components/sidebar/Refs.tsx @@ -1,10 +1,9 @@ import type { FC, MutableRefObject } from 'react'; import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; -import { styled } from '@storybook/core/theming'; - -import type { State } from '@storybook/core/manager-api'; -import { useStorybookApi, useStorybookState } from '@storybook/core/manager-api'; +import type { State } from 'storybook/internal/manager-api'; +import { useStorybookApi, useStorybookState } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; import { transparentize } from 'polished'; diff --git a/code/core/src/manager/components/sidebar/Search.stories.tsx b/code/core/src/manager/components/sidebar/Search.stories.tsx index 1638f06b4dea..09a34d80dc8b 100644 --- a/code/core/src/manager/components/sidebar/Search.stories.tsx +++ b/code/core/src/manager/components/sidebar/Search.stories.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import type { Meta, StoryFn } from '@storybook/react'; +import type { API } from 'storybook/internal/manager-api'; +import { ManagerContext } from 'storybook/internal/manager-api'; -import type { API } from '@storybook/core/manager-api'; -import { ManagerContext } from '@storybook/core/manager-api'; +import type { Meta, StoryFn } from '@storybook/react'; import { action } from '@storybook/addon-actions'; diff --git a/code/core/src/manager/components/sidebar/Search.tsx b/code/core/src/manager/components/sidebar/Search.tsx index 16a7ba0f151e..58868e56a0ba 100644 --- a/code/core/src/manager/components/sidebar/Search.tsx +++ b/code/core/src/manager/components/sidebar/Search.tsx @@ -1,12 +1,12 @@ import React, { type ReactNode, useCallback, useRef, useState } from 'react'; -import { IconButton } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { IconButton } from 'storybook/internal/components'; +import { shortcutToHumanString, useStorybookApi } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; + import { global } from '@storybook/global'; import { CloseIcon, SearchIcon } from '@storybook/icons'; -import { shortcutToHumanString, useStorybookApi } from '@storybook/core/manager-api'; - import type { DownshiftState, StateChangeOptions } from 'downshift'; import Downshift from 'downshift'; import type { FuseOptions } from 'fuse.js'; diff --git a/code/core/src/manager/components/sidebar/SearchResults.stories.tsx b/code/core/src/manager/components/sidebar/SearchResults.stories.tsx index 114f529bcd85..f243f7d3f897 100644 --- a/code/core/src/manager/components/sidebar/SearchResults.stories.tsx +++ b/code/core/src/manager/components/sidebar/SearchResults.stories.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import type { StoriesHash } from '@storybook/core/manager-api'; +import type { StoriesHash } from 'storybook/internal/manager-api'; import { searchItem } from '../../utils/tree'; import { IconSymbols } from './IconSymbols'; diff --git a/code/core/src/manager/components/sidebar/SearchResults.tsx b/code/core/src/manager/components/sidebar/SearchResults.tsx index b7689b7d64d0..432fad9445a1 100644 --- a/code/core/src/manager/components/sidebar/SearchResults.tsx +++ b/code/core/src/manager/components/sidebar/SearchResults.tsx @@ -1,14 +1,14 @@ import type { FC, MouseEventHandler, PropsWithChildren, ReactNode } from 'react'; import React, { useCallback, useEffect } from 'react'; -import { Button, IconButton } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { Button, IconButton } from 'storybook/internal/components'; +import { PRELOAD_ENTRIES } from 'storybook/internal/core-events'; +import { useStorybookApi } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; + import { global } from '@storybook/global'; import { TrashIcon } from '@storybook/icons'; -import { PRELOAD_ENTRIES } from '@storybook/core/core-events'; -import { useStorybookApi } from '@storybook/core/manager-api'; - import type { ControllerStateAndHelpers } from 'downshift'; import { transparentize } from 'polished'; diff --git a/code/core/src/manager/components/sidebar/Sidebar.stories.tsx b/code/core/src/manager/components/sidebar/Sidebar.stories.tsx index 0e2df01f6aed..973419fccc74 100644 --- a/code/core/src/manager/components/sidebar/Sidebar.stories.tsx +++ b/code/core/src/manager/components/sidebar/Sidebar.stories.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import type { API_StatusState, Addon_SidebarTopType } from '@storybook/core/types'; +import type { IndexHash, State } from 'storybook/internal/manager-api'; +import { ManagerContext } from 'storybook/internal/manager-api'; +import type { API_StatusState, Addon_SidebarTopType } from 'storybook/internal/types'; + import type { Meta, StoryObj } from '@storybook/react'; import { expect, fn, userEvent, within } from '@storybook/test'; -import type { IndexHash, State } from '@storybook/core/manager-api'; -import { ManagerContext } from '@storybook/core/manager-api'; - import { LayoutProvider } from '../layout/LayoutProvider'; import { standardData as standardHeaderData } from './Heading.stories'; import { IconSymbols } from './IconSymbols'; diff --git a/code/core/src/manager/components/sidebar/Sidebar.tsx b/code/core/src/manager/components/sidebar/Sidebar.tsx index dfec7fba7826..3d94275baac1 100644 --- a/code/core/src/manager/components/sidebar/Sidebar.tsx +++ b/code/core/src/manager/components/sidebar/Sidebar.tsx @@ -6,14 +6,14 @@ import { Spaced, TooltipNote, WithTooltip, -} from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; -import type { API_LoadedRefData, Addon_SidebarTopType, StoryIndex } from '@storybook/core/types'; +} from 'storybook/internal/components'; +import { type State, useStorybookApi } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; +import type { API_LoadedRefData, Addon_SidebarTopType, StoryIndex } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { PlusIcon } from '@storybook/icons'; -import { type State, useStorybookApi } from '@storybook/core/manager-api'; - import { MEDIA_DESKTOP_BREAKPOINT } from '../../constants'; import { useLayout } from '../layout/LayoutProvider'; import { CreateNewStoryFileModal } from './CreateNewStoryFileModal'; diff --git a/code/core/src/manager/components/sidebar/SidebarBottom.stories.tsx b/code/core/src/manager/components/sidebar/SidebarBottom.stories.tsx index d8d0936d5f27..d7cc3e86e2e0 100644 --- a/code/core/src/manager/components/sidebar/SidebarBottom.stories.tsx +++ b/code/core/src/manager/components/sidebar/SidebarBottom.stories.tsx @@ -1,11 +1,11 @@ import React, { type FC, useEffect, useState } from 'react'; -import { Addon_TypesEnum } from '@storybook/core/types'; +import { type API, ManagerContext } from 'storybook/internal/manager-api'; +import { Addon_TypesEnum } from 'storybook/internal/types'; + import type { Meta, StoryObj } from '@storybook/react'; import { expect, fireEvent, fn, waitFor, within } from '@storybook/test'; -import { type API, ManagerContext } from '@storybook/core/manager-api'; - import { SidebarBottomBase } from './SidebarBottom'; const DynamicHeightDemo: FC = () => { diff --git a/code/core/src/manager/components/sidebar/SidebarBottom.tsx b/code/core/src/manager/components/sidebar/SidebarBottom.tsx index 00730fa36e5c..2016da4e055d 100644 --- a/code/core/src/manager/components/sidebar/SidebarBottom.tsx +++ b/code/core/src/manager/components/sidebar/SidebarBottom.tsx @@ -1,20 +1,19 @@ import React, { Fragment, useEffect, useLayoutEffect, useRef, useState } from 'react'; -import { styled } from '@storybook/core/theming'; -import { type API_FilterFunction } from '@storybook/core/types'; - import { TESTING_MODULE_CRASH_REPORT, TESTING_MODULE_PROGRESS_REPORT, type TestingModuleCrashReportPayload, type TestingModuleProgressReportPayload, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; import { type API, type State, useStorybookApi, useStorybookState, -} from '@storybook/core/manager-api'; +} from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; +import { type API_FilterFunction } from 'storybook/internal/types'; import { NotificationList } from '../notifications/NotificationList'; import { TestingModule } from './TestingModule'; diff --git a/code/core/src/manager/components/sidebar/StatusButton.tsx b/code/core/src/manager/components/sidebar/StatusButton.tsx index 8002cc87ba33..f490d5deecbe 100644 --- a/code/core/src/manager/components/sidebar/StatusButton.tsx +++ b/code/core/src/manager/components/sidebar/StatusButton.tsx @@ -1,5 +1,6 @@ -import { IconButton } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { IconButton } from 'storybook/internal/components'; +import { styled } from 'storybook/internal/theming'; + import type { API_StatusValue } from '@storybook/types'; import type { Theme } from '@emotion/react'; diff --git a/code/core/src/manager/components/sidebar/StatusContext.tsx b/code/core/src/manager/components/sidebar/StatusContext.tsx index 45d57611693c..a02e86325626 100644 --- a/code/core/src/manager/components/sidebar/StatusContext.tsx +++ b/code/core/src/manager/components/sidebar/StatusContext.tsx @@ -1,8 +1,8 @@ import { createContext, useContext } from 'react'; -import type { API_StatusObject, API_StatusState, API_StatusValue, StoryId } from '@storybook/types'; +import type { StoriesHash } from 'storybook/internal/manager-api'; -import type { StoriesHash } from '@storybook/core/manager-api'; +import type { API_StatusObject, API_StatusState, API_StatusValue, StoryId } from '@storybook/types'; import type { Item } from '../../container/Sidebar'; import { getDescendantIds } from '../../utils/tree'; diff --git a/code/core/src/manager/components/sidebar/TagsFilter.tsx b/code/core/src/manager/components/sidebar/TagsFilter.tsx index 02e71aa741e5..b077e331d4d1 100644 --- a/code/core/src/manager/components/sidebar/TagsFilter.tsx +++ b/code/core/src/manager/components/sidebar/TagsFilter.tsx @@ -1,12 +1,12 @@ import React, { useCallback, useEffect, useState } from 'react'; -import { Badge, IconButton, WithTooltip } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; +import { Badge, IconButton, WithTooltip } from 'storybook/internal/components'; +import type { API } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; + import { FilterIcon } from '@storybook/icons'; import type { StoryIndex, Tag } from '@storybook/types'; -import type { API } from '@storybook/core/manager-api'; - import { TagsFilterPanel } from './TagsFilterPanel'; const TAGS_FILTER = 'tags-filter'; diff --git a/code/core/src/manager/components/sidebar/TagsFilterPanel.tsx b/code/core/src/manager/components/sidebar/TagsFilterPanel.tsx index d9fc85c360d0..c366f4c60394 100644 --- a/code/core/src/manager/components/sidebar/TagsFilterPanel.tsx +++ b/code/core/src/manager/components/sidebar/TagsFilterPanel.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import { TooltipLinkList } from '@storybook/core/components'; -import { styled, useTheme } from '@storybook/core/theming'; +import { TooltipLinkList } from 'storybook/internal/components'; +import type { API } from 'storybook/internal/manager-api'; +import { styled, useTheme } from 'storybook/internal/theming'; + import { ShareAltIcon } from '@storybook/icons'; import type { Tag } from '@storybook/types'; -import type { API } from '@storybook/core/manager-api'; - import type { Link } from '../../../components/components/tooltip/TooltipLinkList'; const BUILT_IN_TAGS_SHOW = new Set(['play-fn']); diff --git a/code/core/src/manager/components/sidebar/TestingModule.stories.tsx b/code/core/src/manager/components/sidebar/TestingModule.stories.tsx index 66fd53c488a0..833d5eba92a9 100644 --- a/code/core/src/manager/components/sidebar/TestingModule.stories.tsx +++ b/code/core/src/manager/components/sidebar/TestingModule.stories.tsx @@ -1,14 +1,14 @@ import React from 'react'; -import type { Listener } from '@storybook/core/channels'; -import { styled } from '@storybook/core/theming'; -import { Addon_TypesEnum } from '@storybook/core/types'; +import type { Listener } from 'storybook/internal/channels'; +import { TESTING_MODULE_CONFIG_CHANGE, type TestProviders } from 'storybook/internal/core-events'; +import { ManagerContext, mockChannel } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; +import { Addon_TypesEnum } from 'storybook/internal/types'; + import type { Meta, StoryObj } from '@storybook/react'; import { fireEvent, fn } from '@storybook/test'; -import { TESTING_MODULE_CONFIG_CHANGE, type TestProviders } from '@storybook/core/core-events'; -import { ManagerContext, mockChannel } from '@storybook/core/manager-api'; - import { TestingModule } from './TestingModule'; const TestProvider = styled.div({ diff --git a/code/core/src/manager/components/sidebar/TestingModule.tsx b/code/core/src/manager/components/sidebar/TestingModule.tsx index 9fe95426e597..604251d903c4 100644 --- a/code/core/src/manager/components/sidebar/TestingModule.tsx +++ b/code/core/src/manager/components/sidebar/TestingModule.tsx @@ -1,12 +1,12 @@ import React, { type SyntheticEvent, useCallback, useEffect, useRef, useState } from 'react'; -import { Button, TooltipNote } from '@storybook/core/components'; -import { WithTooltip } from '@storybook/core/components'; -import { keyframes, styled } from '@storybook/core/theming'; -import { ChevronSmallUpIcon, PlayAllHollowIcon } from '@storybook/icons'; +import { Button, TooltipNote } from 'storybook/internal/components'; +import { WithTooltip } from 'storybook/internal/components'; +import { TESTING_MODULE_CONFIG_CHANGE, type TestProviders } from 'storybook/internal/core-events'; +import { useStorybookApi } from 'storybook/internal/manager-api'; +import { keyframes, styled } from 'storybook/internal/theming'; -import { TESTING_MODULE_CONFIG_CHANGE, type TestProviders } from '@storybook/core/core-events'; -import { useStorybookApi } from '@storybook/core/manager-api'; +import { ChevronSmallUpIcon, PlayAllHollowIcon } from '@storybook/icons'; import { LegacyRender } from './LegacyRender'; diff --git a/code/core/src/manager/components/sidebar/Tree.stories.tsx b/code/core/src/manager/components/sidebar/Tree.stories.tsx index baadd2e60fec..4b21d67bbe85 100644 --- a/code/core/src/manager/components/sidebar/Tree.stories.tsx +++ b/code/core/src/manager/components/sidebar/Tree.stories.tsx @@ -1,11 +1,15 @@ // @TODO: use addon-interactions and remove the rule disable above import React, { useState } from 'react'; +import { + type ComponentEntry, + type IndexHash, + ManagerContext, +} from 'storybook/internal/manager-api'; + import type { Meta, StoryObj } from '@storybook/react'; import { expect, fn, userEvent, within } from '@storybook/test'; -import { type ComponentEntry, type IndexHash, ManagerContext } from '@storybook/core/manager-api'; - import { action } from '@storybook/addon-actions'; import { DEFAULT_REF_ID } from './Sidebar'; diff --git a/code/core/src/manager/components/sidebar/Tree.tsx b/code/core/src/manager/components/sidebar/Tree.tsx index cbfc1e330be7..869e1161419c 100644 --- a/code/core/src/manager/components/sidebar/Tree.tsx +++ b/code/core/src/manager/components/sidebar/Tree.tsx @@ -1,9 +1,20 @@ import type { ComponentProps, FC, MutableRefObject } from 'react'; import React, { useCallback, useMemo, useRef } from 'react'; -import { Button, IconButton, ListItem } from '@storybook/core/components'; -import { styled, useTheme } from '@storybook/core/theming'; -import { type API_HashEntry, type API_StatusValue, type StoryId } from '@storybook/core/types'; +import { Button, IconButton, ListItem } from 'storybook/internal/components'; +import { PRELOAD_ENTRIES } from 'storybook/internal/core-events'; +import { useStorybookApi } from 'storybook/internal/manager-api'; +import type { + API, + ComponentEntry, + GroupEntry, + State, + StoriesHash, + StoryEntry, +} from 'storybook/internal/manager-api'; +import { styled, useTheme } from 'storybook/internal/theming'; +import { type API_HashEntry, type API_StatusValue, type StoryId } from 'storybook/internal/types'; + import { CollapseIcon as CollapseIconSvg, ExpandAltIcon, @@ -13,17 +24,6 @@ import { SyncIcon, } from '@storybook/icons'; -import { PRELOAD_ENTRIES } from '@storybook/core/core-events'; -import { useStorybookApi } from '@storybook/core/manager-api'; -import type { - API, - ComponentEntry, - GroupEntry, - State, - StoriesHash, - StoryEntry, -} from '@storybook/core/manager-api'; - import { darken, lighten } from 'polished'; import type { Link } from '../../../components/components/tooltip/TooltipLinkList'; diff --git a/code/core/src/manager/components/sidebar/TreeNode.tsx b/code/core/src/manager/components/sidebar/TreeNode.tsx index e0b23c2ef0a4..0335e9fdba32 100644 --- a/code/core/src/manager/components/sidebar/TreeNode.tsx +++ b/code/core/src/manager/components/sidebar/TreeNode.tsx @@ -1,7 +1,7 @@ import type { ComponentProps, FC } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { transparentize } from 'polished'; diff --git a/code/core/src/manager/components/sidebar/__tests__/Sidebar.test.tsx b/code/core/src/manager/components/sidebar/__tests__/Sidebar.test.tsx index 0840be5fcd71..f6f8a1c3b9c1 100644 --- a/code/core/src/manager/components/sidebar/__tests__/Sidebar.test.tsx +++ b/code/core/src/manager/components/sidebar/__tests__/Sidebar.test.tsx @@ -5,11 +5,10 @@ import { afterEach, describe, expect, test } from 'vitest'; import React from 'react'; -import { ThemeProvider, ensure, themes } from '@storybook/core/theming'; -import type { Theme } from '@storybook/core/theming'; -import type { API_IndexHash } from '@storybook/core/types'; - -import type { HashEntry, Refs } from '@storybook/core/manager-api'; +import type { HashEntry, Refs } from 'storybook/internal/manager-api'; +import type { Theme } from 'storybook/internal/theming'; +import { ThemeProvider, ensure, themes } from 'storybook/internal/theming'; +import type { API_IndexHash } from 'storybook/internal/types'; import { Sidebar } from '../Sidebar'; import type { SidebarProps } from '../Sidebar'; diff --git a/code/core/src/manager/components/sidebar/components/CollapseIcon.tsx b/code/core/src/manager/components/sidebar/components/CollapseIcon.tsx index f4de9e9cd46b..42cb8e64cf44 100644 --- a/code/core/src/manager/components/sidebar/components/CollapseIcon.tsx +++ b/code/core/src/manager/components/sidebar/components/CollapseIcon.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; +import { styled } from 'storybook/internal/theming'; import { transparentize } from 'polished'; diff --git a/code/core/src/manager/components/sidebar/mockdata.ts b/code/core/src/manager/components/sidebar/mockdata.ts index e725ed7d451c..6d653c29ec99 100644 --- a/code/core/src/manager/components/sidebar/mockdata.ts +++ b/code/core/src/manager/components/sidebar/mockdata.ts @@ -1,4 +1,4 @@ -import type { API_HashEntry } from '@storybook/core/types'; +import type { API_HashEntry } from 'storybook/internal/types'; export type MockDataSet = Record>>; diff --git a/code/core/src/manager/components/sidebar/types.ts b/code/core/src/manager/components/sidebar/types.ts index abf0c686b374..0e50ac7661d6 100644 --- a/code/core/src/manager/components/sidebar/types.ts +++ b/code/core/src/manager/components/sidebar/types.ts @@ -1,6 +1,5 @@ -import type { API_StatusState, API_StatusValue } from '@storybook/core/types'; - -import type { State, StoriesHash } from '@storybook/core/manager-api'; +import type { State, StoriesHash } from 'storybook/internal/manager-api'; +import type { API_StatusState, API_StatusValue } from 'storybook/internal/types'; import type { ControllerStateAndHelpers } from 'downshift'; diff --git a/code/core/src/manager/components/sidebar/useExpanded.ts b/code/core/src/manager/components/sidebar/useExpanded.ts index e216c2b2e0cc..27e25a3d584e 100644 --- a/code/core/src/manager/components/sidebar/useExpanded.ts +++ b/code/core/src/manager/components/sidebar/useExpanded.ts @@ -1,11 +1,11 @@ import type { Dispatch, MutableRefObject, Reducer } from 'react'; import { useCallback, useEffect, useReducer } from 'react'; -import { global } from '@storybook/global'; +import { STORIES_COLLAPSE_ALL, STORIES_EXPAND_ALL } from 'storybook/internal/core-events'; +import type { StoriesHash } from 'storybook/internal/manager-api'; +import { useStorybookApi } from 'storybook/internal/manager-api'; -import { STORIES_COLLAPSE_ALL, STORIES_EXPAND_ALL } from '@storybook/core/core-events'; -import type { StoriesHash } from '@storybook/core/manager-api'; -import { useStorybookApi } from '@storybook/core/manager-api'; +import { global } from '@storybook/global'; import { throttle } from 'es-toolkit'; diff --git a/code/core/src/manager/components/sidebar/useHighlighted.ts b/code/core/src/manager/components/sidebar/useHighlighted.ts index 37701c7b1eec..a9b3e7876465 100644 --- a/code/core/src/manager/components/sidebar/useHighlighted.ts +++ b/code/core/src/manager/components/sidebar/useHighlighted.ts @@ -1,10 +1,10 @@ import type { Dispatch, MutableRefObject, RefObject, SetStateAction } from 'react'; import { useCallback, useEffect, useRef, useState } from 'react'; -import { global } from '@storybook/global'; +import { PRELOAD_ENTRIES } from 'storybook/internal/core-events'; +import { useStorybookApi } from 'storybook/internal/manager-api'; -import { PRELOAD_ENTRIES } from '@storybook/core/core-events'; -import { useStorybookApi } from '@storybook/core/manager-api'; +import { global } from '@storybook/global'; import { matchesKeyCode, matchesModifiers } from '../../keybinding'; import { cycle, isAncestor, scrollIntoView } from '../../utils/tree'; diff --git a/code/core/src/manager/components/upgrade/UpgradeBlock.stories.tsx b/code/core/src/manager/components/upgrade/UpgradeBlock.stories.tsx index 1ed8698aad0c..e882a41bf180 100644 --- a/code/core/src/manager/components/upgrade/UpgradeBlock.stories.tsx +++ b/code/core/src/manager/components/upgrade/UpgradeBlock.stories.tsx @@ -1,10 +1,10 @@ import React from 'react'; +import { ManagerContext } from 'storybook/internal/manager-api'; + import type { Meta, StoryObj } from '@storybook/react'; import { fn } from '@storybook/test'; -import { ManagerContext } from '@storybook/core/manager-api'; - import { UpgradeBlock } from './UpgradeBlock'; const meta = { diff --git a/code/core/src/manager/components/upgrade/UpgradeBlock.tsx b/code/core/src/manager/components/upgrade/UpgradeBlock.tsx index f7371abc2e63..77078b6cd031 100644 --- a/code/core/src/manager/components/upgrade/UpgradeBlock.tsx +++ b/code/core/src/manager/components/upgrade/UpgradeBlock.tsx @@ -1,10 +1,9 @@ import type { FC } from 'react'; import React, { useState } from 'react'; -import { Link } from '@storybook/core/components'; -import { styled } from '@storybook/core/theming'; - -import { useStorybookApi } from '@storybook/core/manager-api'; +import { Link } from 'storybook/internal/components'; +import { useStorybookApi } from 'storybook/internal/manager-api'; +import { styled } from 'storybook/internal/theming'; import { MEDIA_DESKTOP_BREAKPOINT } from '../../constants'; diff --git a/code/core/src/manager/container/Menu.stories.tsx b/code/core/src/manager/container/Menu.stories.tsx index 596042fb5a2f..c2633bb73df7 100644 --- a/code/core/src/manager/container/Menu.stories.tsx +++ b/code/core/src/manager/container/Menu.stories.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { TooltipLinkList, WithTooltip } from '@storybook/core/components'; +import { TooltipLinkList, WithTooltip } from 'storybook/internal/components'; + import type { Meta, StoryObj } from '@storybook/react'; import { action } from '@storybook/addon-actions'; diff --git a/code/core/src/manager/container/Menu.tsx b/code/core/src/manager/container/Menu.tsx index fdf21a2ab9a1..836461ab1144 100644 --- a/code/core/src/manager/container/Menu.tsx +++ b/code/core/src/manager/container/Menu.tsx @@ -1,13 +1,13 @@ import type { FC } from 'react'; import React, { useCallback, useMemo } from 'react'; -import { Badge } from '@storybook/core/components'; -import { styled, useTheme } from '@storybook/core/theming'; -import { CheckIcon, InfoIcon, ShareAltIcon, WandIcon } from '@storybook/icons'; +import { Badge } from 'storybook/internal/components'; +import { STORIES_COLLAPSE_ALL } from 'storybook/internal/core-events'; +import type { API, State } from 'storybook/internal/manager-api'; +import { shortcutToHumanString } from 'storybook/internal/manager-api'; +import { styled, useTheme } from 'storybook/internal/theming'; -import { STORIES_COLLAPSE_ALL } from '@storybook/core/core-events'; -import type { API, State } from '@storybook/core/manager-api'; -import { shortcutToHumanString } from '@storybook/core/manager-api'; +import { CheckIcon, InfoIcon, ShareAltIcon, WandIcon } from '@storybook/icons'; import type { Link } from '../../components/components/tooltip/TooltipLinkList'; diff --git a/code/core/src/manager/container/Notifications.tsx b/code/core/src/manager/container/Notifications.tsx index 3067bd8764b8..1e5a8217c74f 100644 --- a/code/core/src/manager/container/Notifications.tsx +++ b/code/core/src/manager/container/Notifications.tsx @@ -1,8 +1,8 @@ import type { FC } from 'react'; import React from 'react'; -import type { Combo } from '@storybook/core/manager-api'; -import { Consumer } from '@storybook/core/manager-api'; +import type { Combo } from 'storybook/internal/manager-api'; +import { Consumer } from 'storybook/internal/manager-api'; import { NotificationList } from '../components/notifications/NotificationList'; diff --git a/code/core/src/manager/container/Panel.tsx b/code/core/src/manager/container/Panel.tsx index f8cc2877cef0..e958919db71c 100644 --- a/code/core/src/manager/container/Panel.tsx +++ b/code/core/src/manager/container/Panel.tsx @@ -1,10 +1,9 @@ import type { FC } from 'react'; import React from 'react'; -import { Addon_TypesEnum } from '@storybook/core/types'; - -import { Consumer } from '@storybook/core/manager-api'; -import type { API, Combo } from '@storybook/core/manager-api'; +import { Consumer } from 'storybook/internal/manager-api'; +import type { API, Combo } from 'storybook/internal/manager-api'; +import { Addon_TypesEnum } from 'storybook/internal/types'; import memoize from 'memoizerific'; diff --git a/code/core/src/manager/container/Preview.tsx b/code/core/src/manager/container/Preview.tsx index fabda783bf64..3eb2a52a379a 100644 --- a/code/core/src/manager/container/Preview.tsx +++ b/code/core/src/manager/container/Preview.tsx @@ -1,12 +1,12 @@ import type { ComponentProps } from 'react'; import React from 'react'; -import type { Addon_BaseType, Addon_Collection, Addon_WrapperType } from '@storybook/core/types'; -import { Addon_TypesEnum } from '@storybook/core/types'; -import { global } from '@storybook/global'; +import type { State, StoriesHash } from 'storybook/internal/manager-api'; +import { Consumer } from 'storybook/internal/manager-api'; +import type { Addon_BaseType, Addon_Collection, Addon_WrapperType } from 'storybook/internal/types'; +import { Addon_TypesEnum } from 'storybook/internal/types'; -import type { State, StoriesHash } from '@storybook/core/manager-api'; -import { Consumer } from '@storybook/core/manager-api'; +import { global } from '@storybook/global'; import memoizerific from 'memoizerific'; diff --git a/code/core/src/manager/container/Sidebar.tsx b/code/core/src/manager/container/Sidebar.tsx index 723d9989ac10..f861aab60541 100755 --- a/code/core/src/manager/container/Sidebar.tsx +++ b/code/core/src/manager/container/Sidebar.tsx @@ -1,9 +1,8 @@ import React, { useMemo } from 'react'; -import { Addon_TypesEnum } from '@storybook/core/types'; - -import type { Combo, StoriesHash } from '@storybook/core/manager-api'; -import { Consumer } from '@storybook/core/manager-api'; +import type { Combo, StoriesHash } from 'storybook/internal/manager-api'; +import { Consumer } from 'storybook/internal/manager-api'; +import { Addon_TypesEnum } from 'storybook/internal/types'; import type { SidebarProps as SidebarComponentProps } from '../components/sidebar/Sidebar'; import { Sidebar as SidebarComponent } from '../components/sidebar/Sidebar'; diff --git a/code/core/src/manager/globals-runtime.ts b/code/core/src/manager/globals-runtime.ts index 7e4c07eccb28..b7e84377d22a 100644 --- a/code/core/src/manager/globals-runtime.ts +++ b/code/core/src/manager/globals-runtime.ts @@ -1,6 +1,6 @@ -import { global } from '@storybook/global'; +import { TELEMETRY_ERROR } from 'storybook/internal/core-events'; -import { TELEMETRY_ERROR } from '@storybook/core/core-events'; +import { global } from '@storybook/global'; import { globalPackages, globalsNameReferenceMap } from './globals/globals'; import { globalsNameValueMap } from './globals/runtime'; diff --git a/code/core/src/manager/globals/exports.ts b/code/core/src/manager/globals/exports.ts index e354ce120ffb..3d4bd8b826b3 100644 --- a/code/core/src/manager/globals/exports.ts +++ b/code/core/src/manager/globals/exports.ts @@ -439,77 +439,6 @@ export default { 'resetComponents', 'withReset', ], - '@storybook/core/components': [ - 'A', - 'ActionBar', - 'AddonPanel', - 'Badge', - 'Bar', - 'Blockquote', - 'Button', - 'ClipboardCode', - 'Code', - 'DL', - 'Div', - 'DocumentWrapper', - 'EmptyTabContent', - 'ErrorFormatter', - 'FlexBar', - 'Form', - 'H1', - 'H2', - 'H3', - 'H4', - 'H5', - 'H6', - 'HR', - 'IconButton', - 'IconButtonSkeleton', - 'Icons', - 'Img', - 'LI', - 'Link', - 'ListItem', - 'Loader', - 'Modal', - 'OL', - 'P', - 'Placeholder', - 'Pre', - 'ProgressSpinner', - 'ResetWrapper', - 'ScrollArea', - 'Separator', - 'Spaced', - 'Span', - 'StorybookIcon', - 'StorybookLogo', - 'Symbols', - 'SyntaxHighlighter', - 'TT', - 'TabBar', - 'TabButton', - 'TabWrapper', - 'Table', - 'Tabs', - 'TabsState', - 'TooltipLinkList', - 'TooltipMessage', - 'TooltipNote', - 'UL', - 'WithTooltip', - 'WithTooltipPure', - 'Zoom', - 'codeCommon', - 'components', - 'createCopyToClipboardFunction', - 'getStoryHref', - 'icons', - 'interleaveSeparators', - 'nameSpaceClassNames', - 'resetComponents', - 'withReset', - ], 'storybook/internal/manager-api': [ 'ActiveTabs', 'Consumer', @@ -578,40 +507,6 @@ export default { 'useStorybookApi', 'useStorybookState', ], - '@storybook/core/manager-api': [ - 'ActiveTabs', - 'Consumer', - 'ManagerContext', - 'Provider', - 'RequestResponseError', - 'addons', - 'combineParameters', - 'controlOrMetaKey', - 'controlOrMetaSymbol', - 'eventMatchesShortcut', - 'eventToShortcut', - 'experimental_requestResponse', - 'isMacLike', - 'isShortcutTaken', - 'keyToSymbol', - 'merge', - 'mockChannel', - 'optionOrAltSymbol', - 'shortcutMatchesShortcut', - 'shortcutToHumanString', - 'types', - 'useAddonState', - 'useArgTypes', - 'useArgs', - 'useChannel', - 'useGlobalTypes', - 'useGlobals', - 'useParameter', - 'useSharedState', - 'useStoryPrepared', - 'useStorybookApi', - 'useStorybookState', - ], 'storybook/internal/router': [ 'BaseLocationProvider', 'DEEPLY_EQUAL', @@ -644,22 +539,6 @@ export default { 'stringifyQuery', 'useNavigate', ], - '@storybook/core/router': [ - 'BaseLocationProvider', - 'DEEPLY_EQUAL', - 'Link', - 'Location', - 'LocationProvider', - 'Match', - 'Route', - 'buildArgsParam', - 'deepDiff', - 'getMatch', - 'parsePath', - 'queryFromLocation', - 'stringifyQuery', - 'useNavigate', - ], 'storybook/internal/theming': [ 'CacheProvider', 'ClassNames', @@ -712,35 +591,8 @@ export default { 'useTheme', 'withTheme', ], - '@storybook/core/theming': [ - 'CacheProvider', - 'ClassNames', - 'Global', - 'ThemeProvider', - 'background', - 'color', - 'convert', - 'create', - 'createCache', - 'createGlobal', - 'createReset', - 'css', - 'darken', - 'ensure', - 'ignoreSsrWarning', - 'isPropValid', - 'jsx', - 'keyframes', - 'lighten', - 'styled', - 'themes', - 'typography', - 'useTheme', - 'withTheme', - ], 'storybook/internal/theming/create': ['create', 'themes'], '@storybook/theming/create': ['create', 'themes'], - '@storybook/core/theming/create': ['create', 'themes'], 'storybook/internal/channels': [ 'Channel', 'PostMessageTransport', @@ -753,12 +605,6 @@ export default { 'WebsocketTransport', 'createBrowserChannel', ], - '@storybook/core/channels': [ - 'Channel', - 'PostMessageTransport', - 'WebsocketTransport', - 'createBrowserChannel', - ], 'storybook/internal/core-errors': [ 'ARGTYPES_INFO_REQUEST', 'ARGTYPES_INFO_RESPONSE', @@ -891,7 +737,7 @@ export default { 'UPDATE_QUERY_PARAMS', 'UPDATE_STORY_ARGS', ], - '@storybook/core/core-events': [ + 'storybook/internal/core-events': [ 'ARGTYPES_INFO_REQUEST', 'ARGTYPES_INFO_RESPONSE', 'CHANNEL_CREATED', @@ -959,7 +805,6 @@ export default { ], 'storybook/internal/types': ['Addon_TypesEnum'], '@storybook/types': ['Addon_TypesEnum'], - '@storybook/core/types': ['Addon_TypesEnum'], 'storybook/internal/manager-errors': [ 'Category', 'ProviderDoesNotExtendBaseProviderError', @@ -970,12 +815,6 @@ export default { 'ProviderDoesNotExtendBaseProviderError', 'UncaughtManagerError', ], - '@storybook/core/manager-errors': [ - 'Category', - 'ProviderDoesNotExtendBaseProviderError', - 'UncaughtManagerError', - ], 'storybook/internal/client-logger': ['deprecate', 'logger', 'once', 'pretty'], '@storybook/client-logger': ['deprecate', 'logger', 'once', 'pretty'], - '@storybook/core/client-logger': ['deprecate', 'logger', 'once', 'pretty'], } as const; diff --git a/code/core/src/manager/globals/globals.ts b/code/core/src/manager/globals/globals.ts index 3a7387c6e3bb..3279e57adab0 100644 --- a/code/core/src/manager/globals/globals.ts +++ b/code/core/src/manager/globals/globals.ts @@ -7,42 +7,33 @@ export const globalsNameReferenceMap = { 'storybook/internal/manager-api': '__STORYBOOK_API__', '@storybook/manager-api': '__STORYBOOK_API__', - '@storybook/core/manager-api': '__STORYBOOK_API__', 'storybook/internal/components': '__STORYBOOK_COMPONENTS__', '@storybook/components': '__STORYBOOK_COMPONENTS__', - '@storybook/core/components': '__STORYBOOK_COMPONENTS__', 'storybook/internal/channels': '__STORYBOOK_CHANNELS__', '@storybook/channels': '__STORYBOOK_CHANNELS__', - '@storybook/core/channels': '__STORYBOOK_CHANNELS__', 'storybook/internal/core-errors': '__STORYBOOK_CORE_EVENTS__', '@storybook/core-events': '__STORYBOOK_CORE_EVENTS__', - '@storybook/core/core-events': '__STORYBOOK_CORE_EVENTS__', + 'storybook/internal/core-events': '__STORYBOOK_CORE_EVENTS__', 'storybook/internal/manager-errors': '__STORYBOOK_CORE_EVENTS_MANAGER_ERRORS__', '@storybook/core-events/manager-errors': '__STORYBOOK_CORE_EVENTS_MANAGER_ERRORS__', - '@storybook/core/manager-errors': '__STORYBOOK_CORE_EVENTS_MANAGER_ERRORS__', 'storybook/internal/router': '__STORYBOOK_ROUTER__', '@storybook/router': '__STORYBOOK_ROUTER__', - '@storybook/core/router': '__STORYBOOK_ROUTER__', 'storybook/internal/theming': '__STORYBOOK_THEMING__', '@storybook/theming': '__STORYBOOK_THEMING__', - '@storybook/core/theming': '__STORYBOOK_THEMING__', 'storybook/internal/theming/create': '__STORYBOOK_THEMING_CREATE__', '@storybook/theming/create': '__STORYBOOK_THEMING_CREATE__', - '@storybook/core/theming/create': '__STORYBOOK_THEMING_CREATE__', 'storybook/internal/client-logger': '__STORYBOOK_CLIENT_LOGGER__', '@storybook/client-logger': '__STORYBOOK_CLIENT_LOGGER__', - '@storybook/core/client-logger': '__STORYBOOK_CLIENT_LOGGER__', 'storybook/internal/types': '__STORYBOOK_TYPES__', '@storybook/types': '__STORYBOOK_TYPES__', - '@storybook/core/types': '__STORYBOOK_TYPES__', } as const; export const globalPackages = Object.keys(globalsNameReferenceMap) as Array< diff --git a/code/core/src/manager/globals/runtime.ts b/code/core/src/manager/globals/runtime.ts index a52501db52cc..ce030147e6b5 100644 --- a/code/core/src/manager/globals/runtime.ts +++ b/code/core/src/manager/globals/runtime.ts @@ -2,18 +2,18 @@ import * as REACT from 'react'; import * as REACT_DOM from 'react-dom'; import * as REACT_DOM_CLIENT from 'react-dom/client'; -import * as CHANNELS from '@storybook/core/channels'; -import * as COMPONENTS from '@storybook/core/components'; -import * as ROUTER from '@storybook/core/router'; -import * as THEMING from '@storybook/core/theming'; -import * as THEMINGCREATE from '@storybook/core/theming/create'; -import * as TYPES from '@storybook/core/types'; -import * as ICONS from '@storybook/icons'; +import * as CHANNELS from 'storybook/internal/channels'; +import * as CLIENT_LOGGER from 'storybook/internal/client-logger'; +import * as COMPONENTS from 'storybook/internal/components'; +import * as EVENTS from 'storybook/internal/core-events'; +import * as MANAGER_API from 'storybook/internal/manager-api'; +import * as EVENTS_MANAGER_ERRORS from 'storybook/internal/manager-errors'; +import * as ROUTER from 'storybook/internal/router'; +import * as THEMING from 'storybook/internal/theming'; +import * as THEMINGCREATE from 'storybook/internal/theming/create'; +import * as TYPES from 'storybook/internal/types'; -import * as CLIENT_LOGGER from '@storybook/core/client-logger'; -import * as EVENTS from '@storybook/core/core-events'; -import * as MANAGER_API from '@storybook/core/manager-api'; -import * as EVENTS_MANAGER_ERRORS from '@storybook/core/manager-errors'; +import * as ICONS from '@storybook/icons'; import type { globalsNameReferenceMap } from './globals'; @@ -26,40 +26,31 @@ export const globalsNameValueMap: Required ({ display: 'flex', diff --git a/code/core/src/manager/settings/ShortcutsPage.tsx b/code/core/src/manager/settings/ShortcutsPage.tsx index ff7872d8df90..71f302dcba83 100644 --- a/code/core/src/manager/settings/ShortcutsPage.tsx +++ b/code/core/src/manager/settings/ShortcutsPage.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React from 'react'; -import { Consumer } from '@storybook/core/manager-api'; +import { Consumer } from 'storybook/internal/manager-api'; import { ShortcutsScreen } from './shortcuts'; diff --git a/code/core/src/manager/settings/defaultShortcuts.tsx b/code/core/src/manager/settings/defaultShortcuts.tsx index ed8ad0fd9135..e17548756367 100644 --- a/code/core/src/manager/settings/defaultShortcuts.tsx +++ b/code/core/src/manager/settings/defaultShortcuts.tsx @@ -1,4 +1,4 @@ -import type { State } from '@storybook/core/manager-api'; +import type { State } from 'storybook/internal/manager-api'; export const defaultShortcuts: State['shortcuts'] = { fullScreen: ['F'], diff --git a/code/core/src/manager/settings/index.tsx b/code/core/src/manager/settings/index.tsx index d1cbb424ea4b..a16910e93927 100644 --- a/code/core/src/manager/settings/index.tsx +++ b/code/core/src/manager/settings/index.tsx @@ -1,15 +1,15 @@ import type { FC, SyntheticEvent } from 'react'; import React, { Fragment } from 'react'; -import { IconButton, ScrollArea, TabBar, TabButton } from '@storybook/core/components'; -import { Location, Route } from '@storybook/core/router'; -import { styled } from '@storybook/core/theming'; -import type { Addon_PageType } from '@storybook/core/types'; +import { IconButton, ScrollArea, TabBar, TabButton } from 'storybook/internal/components'; +import { types, useStorybookApi, useStorybookState } from 'storybook/internal/manager-api'; +import { Location, Route } from 'storybook/internal/router'; +import { styled } from 'storybook/internal/theming'; +import type { Addon_PageType } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { CloseIcon } from '@storybook/icons'; -import { types, useStorybookApi, useStorybookState } from '@storybook/core/manager-api'; - import { matchesKeyCode, matchesModifiers } from '../keybinding'; import { AboutPage } from './AboutPage'; import { ShortcutsPage } from './ShortcutsPage'; diff --git a/code/core/src/manager/settings/shortcuts.tsx b/code/core/src/manager/settings/shortcuts.tsx index 93a768774d18..c7c75e0a221d 100644 --- a/code/core/src/manager/settings/shortcuts.tsx +++ b/code/core/src/manager/settings/shortcuts.tsx @@ -1,15 +1,15 @@ import type { ComponentProps, FC } from 'react'; import React, { Component } from 'react'; -import { Button, Form } from '@storybook/core/components'; -import { keyframes, styled } from '@storybook/core/theming'; -import { CheckIcon } from '@storybook/icons'; - +import { Button, Form } from 'storybook/internal/components'; import { eventToShortcut, shortcutMatchesShortcut, shortcutToHumanString, -} from '@storybook/core/manager-api'; +} from 'storybook/internal/manager-api'; +import { keyframes, styled } from 'storybook/internal/theming'; + +import { CheckIcon } from '@storybook/icons'; import SettingsFooter from './SettingsFooter'; diff --git a/code/core/src/manager/settings/whats_new.tsx b/code/core/src/manager/settings/whats_new.tsx index 9132659e076e..b2510b0370d5 100644 --- a/code/core/src/manager/settings/whats_new.tsx +++ b/code/core/src/manager/settings/whats_new.tsx @@ -1,13 +1,13 @@ import type { ComponentProps, FC } from 'react'; import React, { Fragment, useEffect, useState } from 'react'; -import { Button, Loader } from '@storybook/core/components'; -import { styled, useTheme } from '@storybook/core/theming'; +import { Button, Loader } from 'storybook/internal/components'; +import { useStorybookApi, useStorybookState } from 'storybook/internal/manager-api'; +import { styled, useTheme } from 'storybook/internal/theming'; + import { global } from '@storybook/global'; import { AlertIcon as AlertIconSvg, EyeCloseIcon, EyeIcon, HeartIcon } from '@storybook/icons'; -import { useStorybookApi, useStorybookState } from '@storybook/core/manager-api'; - const Centered = styled.div({ top: '50%', position: 'absolute', diff --git a/code/core/src/manager/typings.d.ts b/code/core/src/manager/typings.d.ts index 3e6d261fb209..4394a90ece5e 100644 --- a/code/core/src/manager/typings.d.ts +++ b/code/core/src/manager/typings.d.ts @@ -7,7 +7,7 @@ declare var PREVIEW_URL: any; declare var __STORYBOOK_ADDONS_MANAGER: any; declare var RELEASE_NOTES_DATA: any; -declare var FEATURES: import('@storybook/core/types').StorybookConfigRaw['features']; +declare var FEATURES: import('storybook/internal/types').StorybookConfigRaw['features']; declare var REFS: any; declare var VERSIONCHECK: any; diff --git a/code/core/src/manager/utils/prepareForTelemetry.ts b/code/core/src/manager/utils/prepareForTelemetry.ts index ccbb8bf236ba..00cfdd35dd43 100644 --- a/code/core/src/manager/utils/prepareForTelemetry.ts +++ b/code/core/src/manager/utils/prepareForTelemetry.ts @@ -1,7 +1,7 @@ /* eslint-disable local-rules/no-uncategorized-errors */ -import { global } from '@storybook/global'; +import { UncaughtManagerError } from 'storybook/internal/manager-errors'; -import { UncaughtManagerError } from '@storybook/core/manager-errors'; +import { global } from '@storybook/global'; import type { BrowserInfo } from 'browser-dtector'; import BrowserDetector from 'browser-dtector'; diff --git a/code/core/src/manager/utils/status.tsx b/code/core/src/manager/utils/status.tsx index 14c2c6a613c5..674d9aef5578 100644 --- a/code/core/src/manager/utils/status.tsx +++ b/code/core/src/manager/utils/status.tsx @@ -1,8 +1,9 @@ import type { ReactElement } from 'react'; import React from 'react'; -import { styled } from '@storybook/core/theming'; -import type { API_HashEntry, API_StatusState, API_StatusValue } from '@storybook/core/types'; +import { styled } from 'storybook/internal/theming'; +import type { API_HashEntry, API_StatusState, API_StatusValue } from 'storybook/internal/types'; + import { CircleIcon } from '@storybook/icons'; import { UseSymbol } from '../components/sidebar/IconSymbols'; diff --git a/code/core/src/manager/utils/tree.ts b/code/core/src/manager/utils/tree.ts index dfe6dfb4cf24..671c616303e1 100644 --- a/code/core/src/manager/utils/tree.ts +++ b/code/core/src/manager/utils/tree.ts @@ -1,8 +1,8 @@ import type { SyntheticEvent } from 'react'; -import { global } from '@storybook/global'; +import type { HashEntry, IndexHash } from 'storybook/internal/manager-api'; -import type { HashEntry, IndexHash } from '@storybook/core/manager-api'; +import { global } from '@storybook/global'; import memoize from 'memoizerific'; diff --git a/code/core/src/node-logger/README.md b/code/core/src/node-logger/README.md index ffdc57aa50c5..008302c607e1 100644 --- a/code/core/src/node-logger/README.md +++ b/code/core/src/node-logger/README.md @@ -5,7 +5,7 @@ Any node logging that is done through storybook should be done through this pack Examples: ```js -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; logger.info('Info message'); logger.warn('Warning message'); diff --git a/code/core/src/preview-api/modules/addons/hooks.ts b/code/core/src/preview-api/modules/addons/hooks.ts index 1a6f3a7f9839..b0c2edaf2c9c 100644 --- a/code/core/src/preview-api/modules/addons/hooks.ts +++ b/code/core/src/preview-api/modules/addons/hooks.ts @@ -1,3 +1,11 @@ +import { logger } from 'storybook/internal/client-logger'; +import { + FORCE_RE_RENDER, + RESET_STORY_ARGS, + STORY_RENDERED, + UPDATE_GLOBALS, + UPDATE_STORY_ARGS, +} from 'storybook/internal/core-events'; import type { Args, DecoratorApplicator, @@ -6,17 +14,9 @@ import type { Renderer, StoryContext, StoryId, -} from '@storybook/core/types'; -import { global } from '@storybook/global'; +} from 'storybook/internal/types'; -import { logger } from '@storybook/core/client-logger'; -import { - FORCE_RE_RENDER, - RESET_STORY_ARGS, - STORY_RENDERED, - UPDATE_GLOBALS, - UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; +import { global } from '@storybook/global'; import { addons } from './main'; diff --git a/code/core/src/preview-api/modules/addons/main.ts b/code/core/src/preview-api/modules/addons/main.ts index f2012bab9f07..c1243e68aecd 100644 --- a/code/core/src/preview-api/modules/addons/main.ts +++ b/code/core/src/preview-api/modules/addons/main.ts @@ -1,4 +1,5 @@ -import type { Channel } from '@storybook/core/channels'; +import type { Channel } from 'storybook/internal/channels'; + import { global } from '@storybook/global'; import { mockChannel } from './storybook-channel-mock'; diff --git a/code/core/src/preview-api/modules/addons/make-decorator.test.ts b/code/core/src/preview-api/modules/addons/make-decorator.test.ts index d926c9f5da81..4519129c9e00 100644 --- a/code/core/src/preview-api/modules/addons/make-decorator.test.ts +++ b/code/core/src/preview-api/modules/addons/make-decorator.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import type { Addon_StoryContext } from '@storybook/core/types'; +import type { Addon_StoryContext } from 'storybook/internal/types'; import { makeDecorator } from './make-decorator'; diff --git a/code/core/src/preview-api/modules/addons/make-decorator.ts b/code/core/src/preview-api/modules/addons/make-decorator.ts index aa9bfb2a0c36..4cca6d63db66 100644 --- a/code/core/src/preview-api/modules/addons/make-decorator.ts +++ b/code/core/src/preview-api/modules/addons/make-decorator.ts @@ -2,7 +2,7 @@ import type { Addon_LegacyStoryFn, Addon_StoryContext, Addon_StoryWrapper, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; export type MakeDecoratorResult = (...args: any) => any; diff --git a/code/core/src/preview-api/modules/addons/storybook-channel-mock.ts b/code/core/src/preview-api/modules/addons/storybook-channel-mock.ts index 2f8abbf20b5f..23fce7c5ff8a 100644 --- a/code/core/src/preview-api/modules/addons/storybook-channel-mock.ts +++ b/code/core/src/preview-api/modules/addons/storybook-channel-mock.ts @@ -1,4 +1,4 @@ -import { Channel } from '@storybook/core/channels'; +import { Channel } from 'storybook/internal/channels'; export function mockChannel() { const transport = { diff --git a/code/core/src/preview-api/modules/preview-web/Preview.tsx b/code/core/src/preview-api/modules/preview-web/Preview.tsx index e929d6749337..15cd1741c1cc 100644 --- a/code/core/src/preview-api/modules/preview-web/Preview.tsx +++ b/code/core/src/preview-api/modules/preview-web/Preview.tsx @@ -1,4 +1,25 @@ -import type { Channel } from '@storybook/core/channels'; +import type { Channel } from 'storybook/internal/channels'; +import { deprecate, logger } from 'storybook/internal/client-logger'; +import { + ARGTYPES_INFO_REQUEST, + ARGTYPES_INFO_RESPONSE, + CONFIG_ERROR, + FORCE_REMOUNT, + FORCE_RE_RENDER, + GLOBALS_UPDATED, + RESET_STORY_ARGS, + SET_GLOBALS, + STORY_ARGS_UPDATED, + STORY_INDEX_INVALIDATED, + UPDATE_GLOBALS, + UPDATE_STORY_ARGS, +} from 'storybook/internal/core-events'; +import { + CalledPreviewMethodBeforeInitializationError, + MissingRenderToCanvasError, + StoryIndexFetchError, + StoryStoreAccessedBeforeInitializationError, +} from 'storybook/internal/preview-errors'; import type { Args, Globals, @@ -13,37 +34,16 @@ import type { StoryId, StoryIndex, StoryRenderOptions, -} from '@storybook/core/types'; -import type { CleanupCallback } from '@storybook/csf'; -import { global } from '@storybook/global'; - -import { deprecate, logger } from '@storybook/core/client-logger'; +} from 'storybook/internal/types'; import type { ArgTypesRequestPayload, ArgTypesResponsePayload, RequestData, ResponseData, -} from '@storybook/core/core-events'; -import { - ARGTYPES_INFO_REQUEST, - ARGTYPES_INFO_RESPONSE, - CONFIG_ERROR, - FORCE_REMOUNT, - FORCE_RE_RENDER, - GLOBALS_UPDATED, - RESET_STORY_ARGS, - SET_GLOBALS, - STORY_ARGS_UPDATED, - STORY_INDEX_INVALIDATED, - UPDATE_GLOBALS, - UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; -import { - CalledPreviewMethodBeforeInitializationError, - MissingRenderToCanvasError, - StoryIndexFetchError, - StoryStoreAccessedBeforeInitializationError, -} from '@storybook/core/preview-errors'; +} from 'storybook/internal/types'; + +import type { CleanupCallback } from '@storybook/csf'; +import { global } from '@storybook/global'; import { StoryStore } from '../../store'; import { addons } from '../addons'; diff --git a/code/core/src/preview-api/modules/preview-web/PreviewWeb.integration.test.ts b/code/core/src/preview-api/modules/preview-web/PreviewWeb.integration.test.ts index 3a6c21dd7239..f5458e471d60 100644 --- a/code/core/src/preview-api/modules/preview-web/PreviewWeb.integration.test.ts +++ b/code/core/src/preview-api/modules/preview-web/PreviewWeb.integration.test.ts @@ -3,7 +3,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import React from 'react'; -import type { RenderContext } from '@storybook/core/types'; +import type { RenderContext } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { addons } from '../addons'; @@ -24,9 +25,9 @@ import { WebView } from './WebView'; // - ie. from`renderToCanvas()` (stories) or`ReactDOM.render()` (docs) in. // This file lets them rip. -vi.mock('@storybook/core/channels', async (importOriginal) => { +vi.mock('storybook/internal/channels', async (importOriginal) => { return { - ...(await importOriginal()), + ...(await importOriginal()), createBrowserChannel: () => mockChannel, }; }); @@ -39,24 +40,24 @@ vi.mock('@storybook/blocks', async () => { HeadersMdx: vi.fn(() => 'HeadersMdx'), }; }); -vi.mock('@storybook/core/client-logger'); -vi.mock('@storybook/core/components'); +vi.mock('storybook/internal/client-logger'); +vi.mock('storybook/internal/components'); -vi.mock('@storybook/core/channels', async (importOriginal) => { +vi.mock('storybook/internal/channels', async (importOriginal) => { return { - ...(await importOriginal()), + ...(await importOriginal()), createBrowserChannel: () => mockChannel, }; }); -vi.mock('@storybook/core/client-logger', async (importOriginal) => { +vi.mock('storybook/internal/client-logger', async (importOriginal) => { return { - ...(await importOriginal()), + ...(await importOriginal()), createBrowserChannel: () => mockChannel, }; }); -vi.mock('@storybook/core/components', async (importOriginal) => { +vi.mock('storybook/internal/components', async (importOriginal) => { return { - ...(await importOriginal()), + ...(await importOriginal()), createBrowserChannel: () => mockChannel, }; }); diff --git a/code/core/src/preview-api/modules/preview-web/PreviewWeb.mockdata.ts b/code/core/src/preview-api/modules/preview-web/PreviewWeb.mockdata.ts index 2ed2352ae4e7..64ae00dfc9cd 100644 --- a/code/core/src/preview-api/modules/preview-web/PreviewWeb.mockdata.ts +++ b/code/core/src/preview-api/modules/preview-web/PreviewWeb.mockdata.ts @@ -1,14 +1,6 @@ import type { Mock, Mocked } from 'vitest'; import { vi } from 'vitest'; -import type { - ModuleImportFn, - ProjectAnnotations, - Renderer, - StoryIndex, - TeardownRenderToCanvas, -} from '@storybook/core/types'; - import { DOCS_RENDERED, STORY_ERRORED, @@ -16,7 +8,14 @@ import { STORY_MISSING, STORY_RENDER_PHASE_CHANGED, STORY_THREW_EXCEPTION, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { + ModuleImportFn, + ProjectAnnotations, + Renderer, + StoryIndex, + TeardownRenderToCanvas, +} from 'storybook/internal/types'; import { EventEmitter } from 'events'; diff --git a/code/core/src/preview-api/modules/preview-web/PreviewWeb.test.ts b/code/core/src/preview-api/modules/preview-web/PreviewWeb.test.ts index 57e3b0357a44..511a54022281 100644 --- a/code/core/src/preview-api/modules/preview-web/PreviewWeb.test.ts +++ b/code/core/src/preview-api/modules/preview-web/PreviewWeb.test.ts @@ -1,10 +1,7 @@ // @vitest-environment happy-dom import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import type { ModuleImportFn, ProjectAnnotations, Renderer } from '@storybook/core/types'; -import { global } from '@storybook/global'; - -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; import { CONFIG_ERROR, CURRENT_STORY_WAS_SET, @@ -29,7 +26,10 @@ import { STORY_UNCHANGED, UPDATE_GLOBALS, UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { ModuleImportFn, ProjectAnnotations, Renderer } from 'storybook/internal/types'; + +import { global } from '@storybook/global'; import { merge, toMerged } from 'es-toolkit'; @@ -74,7 +74,7 @@ vi.mock('@storybook/global', async (importOriginal) => ({ }, })); -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); vi.mock('react-dom'); vi.mock('./WebView'); diff --git a/code/core/src/preview-api/modules/preview-web/PreviewWeb.tsx b/code/core/src/preview-api/modules/preview-web/PreviewWeb.tsx index cb2931350b91..04d6dc2156f3 100644 --- a/code/core/src/preview-api/modules/preview-web/PreviewWeb.tsx +++ b/code/core/src/preview-api/modules/preview-web/PreviewWeb.tsx @@ -1,6 +1,7 @@ /* eslint-disable no-underscore-dangle */ -import type { Renderer } from '@storybook/core/types'; -import type { ModuleImportFn, ProjectAnnotations } from '@storybook/core/types'; +import type { ModuleImportFn, ProjectAnnotations } from 'storybook/internal/types'; +import type { Renderer } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import type { MaybePromise } from './Preview'; diff --git a/code/core/src/preview-api/modules/preview-web/PreviewWithSelection.tsx b/code/core/src/preview-api/modules/preview-web/PreviewWithSelection.tsx index 7534ddea6fb3..2650fb799e31 100644 --- a/code/core/src/preview-api/modules/preview-web/PreviewWithSelection.tsx +++ b/code/core/src/preview-api/modules/preview-web/PreviewWithSelection.tsx @@ -1,8 +1,4 @@ -import type { DocsIndexEntry, StoryIndex } from '@storybook/core/types'; -import type { Args, Globals, Renderer, StoryId, ViewMode } from '@storybook/core/types'; -import type { ModuleImportFn, ProjectAnnotations } from '@storybook/core/types'; - -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; import { CURRENT_STORY_WAS_SET, DOCS_PREPARED, @@ -19,13 +15,16 @@ import { STORY_THREW_EXCEPTION, STORY_UNCHANGED, UPDATE_QUERY_PARAMS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; import { CalledPreviewMethodBeforeInitializationError, EmptyIndexError, MdxFileWithNoCsfReferencesError, NoStoryMatchError, -} from '@storybook/core/preview-errors'; +} from 'storybook/internal/preview-errors'; +import type { DocsIndexEntry, StoryIndex } from 'storybook/internal/types'; +import type { Args, Globals, Renderer, StoryId, ViewMode } from 'storybook/internal/types'; +import type { ModuleImportFn, ProjectAnnotations } from 'storybook/internal/types'; import invariant from 'tiny-invariant'; diff --git a/code/core/src/preview-api/modules/preview-web/SelectionStore.ts b/code/core/src/preview-api/modules/preview-web/SelectionStore.ts index 7d56f5bf586c..34d61520f2d4 100644 --- a/code/core/src/preview-api/modules/preview-web/SelectionStore.ts +++ b/code/core/src/preview-api/modules/preview-web/SelectionStore.ts @@ -1,4 +1,4 @@ -import type { Args, StoryId, ViewMode } from '@storybook/core/types'; +import type { Args, StoryId, ViewMode } from 'storybook/internal/types'; import type { StorySpecifier } from '../store/StoryIndexStore'; diff --git a/code/core/src/preview-api/modules/preview-web/UrlStore.ts b/code/core/src/preview-api/modules/preview-web/UrlStore.ts index c4a68c17decb..aca027c9561e 100644 --- a/code/core/src/preview-api/modules/preview-web/UrlStore.ts +++ b/code/core/src/preview-api/modules/preview-web/UrlStore.ts @@ -1,4 +1,5 @@ -import type { ViewMode } from '@storybook/core/types'; +import type { ViewMode } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { parse, stringify } from 'picoquery'; diff --git a/code/core/src/preview-api/modules/preview-web/View.ts b/code/core/src/preview-api/modules/preview-web/View.ts index bc5e42c35de6..e2c6d473d544 100644 --- a/code/core/src/preview-api/modules/preview-web/View.ts +++ b/code/core/src/preview-api/modules/preview-web/View.ts @@ -1,4 +1,4 @@ -import type { PreparedStory } from '@storybook/core/types'; +import type { PreparedStory } from 'storybook/internal/types'; export interface View { // Get ready to render a story, returning the element to render to diff --git a/code/core/src/preview-api/modules/preview-web/WebView.ts b/code/core/src/preview-api/modules/preview-web/WebView.ts index 90b0d23dce7b..a4d864ce27b7 100644 --- a/code/core/src/preview-api/modules/preview-web/WebView.ts +++ b/code/core/src/preview-api/modules/preview-web/WebView.ts @@ -1,7 +1,7 @@ -import type { PreparedStory } from '@storybook/core/types'; -import { global } from '@storybook/global'; +import { logger } from 'storybook/internal/client-logger'; +import type { PreparedStory } from 'storybook/internal/types'; -import { logger } from '@storybook/core/client-logger'; +import { global } from '@storybook/global'; import AnsiToHtml from 'ansi-to-html'; import { parse } from 'picoquery'; diff --git a/code/core/src/preview-api/modules/preview-web/docs-context/DocsContext.test.ts b/code/core/src/preview-api/modules/preview-web/docs-context/DocsContext.test.ts index f79da3152f0e..736cc763ad2e 100644 --- a/code/core/src/preview-api/modules/preview-web/docs-context/DocsContext.test.ts +++ b/code/core/src/preview-api/modules/preview-web/docs-context/DocsContext.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; -import { Channel } from '@storybook/core/channels'; -import type { CSFFile, Renderer } from '@storybook/core/types'; +import { Channel } from 'storybook/internal/channels'; +import type { CSFFile, Renderer } from 'storybook/internal/types'; import type { StoryStore } from '../../store'; import { DocsContext } from './DocsContext'; diff --git a/code/core/src/preview-api/modules/preview-web/docs-context/DocsContext.ts b/code/core/src/preview-api/modules/preview-web/docs-context/DocsContext.ts index 6e39643859db..67220db1beaa 100644 --- a/code/core/src/preview-api/modules/preview-web/docs-context/DocsContext.ts +++ b/code/core/src/preview-api/modules/preview-web/docs-context/DocsContext.ts @@ -1,4 +1,4 @@ -import type { Channel } from '@storybook/core/channels'; +import type { Channel } from 'storybook/internal/channels'; import type { CSFFile, ModuleExport, @@ -9,7 +9,7 @@ import type { ResolvedModuleExportType, StoryId, StoryName, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/preview-api/modules/preview-web/docs-context/DocsContextProps.ts b/code/core/src/preview-api/modules/preview-web/docs-context/DocsContextProps.ts index f5d8f5694f90..01d1d2560aea 100644 --- a/code/core/src/preview-api/modules/preview-web/docs-context/DocsContextProps.ts +++ b/code/core/src/preview-api/modules/preview-web/docs-context/DocsContextProps.ts @@ -1 +1 @@ -export type { DocsContextProps } from '@storybook/core/types'; +export type { DocsContextProps } from 'storybook/internal/types'; diff --git a/code/core/src/preview-api/modules/preview-web/docs-context/DocsRenderFunction.ts b/code/core/src/preview-api/modules/preview-web/docs-context/DocsRenderFunction.ts index ab7b3818de61..8619ec6c65d2 100644 --- a/code/core/src/preview-api/modules/preview-web/docs-context/DocsRenderFunction.ts +++ b/code/core/src/preview-api/modules/preview-web/docs-context/DocsRenderFunction.ts @@ -1 +1 @@ -export type { DocsRenderFunction } from '@storybook/core/types'; +export type { DocsRenderFunction } from 'storybook/internal/types'; diff --git a/code/core/src/preview-api/modules/preview-web/docs-context/test-utils.ts b/code/core/src/preview-api/modules/preview-web/docs-context/test-utils.ts index 24c7bd4aae95..af0a6836388e 100644 --- a/code/core/src/preview-api/modules/preview-web/docs-context/test-utils.ts +++ b/code/core/src/preview-api/modules/preview-web/docs-context/test-utils.ts @@ -1,4 +1,4 @@ -import type { CSFFile, PreparedStory } from '@storybook/core/types'; +import type { CSFFile, PreparedStory } from 'storybook/internal/types'; export function csfFileParts(storyId = 'meta--story', metaId = 'meta') { // These compose the raw exports of the CSF file diff --git a/code/core/src/preview-api/modules/preview-web/index.ts b/code/core/src/preview-api/modules/preview-web/index.ts index 3a490866bf74..ffc0e9ab5718 100644 --- a/code/core/src/preview-api/modules/preview-web/index.ts +++ b/code/core/src/preview-api/modules/preview-web/index.ts @@ -1,6 +1,6 @@ // FIXME: breaks builder-vite, remove this in 7.0 export { composeConfigs } from '../../store'; -export type { ProjectAnnotations as WebProjectAnnotations } from '@storybook/core/types'; +export type { ProjectAnnotations as WebProjectAnnotations } from 'storybook/internal/types'; export { Preview } from './Preview'; export { PreviewWeb } from './PreviewWeb'; diff --git a/code/core/src/preview-api/modules/preview-web/parseArgsParam.test.ts b/code/core/src/preview-api/modules/preview-web/parseArgsParam.test.ts index 7b8da7118702..252b9f7618ed 100644 --- a/code/core/src/preview-api/modules/preview-web/parseArgsParam.test.ts +++ b/code/core/src/preview-api/modules/preview-web/parseArgsParam.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest'; import { parseArgsParam } from './parseArgsParam'; -vi.mock('@storybook/core/client-logger', () => ({ +vi.mock('storybook/internal/client-logger', () => ({ once: { warn: vi.fn() }, })); diff --git a/code/core/src/preview-api/modules/preview-web/parseArgsParam.ts b/code/core/src/preview-api/modules/preview-web/parseArgsParam.ts index 06d1cd5320be..380c272478d0 100644 --- a/code/core/src/preview-api/modules/preview-web/parseArgsParam.ts +++ b/code/core/src/preview-api/modules/preview-web/parseArgsParam.ts @@ -1,6 +1,5 @@ -import type { Args } from '@storybook/core/types'; - -import { once } from '@storybook/core/client-logger'; +import { once } from 'storybook/internal/client-logger'; +import type { Args } from 'storybook/internal/types'; import { isPlainObject } from 'es-toolkit'; import { type Options, parse } from 'picoquery'; diff --git a/code/core/src/preview-api/modules/preview-web/render/CsfDocsRender.test.ts b/code/core/src/preview-api/modules/preview-web/render/CsfDocsRender.test.ts index aa428572219c..f3a7bea795a4 100644 --- a/code/core/src/preview-api/modules/preview-web/render/CsfDocsRender.test.ts +++ b/code/core/src/preview-api/modules/preview-web/render/CsfDocsRender.test.ts @@ -1,7 +1,7 @@ import { expect, it, vi } from 'vitest'; -import { Channel } from '@storybook/core/channels'; -import type { DocsIndexEntry, RenderContextCallbacks, Renderer } from '@storybook/core/types'; +import { Channel } from 'storybook/internal/channels'; +import type { DocsIndexEntry, RenderContextCallbacks, Renderer } from 'storybook/internal/types'; import type { StoryStore } from '../../store'; import { csfFileParts } from '../docs-context/test-utils'; diff --git a/code/core/src/preview-api/modules/preview-web/render/CsfDocsRender.ts b/code/core/src/preview-api/modules/preview-web/render/CsfDocsRender.ts index 6c13338e501f..22e4fab67dbf 100644 --- a/code/core/src/preview-api/modules/preview-web/render/CsfDocsRender.ts +++ b/code/core/src/preview-api/modules/preview-web/render/CsfDocsRender.ts @@ -1,10 +1,9 @@ -import type { Channel } from '@storybook/core/channels'; -import type { Renderer, StoryId } from '@storybook/core/types'; -import type { CSFFile, PreparedStory } from '@storybook/core/types'; -import type { IndexEntry } from '@storybook/core/types'; -import type { RenderContextCallbacks } from '@storybook/core/types'; - -import { DOCS_RENDERED } from '@storybook/core/core-events'; +import type { Channel } from 'storybook/internal/channels'; +import { DOCS_RENDERED } from 'storybook/internal/core-events'; +import type { Renderer, StoryId } from 'storybook/internal/types'; +import type { CSFFile, PreparedStory } from 'storybook/internal/types'; +import type { IndexEntry } from 'storybook/internal/types'; +import type { RenderContextCallbacks } from 'storybook/internal/types'; import type { StoryStore } from '../../../store'; import { DocsContext } from '../docs-context/DocsContext'; diff --git a/code/core/src/preview-api/modules/preview-web/render/MdxDocsRender.test.ts b/code/core/src/preview-api/modules/preview-web/render/MdxDocsRender.test.ts index 86a172013e9d..6526af86ac08 100644 --- a/code/core/src/preview-api/modules/preview-web/render/MdxDocsRender.test.ts +++ b/code/core/src/preview-api/modules/preview-web/render/MdxDocsRender.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; -import { Channel } from '@storybook/core/channels'; -import type { DocsIndexEntry, RenderContextCallbacks, Renderer } from '@storybook/core/types'; +import { Channel } from 'storybook/internal/channels'; +import type { DocsIndexEntry, RenderContextCallbacks, Renderer } from 'storybook/internal/types'; import type { StoryStore } from '../../store'; import { csfFileParts } from '../docs-context/test-utils'; diff --git a/code/core/src/preview-api/modules/preview-web/render/MdxDocsRender.ts b/code/core/src/preview-api/modules/preview-web/render/MdxDocsRender.ts index a2ef97411b79..f87c034cd621 100644 --- a/code/core/src/preview-api/modules/preview-web/render/MdxDocsRender.ts +++ b/code/core/src/preview-api/modules/preview-web/render/MdxDocsRender.ts @@ -1,10 +1,9 @@ -import type { Channel } from '@storybook/core/channels'; -import type { Renderer, StoryId } from '@storybook/core/types'; -import type { CSFFile, ModuleExports } from '@storybook/core/types'; -import type { IndexEntry } from '@storybook/core/types'; -import type { RenderContextCallbacks } from '@storybook/core/types'; - -import { DOCS_RENDERED } from '@storybook/core/core-events'; +import type { Channel } from 'storybook/internal/channels'; +import { DOCS_RENDERED } from 'storybook/internal/core-events'; +import type { Renderer, StoryId } from 'storybook/internal/types'; +import type { CSFFile, ModuleExports } from 'storybook/internal/types'; +import type { IndexEntry } from 'storybook/internal/types'; +import type { RenderContextCallbacks } from 'storybook/internal/types'; import type { StoryStore } from '../../store'; import { DocsContext } from '../docs-context/DocsContext'; diff --git a/code/core/src/preview-api/modules/preview-web/render/Render.ts b/code/core/src/preview-api/modules/preview-web/render/Render.ts index 71f91fc7b5be..3e23efdab165 100644 --- a/code/core/src/preview-api/modules/preview-web/render/Render.ts +++ b/code/core/src/preview-api/modules/preview-web/render/Render.ts @@ -1,5 +1,5 @@ -import type { Renderer, StoryId } from '@storybook/core/types'; -import type { StoryRenderOptions } from '@storybook/core/types'; +import type { Renderer, StoryId } from 'storybook/internal/types'; +import type { StoryRenderOptions } from 'storybook/internal/types'; export type RenderType = 'story' | 'docs'; diff --git a/code/core/src/preview-api/modules/preview-web/render/StoryRender.test.ts b/code/core/src/preview-api/modules/preview-web/render/StoryRender.test.ts index 41fdea4b6771..b7cab8141bf3 100644 --- a/code/core/src/preview-api/modules/preview-web/render/StoryRender.test.ts +++ b/code/core/src/preview-api/modules/preview-web/render/StoryRender.test.ts @@ -1,10 +1,14 @@ // @vitest-environment happy-dom import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { Channel } from 'storybook/internal/channels'; import { STORY_FINISHED } from 'storybook/internal/core-events'; - -import { Channel } from '@storybook/core/channels'; -import type { PreparedStory, Renderer, StoryContext, StoryIndexEntry } from '@storybook/core/types'; +import type { + PreparedStory, + Renderer, + StoryContext, + StoryIndexEntry, +} from 'storybook/internal/types'; import { ReporterAPI, type StoryStore } from '../../store'; import { PREPARE_ABORTED } from './Render'; diff --git a/code/core/src/preview-api/modules/preview-web/render/StoryRender.ts b/code/core/src/preview-api/modules/preview-web/render/StoryRender.ts index 0eacdf7e7551..353e0774ecf3 100644 --- a/code/core/src/preview-api/modules/preview-web/render/StoryRender.ts +++ b/code/core/src/preview-api/modules/preview-web/render/StoryRender.ts @@ -1,4 +1,16 @@ -import type { Channel } from '@storybook/core/channels'; +import type { Channel } from 'storybook/internal/channels'; +import { + PLAY_FUNCTION_THREW_EXCEPTION, + STORY_FINISHED, + STORY_RENDERED, + STORY_RENDER_PHASE_CHANGED, + type StoryFinishedPayload, + UNHANDLED_ERRORS_WHILE_PLAYING, +} from 'storybook/internal/core-events'; +import { + MountMustBeDestructuredError, + NoStoryMountedError, +} from 'storybook/internal/preview-errors'; import type { Canvas, PreparedStory, @@ -10,17 +22,7 @@ import type { StoryId, StoryRenderOptions, TeardownRenderToCanvas, -} from '@storybook/core/types'; - -import { - PLAY_FUNCTION_THREW_EXCEPTION, - STORY_FINISHED, - STORY_RENDERED, - STORY_RENDER_PHASE_CHANGED, - type StoryFinishedPayload, - UNHANDLED_ERRORS_WHILE_PLAYING, -} from '@storybook/core/core-events'; -import { MountMustBeDestructuredError, NoStoryMountedError } from '@storybook/core/preview-errors'; +} from 'storybook/internal/types'; import type { StoryStore } from '../../store'; import type { Render, RenderType } from './Render'; diff --git a/code/core/src/preview-api/modules/preview-web/render/mount-utils.ts b/code/core/src/preview-api/modules/preview-web/render/mount-utils.ts index 00510d0f5edb..fbf4e353ce6f 100644 --- a/code/core/src/preview-api/modules/preview-web/render/mount-utils.ts +++ b/code/core/src/preview-api/modules/preview-web/render/mount-utils.ts @@ -1,6 +1,6 @@ // Inspired by Vitest fixture implementation: // https://github.com/vitest-dev/vitest/blob/200a4349a2f85686bc7005dce686d9d1b48b84d2/packages/runner/src/fixture.ts -import { type PreparedStory, type Renderer } from '@storybook/core/types'; +import { type PreparedStory, type Renderer } from 'storybook/internal/types'; export function mountDestructured( playFunction: PreparedStory['playFunction'] diff --git a/code/core/src/preview-api/modules/store/ArgsStore.test.ts b/code/core/src/preview-api/modules/store/ArgsStore.test.ts index ad3d20c7664d..03bc52f27a80 100644 --- a/code/core/src/preview-api/modules/store/ArgsStore.test.ts +++ b/code/core/src/preview-api/modules/store/ArgsStore.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest'; import { ArgsStore } from './ArgsStore'; -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); const stringType = { type: { name: 'string' } }; const booleanType = { type: { name: 'boolean' } }; diff --git a/code/core/src/preview-api/modules/store/ArgsStore.ts b/code/core/src/preview-api/modules/store/ArgsStore.ts index da613e76dc81..c4b353431e80 100644 --- a/code/core/src/preview-api/modules/store/ArgsStore.ts +++ b/code/core/src/preview-api/modules/store/ArgsStore.ts @@ -1,5 +1,5 @@ -import type { Args, StoryId } from '@storybook/core/types'; -import type { PreparedStory } from '@storybook/core/types'; +import type { PreparedStory } from 'storybook/internal/types'; +import type { Args, StoryId } from 'storybook/internal/types'; import { DEEPLY_EQUAL, combineArgs, deepDiff, mapArgsToTypes, validateOptions } from './args'; diff --git a/code/core/src/preview-api/modules/store/GlobalsStore.test.ts b/code/core/src/preview-api/modules/store/GlobalsStore.test.ts index eda822e40c64..8a5ed12aa697 100644 --- a/code/core/src/preview-api/modules/store/GlobalsStore.test.ts +++ b/code/core/src/preview-api/modules/store/GlobalsStore.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest'; import { GlobalsStore } from './GlobalsStore'; -vi.mock('@storybook/core/client-logger', () => ({ +vi.mock('storybook/internal/client-logger', () => ({ logger: { warn: vi.fn(), }, diff --git a/code/core/src/preview-api/modules/store/GlobalsStore.ts b/code/core/src/preview-api/modules/store/GlobalsStore.ts index dd15417d9143..6e9a0e9bd381 100644 --- a/code/core/src/preview-api/modules/store/GlobalsStore.ts +++ b/code/core/src/preview-api/modules/store/GlobalsStore.ts @@ -1,6 +1,5 @@ -import type { GlobalTypes, Globals } from '@storybook/core/types'; - -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; +import type { GlobalTypes, Globals } from 'storybook/internal/types'; import { DEEPLY_EQUAL, deepDiff } from './args'; import { getValuesFromArgTypes } from './csf/getValuesFromArgTypes'; diff --git a/code/core/src/preview-api/modules/store/StoryIndexStore.test.ts b/code/core/src/preview-api/modules/store/StoryIndexStore.test.ts index 1cfdd553ea33..e28a63b8533d 100644 --- a/code/core/src/preview-api/modules/store/StoryIndexStore.test.ts +++ b/code/core/src/preview-api/modules/store/StoryIndexStore.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import type { StoryIndex } from '@storybook/core/types'; +import type { StoryIndex } from 'storybook/internal/types'; import { StoryIndexStore } from './StoryIndexStore'; diff --git a/code/core/src/preview-api/modules/store/StoryIndexStore.ts b/code/core/src/preview-api/modules/store/StoryIndexStore.ts index d6812e736f5f..d9dfa82c4716 100644 --- a/code/core/src/preview-api/modules/store/StoryIndexStore.ts +++ b/code/core/src/preview-api/modules/store/StoryIndexStore.ts @@ -1,7 +1,6 @@ -import type { ComponentTitle, Path, StoryId, StoryName } from '@storybook/core/types'; -import type { IndexEntry, StoryIndex } from '@storybook/core/types'; - -import { MissingStoryAfterHmrError } from '@storybook/core/preview-errors'; +import { MissingStoryAfterHmrError } from 'storybook/internal/preview-errors'; +import type { ComponentTitle, Path, StoryId, StoryName } from 'storybook/internal/types'; +import type { IndexEntry, StoryIndex } from 'storybook/internal/types'; import memoize from 'memoizerific'; diff --git a/code/core/src/preview-api/modules/store/StoryStore.test.ts b/code/core/src/preview-api/modules/store/StoryStore.test.ts index b28638960727..f2a5920db8d9 100644 --- a/code/core/src/preview-api/modules/store/StoryStore.test.ts +++ b/code/core/src/preview-api/modules/store/StoryStore.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import type { ProjectAnnotations, Renderer, StoryIndex } from '@storybook/core/types'; +import type { ProjectAnnotations, Renderer, StoryIndex } from 'storybook/internal/types'; import { StoryStore } from './StoryStore'; import { composeConfigs } from './csf/composeConfigs'; @@ -28,7 +28,7 @@ vi.mock('@storybook/global', async (importOriginal) => ({ }, })); -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); const componentOneExports = { default: { title: 'Component One' }, diff --git a/code/core/src/preview-api/modules/store/StoryStore.ts b/code/core/src/preview-api/modules/store/StoryStore.ts index 01404a5f1bf5..efb0f9e393b8 100644 --- a/code/core/src/preview-api/modules/store/StoryStore.ts +++ b/code/core/src/preview-api/modules/store/StoryStore.ts @@ -1,3 +1,8 @@ +import { deprecate } from 'storybook/internal/client-logger'; +import { + CalledExtractOnStoreError, + MissingStoryFromCsfFileError, +} from 'storybook/internal/preview-errors'; import type { ComponentTitle, Parameters, @@ -6,7 +11,7 @@ import type { StoryContext, StoryContextForEnhancers, StoryId, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; import type { BoundStory, CSFFile, @@ -16,20 +21,15 @@ import type { PreparedMeta, PreparedStory, ProjectAnnotations, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; import type { IndexEntry, StoryIndex, StoryIndexV3, V3CompatIndexEntry, -} from '@storybook/core/types'; -import type { Canvas, CleanupCallback } from '@storybook/csf'; +} from 'storybook/internal/types'; -import { deprecate } from '@storybook/core/client-logger'; -import { - CalledExtractOnStoreError, - MissingStoryFromCsfFileError, -} from '@storybook/core/preview-errors'; +import type { Canvas, CleanupCallback } from '@storybook/csf'; import { mapValues, omitBy, pick, toMerged } from 'es-toolkit'; import memoize from 'memoizerific'; diff --git a/code/core/src/preview-api/modules/store/args.test.ts b/code/core/src/preview-api/modules/store/args.test.ts index d40d989cebc7..1180386429ed 100644 --- a/code/core/src/preview-api/modules/store/args.test.ts +++ b/code/core/src/preview-api/modules/store/args.test.ts @@ -1,8 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; -import type { SBType } from '@storybook/core/types'; - -import { once } from '@storybook/core/client-logger'; +import { once } from 'storybook/internal/client-logger'; +import type { SBType } from 'storybook/internal/types'; import { UNTARGETED, @@ -20,7 +19,7 @@ const functionType: SBType = { name: 'function' }; const numArrayType: SBType = { name: 'array', value: numberType }; const boolObjectType: SBType = { name: 'object', value: { bool: booleanType } }; -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); enum ArgsMapTestEnumWithoutInitializer { EnumValue, diff --git a/code/core/src/preview-api/modules/store/args.ts b/code/core/src/preview-api/modules/store/args.ts index 145ccdfbc620..9a8c7394ffb0 100644 --- a/code/core/src/preview-api/modules/store/args.ts +++ b/code/core/src/preview-api/modules/store/args.ts @@ -1,3 +1,4 @@ +import { once } from 'storybook/internal/client-logger'; import type { ArgTypes, Args, @@ -5,9 +6,7 @@ import type { Renderer, SBType, StoryContext, -} from '@storybook/core/types'; - -import { once } from '@storybook/core/client-logger'; +} from 'storybook/internal/types'; import { isEqual as deepEqual, isPlainObject } from 'es-toolkit'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/preview-api/modules/store/autoTitle.test.ts b/code/core/src/preview-api/modules/store/autoTitle.test.ts index 3289261dd8bc..1c5deac9b8c3 100644 --- a/code/core/src/preview-api/modules/store/autoTitle.test.ts +++ b/code/core/src/preview-api/modules/store/autoTitle.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { normalizeStoriesEntry } from '@storybook/core/common'; +import { normalizeStoriesEntry } from 'storybook/internal/common'; import { userOrAutoTitleFromSpecifier as userOrAuto } from './autoTitle'; diff --git a/code/core/src/preview-api/modules/store/autoTitle.ts b/code/core/src/preview-api/modules/store/autoTitle.ts index c8c23e2ca36a..c74e7c165757 100644 --- a/code/core/src/preview-api/modules/store/autoTitle.ts +++ b/code/core/src/preview-api/modules/store/autoTitle.ts @@ -1,6 +1,5 @@ -import type { NormalizedStoriesSpecifier } from '@storybook/core/types'; - -import { once } from '@storybook/core/client-logger'; +import { once } from 'storybook/internal/client-logger'; +import type { NormalizedStoriesSpecifier } from 'storybook/internal/types'; import slash from 'slash'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/preview-api/modules/store/csf/composeConfigs.ts b/code/core/src/preview-api/modules/store/csf/composeConfigs.ts index e5ba4f731b83..c36b2aab124c 100644 --- a/code/core/src/preview-api/modules/store/csf/composeConfigs.ts +++ b/code/core/src/preview-api/modules/store/csf/composeConfigs.ts @@ -1,5 +1,6 @@ -import type { ModuleExports, NormalizedProjectAnnotations } from '@storybook/core/types'; -import type { Renderer } from '@storybook/core/types'; +import type { ModuleExports, NormalizedProjectAnnotations } from 'storybook/internal/types'; +import type { Renderer } from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { combineParameters } from '../parameters'; diff --git a/code/core/src/preview-api/modules/store/csf/getValuesFromArgTypes.ts b/code/core/src/preview-api/modules/store/csf/getValuesFromArgTypes.ts index ff3f124872b8..a69a7062b8c6 100644 --- a/code/core/src/preview-api/modules/store/csf/getValuesFromArgTypes.ts +++ b/code/core/src/preview-api/modules/store/csf/getValuesFromArgTypes.ts @@ -1,4 +1,4 @@ -import type { ArgTypes } from '@storybook/core/types'; +import type { ArgTypes } from 'storybook/internal/types'; export const getValuesFromArgTypes = (argTypes: ArgTypes = {}) => Object.entries(argTypes).reduce((acc, [arg, { defaultValue }]) => { diff --git a/code/core/src/preview-api/modules/store/csf/normalizeComponentAnnotations.ts b/code/core/src/preview-api/modules/store/csf/normalizeComponentAnnotations.ts index b314a89d31bf..b8287d820261 100644 --- a/code/core/src/preview-api/modules/store/csf/normalizeComponentAnnotations.ts +++ b/code/core/src/preview-api/modules/store/csf/normalizeComponentAnnotations.ts @@ -1,5 +1,6 @@ -import type { ModuleExports, NormalizedComponentAnnotations } from '@storybook/core/types'; -import type { Renderer } from '@storybook/core/types'; +import type { ModuleExports, NormalizedComponentAnnotations } from 'storybook/internal/types'; +import type { Renderer } from 'storybook/internal/types'; + import { sanitize } from '@storybook/csf'; import { normalizeInputTypes } from './normalizeInputTypes'; diff --git a/code/core/src/preview-api/modules/store/csf/normalizeInputTypes.ts b/code/core/src/preview-api/modules/store/csf/normalizeInputTypes.ts index f4685dc83090..54a6b3ddf297 100644 --- a/code/core/src/preview-api/modules/store/csf/normalizeInputTypes.ts +++ b/code/core/src/preview-api/modules/store/csf/normalizeInputTypes.ts @@ -5,7 +5,7 @@ import type { StrictArgTypes, StrictGlobalTypes, StrictInputType, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; import { mapValues } from 'es-toolkit'; diff --git a/code/core/src/preview-api/modules/store/csf/normalizeProjectAnnotations.ts b/code/core/src/preview-api/modules/store/csf/normalizeProjectAnnotations.ts index 7c5ec15724fb..25d2fb78b197 100644 --- a/code/core/src/preview-api/modules/store/csf/normalizeProjectAnnotations.ts +++ b/code/core/src/preview-api/modules/store/csf/normalizeProjectAnnotations.ts @@ -1,11 +1,10 @@ +import { deprecate } from 'storybook/internal/client-logger'; import type { ArgTypes, NormalizedProjectAnnotations, ProjectAnnotations, Renderer, -} from '@storybook/core/types'; - -import { deprecate } from '@storybook/core/client-logger'; +} from 'storybook/internal/types'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/preview-api/modules/store/csf/normalizeStory.test.ts b/code/core/src/preview-api/modules/store/csf/normalizeStory.test.ts index e7cad9cb0558..69a740c579cb 100644 --- a/code/core/src/preview-api/modules/store/csf/normalizeStory.test.ts +++ b/code/core/src/preview-api/modules/store/csf/normalizeStory.test.ts @@ -1,10 +1,10 @@ import { describe, expect, it, vi } from 'vitest'; -import type { Renderer, StoryAnnotationsOrFn } from '@storybook/core/types'; +import type { Renderer, StoryAnnotationsOrFn } from 'storybook/internal/types'; import { normalizeStory } from './normalizeStory'; -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); describe('normalizeStory', () => { describe('id generation', () => { diff --git a/code/core/src/preview-api/modules/store/csf/normalizeStory.ts b/code/core/src/preview-api/modules/store/csf/normalizeStory.ts index 7fb9f59d256b..525fb54a9956 100644 --- a/code/core/src/preview-api/modules/store/csf/normalizeStory.ts +++ b/code/core/src/preview-api/modules/store/csf/normalizeStory.ts @@ -1,3 +1,4 @@ +import { deprecate, logger } from 'storybook/internal/client-logger'; import type { ArgTypes, LegacyStoryAnnotationsOrFn, @@ -5,14 +6,13 @@ import type { StoryAnnotations, StoryFn, StoryId, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; import type { NormalizedComponentAnnotations, NormalizedStoryAnnotations, -} from '@storybook/core/types'; -import { storyNameFromExport, toId } from '@storybook/csf'; +} from 'storybook/internal/types'; -import { deprecate, logger } from '@storybook/core/client-logger'; +import { storyNameFromExport, toId } from '@storybook/csf'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/preview-api/modules/store/csf/portable-stories.test.ts b/code/core/src/preview-api/modules/store/csf/portable-stories.test.ts index 24e286b3b909..70d07b47e7b8 100644 --- a/code/core/src/preview-api/modules/store/csf/portable-stories.test.ts +++ b/code/core/src/preview-api/modules/store/csf/portable-stories.test.ts @@ -5,7 +5,8 @@ import type { ComponentAnnotations as Meta, Store_CSFExports, StoryAnnotationsOrFn as Story, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; + import type { ProjectAnnotations } from '@storybook/csf'; import * as defaultExportAnnotations from './__mocks__/defaultExportAnnotations.mockfile'; diff --git a/code/core/src/preview-api/modules/store/csf/portable-stories.ts b/code/core/src/preview-api/modules/store/csf/portable-stories.ts index 774137dcf85a..510b79c67abe 100644 --- a/code/core/src/preview-api/modules/store/csf/portable-stories.ts +++ b/code/core/src/preview-api/modules/store/csf/portable-stories.ts @@ -1,6 +1,7 @@ /* eslint-disable no-underscore-dangle */ /* eslint-disable @typescript-eslint/naming-convention */ +import { MountMustBeDestructuredError } from 'storybook/internal/preview-errors'; import type { Args, Canvas, @@ -18,10 +19,9 @@ import type { Store_CSFExports, StoryContext, StrictArgTypes, -} from '@storybook/core/types'; -import { type CleanupCallback, isExportStory } from '@storybook/csf'; +} from 'storybook/internal/types'; -import { MountMustBeDestructuredError } from '@storybook/core/preview-errors'; +import { type CleanupCallback, isExportStory } from '@storybook/csf'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/preview-api/modules/store/csf/prepareStory.test.ts b/code/core/src/preview-api/modules/store/csf/prepareStory.test.ts index 4f3c88bbd55e..1d05d136d7c2 100644 --- a/code/core/src/preview-api/modules/store/csf/prepareStory.test.ts +++ b/code/core/src/preview-api/modules/store/csf/prepareStory.test.ts @@ -9,7 +9,8 @@ import type { Renderer, SBScalarType, StoryContext, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; + import { global } from '@storybook/global'; import { HooksContext, addons } from '../../addons'; diff --git a/code/core/src/preview-api/modules/store/csf/prepareStory.ts b/code/core/src/preview-api/modules/store/csf/prepareStory.ts index d2d7bba0c6df..3a8888d8f4b1 100644 --- a/code/core/src/preview-api/modules/store/csf/prepareStory.ts +++ b/code/core/src/preview-api/modules/store/csf/prepareStory.ts @@ -1,4 +1,5 @@ /* eslint-disable no-underscore-dangle */ +import { NoRenderFunctionError } from 'storybook/internal/preview-errors'; import type { Args, ArgsStoryFn, @@ -11,19 +12,18 @@ import type { StoryContextForEnhancers, StoryContextForLoaders, StrictArgTypes, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; import type { ModuleExport, NormalizedComponentAnnotations, NormalizedProjectAnnotations, NormalizedStoryAnnotations, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; + import { type CleanupCallback, combineTags, includeConditionalArg } from '@storybook/csf'; import { global } from '@storybook/global'; import { global as globalThis } from '@storybook/global'; -import { NoRenderFunctionError } from '@storybook/core/preview-errors'; - import { applyHooks } from '../../addons'; import { mountDestructured } from '../../preview-web/render/mount-utils'; import { UNTARGETED, groupArgsByTarget } from '../args'; diff --git a/code/core/src/preview-api/modules/store/csf/processCSFFile.ts b/code/core/src/preview-api/modules/store/csf/processCSFFile.ts index e0913f88992f..8e0ccc52dd33 100644 --- a/code/core/src/preview-api/modules/store/csf/processCSFFile.ts +++ b/code/core/src/preview-api/modules/store/csf/processCSFFile.ts @@ -1,8 +1,12 @@ -import type { ComponentTitle, Parameters, Path, Renderer } from '@storybook/core/types'; -import type { CSFFile, ModuleExports, NormalizedComponentAnnotations } from '@storybook/core/types'; -import { isExportStory } from '@storybook/csf'; +import { logger } from 'storybook/internal/client-logger'; +import type { + CSFFile, + ModuleExports, + NormalizedComponentAnnotations, +} from 'storybook/internal/csf-tools'; +import type { ComponentTitle, Parameters, Path, Renderer } from 'storybook/internal/types'; -import { logger } from '@storybook/core/client-logger'; +import { isExportStory } from '@storybook/csf'; import { normalizeComponentAnnotations } from './normalizeComponentAnnotations'; import { normalizeStory } from './normalizeStory'; diff --git a/code/core/src/preview-api/modules/store/csf/stepRunners.test.ts b/code/core/src/preview-api/modules/store/csf/stepRunners.test.ts index aacfa0d4dd5a..07bdbc2aae39 100644 --- a/code/core/src/preview-api/modules/store/csf/stepRunners.test.ts +++ b/code/core/src/preview-api/modules/store/csf/stepRunners.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import type { StepRunner, StoryContext } from '@storybook/core/types'; +import type { StepRunner, StoryContext } from 'storybook/internal/types'; import { composeStepRunners } from './stepRunners'; diff --git a/code/core/src/preview-api/modules/store/csf/stepRunners.ts b/code/core/src/preview-api/modules/store/csf/stepRunners.ts index c79adbfbc3d3..5f34b8848742 100644 --- a/code/core/src/preview-api/modules/store/csf/stepRunners.ts +++ b/code/core/src/preview-api/modules/store/csf/stepRunners.ts @@ -1,4 +1,4 @@ -import type { Renderer, StepRunner } from '@storybook/core/types'; +import type { Renderer, StepRunner } from 'storybook/internal/types'; /** * Compose step runners to create a single step runner that applies each step runner in order. diff --git a/code/core/src/preview-api/modules/store/decorators.test.ts b/code/core/src/preview-api/modules/store/decorators.test.ts index ae3cd2bb8c3c..2252d1972ba8 100644 --- a/code/core/src/preview-api/modules/store/decorators.test.ts +++ b/code/core/src/preview-api/modules/store/decorators.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import type { Renderer, StoryContext } from '@storybook/core/types'; +import type { Renderer, StoryContext } from 'storybook/internal/types'; import { defaultDecorateStory } from './decorators'; diff --git a/code/core/src/preview-api/modules/store/decorators.ts b/code/core/src/preview-api/modules/store/decorators.ts index c5a540325bd4..861c358a9ac3 100644 --- a/code/core/src/preview-api/modules/store/decorators.ts +++ b/code/core/src/preview-api/modules/store/decorators.ts @@ -5,7 +5,7 @@ import type { Renderer, StoryContext, StoryContextUpdate, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; export function decorateStory( storyFn: LegacyStoryFn, diff --git a/code/core/src/preview-api/modules/store/filterArgTypes.ts b/code/core/src/preview-api/modules/store/filterArgTypes.ts index 16c2dd3a6c51..b03a155970e0 100644 --- a/code/core/src/preview-api/modules/store/filterArgTypes.ts +++ b/code/core/src/preview-api/modules/store/filterArgTypes.ts @@ -1,4 +1,4 @@ -import type { StrictArgTypes } from '@storybook/core/types'; +import type { StrictArgTypes } from 'storybook/internal/types'; import { pickBy } from 'es-toolkit'; diff --git a/code/core/src/preview-api/modules/store/hooks.test.ts b/code/core/src/preview-api/modules/store/hooks.test.ts index a44dd495d260..4d20c585f088 100644 --- a/code/core/src/preview-api/modules/store/hooks.test.ts +++ b/code/core/src/preview-api/modules/store/hooks.test.ts @@ -1,14 +1,13 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { DecoratorFunction, StoryContext } from '@storybook/core/types'; - import { FORCE_RE_RENDER, RESET_STORY_ARGS, STORY_RENDERED, UPDATE_GLOBALS, UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { DecoratorFunction, StoryContext } from 'storybook/internal/types'; import { HooksContext, @@ -28,7 +27,7 @@ import { } from '../addons'; import { defaultDecorateStory } from './decorators'; -vi.mock('@storybook/core/client-logger', () => ({ +vi.mock('storybook/internal/client-logger', () => ({ logger: { warn: vi.fn(), log: vi.fn() }, })); diff --git a/code/core/src/preview-api/modules/store/inferArgTypes.test.ts b/code/core/src/preview-api/modules/store/inferArgTypes.test.ts index fa374441a4ec..2541b8e56075 100644 --- a/code/core/src/preview-api/modules/store/inferArgTypes.test.ts +++ b/code/core/src/preview-api/modules/store/inferArgTypes.test.ts @@ -1,10 +1,10 @@ import { describe, expect, it, vi } from 'vitest'; -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; import { inferArgTypes } from './inferArgTypes'; -vi.mock('@storybook/core/client-logger'); +vi.mock('storybook/internal/client-logger'); describe('inferArgTypes', () => { it('infers scalar types', () => { diff --git a/code/core/src/preview-api/modules/store/inferArgTypes.ts b/code/core/src/preview-api/modules/store/inferArgTypes.ts index 35e840fedcd8..5def5c762b0b 100644 --- a/code/core/src/preview-api/modules/store/inferArgTypes.ts +++ b/code/core/src/preview-api/modules/store/inferArgTypes.ts @@ -1,6 +1,5 @@ -import type { ArgTypesEnhancer, Renderer, SBType } from '@storybook/core/types'; - -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; +import type { ArgTypesEnhancer, Renderer, SBType } from 'storybook/internal/types'; import { mapValues } from 'es-toolkit'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/preview-api/modules/store/inferControls.test.ts b/code/core/src/preview-api/modules/store/inferControls.test.ts index abe91702ec36..f16e0b9463ed 100644 --- a/code/core/src/preview-api/modules/store/inferControls.test.ts +++ b/code/core/src/preview-api/modules/store/inferControls.test.ts @@ -1,9 +1,8 @@ import type { MockInstance } from 'vitest'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import type { StoryContextForEnhancers } from '@storybook/core/types'; - -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; +import type { StoryContextForEnhancers } from 'storybook/internal/types'; import { argTypesEnhancers } from './inferControls'; diff --git a/code/core/src/preview-api/modules/store/inferControls.ts b/code/core/src/preview-api/modules/store/inferControls.ts index 92447845cc92..8a137de77771 100644 --- a/code/core/src/preview-api/modules/store/inferControls.ts +++ b/code/core/src/preview-api/modules/store/inferControls.ts @@ -1,11 +1,10 @@ +import { logger } from 'storybook/internal/client-logger'; import type { ArgTypesEnhancer, Renderer, SBEnumType, StrictInputType, -} from '@storybook/core/types'; - -import { logger } from '@storybook/core/client-logger'; +} from 'storybook/internal/types'; import { mapValues } from 'es-toolkit'; diff --git a/code/core/src/preview-api/modules/store/parameters.ts b/code/core/src/preview-api/modules/store/parameters.ts index 3b6077614801..39de894852b9 100644 --- a/code/core/src/preview-api/modules/store/parameters.ts +++ b/code/core/src/preview-api/modules/store/parameters.ts @@ -1,5 +1,5 @@ // Utilities for handling parameters -import type { Parameters } from '@storybook/core/types'; +import type { Parameters } from 'storybook/internal/types'; import { isPlainObject } from 'es-toolkit'; diff --git a/code/core/src/preview-api/modules/store/sortStories.ts b/code/core/src/preview-api/modules/store/sortStories.ts index 39cb86efcc21..a88b23b01ca1 100644 --- a/code/core/src/preview-api/modules/store/sortStories.ts +++ b/code/core/src/preview-api/modules/store/sortStories.ts @@ -1,12 +1,11 @@ -import type { IndexEntry, StoryIndexEntry } from '@storybook/core/types'; import type { Addon_Comparator, Addon_StorySortParameter, Addon_StorySortParameterV7, IndexEntryLegacy, -} from '@storybook/core/types'; -import type { Parameters, Path, Renderer } from '@storybook/core/types'; -import type { PreparedStory } from '@storybook/core/types'; +} from 'storybook/internal/types'; +import type { Parameters, Path, Renderer } from 'storybook/internal/types'; +import type { PreparedStory } from 'storybook/internal/types'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/preview-api/modules/store/storySort.test.ts b/code/core/src/preview-api/modules/store/storySort.test.ts index 104ad3bb1c8d..2c60aa0ddff6 100644 --- a/code/core/src/preview-api/modules/store/storySort.test.ts +++ b/code/core/src/preview-api/modules/store/storySort.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import type { StoryId, StoryIndexEntry } from '@storybook/core/types'; +import type { StoryId, StoryIndexEntry } from 'storybook/internal/types'; import { storySort } from './storySort'; diff --git a/code/core/src/preview-api/modules/store/storySort.ts b/code/core/src/preview-api/modules/store/storySort.ts index eddc18004923..e5700124df12 100644 --- a/code/core/src/preview-api/modules/store/storySort.ts +++ b/code/core/src/preview-api/modules/store/storySort.ts @@ -1,8 +1,8 @@ import type { Addon_StorySortComparatorV7, Addon_StorySortObjectParameter, -} from '@storybook/core/types'; -import type { IndexEntry } from '@storybook/core/types'; +} from 'storybook/internal/types'; +import type { IndexEntry } from 'storybook/internal/types'; const STORY_KIND_PATH_SEPARATOR = /\s*\/\s*/; diff --git a/code/core/src/preview/globals/globals.ts b/code/core/src/preview/globals/globals.ts index c20d2630899e..7341ba7d1e38 100644 --- a/code/core/src/preview/globals/globals.ts +++ b/code/core/src/preview/globals/globals.ts @@ -5,27 +5,21 @@ export const globalsNameReferenceMap = { 'storybook/internal/channels': '__STORYBOOK_MODULE_CHANNELS__', '@storybook/channels': '__STORYBOOK_MODULE_CHANNELS__', - '@storybook/core/channels': '__STORYBOOK_MODULE_CHANNELS__', 'storybook/internal/client-logger': '__STORYBOOK_MODULE_CLIENT_LOGGER__', '@storybook/client-logger': '__STORYBOOK_MODULE_CLIENT_LOGGER__', - '@storybook/core/client-logger': '__STORYBOOK_MODULE_CLIENT_LOGGER__', 'storybook/internal/core-events': '__STORYBOOK_MODULE_CORE_EVENTS__', '@storybook/core-events': '__STORYBOOK_MODULE_CORE_EVENTS__', - '@storybook/core/core-events': '__STORYBOOK_MODULE_CORE_EVENTS__', 'storybook/internal/preview-errors': '__STORYBOOK_MODULE_CORE_EVENTS_PREVIEW_ERRORS__', '@storybook/core-events/preview-errors': '__STORYBOOK_MODULE_CORE_EVENTS_PREVIEW_ERRORS__', - '@storybook/core/preview-errors': '__STORYBOOK_MODULE_CORE_EVENTS_PREVIEW_ERRORS__', 'storybook/internal/preview-api': '__STORYBOOK_MODULE_PREVIEW_API__', '@storybook/preview-api': '__STORYBOOK_MODULE_PREVIEW_API__', - '@storybook/core/preview-api': '__STORYBOOK_MODULE_PREVIEW_API__', 'storybook/internal/types': '__STORYBOOK_MODULE_TYPES__', '@storybook/types': '__STORYBOOK_MODULE_TYPES__', - '@storybook/core/types': '__STORYBOOK_MODULE_TYPES__', } as const; export const globalPackages = Object.keys(globalsNameReferenceMap) as Array< diff --git a/code/core/src/preview/globals/runtime.ts b/code/core/src/preview/globals/runtime.ts index 48418bc6de7e..d90b93538754 100644 --- a/code/core/src/preview/globals/runtime.ts +++ b/code/core/src/preview/globals/runtime.ts @@ -1,11 +1,11 @@ -import * as CHANNELS from '@storybook/core/channels'; -import * as TYPES from '@storybook/core/types'; -import * as GLOBAL from '@storybook/global'; +import * as CHANNELS from 'storybook/internal/channels'; +import * as CLIENT_LOGGER from 'storybook/internal/client-logger'; +import * as CORE_EVENTS from 'storybook/internal/core-events'; +import * as PREVIEW_API from 'storybook/internal/preview-api'; +import * as CORE_EVENTS_PREVIEW_ERRORS from 'storybook/internal/preview-errors'; +import * as TYPES from 'storybook/internal/types'; -import * as CLIENT_LOGGER from '@storybook/core/client-logger'; -import * as CORE_EVENTS from '@storybook/core/core-events'; -import * as PREVIEW_API from '@storybook/core/preview-api'; -import * as CORE_EVENTS_PREVIEW_ERRORS from '@storybook/core/preview-errors'; +import * as GLOBAL from '@storybook/global'; import type { globalsNameReferenceMap } from './globals'; @@ -15,25 +15,19 @@ export const globalsNameValueMap: Required ({ +vi.mock('storybook/internal/client-logger', () => ({ once: { warn: vi.fn() }, })); diff --git a/code/core/src/router/utils.ts b/code/core/src/router/utils.ts index bd8e3edc7aa5..66efa79cb68b 100644 --- a/code/core/src/router/utils.ts +++ b/code/core/src/router/utils.ts @@ -1,4 +1,4 @@ -import { once } from '@storybook/core/client-logger'; +import { once } from 'storybook/internal/client-logger'; import { isEqual as deepEqual, isPlainObject } from 'es-toolkit'; import memoize from 'memoizerific'; diff --git a/code/core/src/telemetry/anonymous-id.ts b/code/core/src/telemetry/anonymous-id.ts index 1d23d0a493ae..acd807ffd95b 100644 --- a/code/core/src/telemetry/anonymous-id.ts +++ b/code/core/src/telemetry/anonymous-id.ts @@ -1,6 +1,6 @@ import { relative } from 'node:path'; -import { getProjectRoot } from '@storybook/core/common'; +import { getProjectRoot } from 'storybook/internal/common'; import { execSync } from 'child_process'; import slash from 'slash'; diff --git a/code/core/src/telemetry/event-cache.ts b/code/core/src/telemetry/event-cache.ts index 95fecef60c05..c40d7254aefc 100644 --- a/code/core/src/telemetry/event-cache.ts +++ b/code/core/src/telemetry/event-cache.ts @@ -1,4 +1,4 @@ -import { cache } from '@storybook/core/common'; +import { cache } from 'storybook/internal/common'; import type { EventType } from './types'; diff --git a/code/core/src/telemetry/get-chromatic-version.ts b/code/core/src/telemetry/get-chromatic-version.ts index eb1c38fbf3b7..a313b2a8936b 100644 --- a/code/core/src/telemetry/get-chromatic-version.ts +++ b/code/core/src/telemetry/get-chromatic-version.ts @@ -1,4 +1,4 @@ -import type { PackageJson } from '@storybook/core/types'; +import type { PackageJson } from 'storybook/internal/types'; export function getChromaticVersionSpecifier(packageJson: PackageJson) { const dependency = diff --git a/code/core/src/telemetry/get-framework-info.test.ts b/code/core/src/telemetry/get-framework-info.test.ts index e95e643dc8b1..8fc25c4b99ca 100644 --- a/code/core/src/telemetry/get-framework-info.test.ts +++ b/code/core/src/telemetry/get-framework-info.test.ts @@ -2,7 +2,7 @@ import { sep } from 'node:path'; import { describe, expect, it, vi } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import { getFrameworkInfo } from './get-framework-info'; import { getActualPackageJson } from './package-json'; diff --git a/code/core/src/telemetry/get-framework-info.ts b/code/core/src/telemetry/get-framework-info.ts index d5b3390128ea..0216e13bf4db 100644 --- a/code/core/src/telemetry/get-framework-info.ts +++ b/code/core/src/telemetry/get-framework-info.ts @@ -1,7 +1,7 @@ import { normalize } from 'node:path'; -import { frameworkPackages } from '@storybook/core/common'; -import type { PackageJson, StorybookConfig } from '@storybook/core/types'; +import { frameworkPackages } from 'storybook/internal/common'; +import type { PackageJson, StorybookConfig } from 'storybook/internal/types'; import { getActualPackageJson } from './package-json'; import { cleanPaths } from './sanitize'; diff --git a/code/core/src/telemetry/get-monorepo-type.test.ts b/code/core/src/telemetry/get-monorepo-type.test.ts index 3f8ecfca723a..f23369330d97 100644 --- a/code/core/src/telemetry/get-monorepo-type.test.ts +++ b/code/core/src/telemetry/get-monorepo-type.test.ts @@ -8,9 +8,9 @@ import { getMonorepoType, monorepoConfigs } from './get-monorepo-type'; vi.mock('node:fs', async () => import('../../../__mocks__/fs')); -vi.mock('@storybook/core/common', async (importOriginal) => { +vi.mock('storybook/internal/common', async (importOriginal) => { return { - ...(await importOriginal()), + ...(await importOriginal()), getProjectRoot: () => 'root', }; }); diff --git a/code/core/src/telemetry/get-monorepo-type.ts b/code/core/src/telemetry/get-monorepo-type.ts index 143241b0a214..d3825f0f8063 100644 --- a/code/core/src/telemetry/get-monorepo-type.ts +++ b/code/core/src/telemetry/get-monorepo-type.ts @@ -1,8 +1,8 @@ import { existsSync, readFileSync } from 'node:fs'; import { join } from 'node:path'; -import { getProjectRoot } from '@storybook/core/common'; -import type { PackageJson } from '@storybook/core/types'; +import { getProjectRoot } from 'storybook/internal/common'; +import type { PackageJson } from 'storybook/internal/types'; export const monorepoConfigs = { Nx: 'nx.json', diff --git a/code/core/src/telemetry/index.ts b/code/core/src/telemetry/index.ts index 0811901dc2aa..a53be966fd40 100644 --- a/code/core/src/telemetry/index.ts +++ b/code/core/src/telemetry/index.ts @@ -1,4 +1,4 @@ -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import { notify } from './notify'; import { sanitizeError } from './sanitize'; diff --git a/code/core/src/telemetry/notify.ts b/code/core/src/telemetry/notify.ts index a6cf3e5b8b51..224b5e758ec8 100644 --- a/code/core/src/telemetry/notify.ts +++ b/code/core/src/telemetry/notify.ts @@ -1,4 +1,4 @@ -import { cache } from '@storybook/core/common'; +import { cache } from 'storybook/internal/common'; import picocolors from 'picocolors'; diff --git a/code/core/src/telemetry/session-id.test.ts b/code/core/src/telemetry/session-id.test.ts index cff48bfa6dda..c9d2646f9016 100644 --- a/code/core/src/telemetry/session-id.test.ts +++ b/code/core/src/telemetry/session-id.test.ts @@ -1,14 +1,14 @@ import type { MockInstance } from 'vitest'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { cache } from '@storybook/core/common'; +import { cache } from 'storybook/internal/common'; import { nanoid } from 'nanoid'; import { SESSION_TIMEOUT, getSessionId, resetSessionIdForTest } from './session-id'; -vi.mock('@storybook/core/common', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('storybook/internal/common', async (importOriginal) => ({ + ...(await importOriginal()), cache: { get: vi.fn(), set: vi.fn(), diff --git a/code/core/src/telemetry/session-id.ts b/code/core/src/telemetry/session-id.ts index 3029855c5cee..82d0d8947f1d 100644 --- a/code/core/src/telemetry/session-id.ts +++ b/code/core/src/telemetry/session-id.ts @@ -1,4 +1,4 @@ -import { cache } from '@storybook/core/common'; +import { cache } from 'storybook/internal/common'; import { nanoid } from 'nanoid'; diff --git a/code/core/src/telemetry/storybook-metadata.test.ts b/code/core/src/telemetry/storybook-metadata.test.ts index 8d73ff7b437d..05d69aef1783 100644 --- a/code/core/src/telemetry/storybook-metadata.test.ts +++ b/code/core/src/telemetry/storybook-metadata.test.ts @@ -3,7 +3,7 @@ import path from 'node:path'; import type { MockInstance } from 'vitest'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import type { PackageJson, StorybookConfig } from '@storybook/core/types'; +import type { PackageJson, StorybookConfig } from 'storybook/internal/types'; import { computeStorybookMetadata, metaFrameworks, sanitizeAddonName } from './storybook-metadata'; @@ -53,9 +53,9 @@ vi.mock('detect-package-manager', () => ({ getNpmVersion: () => '3.1.1', })); -vi.mock('@storybook/core/common', async (importOriginal) => { +vi.mock('storybook/internal/common', async (importOriginal) => { return { - ...(await importOriginal()), + ...(await importOriginal()), getProjectRoot: () => process.cwd(), }; }); diff --git a/code/core/src/telemetry/storybook-metadata.ts b/code/core/src/telemetry/storybook-metadata.ts index 5258eef0ffb7..d521f3a98eaf 100644 --- a/code/core/src/telemetry/storybook-metadata.ts +++ b/code/core/src/telemetry/storybook-metadata.ts @@ -5,10 +5,9 @@ import { getStorybookConfiguration, getStorybookInfo, loadMainConfig, -} from '@storybook/core/common'; -import type { PackageJson, StorybookConfig } from '@storybook/core/types'; - -import { readConfig } from '@storybook/core/csf-tools'; +} from 'storybook/internal/common'; +import { readConfig } from 'storybook/internal/csf-tools'; +import type { PackageJson, StorybookConfig } from 'storybook/internal/types'; import { detect, getNpmVersion } from 'detect-package-manager'; import { findPackage, findPackagePath } from 'fd-package-json'; diff --git a/code/core/src/telemetry/types.ts b/code/core/src/telemetry/types.ts index e43373e5e61b..aaca07362b1c 100644 --- a/code/core/src/telemetry/types.ts +++ b/code/core/src/telemetry/types.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig, TypescriptOptions } from '@storybook/core/types'; +import type { StorybookConfig, TypescriptOptions } from 'storybook/internal/types'; import type { PM } from 'detect-package-manager'; diff --git a/code/core/src/theming/ensure.ts b/code/core/src/theming/ensure.ts index 39e3ee7e9d00..295defadc89e 100644 --- a/code/core/src/theming/ensure.ts +++ b/code/core/src/theming/ensure.ts @@ -1,4 +1,4 @@ -import { logger } from '@storybook/core/client-logger'; +import { logger } from 'storybook/internal/client-logger'; import { deletedDiff } from 'deep-object-diff'; import { dedent } from 'ts-dedent'; diff --git a/code/core/src/theming/utils.ts b/code/core/src/theming/utils.ts index e739146789fe..d73ff3255133 100644 --- a/code/core/src/theming/utils.ts +++ b/code/core/src/theming/utils.ts @@ -1,6 +1,6 @@ -import { global } from '@storybook/global'; +import { logger } from 'storybook/internal/client-logger'; -import { logger } from '@storybook/core/client-logger'; +import { global } from '@storybook/global'; import { darken, lighten, rgba } from 'polished'; diff --git a/code/core/src/types/modules/addons.ts b/code/core/src/types/modules/addons.ts index b2c7b4ac2f3c..66aaf8d23360 100644 --- a/code/core/src/types/modules/addons.ts +++ b/code/core/src/types/modules/addons.ts @@ -414,7 +414,7 @@ export interface Addon_PageType { * @example * * ```jsx - * import { Route } from '@storybook/core/router'; + * import { Route } from 'storybook/internal/router'; * * Render: () => { * return ( diff --git a/code/core/src/types/modules/docs.ts b/code/core/src/types/modules/docs.ts index b23d9b404328..9e90aad52d75 100644 --- a/code/core/src/types/modules/docs.ts +++ b/code/core/src/types/modules/docs.ts @@ -1,4 +1,4 @@ -import type { Channel } from '@storybook/core/channels'; +import type { Channel } from 'storybook/internal/channels'; import type { Parameters, Renderer, StoryContext, StoryId, StoryName } from './csf'; import type { diff --git a/code/core/template/stories/argMapping.stories.ts b/code/core/template/stories/argMapping.stories.ts index 41575e931239..f2813a95d26d 100644 --- a/code/core/template/stories/argMapping.stories.ts +++ b/code/core/template/stories/argMapping.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/argTypes.stories.ts b/code/core/template/stories/argTypes.stories.ts index 6ad691324495..d64316c63b8e 100644 --- a/code/core/template/stories/argTypes.stories.ts +++ b/code/core/template/stories/argTypes.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/args.stories.ts b/code/core/template/stories/args.stories.ts index 4c83a98ca0ae..e1499f1a175e 100644 --- a/code/core/template/stories/args.stories.ts +++ b/code/core/template/stories/args.stories.ts @@ -1,12 +1,12 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; -import { global as globalThis } from '@storybook/global'; -import { expect, within } from '@storybook/test'; - import { RESET_STORY_ARGS, STORY_ARGS_UPDATED, UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + +import { global as globalThis } from '@storybook/global'; +import { expect, within } from '@storybook/test'; function pick(obj, keys) { const result = {}; diff --git a/code/core/template/stories/autotitle.stories.ts b/code/core/template/stories/autotitle.stories.ts index 0a675faadec8..9399cf241216 100644 --- a/code/core/template/stories/autotitle.stories.ts +++ b/code/core/template/stories/autotitle.stories.ts @@ -1,4 +1,5 @@ -import type { PlayFunctionContext } from '@storybook/core/types'; +import type { PlayFunctionContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect } from '@storybook/test'; diff --git a/code/core/template/stories/component-play.stories.ts b/code/core/template/stories/component-play.stories.ts index 0571cf37b324..db93783ed167 100644 --- a/code/core/template/stories/component-play.stories.ts +++ b/code/core/template/stories/component-play.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/decorators.stories.ts b/code/core/template/stories/decorators.stories.ts index aa5cb1b6d496..7e60034b0ae6 100644 --- a/code/core/template/stories/decorators.stories.ts +++ b/code/core/template/stories/decorators.stories.ts @@ -1,19 +1,19 @@ +import { + RESET_STORY_ARGS, + STORY_ARGS_UPDATED, + UPDATE_STORY_ARGS, +} from 'storybook/internal/core-events'; +import { useEffect } from 'storybook/internal/preview-api'; import type { ArgsStoryFn, PartialStoryFn, PlayFunctionContext, StoryContext, -} from '@storybook/core/types'; +} from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; -import { - RESET_STORY_ARGS, - STORY_ARGS_UPDATED, - UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; -import { useEffect } from '@storybook/core/preview-api'; - export default { component: globalThis.Components.Pre, parameters: { useProjectDecorator: true }, diff --git a/code/core/template/stories/globals.stories.ts b/code/core/template/stories/globals.stories.ts index 0afd7d1fc44d..b4dd7960df9e 100644 --- a/code/core/template/stories/globals.stories.ts +++ b/code/core/template/stories/globals.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/hooks.stories.ts b/code/core/template/stories/hooks.stories.ts index 3593fcbd72ec..b2d2cc01e73a 100644 --- a/code/core/template/stories/hooks.stories.ts +++ b/code/core/template/stories/hooks.stories.ts @@ -1,9 +1,9 @@ -import type { PartialStoryFn, StoryContext } from '@storybook/core/types'; +import { useEffect, useState } from 'storybook/internal/preview-api'; +import type { PartialStoryFn, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { userEvent, within } from '@storybook/test'; -import { useEffect, useState } from '@storybook/core/preview-api'; - export default { component: globalThis.Components.Button, tags: ['!vitest'], diff --git a/code/core/template/stories/indexer.stories.ts b/code/core/template/stories/indexer.stories.ts index 5468e698d3cb..684b195e5bfd 100644 --- a/code/core/template/stories/indexer.stories.ts +++ b/code/core/template/stories/indexer.stories.ts @@ -1,4 +1,5 @@ -import type { PlayFunctionContext } from '@storybook/core/types'; +import type { PlayFunctionContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect } from '@storybook/test'; diff --git a/code/core/template/stories/loaders.stories.ts b/code/core/template/stories/loaders.stories.ts index 1c24f5214fa2..b9a5d31eaf18 100644 --- a/code/core/template/stories/loaders.stories.ts +++ b/code/core/template/stories/loaders.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/names.stories.ts b/code/core/template/stories/names.stories.ts index b89304a63f59..9ad9320b4e5b 100644 --- a/code/core/template/stories/names.stories.ts +++ b/code/core/template/stories/names.stories.ts @@ -1,4 +1,5 @@ -import type { PlayFunctionContext } from '@storybook/core/types'; +import type { PlayFunctionContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect } from '@storybook/test'; diff --git a/code/core/template/stories/parameters.stories.ts b/code/core/template/stories/parameters.stories.ts index a4200444cd0e..5d7020197197 100644 --- a/code/core/template/stories/parameters.stories.ts +++ b/code/core/template/stories/parameters.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/preview.ts b/code/core/template/stories/preview.ts index bba2716864bc..706fd0854027 100644 --- a/code/core/template/stories/preview.ts +++ b/code/core/template/stories/preview.ts @@ -1,5 +1,5 @@ /* eslint-disable no-underscore-dangle */ -import type { PartialStoryFn, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, StoryContext } from 'storybook/internal/types'; declare global { interface Window { diff --git a/code/core/template/stories/rendering.stories.ts b/code/core/template/stories/rendering.stories.ts index 77e9432ef512..6df7cb67aa91 100644 --- a/code/core/template/stories/rendering.stories.ts +++ b/code/core/template/stories/rendering.stories.ts @@ -1,13 +1,13 @@ -import type { PlayFunctionContext } from '@storybook/core/types'; -import { global as globalThis } from '@storybook/global'; -import { expect, waitFor, within } from '@storybook/test'; - import { FORCE_REMOUNT, RESET_STORY_ARGS, STORY_ARGS_UPDATED, UPDATE_STORY_ARGS, -} from '@storybook/core/core-events'; +} from 'storybook/internal/core-events'; +import type { PlayFunctionContext } from 'storybook/internal/types'; + +import { global as globalThis } from '@storybook/global'; +import { expect, waitFor, within } from '@storybook/test'; export default { component: globalThis.Components.Button, diff --git a/code/core/template/stories/shortcuts.stories.ts b/code/core/template/stories/shortcuts.stories.ts index 429d3a5f4147..c726c31457d6 100644 --- a/code/core/template/stories/shortcuts.stories.ts +++ b/code/core/template/stories/shortcuts.stories.ts @@ -1,9 +1,9 @@ +import { PREVIEW_KEYDOWN } from 'storybook/internal/core-events'; + import type { PlayFunctionContext } from '@storybook/csf'; import { global as globalThis } from '@storybook/global'; import { expect, fn, userEvent, within } from '@storybook/test'; -import { PREVIEW_KEYDOWN } from '@storybook/core/core-events'; - export default { component: globalThis.Components.Form, tags: ['autodocs'], diff --git a/code/core/template/stories/tags-add.stories.ts b/code/core/template/stories/tags-add.stories.ts index edb70171eba1..de5469bad877 100644 --- a/code/core/template/stories/tags-add.stories.ts +++ b/code/core/template/stories/tags-add.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/tags-config.stories.ts b/code/core/template/stories/tags-config.stories.ts index a57a70390ce1..3917a1a95199 100644 --- a/code/core/template/stories/tags-config.stories.ts +++ b/code/core/template/stories/tags-config.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/tags-remove.stories.ts b/code/core/template/stories/tags-remove.stories.ts index 468f99614aa0..ced6ace2cecb 100644 --- a/code/core/template/stories/tags-remove.stories.ts +++ b/code/core/template/stories/tags-remove.stories.ts @@ -1,4 +1,5 @@ -import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types'; +import type { PartialStoryFn, PlayFunctionContext, StoryContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect, within } from '@storybook/test'; diff --git a/code/core/template/stories/title.stories.ts b/code/core/template/stories/title.stories.ts index deabd76f7623..0c0246a096f8 100644 --- a/code/core/template/stories/title.stories.ts +++ b/code/core/template/stories/title.stories.ts @@ -1,4 +1,5 @@ -import type { PlayFunctionContext } from '@storybook/core/types'; +import type { PlayFunctionContext } from 'storybook/internal/types'; + import { global as globalThis } from '@storybook/global'; import { expect } from '@storybook/test'; diff --git a/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.test.ts index 2729cfb1da16..11a88344b60b 100644 --- a/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; import stripAnsi from 'strip-ansi'; @@ -54,7 +54,7 @@ describe('missingStorybookDependencies', () => { }), retrievePackageJson: vi.fn().mockResolvedValue({ dependencies: { - '@storybook/core': '8.1.0', + storybook: '8.1.0', }, }), addDependencies: vi.fn().mockResolvedValue(undefined), diff --git a/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.ts b/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.ts index 8eda42d9b9ba..7e36f4750284 100644 --- a/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.ts +++ b/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.ts @@ -1,8 +1,7 @@ import { readFile } from 'node:fs/promises'; import { getStorybookVersionSpecifier } from 'storybook/internal/cli'; - -import type { InstallationMetadata, JsPackageManager } from '@storybook/core/common'; +import type { InstallationMetadata, JsPackageManager } from 'storybook/internal/common'; import picocolors from 'picocolors'; import { dedent } from 'ts-dedent'; @@ -129,6 +128,7 @@ export const missingStorybookDependencies: Fix { describe.each([ ['│ │ │ ├── @babel/code-frame@7.10.3 deduped', null], - [ - '│ ├── "@storybook/core/theming@6.0.0-beta.37 extraneous', - { package: '@storybook/core/theming', version: '6.0.0-beta.37' }, - ], [ '├─┬ @storybook/preset-create-react-app@3.1.2', { package: '@storybook/preset-create-react-app', version: '3.1.2' }, diff --git a/code/lib/cli-storybook/test/default/cli.test.cjs b/code/lib/cli-storybook/test/default/cli.test.cjs index f55fa0ef9a61..0de2e46e415b 100755 --- a/code/lib/cli-storybook/test/default/cli.test.cjs +++ b/code/lib/cli-storybook/test/default/cli.test.cjs @@ -17,87 +17,87 @@ describe('Help command', () => { it('should prints out "init" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('init'); expect(stdout.toString()).toContain('Initialize Storybook into your project'); + expect(status).toBe(0); }); it('should prints out "add" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('add'); expect(stdout.toString()).toContain('Add an addon to your Storybook'); + expect(status).toBe(0); }); it('should prints out "remove" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('remove'); expect(stdout.toString()).toContain('Remove an addon from your Storybook'); + expect(status).toBe(0); }); it('should prints out "upgrade" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('upgrade'); expect(stdout.toString()).toContain('Upgrade your Storybook packages to'); + expect(status).toBe(0); }); it('should prints out "migrate" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('migrate'); expect(stdout.toString()).toContain('Run a Storybook codemod migration on your source files'); + expect(status).toBe(0); }); it('should prints out "sandbox" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('sandbox'); expect(stdout.toString()).toContain('Create a sandbox from a set of possible templates'); + expect(status).toBe(0); }); it('should prints out "link" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('link'); expect(stdout.toString()).toContain( 'Pull down a repro from a URL (or a local directory), link it, and run storybook' ); + expect(status).toBe(0); }); it('should prints out "automigrate" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('automigrate'); expect(stdout.toString()).toContain( 'Check storybook for incompatibilities or migrations and apply fixes' ); + expect(status).toBe(0); }); it('should prints out "doctor" command', () => { const { status, stdout, stderr } = run(['help']); - expect(status).toBe(0); expect(stderr.toString()).toBe(''); expect(stdout.toString()).toContain('doctor'); expect(stdout.toString()).toContain( 'Check Storybook for known problems and provide suggestions or fixes' ); + expect(status).toBe(0); }); }); diff --git a/code/lib/cli-storybook/test/helpers.cjs b/code/lib/cli-storybook/test/helpers.cjs index 6b68939a4659..a8ddc097f5d6 100644 --- a/code/lib/cli-storybook/test/helpers.cjs +++ b/code/lib/cli-storybook/test/helpers.cjs @@ -1,7 +1,7 @@ const { sync: spawnSync } = require('cross-spawn'); const path = require('path'); -const CLI_PATH = path.join(__dirname, '..', 'bin', 'index.cjs'); +const CLI_PATH = path.join(__dirname, '..', '..', '..', 'core', 'bin', 'index.cjs'); /** * Execute command diff --git a/code/lib/cli/core/babel/index.cjs b/code/lib/cli/core/babel/index.cjs index 08406d9e434c..7d4f1b2a4f93 100644 --- a/code/lib/cli/core/babel/index.cjs +++ b/code/lib/cli/core/babel/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/babel'); +module.exports = require('storybook/internal/babel'); diff --git a/code/lib/cli/core/babel/index.d.ts b/code/lib/cli/core/babel/index.d.ts index 83441bd766c9..d0c4099635d5 100644 --- a/code/lib/cli/core/babel/index.d.ts +++ b/code/lib/cli/core/babel/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/babel'; -export type * from '@storybook/core/babel'; +export * from 'storybook/internal/babel'; +export type * from 'storybook/internal/babel'; diff --git a/code/lib/cli/core/babel/index.js b/code/lib/cli/core/babel/index.js index 670e11702916..fd0581c786ed 100644 --- a/code/lib/cli/core/babel/index.js +++ b/code/lib/cli/core/babel/index.js @@ -1 +1 @@ -export * from '@storybook/core/babel'; +export * from 'storybook/internal/babel'; diff --git a/code/lib/cli/core/bin/index.cjs b/code/lib/cli/core/bin/index.cjs index 025637e335d7..cbde91daf277 100644 --- a/code/lib/cli/core/bin/index.cjs +++ b/code/lib/cli/core/bin/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/bin'); +module.exports = require('storybook/internal/bin'); diff --git a/code/lib/cli/core/bin/index.js b/code/lib/cli/core/bin/index.js index 4ba0fd70532a..cf57cd4ff43f 100644 --- a/code/lib/cli/core/bin/index.js +++ b/code/lib/cli/core/bin/index.js @@ -1 +1 @@ -export * from '@storybook/core/bin'; +export * from 'storybook/internal/bin'; diff --git a/code/lib/cli/core/builder-manager/index.cjs b/code/lib/cli/core/builder-manager/index.cjs index 0582f86fac91..816cb718e504 100644 --- a/code/lib/cli/core/builder-manager/index.cjs +++ b/code/lib/cli/core/builder-manager/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/builder-manager'); +module.exports = require('storybook/internal/builder-manager'); diff --git a/code/lib/cli/core/builder-manager/index.d.ts b/code/lib/cli/core/builder-manager/index.d.ts index f4367f7678d7..3b1b1e34d5fa 100644 --- a/code/lib/cli/core/builder-manager/index.d.ts +++ b/code/lib/cli/core/builder-manager/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/builder-manager'; -export type * from '@storybook/core/builder-manager'; +export * from 'storybook/internal/builder-manager'; +export type * from 'storybook/internal/builder-manager'; diff --git a/code/lib/cli/core/builder-manager/index.js b/code/lib/cli/core/builder-manager/index.js index 77114582e295..87947f749d4c 100644 --- a/code/lib/cli/core/builder-manager/index.js +++ b/code/lib/cli/core/builder-manager/index.js @@ -1 +1 @@ -export * from '@storybook/core/builder-manager'; +export * from 'storybook/internal/builder-manager'; diff --git a/code/lib/cli/core/channels/index.cjs b/code/lib/cli/core/channels/index.cjs index 3a7134d94607..3fc5e066f43d 100644 --- a/code/lib/cli/core/channels/index.cjs +++ b/code/lib/cli/core/channels/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/channels'); +module.exports = require('storybook/internal/channels'); diff --git a/code/lib/cli/core/channels/index.d.ts b/code/lib/cli/core/channels/index.d.ts index e016a9453232..e1eda45f4fac 100644 --- a/code/lib/cli/core/channels/index.d.ts +++ b/code/lib/cli/core/channels/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/channels'; -export type * from '@storybook/core/channels'; +export * from 'storybook/internal/channels'; +export type * from 'storybook/internal/channels'; diff --git a/code/lib/cli/core/channels/index.js b/code/lib/cli/core/channels/index.js index decffc31a8f3..9f71f6af877a 100644 --- a/code/lib/cli/core/channels/index.js +++ b/code/lib/cli/core/channels/index.js @@ -1 +1 @@ -export * from '@storybook/core/channels'; +export * from 'storybook/internal/channels'; diff --git a/code/lib/cli/core/cli/bin/index.cjs b/code/lib/cli/core/cli/bin/index.cjs index 28b8be5e01cc..eb9259800415 100644 --- a/code/lib/cli/core/cli/bin/index.cjs +++ b/code/lib/cli/core/cli/bin/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/cli/bin'); +module.exports = require('storybook/internal/cli/bin'); diff --git a/code/lib/cli/core/cli/bin/index.d.ts b/code/lib/cli/core/cli/bin/index.d.ts index c846fa780147..f92e0db0f6ae 100644 --- a/code/lib/cli/core/cli/bin/index.d.ts +++ b/code/lib/cli/core/cli/bin/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/cli/bin'; -export type * from '@storybook/core/cli/bin'; +export * from 'storybook/internal/cli/bin'; +export type * from 'storybook/internal/cli/bin'; diff --git a/code/lib/cli/core/cli/bin/index.js b/code/lib/cli/core/cli/bin/index.js index 32a19f877c90..2ff832b3cf4a 100644 --- a/code/lib/cli/core/cli/bin/index.js +++ b/code/lib/cli/core/cli/bin/index.js @@ -1 +1 @@ -export * from '@storybook/core/cli/bin'; +export * from 'storybook/internal/cli/bin'; diff --git a/code/lib/cli/core/cli/index.cjs b/code/lib/cli/core/cli/index.cjs index 023342dde38e..05e4262a5e68 100644 --- a/code/lib/cli/core/cli/index.cjs +++ b/code/lib/cli/core/cli/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/cli'); +module.exports = require('storybook/internal/cli'); diff --git a/code/lib/cli/core/cli/index.d.ts b/code/lib/cli/core/cli/index.d.ts index 2ce4e03dd15f..83fe2bcc33f0 100644 --- a/code/lib/cli/core/cli/index.d.ts +++ b/code/lib/cli/core/cli/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/cli'; -export type * from '@storybook/core/cli'; +export * from 'storybook/internal/cli'; +export type * from 'storybook/internal/cli'; diff --git a/code/lib/cli/core/cli/index.js b/code/lib/cli/core/cli/index.js index 59fef763e102..e76461a9507c 100644 --- a/code/lib/cli/core/cli/index.js +++ b/code/lib/cli/core/cli/index.js @@ -1 +1 @@ -export * from '@storybook/core/cli'; +export * from 'storybook/internal/cli'; diff --git a/code/lib/cli/core/client-logger/index.cjs b/code/lib/cli/core/client-logger/index.cjs index 59df24773ae3..c3bec8e1d4f7 100644 --- a/code/lib/cli/core/client-logger/index.cjs +++ b/code/lib/cli/core/client-logger/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/client-logger'); +module.exports = require('storybook/internal/client-logger'); diff --git a/code/lib/cli/core/client-logger/index.d.ts b/code/lib/cli/core/client-logger/index.d.ts index 77a41557155b..eed6d17c08f9 100644 --- a/code/lib/cli/core/client-logger/index.d.ts +++ b/code/lib/cli/core/client-logger/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/client-logger'; -export type * from '@storybook/core/client-logger'; +export * from 'storybook/internal/client-logger'; +export type * from 'storybook/internal/client-logger'; diff --git a/code/lib/cli/core/client-logger/index.js b/code/lib/cli/core/client-logger/index.js index d44c114b44f1..bad256478de1 100644 --- a/code/lib/cli/core/client-logger/index.js +++ b/code/lib/cli/core/client-logger/index.js @@ -1 +1 @@ -export * from '@storybook/core/client-logger'; +export * from 'storybook/internal/client-logger'; diff --git a/code/lib/cli/core/common/index.cjs b/code/lib/cli/core/common/index.cjs index 915b490c3513..ded314ab42d2 100644 --- a/code/lib/cli/core/common/index.cjs +++ b/code/lib/cli/core/common/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/common'); +module.exports = require('storybook/internal/common'); diff --git a/code/lib/cli/core/common/index.d.ts b/code/lib/cli/core/common/index.d.ts index 7665530a7643..4b5fe2012690 100644 --- a/code/lib/cli/core/common/index.d.ts +++ b/code/lib/cli/core/common/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/common'; -export type * from '@storybook/core/common'; +export * from 'storybook/internal/common'; +export type * from 'storybook/internal/common'; diff --git a/code/lib/cli/core/common/index.js b/code/lib/cli/core/common/index.js index 68e8304b9684..f3fd8e3bbc47 100644 --- a/code/lib/cli/core/common/index.js +++ b/code/lib/cli/core/common/index.js @@ -1 +1 @@ -export * from '@storybook/core/common'; +export * from 'storybook/internal/common'; diff --git a/code/lib/cli/core/components/index.cjs b/code/lib/cli/core/components/index.cjs index 948b1dceaa20..5c194a871e32 100644 --- a/code/lib/cli/core/components/index.cjs +++ b/code/lib/cli/core/components/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/components'); +module.exports = require('storybook/internal/components'); diff --git a/code/lib/cli/core/components/index.d.ts b/code/lib/cli/core/components/index.d.ts index dcca580fcb76..c9a7cbbc07b7 100644 --- a/code/lib/cli/core/components/index.d.ts +++ b/code/lib/cli/core/components/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/components'; -export type * from '@storybook/core/components'; +export * from 'storybook/internal/components'; +export type * from 'storybook/internal/components'; diff --git a/code/lib/cli/core/components/index.js b/code/lib/cli/core/components/index.js index b9a21f01890e..466c6c1f3fe2 100644 --- a/code/lib/cli/core/components/index.js +++ b/code/lib/cli/core/components/index.js @@ -1 +1 @@ -export * from '@storybook/core/components'; +export * from 'storybook/internal/components'; diff --git a/code/lib/cli/core/core-events/index.cjs b/code/lib/cli/core/core-events/index.cjs index 9db3090385a8..217389a630ed 100644 --- a/code/lib/cli/core/core-events/index.cjs +++ b/code/lib/cli/core/core-events/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/core-events'); +module.exports = require('storybook/internal/core-events'); diff --git a/code/lib/cli/core/core-events/index.d.ts b/code/lib/cli/core/core-events/index.d.ts index f4291440fc36..7faa3971ce7f 100644 --- a/code/lib/cli/core/core-events/index.d.ts +++ b/code/lib/cli/core/core-events/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/core-events'; -export type * from '@storybook/core/core-events'; +export * from 'storybook/internal/core-events'; +export type * from 'storybook/internal/core-events'; diff --git a/code/lib/cli/core/core-events/index.js b/code/lib/cli/core/core-events/index.js index cdad00789b18..0007b1e316da 100644 --- a/code/lib/cli/core/core-events/index.js +++ b/code/lib/cli/core/core-events/index.js @@ -1 +1 @@ -export * from '@storybook/core/core-events'; +export * from 'storybook/internal/core-events'; diff --git a/code/lib/cli/core/core-server/index.cjs b/code/lib/cli/core/core-server/index.cjs index c4a21d0d0f7d..3529da2cb172 100644 --- a/code/lib/cli/core/core-server/index.cjs +++ b/code/lib/cli/core/core-server/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/core-server'); +module.exports = require('storybook/internal/core-server'); diff --git a/code/lib/cli/core/core-server/index.d.ts b/code/lib/cli/core/core-server/index.d.ts index 32b7fc4583e3..6df9793536fc 100644 --- a/code/lib/cli/core/core-server/index.d.ts +++ b/code/lib/cli/core/core-server/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/core-server'; -export type * from '@storybook/core/core-server'; +export * from 'storybook/internal/core-server'; +export type * from 'storybook/internal/core-server'; diff --git a/code/lib/cli/core/core-server/index.js b/code/lib/cli/core/core-server/index.js index fef6373082b0..b0f995d4decc 100644 --- a/code/lib/cli/core/core-server/index.js +++ b/code/lib/cli/core/core-server/index.js @@ -1 +1 @@ -export * from '@storybook/core/core-server'; +export * from 'storybook/internal/core-server'; diff --git a/code/lib/cli/core/core-server/presets/common-manager.js b/code/lib/cli/core/core-server/presets/common-manager.js index dd6a9887fc63..6187eb353297 100644 --- a/code/lib/cli/core/core-server/presets/common-manager.js +++ b/code/lib/cli/core/core-server/presets/common-manager.js @@ -1 +1 @@ -export * from '@storybook/core/core-server/presets/common-manager'; +export * from 'storybook/internal/core-server/presets/common-manager'; diff --git a/code/lib/cli/core/core-server/presets/common-override-preset.cjs b/code/lib/cli/core/core-server/presets/common-override-preset.cjs index 37b00327d4d8..2b1df370b898 100644 --- a/code/lib/cli/core/core-server/presets/common-override-preset.cjs +++ b/code/lib/cli/core/core-server/presets/common-override-preset.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/core-server/presets/common-override-preset'); +module.exports = require('storybook/internal/core-server/presets/common-override-preset'); diff --git a/code/lib/cli/core/core-server/presets/common-override-preset.js b/code/lib/cli/core/core-server/presets/common-override-preset.js index 976bb94cd511..ef3f3499c497 100644 --- a/code/lib/cli/core/core-server/presets/common-override-preset.js +++ b/code/lib/cli/core/core-server/presets/common-override-preset.js @@ -1 +1 @@ -export * from '@storybook/core/core-server/presets/common-override-preset'; +export * from 'storybook/internal/core-server/presets/common-override-preset'; diff --git a/code/lib/cli/core/core-server/presets/common-preset.cjs b/code/lib/cli/core/core-server/presets/common-preset.cjs index f89cd2ce7968..a715ffb37b4d 100644 --- a/code/lib/cli/core/core-server/presets/common-preset.cjs +++ b/code/lib/cli/core/core-server/presets/common-preset.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/core-server/presets/common-preset'); +module.exports = require('storybook/internal/core-server/presets/common-preset'); diff --git a/code/lib/cli/core/core-server/presets/common-preset.js b/code/lib/cli/core/core-server/presets/common-preset.js index 11f72497e11d..3104bea68f8e 100644 --- a/code/lib/cli/core/core-server/presets/common-preset.js +++ b/code/lib/cli/core/core-server/presets/common-preset.js @@ -1 +1 @@ -export * from '@storybook/core/core-server/presets/common-preset'; +export * from 'storybook/internal/core-server/presets/common-preset'; diff --git a/code/lib/cli/core/csf-tools/index.cjs b/code/lib/cli/core/csf-tools/index.cjs index 732eb73d92a5..ff730963c65e 100644 --- a/code/lib/cli/core/csf-tools/index.cjs +++ b/code/lib/cli/core/csf-tools/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/csf-tools'); +module.exports = require('storybook/internal/csf-tools'); diff --git a/code/lib/cli/core/csf-tools/index.d.ts b/code/lib/cli/core/csf-tools/index.d.ts index 0005eff71fbe..d221de8eb2ed 100644 --- a/code/lib/cli/core/csf-tools/index.d.ts +++ b/code/lib/cli/core/csf-tools/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/csf-tools'; -export type * from '@storybook/core/csf-tools'; +export * from 'storybook/internal/csf-tools'; +export type * from 'storybook/internal/csf-tools'; diff --git a/code/lib/cli/core/csf-tools/index.js b/code/lib/cli/core/csf-tools/index.js index 847e92d45fef..74c0c0100712 100644 --- a/code/lib/cli/core/csf-tools/index.js +++ b/code/lib/cli/core/csf-tools/index.js @@ -1 +1 @@ -export * from '@storybook/core/csf-tools'; +export * from 'storybook/internal/csf-tools'; diff --git a/code/lib/cli/core/docs-tools/index.cjs b/code/lib/cli/core/docs-tools/index.cjs index 9af3433ed2d7..0049a0ebd871 100644 --- a/code/lib/cli/core/docs-tools/index.cjs +++ b/code/lib/cli/core/docs-tools/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/docs-tools'); +module.exports = require('storybook/internal/docs-tools'); diff --git a/code/lib/cli/core/docs-tools/index.d.ts b/code/lib/cli/core/docs-tools/index.d.ts index 57d0a6791b48..0774f84ad6f1 100644 --- a/code/lib/cli/core/docs-tools/index.d.ts +++ b/code/lib/cli/core/docs-tools/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/docs-tools'; -export type * from '@storybook/core/docs-tools'; +export * from 'storybook/internal/docs-tools'; +export type * from 'storybook/internal/docs-tools'; diff --git a/code/lib/cli/core/docs-tools/index.js b/code/lib/cli/core/docs-tools/index.js index 74811e14ac2e..a6a642d3273f 100644 --- a/code/lib/cli/core/docs-tools/index.js +++ b/code/lib/cli/core/docs-tools/index.js @@ -1 +1 @@ -export * from '@storybook/core/docs-tools'; +export * from 'storybook/internal/docs-tools'; diff --git a/code/lib/cli/core/index.cjs b/code/lib/cli/core/index.cjs index 2bf20ff12ab3..0155f9981d9a 100644 --- a/code/lib/cli/core/index.cjs +++ b/code/lib/cli/core/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/index'); +module.exports = require('storybook/internal/index'); diff --git a/code/lib/cli/core/index.d.ts b/code/lib/cli/core/index.d.ts index ea19cac5b37c..858a2eee1874 100644 --- a/code/lib/cli/core/index.d.ts +++ b/code/lib/cli/core/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/index'; -export type * from '@storybook/core/index'; +export * from 'storybook/internal/index'; +export type * from 'storybook/internal/index'; diff --git a/code/lib/cli/core/index.js b/code/lib/cli/core/index.js index ef7916066daa..a4c6ac621051 100644 --- a/code/lib/cli/core/index.js +++ b/code/lib/cli/core/index.js @@ -1 +1 @@ -export * from '@storybook/core/index'; +export * from 'storybook/internal/index'; diff --git a/code/lib/cli/core/manager-api/index.cjs b/code/lib/cli/core/manager-api/index.cjs index 663a30f0b2c5..8c8b0f89bd06 100644 --- a/code/lib/cli/core/manager-api/index.cjs +++ b/code/lib/cli/core/manager-api/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/manager-api'); +module.exports = require('storybook/internal/manager-api'); diff --git a/code/lib/cli/core/manager-api/index.d.ts b/code/lib/cli/core/manager-api/index.d.ts index 9efaf590ba81..7d7ee81f43cd 100644 --- a/code/lib/cli/core/manager-api/index.d.ts +++ b/code/lib/cli/core/manager-api/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/manager-api'; -export type * from '@storybook/core/manager-api'; +export * from 'storybook/internal/manager-api'; +export type * from 'storybook/internal/manager-api'; diff --git a/code/lib/cli/core/manager-api/index.js b/code/lib/cli/core/manager-api/index.js index 5eb93cb979a0..7c8cfaaae3a2 100644 --- a/code/lib/cli/core/manager-api/index.js +++ b/code/lib/cli/core/manager-api/index.js @@ -1 +1 @@ -export * from '@storybook/core/manager-api'; +export * from 'storybook/internal/manager-api'; diff --git a/code/lib/cli/core/manager-errors.d.ts b/code/lib/cli/core/manager-errors.d.ts index 131783ee6986..ba538d31b00e 100644 --- a/code/lib/cli/core/manager-errors.d.ts +++ b/code/lib/cli/core/manager-errors.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/manager-errors'; -export type * from '@storybook/core/manager-errors'; +export * from 'storybook/internal/manager-errors'; +export type * from 'storybook/internal/manager-errors'; diff --git a/code/lib/cli/core/manager-errors.js b/code/lib/cli/core/manager-errors.js index 13910319d675..2d64af64fbb0 100644 --- a/code/lib/cli/core/manager-errors.js +++ b/code/lib/cli/core/manager-errors.js @@ -1 +1 @@ -export * from '@storybook/core/manager-errors'; +export * from 'storybook/internal/manager-errors'; diff --git a/code/lib/cli/core/manager/globals-module-info.cjs b/code/lib/cli/core/manager/globals-module-info.cjs index 3b115408b001..3e56aa647ca3 100644 --- a/code/lib/cli/core/manager/globals-module-info.cjs +++ b/code/lib/cli/core/manager/globals-module-info.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/manager/globals-module-info'); +module.exports = require('storybook/internal/manager/globals-module-info'); diff --git a/code/lib/cli/core/manager/globals-module-info.d.ts b/code/lib/cli/core/manager/globals-module-info.d.ts index 111fa9c73720..e3d0a6d0c1fa 100644 --- a/code/lib/cli/core/manager/globals-module-info.d.ts +++ b/code/lib/cli/core/manager/globals-module-info.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/manager/globals-module-info'; -export type * from '@storybook/core/manager/globals-module-info'; +export * from 'storybook/internal/manager/globals-module-info'; +export type * from 'storybook/internal/manager/globals-module-info'; diff --git a/code/lib/cli/core/manager/globals-module-info.js b/code/lib/cli/core/manager/globals-module-info.js index bb4a51c3c5ea..ae3e18adb9f1 100644 --- a/code/lib/cli/core/manager/globals-module-info.js +++ b/code/lib/cli/core/manager/globals-module-info.js @@ -1 +1 @@ -export * from '@storybook/core/manager/globals-module-info'; +export * from 'storybook/internal/manager/globals-module-info'; diff --git a/code/lib/cli/core/manager/globals-runtime.js b/code/lib/cli/core/manager/globals-runtime.js index 5b5c33945b1a..32ec83242a96 100644 --- a/code/lib/cli/core/manager/globals-runtime.js +++ b/code/lib/cli/core/manager/globals-runtime.js @@ -1 +1 @@ -export * from '@storybook/core/manager/globals-runtime'; +export * from 'storybook/internal/manager/globals-runtime'; diff --git a/code/lib/cli/core/manager/globals.cjs b/code/lib/cli/core/manager/globals.cjs index 3dc797bf4cd7..d6ee8ec2d144 100644 --- a/code/lib/cli/core/manager/globals.cjs +++ b/code/lib/cli/core/manager/globals.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/manager/globals'); +module.exports = require('storybook/internal/manager/globals'); diff --git a/code/lib/cli/core/manager/globals.d.ts b/code/lib/cli/core/manager/globals.d.ts index 47746a38ada4..a2b581c8ca04 100644 --- a/code/lib/cli/core/manager/globals.d.ts +++ b/code/lib/cli/core/manager/globals.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/manager/globals'; -export type * from '@storybook/core/manager/globals'; +export * from 'storybook/internal/manager/globals'; +export type * from 'storybook/internal/manager/globals'; diff --git a/code/lib/cli/core/manager/globals.js b/code/lib/cli/core/manager/globals.js index 779828900cda..0dab1b6906f8 100644 --- a/code/lib/cli/core/manager/globals.js +++ b/code/lib/cli/core/manager/globals.js @@ -1 +1 @@ -export * from '@storybook/core/manager/globals'; +export * from 'storybook/internal/manager/globals'; diff --git a/code/lib/cli/core/node-logger/index.cjs b/code/lib/cli/core/node-logger/index.cjs index df7718d330bf..0c85d6dc5400 100644 --- a/code/lib/cli/core/node-logger/index.cjs +++ b/code/lib/cli/core/node-logger/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/node-logger'); +module.exports = require('storybook/internal/node-logger'); diff --git a/code/lib/cli/core/node-logger/index.d.ts b/code/lib/cli/core/node-logger/index.d.ts index 7d65df337415..d3f2a89ae0dc 100644 --- a/code/lib/cli/core/node-logger/index.d.ts +++ b/code/lib/cli/core/node-logger/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/node-logger'; -export type * from '@storybook/core/node-logger'; +export * from 'storybook/internal/node-logger'; +export type * from 'storybook/internal/node-logger'; diff --git a/code/lib/cli/core/node-logger/index.js b/code/lib/cli/core/node-logger/index.js index a0cd3b44e714..1c35c8624ddf 100644 --- a/code/lib/cli/core/node-logger/index.js +++ b/code/lib/cli/core/node-logger/index.js @@ -1 +1 @@ -export * from '@storybook/core/node-logger'; +export * from 'storybook/internal/node-logger'; diff --git a/code/lib/cli/core/preview-api/index.cjs b/code/lib/cli/core/preview-api/index.cjs index e966223abf1d..8a7455da77ec 100644 --- a/code/lib/cli/core/preview-api/index.cjs +++ b/code/lib/cli/core/preview-api/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/preview-api'); +module.exports = require('storybook/internal/preview-api'); diff --git a/code/lib/cli/core/preview-api/index.d.ts b/code/lib/cli/core/preview-api/index.d.ts index 8ae857586fbd..3386009da4ee 100644 --- a/code/lib/cli/core/preview-api/index.d.ts +++ b/code/lib/cli/core/preview-api/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/preview-api'; -export type * from '@storybook/core/preview-api'; +export * from 'storybook/internal/preview-api'; +export type * from 'storybook/internal/preview-api'; diff --git a/code/lib/cli/core/preview-api/index.js b/code/lib/cli/core/preview-api/index.js index 4b5493c3e244..e498112f799e 100644 --- a/code/lib/cli/core/preview-api/index.js +++ b/code/lib/cli/core/preview-api/index.js @@ -1 +1 @@ -export * from '@storybook/core/preview-api'; +export * from 'storybook/internal/preview-api'; diff --git a/code/lib/cli/core/preview-errors.cjs b/code/lib/cli/core/preview-errors.cjs index 4d8c191e15d2..ea70b9995a64 100644 --- a/code/lib/cli/core/preview-errors.cjs +++ b/code/lib/cli/core/preview-errors.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/preview-errors'); +module.exports = require('storybook/internal/preview-errors'); diff --git a/code/lib/cli/core/preview-errors.d.ts b/code/lib/cli/core/preview-errors.d.ts index 1f3ad509a404..81c4160d2936 100644 --- a/code/lib/cli/core/preview-errors.d.ts +++ b/code/lib/cli/core/preview-errors.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/preview-errors'; -export type * from '@storybook/core/preview-errors'; +export * from 'storybook/internal/preview-errors'; +export type * from 'storybook/internal/preview-errors'; diff --git a/code/lib/cli/core/preview-errors.js b/code/lib/cli/core/preview-errors.js index 57e9b5fcf2b4..2fb48796e867 100644 --- a/code/lib/cli/core/preview-errors.js +++ b/code/lib/cli/core/preview-errors.js @@ -1 +1 @@ -export * from '@storybook/core/preview-errors'; +export * from 'storybook/internal/preview-errors'; diff --git a/code/lib/cli/core/preview/globals.cjs b/code/lib/cli/core/preview/globals.cjs index af5d8fb28d6b..91340ce6505b 100644 --- a/code/lib/cli/core/preview/globals.cjs +++ b/code/lib/cli/core/preview/globals.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/preview/globals'); +module.exports = require('storybook/internal/preview/globals'); diff --git a/code/lib/cli/core/preview/globals.d.ts b/code/lib/cli/core/preview/globals.d.ts index 419e1626eaad..165a3a44a8fb 100644 --- a/code/lib/cli/core/preview/globals.d.ts +++ b/code/lib/cli/core/preview/globals.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/preview/globals'; -export type * from '@storybook/core/preview/globals'; +export * from 'storybook/internal/preview/globals'; +export type * from 'storybook/internal/preview/globals'; diff --git a/code/lib/cli/core/preview/globals.js b/code/lib/cli/core/preview/globals.js index 354ef613559f..c04bc1063044 100644 --- a/code/lib/cli/core/preview/globals.js +++ b/code/lib/cli/core/preview/globals.js @@ -1 +1 @@ -export * from '@storybook/core/preview/globals'; +export * from 'storybook/internal/preview/globals'; diff --git a/code/lib/cli/core/preview/runtime.js b/code/lib/cli/core/preview/runtime.js index 612f0116dc32..dffa3ddb106d 100644 --- a/code/lib/cli/core/preview/runtime.js +++ b/code/lib/cli/core/preview/runtime.js @@ -1 +1 @@ -export * from '@storybook/core/preview/runtime'; +export * from 'storybook/internal/preview/runtime'; diff --git a/code/lib/cli/core/router/index.cjs b/code/lib/cli/core/router/index.cjs index 663cce17cc32..4ffedd37e521 100644 --- a/code/lib/cli/core/router/index.cjs +++ b/code/lib/cli/core/router/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/router'); +module.exports = require('storybook/internal/router'); diff --git a/code/lib/cli/core/router/index.d.ts b/code/lib/cli/core/router/index.d.ts index c32cafe337b8..961d0ed58466 100644 --- a/code/lib/cli/core/router/index.d.ts +++ b/code/lib/cli/core/router/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/router'; -export type * from '@storybook/core/router'; +export * from 'storybook/internal/router'; +export type * from 'storybook/internal/router'; diff --git a/code/lib/cli/core/router/index.js b/code/lib/cli/core/router/index.js index 9de4a0584100..7bbbbccd732e 100644 --- a/code/lib/cli/core/router/index.js +++ b/code/lib/cli/core/router/index.js @@ -1 +1 @@ -export * from '@storybook/core/router'; +export * from 'storybook/internal/router'; diff --git a/code/lib/cli/core/server-errors.cjs b/code/lib/cli/core/server-errors.cjs index 867fe400c201..0ba992a7395b 100644 --- a/code/lib/cli/core/server-errors.cjs +++ b/code/lib/cli/core/server-errors.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/server-errors'); +module.exports = require('storybook/internal/server-errors'); diff --git a/code/lib/cli/core/server-errors.d.ts b/code/lib/cli/core/server-errors.d.ts index 0462c9d7f2a8..4f680db9de59 100644 --- a/code/lib/cli/core/server-errors.d.ts +++ b/code/lib/cli/core/server-errors.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/server-errors'; -export type * from '@storybook/core/server-errors'; +export * from 'storybook/internal/server-errors'; +export type * from 'storybook/internal/server-errors'; diff --git a/code/lib/cli/core/server-errors.js b/code/lib/cli/core/server-errors.js index 5b52be6ccc4c..53bd5c6b0774 100644 --- a/code/lib/cli/core/server-errors.js +++ b/code/lib/cli/core/server-errors.js @@ -1 +1 @@ -export * from '@storybook/core/server-errors'; +export * from 'storybook/internal/server-errors'; diff --git a/code/lib/cli/core/telemetry/index.cjs b/code/lib/cli/core/telemetry/index.cjs index 10d865bd088e..573d88c8ed38 100644 --- a/code/lib/cli/core/telemetry/index.cjs +++ b/code/lib/cli/core/telemetry/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/telemetry'); +module.exports = require('storybook/internal/telemetry'); diff --git a/code/lib/cli/core/telemetry/index.d.ts b/code/lib/cli/core/telemetry/index.d.ts index 4e61f1036ac8..e665939afdeb 100644 --- a/code/lib/cli/core/telemetry/index.d.ts +++ b/code/lib/cli/core/telemetry/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/telemetry'; -export type * from '@storybook/core/telemetry'; +export * from 'storybook/internal/telemetry'; +export type * from 'storybook/internal/telemetry'; diff --git a/code/lib/cli/core/telemetry/index.js b/code/lib/cli/core/telemetry/index.js index e7f905e56f7d..203cb379cfd2 100644 --- a/code/lib/cli/core/telemetry/index.js +++ b/code/lib/cli/core/telemetry/index.js @@ -1 +1 @@ -export * from '@storybook/core/telemetry'; +export * from 'storybook/internal/telemetry'; diff --git a/code/lib/cli/core/theming/create.cjs b/code/lib/cli/core/theming/create.cjs index 27f33e6b1cd7..46a7e06dbb15 100644 --- a/code/lib/cli/core/theming/create.cjs +++ b/code/lib/cli/core/theming/create.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/theming/create'); +module.exports = require('storybook/internal/theming/create'); diff --git a/code/lib/cli/core/theming/create.d.ts b/code/lib/cli/core/theming/create.d.ts index 19813279e3db..dea7198ef9da 100644 --- a/code/lib/cli/core/theming/create.d.ts +++ b/code/lib/cli/core/theming/create.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/theming/create'; -export type * from '@storybook/core/theming/create'; +export * from 'storybook/internal/theming/create'; +export type * from 'storybook/internal/theming/create'; diff --git a/code/lib/cli/core/theming/create.js b/code/lib/cli/core/theming/create.js index dde5c77a4c9e..f42a04fbeb52 100644 --- a/code/lib/cli/core/theming/create.js +++ b/code/lib/cli/core/theming/create.js @@ -1 +1 @@ -export * from '@storybook/core/theming/create'; +export * from 'storybook/internal/theming/create'; diff --git a/code/lib/cli/core/theming/index.cjs b/code/lib/cli/core/theming/index.cjs index 9bbd86c495ec..b6f2d0379538 100644 --- a/code/lib/cli/core/theming/index.cjs +++ b/code/lib/cli/core/theming/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/theming'); +module.exports = require('storybook/internal/theming'); diff --git a/code/lib/cli/core/theming/index.d.ts b/code/lib/cli/core/theming/index.d.ts index 6b0ecfaabb13..a68c540ba621 100644 --- a/code/lib/cli/core/theming/index.d.ts +++ b/code/lib/cli/core/theming/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/theming'; -export type * from '@storybook/core/theming'; +export * from 'storybook/internal/theming'; +export type * from 'storybook/internal/theming'; diff --git a/code/lib/cli/core/theming/index.js b/code/lib/cli/core/theming/index.js index dc54a4fc4b73..b2a600a67fc7 100644 --- a/code/lib/cli/core/theming/index.js +++ b/code/lib/cli/core/theming/index.js @@ -1 +1 @@ -export * from '@storybook/core/theming'; +export * from 'storybook/internal/theming'; diff --git a/code/lib/cli/core/types/index.cjs b/code/lib/cli/core/types/index.cjs index b694805927ff..d6e674cadaca 100644 --- a/code/lib/cli/core/types/index.cjs +++ b/code/lib/cli/core/types/index.cjs @@ -1 +1 @@ -module.exports = require('@storybook/core/types'); +module.exports = require('storybook/internal/types'); diff --git a/code/lib/cli/core/types/index.d.ts b/code/lib/cli/core/types/index.d.ts index 8a3c5408f17d..71839eb6a5ba 100644 --- a/code/lib/cli/core/types/index.d.ts +++ b/code/lib/cli/core/types/index.d.ts @@ -1,2 +1,2 @@ -export * from '@storybook/core/types'; -export type * from '@storybook/core/types'; +export * from 'storybook/internal/types'; +export type * from 'storybook/internal/types'; diff --git a/code/lib/cli/core/types/index.js b/code/lib/cli/core/types/index.js index f92be93e094e..62bc04586d6d 100644 --- a/code/lib/cli/core/types/index.js +++ b/code/lib/cli/core/types/index.js @@ -1 +1 @@ -export * from '@storybook/core/types'; +export * from 'storybook/internal/types'; diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 3e830a2240ea..b1966bfc5b69 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -1,5 +1,5 @@ { - "name": "storybook", + "name": "storybook-renamed", "version": "8.5.0-beta.7", "description": "Storybook's CLI - install, dev, build, upgrade, and more", "keywords": [ @@ -197,6 +197,156 @@ "./internal/bin": { "import": "./core/bin/index.js", "require": "./core/bin/index.cjs" + }, + "./internal/internal/babel": { + "types": "./core/babel/index.d.ts", + "import": "./core/babel/index.js", + "require": "./core/babel/index.cjs" + }, + "./internal/internal/bin": { + "import": "./core/bin/index.js", + "require": "./core/bin/index.cjs" + }, + "./internal/internal/builder-manager": { + "types": "./core/builder-manager/index.d.ts", + "import": "./core/builder-manager/index.js", + "require": "./core/builder-manager/index.cjs" + }, + "./internal/internal/channels": { + "types": "./core/channels/index.d.ts", + "import": "./core/channels/index.js", + "require": "./core/channels/index.cjs" + }, + "./internal/internal/cli": { + "types": "./core/cli/index.d.ts", + "import": "./core/cli/index.js", + "require": "./core/cli/index.cjs" + }, + "./internal/internal/cli/bin": { + "types": "./core/cli/bin/index.d.ts", + "import": "./core/cli/bin/index.js", + "require": "./core/cli/bin/index.cjs" + }, + "./internal/internal/client-logger": { + "types": "./core/client-logger/index.d.ts", + "import": "./core/client-logger/index.js", + "require": "./core/client-logger/index.cjs" + }, + "./internal/internal/common": { + "types": "./core/common/index.d.ts", + "import": "./core/common/index.js", + "require": "./core/common/index.cjs" + }, + "./internal/internal/components": { + "types": "./core/components/index.d.ts", + "import": "./core/components/index.js", + "require": "./core/components/index.cjs" + }, + "./internal/internal/core-events": { + "types": "./core/core-events/index.d.ts", + "import": "./core/core-events/index.js", + "require": "./core/core-events/index.cjs" + }, + "./internal/internal/core-server": { + "types": "./core/core-server/index.d.ts", + "import": "./core/core-server/index.js", + "require": "./core/core-server/index.cjs" + }, + "./internal/internal/core-server/presets/common-manager": { + "import": "./core/core-server/presets/common-manager.js" + }, + "./internal/internal/core-server/presets/common-override-preset": { + "import": "./core/core-server/presets/common-override-preset.js", + "require": "./core/core-server/presets/common-override-preset.cjs" + }, + "./internal/internal/core-server/presets/common-preset": { + "import": "./core/core-server/presets/common-preset.js", + "require": "./core/core-server/presets/common-preset.cjs" + }, + "./internal/internal/csf-tools": { + "types": "./core/csf-tools/index.d.ts", + "import": "./core/csf-tools/index.js", + "require": "./core/csf-tools/index.cjs" + }, + "./internal/internal/docs-tools": { + "types": "./core/docs-tools/index.d.ts", + "import": "./core/docs-tools/index.js", + "require": "./core/docs-tools/index.cjs" + }, + "./internal/internal/manager-api": { + "types": "./core/manager-api/index.d.ts", + "import": "./core/manager-api/index.js", + "require": "./core/manager-api/index.cjs" + }, + "./internal/internal/manager-errors": { + "types": "./core/manager-errors.d.ts", + "import": "./core/manager-errors.js" + }, + "./internal/internal/manager/globals": { + "types": "./core/manager/globals.d.ts", + "import": "./core/manager/globals.js", + "require": "./core/manager/globals.cjs" + }, + "./internal/internal/manager/globals-module-info": { + "types": "./core/manager/globals-module-info.d.ts", + "import": "./core/manager/globals-module-info.js", + "require": "./core/manager/globals-module-info.cjs" + }, + "./internal/internal/manager/globals-runtime": { + "import": "./core/manager/globals-runtime.js" + }, + "./internal/internal/node-logger": { + "types": "./core/node-logger/index.d.ts", + "import": "./core/node-logger/index.js", + "require": "./core/node-logger/index.cjs" + }, + "./internal/internal/preview-api": { + "types": "./core/preview-api/index.d.ts", + "import": "./core/preview-api/index.js", + "require": "./core/preview-api/index.cjs" + }, + "./internal/internal/preview-errors": { + "types": "./core/preview-errors.d.ts", + "import": "./core/preview-errors.js", + "require": "./core/preview-errors.cjs" + }, + "./internal/internal/preview/globals": { + "types": "./core/preview/globals.d.ts", + "import": "./core/preview/globals.js", + "require": "./core/preview/globals.cjs" + }, + "./internal/internal/preview/runtime": { + "import": "./core/preview/runtime.js" + }, + "./internal/internal/router": { + "types": "./core/router/index.d.ts", + "import": "./core/router/index.js", + "require": "./core/router/index.cjs" + }, + "./internal/internal/server-errors": { + "types": "./core/server-errors.d.ts", + "import": "./core/server-errors.js", + "require": "./core/server-errors.cjs" + }, + "./internal/internal/telemetry": { + "types": "./core/telemetry/index.d.ts", + "import": "./core/telemetry/index.js", + "require": "./core/telemetry/index.cjs" + }, + "./internal/internal/theming": { + "types": "./core/theming/index.d.ts", + "import": "./core/theming/index.js", + "require": "./core/theming/index.cjs" + }, + "./internal/internal/theming/create": { + "types": "./core/theming/create.d.ts", + "import": "./core/theming/create.js", + "require": "./core/theming/create.cjs" + }, + "./internal/internal/types": { + "types": "./core/types/index.d.ts", + "import": "./core/types/index.js", + "require": "./core/types/index.cjs" } }, "main": "dist/index.cjs", @@ -207,82 +357,82 @@ "internal/*": [ "./core/index.d.ts" ], - "internal/babel": [ + "internal/internal/babel": [ "./core/babel/index.d.ts" ], - "internal/builder-manager": [ + "internal/internal/builder-manager": [ "./core/builder-manager/index.d.ts" ], - "internal/channels": [ + "internal/internal/channels": [ "./core/channels/index.d.ts" ], - "internal/cli": [ + "internal/internal/cli": [ "./core/cli/index.d.ts" ], - "internal/cli/bin": [ + "internal/internal/cli/bin": [ "./core/cli/bin/index.d.ts" ], - "internal/client-logger": [ + "internal/internal/client-logger": [ "./core/client-logger/index.d.ts" ], - "internal/common": [ + "internal/internal/common": [ "./core/common/index.d.ts" ], - "internal/components": [ + "internal/internal/components": [ "./core/components/index.d.ts" ], - "internal/core-events": [ + "internal/internal/core-events": [ "./core/core-events/index.d.ts" ], - "internal/core-server": [ + "internal/internal/core-server": [ "./core/core-server/index.d.ts" ], - "internal/csf-tools": [ + "internal/internal/csf-tools": [ "./core/csf-tools/index.d.ts" ], - "internal/docs-tools": [ + "internal/internal/docs-tools": [ "./core/docs-tools/index.d.ts" ], - "internal/manager-api": [ + "internal/internal/manager-api": [ "./core/manager-api/index.d.ts" ], - "internal/manager-errors": [ + "internal/internal/manager-errors": [ "./core/manager-errors.d.ts" ], - "internal/manager/globals": [ + "internal/internal/manager/globals": [ "./core/manager/globals.d.ts" ], - "internal/manager/globals-module-info": [ + "internal/internal/manager/globals-module-info": [ "./core/manager/globals-module-info.d.ts" ], - "internal/node-logger": [ + "internal/internal/node-logger": [ "./core/node-logger/index.d.ts" ], - "internal/preview-api": [ + "internal/internal/preview-api": [ "./core/preview-api/index.d.ts" ], - "internal/preview-errors": [ + "internal/internal/preview-errors": [ "./core/preview-errors.d.ts" ], - "internal/preview/globals": [ + "internal/internal/preview/globals": [ "./core/preview/globals.d.ts" ], - "internal/router": [ + "internal/internal/router": [ "./core/router/index.d.ts" ], - "internal/server-errors": [ + "internal/internal/server-errors": [ "./core/server-errors.d.ts" ], - "internal/telemetry": [ + "internal/internal/telemetry": [ "./core/telemetry/index.d.ts" ], - "internal/theming": [ + "internal/internal/theming": [ "./core/theming/index.d.ts" ], - "internal/theming/create": [ + "internal/internal/theming/create": [ "./core/theming/create.d.ts" ], - "internal/types": [ + "internal/internal/types": [ "./core/types/index.d.ts" ], "*": [ @@ -319,7 +469,7 @@ "sb": "node ./bin/index.js" }, "dependencies": { - "@storybook/core": "workspace:*" + "storybook": "workspace:*" }, "devDependencies": { "typescript": "^5.3.2" diff --git a/code/lib/cli/project.json b/code/lib/cli/project.json index 4f06674e2e03..a476a934d5f1 100644 --- a/code/lib/cli/project.json +++ b/code/lib/cli/project.json @@ -1,5 +1,5 @@ { - "name": "storybook", + "name": "storybook-renamed", "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "library", "targets": { diff --git a/code/lib/cli/scripts/utils.ts b/code/lib/cli/scripts/utils.ts index 1c27080075c5..1d8b54fafb10 100644 --- a/code/lib/cli/scripts/utils.ts +++ b/code/lib/cli/scripts/utils.ts @@ -30,15 +30,15 @@ export const generateMapperContent = (input: string) => { .replace('.mjs', '') .replace('.js', ''); if (input.endsWith('.js')) { - return `export * from '@storybook/core/${value}';\n`; + return `export * from 'storybook/internal/${value}';\n`; } if (input.endsWith('.cjs')) { - return `module.exports = require('@storybook/core/${value}');\n`; + return `module.exports = require('storybook/internal/${value}');\n`; } if (input.endsWith('.d.ts')) { return dedent` - export * from '@storybook/core/${value}'; - export type * from '@storybook/core/${value}';\n + export * from 'storybook/internal/${value}'; + export type * from 'storybook/internal/${value}';\n `; } // eslint-disable-next-line local-rules/no-uncategorized-errors diff --git a/code/lib/cli/src/core-path.ts b/code/lib/cli/src/core-path.ts index 63785643aba8..1136c71bc9ec 100644 --- a/code/lib/cli/src/core-path.ts +++ b/code/lib/cli/src/core-path.ts @@ -1,3 +1,3 @@ import { dirname } from 'node:path'; -export const corePath = dirname(require.resolve('@storybook/core/package.json')); +export const corePath = dirname(require.resolve('storybook/package.json')); diff --git a/code/lib/cli/src/index.ts b/code/lib/cli/src/index.ts index 4dcb8c60afef..aba7474a42fb 100644 --- a/code/lib/cli/src/index.ts +++ b/code/lib/cli/src/index.ts @@ -1,4 +1,4 @@ -import { deprecate } from '@storybook/core/node-logger'; +import { deprecate } from 'storybook/internal/node-logger'; deprecate( 'Exports from @storybook/cli are removed. Please import from @storybook/core-common instead.' diff --git a/code/lib/cli/src/proxy.ts b/code/lib/cli/src/proxy.ts index 12cac7558ae5..08376c5fef5b 100644 --- a/code/lib/cli/src/proxy.ts +++ b/code/lib/cli/src/proxy.ts @@ -1,11 +1,11 @@ -import { versions } from '@storybook/core/common'; +import { versions } from 'storybook/internal/common'; import { spawn } from 'child_process'; const args = process.argv.slice(2); if (['dev', 'build'].includes(args[0])) { - require('@storybook/core/cli/bin'); + require('storybook/internal/cli/bin'); } else { const proxiedArgs = args[0] === 'init' diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index 99f6ebf2f4cf..e8c21af0230f 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -57,7 +57,6 @@ "@babel/core": "^7.24.4", "@babel/preset-env": "^7.24.4", "@babel/types": "^7.24.0", - "@storybook/core": "workspace:*", "@storybook/csf": "0.1.12", "@types/cross-spawn": "^6.0.2", "cross-spawn": "^7.0.3", @@ -66,6 +65,7 @@ "jscodeshift": "^0.15.1", "prettier": "^3.1.1", "recast": "^0.23.5", + "storybook": "workspace:*", "tiny-invariant": "^1.3.1" }, "devDependencies": { diff --git a/code/lib/codemod/src/transforms/__tests__/transforms.tests.js b/code/lib/codemod/src/transforms/__tests__/transforms.tests.js index 85aab5dc009f..c4c29cd68ab4 100644 --- a/code/lib/codemod/src/transforms/__tests__/transforms.tests.js +++ b/code/lib/codemod/src/transforms/__tests__/transforms.tests.js @@ -5,7 +5,7 @@ import { describe, expect, it, vi } from 'vitest'; import { applyTransform } from 'jscodeshift/dist/testUtils'; -vi.mock('@storybook/core/node-logger'); +vi.mock('storybook/internal/node-logger'); const inputRegExp = /\.input\.js$/; diff --git a/code/lib/codemod/src/transforms/csf-2-to-3.ts b/code/lib/codemod/src/transforms/csf-2-to-3.ts index 5383188978b5..becbac014625 100644 --- a/code/lib/codemod/src/transforms/csf-2-to-3.ts +++ b/code/lib/codemod/src/transforms/csf-2-to-3.ts @@ -1,9 +1,8 @@ /* eslint-disable no-underscore-dangle */ -import type { BabelFile, NodePath } from '@storybook/core/babel'; -import { core as babel, types as t } from '@storybook/core/babel'; - -import type { CsfFile } from '@storybook/core/csf-tools'; -import { loadCsf, printCsf } from '@storybook/core/csf-tools'; +import type { BabelFile, NodePath } from 'storybook/internal/babel'; +import { core as babel, types as t } from 'storybook/internal/babel'; +import type { CsfFile } from 'storybook/internal/csf-tools'; +import { loadCsf, printCsf } from 'storybook/internal/csf-tools'; import type { API, FileInfo } from 'jscodeshift'; import prettier from 'prettier'; diff --git a/code/lib/codemod/src/transforms/find-implicit-spies.ts b/code/lib/codemod/src/transforms/find-implicit-spies.ts index e3d6259a44b3..964eb54f9622 100644 --- a/code/lib/codemod/src/transforms/find-implicit-spies.ts +++ b/code/lib/codemod/src/transforms/find-implicit-spies.ts @@ -1,5 +1,5 @@ /* eslint-disable no-underscore-dangle */ -import { loadCsf } from '@storybook/core/csf-tools'; +import { loadCsf } from 'storybook/internal/csf-tools'; import type { BabelFile } from '@babel/core'; import * as babel from '@babel/core'; diff --git a/code/lib/codemod/src/transforms/mdx-to-csf.ts b/code/lib/codemod/src/transforms/mdx-to-csf.ts index c83f900d0d87..5e94c8f0b12f 100644 --- a/code/lib/codemod/src/transforms/mdx-to-csf.ts +++ b/code/lib/codemod/src/transforms/mdx-to-csf.ts @@ -9,7 +9,7 @@ import { babelParseExpression, recast, types as t, -} from '@storybook/core/babel'; +} from 'storybook/internal/babel'; import { camelCase } from 'es-toolkit'; import type { FileInfo } from 'jscodeshift'; diff --git a/code/lib/codemod/src/transforms/migrate-to-test-package.ts b/code/lib/codemod/src/transforms/migrate-to-test-package.ts index 1128be36d5d0..9fffa57f7ad6 100644 --- a/code/lib/codemod/src/transforms/migrate-to-test-package.ts +++ b/code/lib/codemod/src/transforms/migrate-to-test-package.ts @@ -1,7 +1,6 @@ /* eslint-disable no-underscore-dangle */ -import { type BabelFile, core as babel, types as t } from '@storybook/core/babel'; - -import { loadCsf, printCsf } from '@storybook/core/csf-tools'; +import { type BabelFile, core as babel, types as t } from 'storybook/internal/babel'; +import { loadCsf, printCsf } from 'storybook/internal/csf-tools'; import type { FileInfo } from 'jscodeshift'; import prettier from 'prettier'; diff --git a/code/lib/codemod/src/transforms/storiesof-to-csf.js b/code/lib/codemod/src/transforms/storiesof-to-csf.js index 824282467ac7..312deed9c387 100644 --- a/code/lib/codemod/src/transforms/storiesof-to-csf.js +++ b/code/lib/codemod/src/transforms/storiesof-to-csf.js @@ -1,6 +1,6 @@ -import { storyNameFromExport } from '@storybook/csf'; +import { logger } from 'storybook/internal/node-logger'; -import { logger } from '@storybook/core/node-logger'; +import { storyNameFromExport } from '@storybook/csf'; import prettier from 'prettier'; diff --git a/code/lib/codemod/src/transforms/upgrade-deprecated-types.ts b/code/lib/codemod/src/transforms/upgrade-deprecated-types.ts index a8fe8f951718..3e59eff1cd52 100644 --- a/code/lib/codemod/src/transforms/upgrade-deprecated-types.ts +++ b/code/lib/codemod/src/transforms/upgrade-deprecated-types.ts @@ -1,7 +1,6 @@ /* eslint-disable no-underscore-dangle */ -import { type BabelFile, type NodePath, core as babel, types as t } from '@storybook/core/babel'; - -import { loadCsf, printCsf } from '@storybook/core/csf-tools'; +import { type BabelFile, type NodePath, core as babel, types as t } from 'storybook/internal/babel'; +import { loadCsf, printCsf } from 'storybook/internal/csf-tools'; import type { API, FileInfo } from 'jscodeshift'; import prettier from 'prettier'; diff --git a/code/lib/create-storybook/src/generators/SVELTE/index.test.ts b/code/lib/create-storybook/src/generators/SVELTE/index.test.ts index 0fb124025879..94128ba71916 100644 --- a/code/lib/create-storybook/src/generators/SVELTE/index.test.ts +++ b/code/lib/create-storybook/src/generators/SVELTE/index.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; import { getAddonSvelteCsfVersion } from './index'; diff --git a/code/package.json b/code/package.json index 095188241d45..7ea7486a481a 100644 --- a/code/package.json +++ b/code/package.json @@ -121,7 +121,6 @@ "@storybook/builder-vite": "workspace:*", "@storybook/builder-webpack5": "workspace:*", "@storybook/codemod": "workspace:*", - "@storybook/core": "workspace:*", "@storybook/core-webpack": "workspace:*", "@storybook/csf": "0.1.12", "@storybook/csf-plugin": "workspace:*", diff --git a/code/sandbox/angular-cli-15-ts/project.json b/code/sandbox/angular-cli-15-ts/project.json index d2d595560d2a..d6b1a5552270 100644 --- a/code/sandbox/angular-cli-15-ts/project.json +++ b/code/sandbox/angular-cli-15-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/angular-cli-default-ts/project.json b/code/sandbox/angular-cli-default-ts/project.json index cb48bbc83e0e..7632b5c48937 100644 --- a/code/sandbox/angular-cli-default-ts/project.json +++ b/code/sandbox/angular-cli-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/angular-cli-prerelease/project.json b/code/sandbox/angular-cli-prerelease/project.json index 4433e7dde157..1587a5387ea5 100644 --- a/code/sandbox/angular-cli-prerelease/project.json +++ b/code/sandbox/angular-cli-prerelease/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/bench-react-vite-default-ts-nodocs/project.json b/code/sandbox/bench-react-vite-default-ts-nodocs/project.json index e0ed20e23930..021350213dd6 100644 --- a/code/sandbox/bench-react-vite-default-ts-nodocs/project.json +++ b/code/sandbox/bench-react-vite-default-ts-nodocs/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/bench-react-vite-default-ts-test-build/project.json b/code/sandbox/bench-react-vite-default-ts-test-build/project.json index 5e44f6ba14ce..75fde83971b3 100644 --- a/code/sandbox/bench-react-vite-default-ts-test-build/project.json +++ b/code/sandbox/bench-react-vite-default-ts-test-build/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/bench-react-vite-default-ts/project.json b/code/sandbox/bench-react-vite-default-ts/project.json index a59cb05cc369..c88a13c77ce5 100644 --- a/code/sandbox/bench-react-vite-default-ts/project.json +++ b/code/sandbox/bench-react-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/bench-react-webpack-18-ts-test-build/project.json b/code/sandbox/bench-react-webpack-18-ts-test-build/project.json index 647d78878fd3..a7b95c434494 100644 --- a/code/sandbox/bench-react-webpack-18-ts-test-build/project.json +++ b/code/sandbox/bench-react-webpack-18-ts-test-build/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/bench-react-webpack-18-ts/project.json b/code/sandbox/bench-react-webpack-18-ts/project.json index 2825bb2831d2..1296b417b395 100644 --- a/code/sandbox/bench-react-webpack-18-ts/project.json +++ b/code/sandbox/bench-react-webpack-18-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/cra-default-js/project.json b/code/sandbox/cra-default-js/project.json index a8febc5d3b00..d2e69c94e5fe 100644 --- a/code/sandbox/cra-default-js/project.json +++ b/code/sandbox/cra-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/cra-default-ts/project.json b/code/sandbox/cra-default-ts/project.json index b51b71aa0940..9c41f11d0c05 100644 --- a/code/sandbox/cra-default-ts/project.json +++ b/code/sandbox/cra-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/ember-3-js/project.json b/code/sandbox/ember-3-js/project.json index 068515be75b2..1466ac8f83af 100644 --- a/code/sandbox/ember-3-js/project.json +++ b/code/sandbox/ember-3-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/ember-default-js/project.json b/code/sandbox/ember-default-js/project.json index 81f91494ac2a..b70af44d8e8c 100644 --- a/code/sandbox/ember-default-js/project.json +++ b/code/sandbox/ember-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/experimental-nextjs-vite-default-ts/project.json b/code/sandbox/experimental-nextjs-vite-default-ts/project.json index ae9d595865dd..19f7c07453aa 100644 --- a/code/sandbox/experimental-nextjs-vite-default-ts/project.json +++ b/code/sandbox/experimental-nextjs-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/html-vite-default-js/project.json b/code/sandbox/html-vite-default-js/project.json index 9363e37e0b07..0e3cc85808a8 100644 --- a/code/sandbox/html-vite-default-js/project.json +++ b/code/sandbox/html-vite-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/html-vite-default-ts/project.json b/code/sandbox/html-vite-default-ts/project.json index d816dd3fbd29..65f1231c5c1d 100644 --- a/code/sandbox/html-vite-default-ts/project.json +++ b/code/sandbox/html-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/html-webpack-default/project.json b/code/sandbox/html-webpack-default/project.json index 466b55828a54..deba12107957 100644 --- a/code/sandbox/html-webpack-default/project.json +++ b/code/sandbox/html-webpack-default/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/internal-react16-webpack/project.json b/code/sandbox/internal-react16-webpack/project.json index a2164412649b..09157d3a842e 100644 --- a/code/sandbox/internal-react16-webpack/project.json +++ b/code/sandbox/internal-react16-webpack/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/internal-react18-webpack-babel/project.json b/code/sandbox/internal-react18-webpack-babel/project.json index e1585cc8ba0b..9ddf15267bbb 100644 --- a/code/sandbox/internal-react18-webpack-babel/project.json +++ b/code/sandbox/internal-react18-webpack-babel/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/internal-server-webpack5/project.json b/code/sandbox/internal-server-webpack5/project.json index 51b572402699..5d143b47fcac 100644 --- a/code/sandbox/internal-server-webpack5/project.json +++ b/code/sandbox/internal-server-webpack5/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/lit-vite-default-js/project.json b/code/sandbox/lit-vite-default-js/project.json index 22bf1065c982..07ce7905641d 100644 --- a/code/sandbox/lit-vite-default-js/project.json +++ b/code/sandbox/lit-vite-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/lit-vite-default-ts/project.json b/code/sandbox/lit-vite-default-ts/project.json index 978833395968..375a9b862c47 100644 --- a/code/sandbox/lit-vite-default-ts/project.json +++ b/code/sandbox/lit-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/nextjs-13-ts/project.json b/code/sandbox/nextjs-13-ts/project.json index d83ef788bf2c..efaf37bb0920 100644 --- a/code/sandbox/nextjs-13-ts/project.json +++ b/code/sandbox/nextjs-13-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/nextjs-default-js/project.json b/code/sandbox/nextjs-default-js/project.json index 540936cbd268..c2074e7978e9 100644 --- a/code/sandbox/nextjs-default-js/project.json +++ b/code/sandbox/nextjs-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/nextjs-default-ts/project.json b/code/sandbox/nextjs-default-ts/project.json index 5144fc10b9d4..d25343ef2470 100644 --- a/code/sandbox/nextjs-default-ts/project.json +++ b/code/sandbox/nextjs-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/nextjs-prerelease/project.json b/code/sandbox/nextjs-prerelease/project.json index 9579c10b3928..5c7843a566ed 100644 --- a/code/sandbox/nextjs-prerelease/project.json +++ b/code/sandbox/nextjs-prerelease/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/nuxt-vite-default-ts/project.json b/code/sandbox/nuxt-vite-default-ts/project.json index 71bb3820c382..9bdc5c68252a 100644 --- a/code/sandbox/nuxt-vite-default-ts/project.json +++ b/code/sandbox/nuxt-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/preact-vite-default-js/project.json b/code/sandbox/preact-vite-default-js/project.json index 4eb038e5c735..16966e6079a8 100644 --- a/code/sandbox/preact-vite-default-js/project.json +++ b/code/sandbox/preact-vite-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/preact-vite-default-ts/project.json b/code/sandbox/preact-vite-default-ts/project.json index 2c1cdf04e3a4..e756d1ef647a 100644 --- a/code/sandbox/preact-vite-default-ts/project.json +++ b/code/sandbox/preact-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/qwik-vite-default-ts/project.json b/code/sandbox/qwik-vite-default-ts/project.json index 0a1c65c53499..0eb305e7700c 100644 --- a/code/sandbox/qwik-vite-default-ts/project.json +++ b/code/sandbox/qwik-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/react-vite-default-js/project.json b/code/sandbox/react-vite-default-js/project.json index cc44d8e4a6fa..6b56944f01b9 100644 --- a/code/sandbox/react-vite-default-js/project.json +++ b/code/sandbox/react-vite-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/react-vite-default-ts/project.json b/code/sandbox/react-vite-default-ts/project.json index 25c9b2442a1b..21fb82576608 100644 --- a/code/sandbox/react-vite-default-ts/project.json +++ b/code/sandbox/react-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/react-webpack-17-ts/project.json b/code/sandbox/react-webpack-17-ts/project.json index 01209a70efa9..a7ffafd8aec5 100644 --- a/code/sandbox/react-webpack-17-ts/project.json +++ b/code/sandbox/react-webpack-17-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/react-webpack-18-ts/project.json b/code/sandbox/react-webpack-18-ts/project.json index 34cae14e059c..a48dbef996f0 100644 --- a/code/sandbox/react-webpack-18-ts/project.json +++ b/code/sandbox/react-webpack-18-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/solid-vite-default-js/project.json b/code/sandbox/solid-vite-default-js/project.json index 7bba5774a7a1..baffb8151c79 100644 --- a/code/sandbox/solid-vite-default-js/project.json +++ b/code/sandbox/solid-vite-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/solid-vite-default-ts/project.json b/code/sandbox/solid-vite-default-ts/project.json index 50d504a77255..d02e98c312ae 100644 --- a/code/sandbox/solid-vite-default-ts/project.json +++ b/code/sandbox/solid-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/svelte-kit-prerelease-ts/project.json b/code/sandbox/svelte-kit-prerelease-ts/project.json index e9ec53e855c8..9da6435e3570 100644 --- a/code/sandbox/svelte-kit-prerelease-ts/project.json +++ b/code/sandbox/svelte-kit-prerelease-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/svelte-kit-skeleton-js/project.json b/code/sandbox/svelte-kit-skeleton-js/project.json index c0ac8adf0ba2..a4d29a606246 100644 --- a/code/sandbox/svelte-kit-skeleton-js/project.json +++ b/code/sandbox/svelte-kit-skeleton-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/svelte-kit-skeleton-ts/project.json b/code/sandbox/svelte-kit-skeleton-ts/project.json index 17f7e5cdee4e..c766fe459074 100644 --- a/code/sandbox/svelte-kit-skeleton-ts/project.json +++ b/code/sandbox/svelte-kit-skeleton-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/svelte-vite-default-js/project.json b/code/sandbox/svelte-vite-default-js/project.json index d93d4e9b6ab1..454bfbef47b6 100644 --- a/code/sandbox/svelte-vite-default-js/project.json +++ b/code/sandbox/svelte-vite-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/svelte-vite-default-ts/project.json b/code/sandbox/svelte-vite-default-ts/project.json index 90dadf8177f4..0645439bd245 100644 --- a/code/sandbox/svelte-vite-default-ts/project.json +++ b/code/sandbox/svelte-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/vue-cli-default-js/project.json b/code/sandbox/vue-cli-default-js/project.json index fa29b401d74a..c06a3b9ac872 100644 --- a/code/sandbox/vue-cli-default-js/project.json +++ b/code/sandbox/vue-cli-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/vue3-vite-default-js/project.json b/code/sandbox/vue3-vite-default-js/project.json index 6bbb297d51cd..a3c6541a2b80 100644 --- a/code/sandbox/vue3-vite-default-js/project.json +++ b/code/sandbox/vue3-vite-default-js/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/sandbox/vue3-vite-default-ts/project.json b/code/sandbox/vue3-vite-default-ts/project.json index ad777a4b5ece..78c8fda72e9a 100644 --- a/code/sandbox/vue3-vite-default-ts/project.json +++ b/code/sandbox/vue3-vite-default-ts/project.json @@ -3,7 +3,6 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "application", "implicitDependencies": [ - "storybook", "core", "addon-essentials", "addon-interactions", diff --git a/code/yarn.lock b/code/yarn.lock index 37f5a5b12899..fa4f0aaef81d 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6100,7 +6100,6 @@ __metadata: "@babel/core": "npm:^7.24.4" "@babel/preset-env": "npm:^7.24.4" "@babel/types": "npm:^7.24.0" - "@storybook/core": "workspace:*" "@storybook/csf": "npm:0.1.12" "@types/cross-spawn": "npm:^6.0.2" "@types/jscodeshift": "npm:^0.11.10" @@ -6116,6 +6115,7 @@ __metadata: recast: "npm:^0.23.5" remark: "npm:^15.0.1" remark-mdx: "npm:^3.0.0" + storybook: "workspace:*" tiny-invariant: "npm:^1.3.1" ts-dedent: "npm:^2.2.0" typescript: "npm:^5.3.2" @@ -6173,152 +6173,6 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core@workspace:*, @storybook/core@workspace:core": - version: 0.0.0-use.local - resolution: "@storybook/core@workspace:core" - dependencies: - "@aw-web-design/x-default-browser": "npm:1.4.126" - "@babel/core": "npm:^7.24.4" - "@babel/generator": "npm:^7.24.4" - "@babel/parser": "npm:^7.24.4" - "@babel/preset-react": "npm:^7.24.1" - "@babel/traverse": "npm:^7.24.1" - "@babel/types": "npm:^7.24.0" - "@discoveryjs/json-ext": "npm:^0.5.3" - "@emotion/cache": "npm:^11.11.0" - "@emotion/is-prop-valid": "npm:^1.2.2" - "@emotion/react": "npm:^11.11.4" - "@emotion/styled": "npm:^11.11.0" - "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1" - "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2" - "@ndelangen/get-tarball": "npm:^3.0.7" - "@polka/compression": "npm:^1.0.0-next.28" - "@popperjs/core": "npm:^2.6.0" - "@radix-ui/react-dialog": "npm:^1.0.5" - "@radix-ui/react-scroll-area": "npm:1.2.0-rc.7" - "@radix-ui/react-slot": "npm:^1.0.2" - "@storybook/csf": "npm:0.1.12" - "@storybook/docs-mdx": "npm:4.0.0-next.1" - "@storybook/global": "npm:^5.0.0" - "@storybook/icons": "npm:^1.2.12" - "@tanstack/react-virtual": "npm:^3.3.0" - "@testing-library/react": "npm:^14.0.0" - "@types/cross-spawn": "npm:^6.0.2" - "@types/detect-port": "npm:^1.3.0" - "@types/diff": "npm:^5.0.9" - "@types/ejs": "npm:^3.1.1" - "@types/find-cache-dir": "npm:^5.0.0" - "@types/js-yaml": "npm:^4.0.5" - "@types/node": "npm:^22.0.0" - "@types/npmlog": "npm:^7.0.0" - "@types/picomatch": "npm:^2.3.0" - "@types/prettier": "npm:^3.0.0" - "@types/pretty-hrtime": "npm:^1.0.0" - "@types/prompts": "npm:^2.0.9" - "@types/react-syntax-highlighter": "npm:11.0.5" - "@types/react-transition-group": "npm:^4" - "@types/semver": "npm:^7.5.8" - "@types/ws": "npm:^8" - "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.10" - "@yarnpkg/fslib": "npm:2.10.3" - "@yarnpkg/libzip": "npm:2.3.0" - ansi-to-html: "npm:^0.7.2" - assert: "npm:^2.1.0" - babel-plugin-react-docgen: "npm:4.2.1" - better-opn: "npm:^3.0.2" - boxen: "npm:^7.1.1" - browser-assert: "npm:^1.2.1" - browser-dtector: "npm:^3.4.0" - camelcase: "npm:^8.0.0" - cli-table3: "npm:^0.6.1" - commander: "npm:^12.1.0" - comment-parser: "npm:^1.4.1" - copy-to-clipboard: "npm:^3.3.1" - cross-spawn: "npm:^7.0.3" - css: "npm:^3.0.0" - deep-object-diff: "npm:^1.1.0" - dequal: "npm:^2.0.2" - detect-indent: "npm:^7.0.1" - detect-package-manager: "npm:^3.0.2" - detect-port: "npm:^1.3.0" - diff: "npm:^5.2.0" - downshift: "npm:^9.0.4" - ejs: "npm:^3.1.10" - es-toolkit: "npm:^1.22.0" - esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0" - esbuild-plugin-alias: "npm:^0.2.1" - esbuild-register: "npm:^3.5.0" - execa: "npm:^8.0.1" - fd-package-json: "npm:^1.2.0" - fetch-retry: "npm:^6.0.0" - find-cache-dir: "npm:^5.0.0" - find-up: "npm:^7.0.0" - flush-promises: "npm:^1.0.2" - fuse.js: "npm:^3.6.1" - get-npm-tarball-url: "npm:^2.0.3" - glob: "npm:^10.0.0" - globby: "npm:^14.0.1" - jiti: "npm:^1.21.6" - js-yaml: "npm:^4.1.0" - jsdoc-type-pratt-parser: "npm:^4.0.0" - lazy-universal-dotenv: "npm:^4.0.0" - leven: "npm:^4.0.0" - markdown-to-jsx: "npm:^7.4.5" - memfs: "npm:^4.11.1" - memoizerific: "npm:^1.11.3" - nanoid: "npm:^4.0.2" - npmlog: "npm:^7.0.0" - open: "npm:^8.4.0" - picocolors: "npm:^1.1.0" - picomatch: "npm:^2.3.0" - picoquery: "npm:^1.4.0" - polished: "npm:^4.2.2" - polka: "npm:^1.0.0-next.28" - prettier: "npm:^3.2.5" - pretty-hrtime: "npm:^1.0.3" - process: "npm:^0.11.10" - prompts: "npm:^2.4.0" - react: "npm:^18.2.0" - react-dom: "npm:^18.2.0" - react-draggable: "npm:^4.4.5" - react-helmet-async: "npm:^1.3.0" - react-popper-tooltip: "npm:^4.4.2" - react-resize-detector: "npm:^7.1.2" - react-router-dom: "npm:6.0.2" - react-syntax-highlighter: "npm:^15.4.5" - react-textarea-autosize: "npm:^8.3.0" - react-transition-group: "npm:^4.4.5" - recast: "npm:^0.23.5" - require-from-string: "npm:^2.0.2" - resolve-from: "npm:^5.0.0" - semver: "npm:^7.6.2" - sirv: "npm:^2.0.4" - slash: "npm:^5.0.0" - source-map: "npm:^0.7.4" - store2: "npm:^2.14.2" - strip-json-comments: "npm:^5.0.1" - telejson: "npm:^7.2.0" - tiny-invariant: "npm:^1.3.1" - tinyspy: "npm:^2.2.0" - ts-dedent: "npm:^2.0.0" - tsconfig-paths: "npm:^4.2.0" - type-fest: "npm:^4.18.1" - typescript: "npm:^5.3.2" - unique-string: "npm:^3.0.0" - use-resize-observer: "npm:^9.1.0" - util: "npm:^0.12.5" - watchpack: "npm:^2.2.0" - ws: "npm:^8.2.3" - peerDependencies: - prettier: ^2 || ^3 - peerDependenciesMeta: - prettier: - optional: true - bin: - core: ./bin/index.cjs - languageName: unknown - linkType: soft - "@storybook/csf-plugin@workspace:*, @storybook/csf-plugin@workspace:lib/csf-plugin": version: 0.0.0-use.local resolution: "@storybook/csf-plugin@workspace:lib/csf-plugin" @@ -7063,7 +6917,6 @@ __metadata: "@storybook/builder-vite": "workspace:*" "@storybook/builder-webpack5": "workspace:*" "@storybook/codemod": "workspace:*" - "@storybook/core": "workspace:*" "@storybook/core-webpack": "workspace:*" "@storybook/csf": "npm:0.1.12" "@storybook/csf-plugin": "workspace:*" @@ -26812,11 +26665,11 @@ __metadata: languageName: node linkType: hard -"storybook@workspace:*, storybook@workspace:^, storybook@workspace:lib/cli": +"storybook-renamed@workspace:lib/cli": version: 0.0.0-use.local - resolution: "storybook@workspace:lib/cli" + resolution: "storybook-renamed@workspace:lib/cli" dependencies: - "@storybook/core": "workspace:*" + storybook: "workspace:*" typescript: "npm:^5.3.2" peerDependencies: prettier: ^2 || ^3 @@ -26830,6 +26683,152 @@ __metadata: languageName: unknown linkType: soft +"storybook@workspace:*, storybook@workspace:^, storybook@workspace:core": + version: 0.0.0-use.local + resolution: "storybook@workspace:core" + dependencies: + "@aw-web-design/x-default-browser": "npm:1.4.126" + "@babel/core": "npm:^7.24.4" + "@babel/generator": "npm:^7.24.4" + "@babel/parser": "npm:^7.24.4" + "@babel/preset-react": "npm:^7.24.1" + "@babel/traverse": "npm:^7.24.1" + "@babel/types": "npm:^7.24.0" + "@discoveryjs/json-ext": "npm:^0.5.3" + "@emotion/cache": "npm:^11.11.0" + "@emotion/is-prop-valid": "npm:^1.2.2" + "@emotion/react": "npm:^11.11.4" + "@emotion/styled": "npm:^11.11.0" + "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1" + "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2" + "@ndelangen/get-tarball": "npm:^3.0.7" + "@polka/compression": "npm:^1.0.0-next.28" + "@popperjs/core": "npm:^2.6.0" + "@radix-ui/react-dialog": "npm:^1.0.5" + "@radix-ui/react-scroll-area": "npm:1.2.0-rc.7" + "@radix-ui/react-slot": "npm:^1.0.2" + "@storybook/csf": "npm:0.1.12" + "@storybook/docs-mdx": "npm:4.0.0-next.1" + "@storybook/global": "npm:^5.0.0" + "@storybook/icons": "npm:^1.2.12" + "@tanstack/react-virtual": "npm:^3.3.0" + "@testing-library/react": "npm:^14.0.0" + "@types/cross-spawn": "npm:^6.0.2" + "@types/detect-port": "npm:^1.3.0" + "@types/diff": "npm:^5.0.9" + "@types/ejs": "npm:^3.1.1" + "@types/find-cache-dir": "npm:^5.0.0" + "@types/js-yaml": "npm:^4.0.5" + "@types/node": "npm:^22.0.0" + "@types/npmlog": "npm:^7.0.0" + "@types/picomatch": "npm:^2.3.0" + "@types/prettier": "npm:^3.0.0" + "@types/pretty-hrtime": "npm:^1.0.0" + "@types/prompts": "npm:^2.0.9" + "@types/react-syntax-highlighter": "npm:11.0.5" + "@types/react-transition-group": "npm:^4" + "@types/semver": "npm:^7.5.8" + "@types/ws": "npm:^8" + "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.10" + "@yarnpkg/fslib": "npm:2.10.3" + "@yarnpkg/libzip": "npm:2.3.0" + ansi-to-html: "npm:^0.7.2" + assert: "npm:^2.1.0" + babel-plugin-react-docgen: "npm:4.2.1" + better-opn: "npm:^3.0.2" + boxen: "npm:^7.1.1" + browser-assert: "npm:^1.2.1" + browser-dtector: "npm:^3.4.0" + camelcase: "npm:^8.0.0" + cli-table3: "npm:^0.6.1" + commander: "npm:^12.1.0" + comment-parser: "npm:^1.4.1" + copy-to-clipboard: "npm:^3.3.1" + cross-spawn: "npm:^7.0.3" + css: "npm:^3.0.0" + deep-object-diff: "npm:^1.1.0" + dequal: "npm:^2.0.2" + detect-indent: "npm:^7.0.1" + detect-package-manager: "npm:^3.0.2" + detect-port: "npm:^1.3.0" + diff: "npm:^5.2.0" + downshift: "npm:^9.0.4" + ejs: "npm:^3.1.10" + es-toolkit: "npm:^1.22.0" + esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0" + esbuild-plugin-alias: "npm:^0.2.1" + esbuild-register: "npm:^3.5.0" + execa: "npm:^8.0.1" + fd-package-json: "npm:^1.2.0" + fetch-retry: "npm:^6.0.0" + find-cache-dir: "npm:^5.0.0" + find-up: "npm:^7.0.0" + flush-promises: "npm:^1.0.2" + fuse.js: "npm:^3.6.1" + get-npm-tarball-url: "npm:^2.0.3" + glob: "npm:^10.0.0" + globby: "npm:^14.0.1" + jiti: "npm:^1.21.6" + js-yaml: "npm:^4.1.0" + jsdoc-type-pratt-parser: "npm:^4.0.0" + lazy-universal-dotenv: "npm:^4.0.0" + leven: "npm:^4.0.0" + markdown-to-jsx: "npm:^7.4.5" + memfs: "npm:^4.11.1" + memoizerific: "npm:^1.11.3" + nanoid: "npm:^4.0.2" + npmlog: "npm:^7.0.0" + open: "npm:^8.4.0" + picocolors: "npm:^1.1.0" + picomatch: "npm:^2.3.0" + picoquery: "npm:^1.4.0" + polished: "npm:^4.2.2" + polka: "npm:^1.0.0-next.28" + prettier: "npm:^3.2.5" + pretty-hrtime: "npm:^1.0.3" + process: "npm:^0.11.10" + prompts: "npm:^2.4.0" + react: "npm:^18.2.0" + react-dom: "npm:^18.2.0" + react-draggable: "npm:^4.4.5" + react-helmet-async: "npm:^1.3.0" + react-popper-tooltip: "npm:^4.4.2" + react-resize-detector: "npm:^7.1.2" + react-router-dom: "npm:6.0.2" + react-syntax-highlighter: "npm:^15.4.5" + react-textarea-autosize: "npm:^8.3.0" + react-transition-group: "npm:^4.4.5" + recast: "npm:^0.23.5" + require-from-string: "npm:^2.0.2" + resolve-from: "npm:^5.0.0" + semver: "npm:^7.6.2" + sirv: "npm:^2.0.4" + slash: "npm:^5.0.0" + source-map: "npm:^0.7.4" + store2: "npm:^2.14.2" + strip-json-comments: "npm:^5.0.1" + telejson: "npm:^7.2.0" + tiny-invariant: "npm:^1.3.1" + tinyspy: "npm:^2.2.0" + ts-dedent: "npm:^2.0.0" + tsconfig-paths: "npm:^4.2.0" + type-fest: "npm:^4.18.1" + typescript: "npm:^5.3.2" + unique-string: "npm:^3.0.0" + use-resize-observer: "npm:^9.1.0" + util: "npm:^0.12.5" + watchpack: "npm:^2.2.0" + ws: "npm:^8.2.3" + peerDependencies: + prettier: ^2 || ^3 + peerDependenciesMeta: + prettier: + optional: true + bin: + storybook: ./bin/index.cjs + languageName: unknown + linkType: soft + "stream-browserify@npm:^3.0.0": version: 3.0.0 resolution: "stream-browserify@npm:3.0.0" diff --git a/scripts/eslint-plugin-local-rules/storybook-monorepo-imports.js b/scripts/eslint-plugin-local-rules/storybook-monorepo-imports.js index 8b9dba6de0f3..844c6d1802a1 100644 --- a/scripts/eslint-plugin-local-rules/storybook-monorepo-imports.js +++ b/scripts/eslint-plugin-local-rules/storybook-monorepo-imports.js @@ -38,18 +38,18 @@ module.exports = { }); } - if (node.source.value.startsWith('storybook/internal/') && isInCore) { - const newPath = node.source.value - .replace('storybook/internal', '@storybook/core') - .replace('/src', ''); - context.report({ - node: node, - message: `Cannot import from storybook/internal in this package. Use @storybook/core instead.`, - fix: (fixer) => { - return fixer.replaceText(node.source, `'${newPath}'`); - }, - }); - } + // if (node.source.value.startsWith('storybook/internal/') && isInCore) { + // const newPath = node.source.value + // .replace('storybook/internal', '@storybook/core') + // .replace('/src', ''); + // context.report({ + // node: node, + // message: `Cannot import from storybook/internal in this package. Use @storybook/core instead.`, + // fix: (fixer) => { + // return fixer.replaceText(node.source, `'${newPath}'`); + // }, + // }); + // } }, }; }, diff --git a/scripts/release/is-version-published.ts b/scripts/release/is-version-published.ts index a6a6891b2124..38e497616536 100644 --- a/scripts/release/is-version-published.ts +++ b/scripts/release/is-version-published.ts @@ -69,7 +69,7 @@ export const run = async (args: unknown[], options: unknown) => { const isAlreadyPublished = await isVersionPublished({ version, - packageName: '@storybook/core', + packageName: 'storybook', verbose, }); diff --git a/scripts/release/publish.ts b/scripts/release/publish.ts index f2054d93398e..3021496b8f73 100644 --- a/scripts/release/publish.ts +++ b/scripts/release/publish.ts @@ -177,7 +177,7 @@ export const run = async (options: unknown) => { const currentVersion = await getCurrentVersion(verbose); const isAlreadyPublished = await isCurrentVersionPublished({ currentVersion, - packageName: '@storybook/core', + packageName: 'storybook', verbose, }); if (isAlreadyPublished) { diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts index 271fbba9dcd8..6988efa34a6d 100644 --- a/scripts/tasks/sandbox-parts.ts +++ b/scripts/tasks/sandbox-parts.ts @@ -672,7 +672,7 @@ export const addStories: Task['run'] = async ( if (isCoreRenderer) { // Add stories for lib/preview-api (and addons below). NOTE: these stories will be in the // template-stories folder and *not* processed by the framework build config (instead by esbuild-loader) - await linkPackageStories(await workspacePath('core package', '@storybook/core'), { + await linkPackageStories(await workspacePath('core package', 'storybook'), { mainConfig, cwd, disableDocs, diff --git a/test-storybooks/ember-cli/package.json b/test-storybooks/ember-cli/package.json index 3ac8ca31acfb..5fbc07dbe387 100644 --- a/test-storybooks/ember-cli/package.json +++ b/test-storybooks/ember-cli/package.json @@ -36,7 +36,7 @@ "@storybook/client-logger": "file:../../code/lib/client-logger", "@storybook/codemod": "file:../../code/lib/codemod", "@storybook/components": "file:../../code/deprecated/components", - "@storybook/core": "file:../../code/core", + "storybook": "file:../../code/core", "@storybook/core-webpack": "file:../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../code/lib/csf-plugin", "@storybook/ember": "file:../../code/frameworks/ember", @@ -74,8 +74,7 @@ "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5", "@storybook/web-components": "file:../../code/renderers/web-components", "@storybook/web-components-vite": "file:../../code/frameworks/web-components-vite", - "@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5", - "storybook": "file:../../code/lib/cli" + "@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5" }, "dependencies": { "ember-named-blocks-polyfill": "^0.2.3", @@ -129,4 +128,4 @@ "projectToken": "19z23qxndju" } } -} +} \ No newline at end of file diff --git a/test-storybooks/external-docs/package.json b/test-storybooks/external-docs/package.json index adb509ce45c3..12b28bd34de7 100644 --- a/test-storybooks/external-docs/package.json +++ b/test-storybooks/external-docs/package.json @@ -36,7 +36,7 @@ "@storybook/client-logger": "file:../../code/lib/client-logger", "@storybook/codemod": "file:../../code/lib/codemod", "@storybook/components": "file:../../code/deprecated/components", - "@storybook/core": "file:../../code/core", + "storybook": "file:../../code/core", "@storybook/core-webpack": "file:../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../code/lib/csf-plugin", "@storybook/ember": "file:../../code/frameworks/ember", @@ -74,8 +74,7 @@ "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5", "@storybook/web-components": "file:../../code/renderers/web-components", "@storybook/web-components-vite": "file:../../code/frameworks/web-components-vite", - "@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5", - "storybook": "file:../../code/lib/cli" + "@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5" }, "dependencies": { "@storybook/addon-docs": "*", diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json index 69722cabd5db..17f2a3b635d4 100644 --- a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json +++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json @@ -37,7 +37,7 @@ "@storybook/builder-webpack5": "file:../../../code/builders/builder-webpack5", "@storybook/codemod": "file:../../../code/lib/codemod", "@storybook/components": "file:../../../code/deprecated/components", - "@storybook/core": "file:../../../code/core", + "storybook": "file:../../../code/core", "@storybook/core-webpack": "file:../../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../../code/lib/csf-plugin", "@storybook/ember": "file:../../../code/frameworks/ember", @@ -75,8 +75,7 @@ "@storybook/vue3-webpack5": "file:../../../code/frameworks/vue3-webpack5", "@storybook/web-components": "file:../../../code/renderers/web-components", "@storybook/web-components-vite": "file:../../../code/frameworks/web-components-vite", - "@storybook/web-components-webpack5": "file:../../../code/frameworks/web-components-webpack5", - "storybook": "file:../../../code/lib/cli" + "@storybook/web-components-webpack5": "file:../../../code/frameworks/web-components-webpack5" }, "dependencies": { "next": "^14.2.0", @@ -108,4 +107,4 @@ "maintainer_please_read_this": { "_": "we use file protocol to make this setup close to real life scenarios as well as avoid issues with duplicated React instances. When you recompile the SB packages, you need to rerun install." } -} +} \ No newline at end of file diff --git a/test-storybooks/portable-stories-kitchen-sink/react/package.json b/test-storybooks/portable-stories-kitchen-sink/react/package.json index 383364e5909a..52e7ee0b260a 100644 --- a/test-storybooks/portable-stories-kitchen-sink/react/package.json +++ b/test-storybooks/portable-stories-kitchen-sink/react/package.json @@ -40,7 +40,7 @@ "@storybook/builder-webpack5": "portal:../../../code/builders/builder-webpack5", "@storybook/codemod": "portal:../../../code/lib/codemod", "@storybook/components": "file:../../../code/deprecated/components", - "@storybook/core": "portal:../../../code/core", + "storybook": "portal:../../../code/core", "@storybook/core-webpack": "portal:../../../code/lib/core-webpack", "@storybook/csf-plugin": "portal:../../../code/lib/csf-plugin", "@storybook/ember": "portal:../../../code/frameworks/ember", @@ -80,8 +80,7 @@ "@storybook/web-components": "portal:../../../code/renderers/web-components", "@storybook/web-components-vite": "portal:../../../code/frameworks/web-components-vite", "@storybook/web-components-webpack5": "portal:../../../code/frameworks/web-components-webpack5", - "playwright": "1.48.1", - "storybook": "portal:../../../code/lib/cli" + "playwright": "1.48.1" }, "dependencies": { "react": "^18.2.0", @@ -125,4 +124,4 @@ "vite": "^5.1.1", "vitest": "^2.1.3" } -} +} \ No newline at end of file diff --git a/test-storybooks/portable-stories-kitchen-sink/svelte/package.json b/test-storybooks/portable-stories-kitchen-sink/svelte/package.json index ad5699a549c7..62c7622f8500 100644 --- a/test-storybooks/portable-stories-kitchen-sink/svelte/package.json +++ b/test-storybooks/portable-stories-kitchen-sink/svelte/package.json @@ -38,7 +38,7 @@ "@storybook/builder-webpack5": "portal:../../../code/builders/builder-webpack5", "@storybook/codemod": "portal:../../../code/lib/codemod", "@storybook/components": "file:../../../code/deprecated/components", - "@storybook/core": "portal:../../../code/core", + "storybook": "portal:../../../code/core", "@storybook/core-webpack": "portal:../../../code/lib/core-webpack", "@storybook/csf-plugin": "portal:../../../code/lib/csf-plugin", "@storybook/ember": "portal:../../../code/frameworks/ember", @@ -77,8 +77,7 @@ "@storybook/web-components": "portal:../../../code/renderers/web-components", "@storybook/web-components-vite": "portal:../../../code/frameworks/web-components-vite", "@storybook/web-components-webpack5": "portal:../../../code/frameworks/web-components-webpack5", - "playwright": "1.48.1", - "storybook": "portal:../../../code/lib/cli" + "playwright": "1.48.1" }, "devDependencies": { "@playwright/experimental-ct-svelte": "1.48.1", @@ -101,4 +100,4 @@ "vite": "^5.1.4", "vitest": "^1.6.0" } -} +} \ No newline at end of file diff --git a/test-storybooks/portable-stories-kitchen-sink/vue3/package.json b/test-storybooks/portable-stories-kitchen-sink/vue3/package.json index f286a9ce6258..7ba1bfefa42a 100644 --- a/test-storybooks/portable-stories-kitchen-sink/vue3/package.json +++ b/test-storybooks/portable-stories-kitchen-sink/vue3/package.json @@ -39,7 +39,7 @@ "@storybook/builder-webpack5": "file:../../../code/builders/builder-webpack5", "@storybook/codemod": "file:../../../code/lib/codemod", "@storybook/components": "file:../../../code/deprecated/components", - "@storybook/core": "file:../../../code/core", + "storybook": "file:../../../code/core", "@storybook/core-webpack": "file:../../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../../code/lib/csf-plugin", "@storybook/ember": "file:../../../code/frameworks/ember", @@ -78,8 +78,7 @@ "@storybook/web-components": "file:../../../code/renderers/web-components", "@storybook/web-components-vite": "file:../../../code/frameworks/web-components-vite", "@storybook/web-components-webpack5": "file:../../../code/frameworks/web-components-webpack5", - "playwright": "1.48.1", - "storybook": "file:../../../code/lib/cli" + "playwright": "1.48.1" }, "dependencies": { "vue": "^3.4.19" diff --git a/test-storybooks/server-kitchen-sink/package.json b/test-storybooks/server-kitchen-sink/package.json index 144d15fcf03d..3fc0ec3ebd72 100644 --- a/test-storybooks/server-kitchen-sink/package.json +++ b/test-storybooks/server-kitchen-sink/package.json @@ -39,7 +39,7 @@ "@storybook/client-logger": "file:../../code/lib/client-logger", "@storybook/codemod": "file:../../code/lib/codemod", "@storybook/components": "file:../../code/deprecated/components", - "@storybook/core": "file:../../code/core", + "storybook": "file:../../code/core", "@storybook/core-webpack": "file:../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../code/lib/csf-plugin", "@storybook/ember": "file:../../code/frameworks/ember", @@ -77,8 +77,7 @@ "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5", "@storybook/web-components": "file:../../code/renderers/web-components", "@storybook/web-components-vite": "file:../../code/frameworks/web-components-vite", - "@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5", - "storybook": "file:../../code/lib/cli" + "@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5" }, "devDependencies": { "@storybook/addon-a11y": "*", diff --git a/test-storybooks/standalone-preview/package.json b/test-storybooks/standalone-preview/package.json index 1d32f7457a40..ebe7eb0db38a 100644 --- a/test-storybooks/standalone-preview/package.json +++ b/test-storybooks/standalone-preview/package.json @@ -32,7 +32,7 @@ "@storybook/client-logger": "file:../../code/lib/client-logger", "@storybook/codemod": "file:../../code/lib/codemod", "@storybook/components": "file:../../../code/deprecated/components", - "@storybook/core": "file:../../code/core", + "storybook": "file:../../../code/core", "@storybook/core-webpack": "file:../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../code/lib/csf-plugin", "@storybook/ember": "file:../../code/frameworks/ember", @@ -70,8 +70,7 @@ "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5", "@storybook/web-components": "file:../../code/renderers/web-components", "@storybook/web-components-vite": "file:../../code/frameworks/web-components-vite", - "@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5", - "storybook": "file:../../code/lib/cli" + "@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5" }, "devDependencies": { "@storybook/addon-docs": "*", From bf238988ac3e470be216be8d19bed38ad45d32da Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 2 Jan 2025 16:01:02 +0100 Subject: [PATCH 3/9] delete cli package --- code/addons/a11y/src/postinstall.ts | 4 +- .../essentials/src/backgrounds/preview.ts | 1 - .../essentials/src/highlight/preview.ts | 1 - code/addons/essentials/src/outline/preview.ts | 1 - .../addons/essentials/src/viewport/preview.ts | 1 - code/builders/builder-webpack5/src/index.ts | 5 +- code/core/package.json | 85 --- .../helpers/generatePackageJsonFile.ts | 42 +- code/core/src/cli/dirs.ts | 2 +- code/core/src/cli/helpers.ts | 2 +- .../core/src/core-server/utils/doTelemetry.ts | 4 +- .../utils/getStoryIndexGenerator.ts | 4 +- code/core/src/core-server/utils/metadata.ts | 4 +- .../src/core-server/utils/server-statics.ts | 4 +- .../core-server/utils/stories-json.test.ts | 8 +- .../src/core-server/utils/stories-json.ts | 4 +- .../modules/preview-web/Preview.tsx | 12 +- .../modules/store/csf/processCSFFile.ts | 2 +- .../preview-api/modules/store/sortStories.ts | 2 + .../nextjs/src/next-image-loader-stub.ts | 1 + code/frameworks/sveltekit/src/preset.ts | 1 - code/lib/cli/.eslintrc.cjs | 31 -- code/lib/cli/README.md | 49 -- .../@aw-web-design/x-default-browser.js | 2 - code/lib/cli/bin/index.cjs | 26 - code/lib/cli/core.cjs | 0 code/lib/cli/core.d.ts | 0 code/lib/cli/core.js | 1 - code/lib/cli/core/babel/index.cjs | 1 - code/lib/cli/core/babel/index.d.ts | 2 - code/lib/cli/core/babel/index.js | 1 - code/lib/cli/core/bin/index.cjs | 1 - code/lib/cli/core/bin/index.js | 1 - code/lib/cli/core/builder-manager/index.cjs | 1 - code/lib/cli/core/builder-manager/index.d.ts | 2 - code/lib/cli/core/builder-manager/index.js | 1 - code/lib/cli/core/channels/index.cjs | 1 - code/lib/cli/core/channels/index.d.ts | 2 - code/lib/cli/core/channels/index.js | 1 - code/lib/cli/core/cli/bin/index.cjs | 1 - code/lib/cli/core/cli/bin/index.d.ts | 2 - code/lib/cli/core/cli/bin/index.js | 1 - code/lib/cli/core/cli/index.cjs | 1 - code/lib/cli/core/cli/index.d.ts | 2 - code/lib/cli/core/cli/index.js | 1 - code/lib/cli/core/client-logger/index.cjs | 1 - code/lib/cli/core/client-logger/index.d.ts | 2 - code/lib/cli/core/client-logger/index.js | 1 - code/lib/cli/core/common/index.cjs | 1 - code/lib/cli/core/common/index.d.ts | 2 - code/lib/cli/core/common/index.js | 1 - code/lib/cli/core/components/index.cjs | 1 - code/lib/cli/core/components/index.d.ts | 2 - code/lib/cli/core/components/index.js | 1 - code/lib/cli/core/core-events/index.cjs | 1 - code/lib/cli/core/core-events/index.d.ts | 2 - code/lib/cli/core/core-events/index.js | 1 - code/lib/cli/core/core-server/index.cjs | 1 - code/lib/cli/core/core-server/index.d.ts | 2 - code/lib/cli/core/core-server/index.js | 1 - .../core-server/presets/common-manager.js | 1 - .../presets/common-override-preset.cjs | 1 - .../presets/common-override-preset.js | 1 - .../core-server/presets/common-preset.cjs | 1 - .../core/core-server/presets/common-preset.js | 1 - code/lib/cli/core/csf-tools/index.cjs | 1 - code/lib/cli/core/csf-tools/index.d.ts | 2 - code/lib/cli/core/csf-tools/index.js | 1 - code/lib/cli/core/docs-tools/index.cjs | 1 - code/lib/cli/core/docs-tools/index.d.ts | 2 - code/lib/cli/core/docs-tools/index.js | 1 - code/lib/cli/core/index.cjs | 1 - code/lib/cli/core/index.d.ts | 2 - code/lib/cli/core/index.js | 1 - code/lib/cli/core/manager-api/index.cjs | 1 - code/lib/cli/core/manager-api/index.d.ts | 2 - code/lib/cli/core/manager-api/index.js | 1 - code/lib/cli/core/manager-errors.d.ts | 2 - code/lib/cli/core/manager-errors.js | 1 - .../cli/core/manager/globals-module-info.cjs | 1 - .../cli/core/manager/globals-module-info.d.ts | 2 - .../cli/core/manager/globals-module-info.js | 1 - code/lib/cli/core/manager/globals-runtime.js | 1 - code/lib/cli/core/manager/globals.cjs | 1 - code/lib/cli/core/manager/globals.d.ts | 2 - code/lib/cli/core/manager/globals.js | 1 - code/lib/cli/core/node-logger/index.cjs | 1 - code/lib/cli/core/node-logger/index.d.ts | 2 - code/lib/cli/core/node-logger/index.js | 1 - code/lib/cli/core/preview-api/index.cjs | 1 - code/lib/cli/core/preview-api/index.d.ts | 2 - code/lib/cli/core/preview-api/index.js | 1 - code/lib/cli/core/preview-errors.cjs | 1 - code/lib/cli/core/preview-errors.d.ts | 2 - code/lib/cli/core/preview-errors.js | 1 - code/lib/cli/core/preview/globals.cjs | 1 - code/lib/cli/core/preview/globals.d.ts | 2 - code/lib/cli/core/preview/globals.js | 1 - code/lib/cli/core/preview/runtime.js | 1 - code/lib/cli/core/router/index.cjs | 1 - code/lib/cli/core/router/index.d.ts | 2 - code/lib/cli/core/router/index.js | 1 - code/lib/cli/core/server-errors.cjs | 1 - code/lib/cli/core/server-errors.d.ts | 2 - code/lib/cli/core/server-errors.js | 1 - code/lib/cli/core/telemetry/index.cjs | 1 - code/lib/cli/core/telemetry/index.d.ts | 2 - code/lib/cli/core/telemetry/index.js | 1 - code/lib/cli/core/theming/create.cjs | 1 - code/lib/cli/core/theming/create.d.ts | 2 - code/lib/cli/core/theming/create.js | 1 - code/lib/cli/core/theming/index.cjs | 1 - code/lib/cli/core/theming/index.d.ts | 2 - code/lib/cli/core/theming/index.js | 1 - code/lib/cli/core/types/index.cjs | 1 - code/lib/cli/core/types/index.d.ts | 2 - code/lib/cli/core/types/index.js | 1 - code/lib/cli/docs/getstorybook.png | Bin 113291 -> 0 bytes code/lib/cli/package.json | 498 ------------------ code/lib/cli/project.json | 8 - code/lib/cli/scripts/update-core-portal.ts | 87 --- code/lib/cli/scripts/utils.ts | 46 -- code/lib/cli/src/core-path.ts | 3 - code/lib/cli/src/index.ts | 5 - code/lib/cli/src/proxy.ts | 22 - code/lib/cli/tsconfig.json | 5 - code/lib/cli/vitest.config.ts | 10 - code/tsconfig.json | 4 +- 128 files changed, 54 insertions(+), 1049 deletions(-) delete mode 100644 code/lib/cli/.eslintrc.cjs delete mode 100644 code/lib/cli/README.md delete mode 100644 code/lib/cli/__mocks__/@aw-web-design/x-default-browser.js delete mode 100755 code/lib/cli/bin/index.cjs delete mode 100644 code/lib/cli/core.cjs delete mode 100644 code/lib/cli/core.d.ts delete mode 100644 code/lib/cli/core.js delete mode 100644 code/lib/cli/core/babel/index.cjs delete mode 100644 code/lib/cli/core/babel/index.d.ts delete mode 100644 code/lib/cli/core/babel/index.js delete mode 100644 code/lib/cli/core/bin/index.cjs delete mode 100644 code/lib/cli/core/bin/index.js delete mode 100644 code/lib/cli/core/builder-manager/index.cjs delete mode 100644 code/lib/cli/core/builder-manager/index.d.ts delete mode 100644 code/lib/cli/core/builder-manager/index.js delete mode 100644 code/lib/cli/core/channels/index.cjs delete mode 100644 code/lib/cli/core/channels/index.d.ts delete mode 100644 code/lib/cli/core/channels/index.js delete mode 100644 code/lib/cli/core/cli/bin/index.cjs delete mode 100644 code/lib/cli/core/cli/bin/index.d.ts delete mode 100644 code/lib/cli/core/cli/bin/index.js delete mode 100644 code/lib/cli/core/cli/index.cjs delete mode 100644 code/lib/cli/core/cli/index.d.ts delete mode 100644 code/lib/cli/core/cli/index.js delete mode 100644 code/lib/cli/core/client-logger/index.cjs delete mode 100644 code/lib/cli/core/client-logger/index.d.ts delete mode 100644 code/lib/cli/core/client-logger/index.js delete mode 100644 code/lib/cli/core/common/index.cjs delete mode 100644 code/lib/cli/core/common/index.d.ts delete mode 100644 code/lib/cli/core/common/index.js delete mode 100644 code/lib/cli/core/components/index.cjs delete mode 100644 code/lib/cli/core/components/index.d.ts delete mode 100644 code/lib/cli/core/components/index.js delete mode 100644 code/lib/cli/core/core-events/index.cjs delete mode 100644 code/lib/cli/core/core-events/index.d.ts delete mode 100644 code/lib/cli/core/core-events/index.js delete mode 100644 code/lib/cli/core/core-server/index.cjs delete mode 100644 code/lib/cli/core/core-server/index.d.ts delete mode 100644 code/lib/cli/core/core-server/index.js delete mode 100644 code/lib/cli/core/core-server/presets/common-manager.js delete mode 100644 code/lib/cli/core/core-server/presets/common-override-preset.cjs delete mode 100644 code/lib/cli/core/core-server/presets/common-override-preset.js delete mode 100644 code/lib/cli/core/core-server/presets/common-preset.cjs delete mode 100644 code/lib/cli/core/core-server/presets/common-preset.js delete mode 100644 code/lib/cli/core/csf-tools/index.cjs delete mode 100644 code/lib/cli/core/csf-tools/index.d.ts delete mode 100644 code/lib/cli/core/csf-tools/index.js delete mode 100644 code/lib/cli/core/docs-tools/index.cjs delete mode 100644 code/lib/cli/core/docs-tools/index.d.ts delete mode 100644 code/lib/cli/core/docs-tools/index.js delete mode 100644 code/lib/cli/core/index.cjs delete mode 100644 code/lib/cli/core/index.d.ts delete mode 100644 code/lib/cli/core/index.js delete mode 100644 code/lib/cli/core/manager-api/index.cjs delete mode 100644 code/lib/cli/core/manager-api/index.d.ts delete mode 100644 code/lib/cli/core/manager-api/index.js delete mode 100644 code/lib/cli/core/manager-errors.d.ts delete mode 100644 code/lib/cli/core/manager-errors.js delete mode 100644 code/lib/cli/core/manager/globals-module-info.cjs delete mode 100644 code/lib/cli/core/manager/globals-module-info.d.ts delete mode 100644 code/lib/cli/core/manager/globals-module-info.js delete mode 100644 code/lib/cli/core/manager/globals-runtime.js delete mode 100644 code/lib/cli/core/manager/globals.cjs delete mode 100644 code/lib/cli/core/manager/globals.d.ts delete mode 100644 code/lib/cli/core/manager/globals.js delete mode 100644 code/lib/cli/core/node-logger/index.cjs delete mode 100644 code/lib/cli/core/node-logger/index.d.ts delete mode 100644 code/lib/cli/core/node-logger/index.js delete mode 100644 code/lib/cli/core/preview-api/index.cjs delete mode 100644 code/lib/cli/core/preview-api/index.d.ts delete mode 100644 code/lib/cli/core/preview-api/index.js delete mode 100644 code/lib/cli/core/preview-errors.cjs delete mode 100644 code/lib/cli/core/preview-errors.d.ts delete mode 100644 code/lib/cli/core/preview-errors.js delete mode 100644 code/lib/cli/core/preview/globals.cjs delete mode 100644 code/lib/cli/core/preview/globals.d.ts delete mode 100644 code/lib/cli/core/preview/globals.js delete mode 100644 code/lib/cli/core/preview/runtime.js delete mode 100644 code/lib/cli/core/router/index.cjs delete mode 100644 code/lib/cli/core/router/index.d.ts delete mode 100644 code/lib/cli/core/router/index.js delete mode 100644 code/lib/cli/core/server-errors.cjs delete mode 100644 code/lib/cli/core/server-errors.d.ts delete mode 100644 code/lib/cli/core/server-errors.js delete mode 100644 code/lib/cli/core/telemetry/index.cjs delete mode 100644 code/lib/cli/core/telemetry/index.d.ts delete mode 100644 code/lib/cli/core/telemetry/index.js delete mode 100644 code/lib/cli/core/theming/create.cjs delete mode 100644 code/lib/cli/core/theming/create.d.ts delete mode 100644 code/lib/cli/core/theming/create.js delete mode 100644 code/lib/cli/core/theming/index.cjs delete mode 100644 code/lib/cli/core/theming/index.d.ts delete mode 100644 code/lib/cli/core/theming/index.js delete mode 100644 code/lib/cli/core/types/index.cjs delete mode 100644 code/lib/cli/core/types/index.d.ts delete mode 100644 code/lib/cli/core/types/index.js delete mode 100644 code/lib/cli/docs/getstorybook.png delete mode 100644 code/lib/cli/package.json delete mode 100644 code/lib/cli/project.json delete mode 100644 code/lib/cli/scripts/update-core-portal.ts delete mode 100644 code/lib/cli/scripts/utils.ts delete mode 100644 code/lib/cli/src/core-path.ts delete mode 100644 code/lib/cli/src/index.ts delete mode 100644 code/lib/cli/src/proxy.ts delete mode 100644 code/lib/cli/tsconfig.json delete mode 100644 code/lib/cli/vitest.config.ts diff --git a/code/addons/a11y/src/postinstall.ts b/code/addons/a11y/src/postinstall.ts index 9a64796f5e1b..eec54fd84cfc 100644 --- a/code/addons/a11y/src/postinstall.ts +++ b/code/addons/a11y/src/postinstall.ts @@ -1,8 +1,8 @@ -import type { PostinstallOptions } from '@storybook/cli/src/add'; - // eslint-disable-next-line depend/ban-dependencies import { execa } from 'execa'; +import type { PostinstallOptions } from '../../../lib/cli-storybook/src/add'; + const $ = execa({ preferLocal: true, stdio: 'inherit', diff --git a/code/addons/essentials/src/backgrounds/preview.ts b/code/addons/essentials/src/backgrounds/preview.ts index cf24112788f3..2d01bf61bb6a 100644 --- a/code/addons/essentials/src/backgrounds/preview.ts +++ b/code/addons/essentials/src/backgrounds/preview.ts @@ -1,2 +1 @@ -// @ts-expect-error (no types needed for this) export * from '@storybook/addon-backgrounds/preview'; diff --git a/code/addons/essentials/src/highlight/preview.ts b/code/addons/essentials/src/highlight/preview.ts index e124e7a1374a..c57b34aafd63 100644 --- a/code/addons/essentials/src/highlight/preview.ts +++ b/code/addons/essentials/src/highlight/preview.ts @@ -1,2 +1 @@ -// @ts-expect-error (no types needed for this) export * from '@storybook/addon-highlight/preview'; diff --git a/code/addons/essentials/src/outline/preview.ts b/code/addons/essentials/src/outline/preview.ts index 3fe09381fe8f..16cc2faa0397 100644 --- a/code/addons/essentials/src/outline/preview.ts +++ b/code/addons/essentials/src/outline/preview.ts @@ -1,2 +1 @@ -// @ts-expect-error (no types needed for this) export * from '@storybook/addon-outline/preview'; diff --git a/code/addons/essentials/src/viewport/preview.ts b/code/addons/essentials/src/viewport/preview.ts index 34ee7de45614..b039b3bfa870 100644 --- a/code/addons/essentials/src/viewport/preview.ts +++ b/code/addons/essentials/src/viewport/preview.ts @@ -1,2 +1 @@ -// @ts-expect-error (no types needed for this) export * from '@storybook/addon-viewport/preview'; diff --git a/code/builders/builder-webpack5/src/index.ts b/code/builders/builder-webpack5/src/index.ts index 71be9982973a..9919037e5abc 100644 --- a/code/builders/builder-webpack5/src/index.ts +++ b/code/builders/builder-webpack5/src/index.ts @@ -1,5 +1,5 @@ import { cp } from 'node:fs/promises'; -import { join, parse } from 'node:path'; +import { dirname, join, parse } from 'node:path'; import { PREVIEW_BUILDER_PROGRESS } from 'storybook/internal/core-events'; import { logger } from 'storybook/internal/node-logger'; @@ -14,7 +14,6 @@ import { checkWebpackVersion } from '@storybook/core-webpack'; import prettyTime from 'pretty-hrtime'; import sirv from 'sirv'; -import { corePath } from 'storybook/core-path'; import type { Configuration, Stats, StatsOptions } from 'webpack'; import webpackDep, { DefinePlugin, ProgressPlugin } from 'webpack'; import webpackDevMiddleware from 'webpack-dev-middleware'; @@ -31,6 +30,8 @@ export const printDuration = (startTime: [number, number]) => .replace(' s', ' seconds') .replace(' m', ' minutes'); +const corePath = dirname(require.resolve('storybook/package.json')); + let compilation: ReturnType | undefined; let reject: (reason?: any) => void; diff --git a/code/core/package.json b/code/core/package.json index a53babfe9dca..75f3239503dc 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -182,91 +182,6 @@ "main": "dist/index.cjs", "module": "dist/index.js", "types": "dist/index.d.ts", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ], - "internal/node-logger": [ - "./dist/node-logger/index.d.ts" - ], - "internal/client-logger": [ - "./dist/client-logger/index.d.ts" - ], - "internal/theming": [ - "./dist/theming/index.d.ts" - ], - "internal/theming/create": [ - "./dist/theming/create.d.ts" - ], - "internal/core-server": [ - "./dist/core-server/index.d.ts" - ], - "internal/core-events": [ - "./dist/core-events/index.d.ts" - ], - "internal/manager-errors": [ - "./dist/manager-errors.d.ts" - ], - "internal/preview-errors": [ - "./dist/preview-errors.d.ts" - ], - "internal/server-errors": [ - "./dist/server-errors.d.ts" - ], - "internal/channels": [ - "./dist/channels/index.d.ts" - ], - "internal/types": [ - "./dist/types/index.d.ts" - ], - "internal/csf-tools": [ - "./dist/csf-tools/index.d.ts" - ], - "internal/common": [ - "./dist/common/index.d.ts" - ], - "internal/builder-manager": [ - "./dist/builder-manager/index.d.ts" - ], - "internal/telemetry": [ - "./dist/telemetry/index.d.ts" - ], - "internal/preview-api": [ - "./dist/preview-api/index.d.ts" - ], - "internal/manager-api": [ - "./dist/manager-api/index.d.ts" - ], - "internal/router": [ - "./dist/router/index.d.ts" - ], - "internal/components": [ - "./dist/components/index.d.ts" - ], - "internal/docs-tools": [ - "./dist/docs-tools/index.d.ts" - ], - "internal/manager/globals-module-info": [ - "./dist/manager/globals-module-info.d.ts" - ], - "internal/manager/globals": [ - "./dist/manager/globals.d.ts" - ], - "internal/preview/globals": [ - "./dist/preview/globals.d.ts" - ], - "internal/cli": [ - "./dist/cli/index.d.ts" - ], - "internal/babel": [ - "./dist/babel/index.d.ts" - ], - "internal/cli/bin": [ - "./dist/cli/bin/index.d.ts" - ] - } - }, "bin": "./bin/index.cjs", "files": [ "dist/**/*", diff --git a/code/core/scripts/helpers/generatePackageJsonFile.ts b/code/core/scripts/helpers/generatePackageJsonFile.ts index 020724b8113e..27a4d93e96b5 100644 --- a/code/core/scripts/helpers/generatePackageJsonFile.ts +++ b/code/core/scripts/helpers/generatePackageJsonFile.ts @@ -54,30 +54,30 @@ export async function generatePackageJsonFile(entries: ReturnType>((acc, entry) => { - if (!entry.dts) { - return acc; - } + // pkgJson.typesVersions = { + // '*': { + // '*': ['./dist/index.d.ts'], + // ...entries.reduce>((acc, entry) => { + // if (!entry.dts) { + // return acc; + // } - let main = slash(relative(cwd, entry.file).replace('src', 'dist')); - if (main === './dist/index.ts' || main === './dist/index.tsx') { - main = '.'; - } - const key = main.replace(/\/index\.tsx?/, '').replace(/\.tsx?/, ''); + // let main = slash(relative(cwd, entry.file).replace('src', 'dist')); + // if (main === './dist/index.ts' || main === './dist/index.tsx') { + // main = '.'; + // } + // const key = main.replace(/\/index\.tsx?/, '').replace(/\.tsx?/, ''); - if (key === 'dist') { - return acc; - } + // if (key === 'dist') { + // return acc; + // } - const content = ['./' + main.replace(/\.tsx?/, '.d.ts')]; - acc[key.replace('dist/', 'internal/')] = content; - return acc; - }, {}), - }, - }; + // const content = ['./' + main.replace(/\.tsx?/, '.d.ts')]; + // acc[key.replace('dist/', 'internal/')] = content; + // return acc; + // }, {}), + // }, + // }; await writeFile(location, `${sortPackageJson(JSON.stringify(pkgJson, null, 2))}\n`, {}); } diff --git a/code/core/src/cli/dirs.ts b/code/core/src/cli/dirs.ts index 2feded6216c5..a75c1f90d9fd 100644 --- a/code/core/src/cli/dirs.ts +++ b/code/core/src/cli/dirs.ts @@ -2,7 +2,7 @@ import { dirname, join } from 'node:path'; import { temporaryDirectory, versions } from 'storybook/internal/common'; import type { JsPackageManager } from 'storybook/internal/common'; -import type { SupportedFrameworks } from 'storybook/internal/es'; +import type { SupportedFrameworks } from 'storybook/internal/types'; import downloadTarballDefault from '@ndelangen/get-tarball'; import getNpmTarballUrlDefault from 'get-npm-tarball-url'; diff --git a/code/core/src/cli/helpers.ts b/code/core/src/cli/helpers.ts index 74e7a98b9a7a..c7f08b181337 100644 --- a/code/core/src/cli/helpers.ts +++ b/code/core/src/cli/helpers.ts @@ -9,7 +9,7 @@ import { type PackageJsonWithDepsAndDevDeps, } from 'storybook/internal/common'; import { versions as storybookMonorepoPackages } from 'storybook/internal/common'; -import type { SupportedFrameworks, SupportedRenderers } from 'storybook/internal/es'; +import type { SupportedFrameworks, SupportedRenderers } from 'storybook/internal/types'; import { findUpSync } from 'find-up'; import picocolors from 'picocolors'; diff --git a/code/core/src/core-server/utils/doTelemetry.ts b/code/core/src/core-server/utils/doTelemetry.ts index 1d2ef54d3076..607ed645c358 100644 --- a/code/core/src/core-server/utils/doTelemetry.ts +++ b/code/core/src/core-server/utils/doTelemetry.ts @@ -1,7 +1,7 @@ import { getPrecedingUpgrade, telemetry } from 'storybook/internal/telemetry'; import type { CoreConfig, Options } from 'storybook/internal/types'; -import type Polka from 'polka'; +import type { Polka } from 'polka'; import invariant from 'tiny-invariant'; import { sendTelemetryError } from '../withTelemetry'; @@ -11,7 +11,7 @@ import { summarizeIndex } from './summarizeIndex'; import { versionStatus } from './versionStatus'; export async function doTelemetry( - app: Polka.Polka, + app: Polka, core: CoreConfig, initializedStoryIndexGenerator: Promise, options: Options diff --git a/code/core/src/core-server/utils/getStoryIndexGenerator.ts b/code/core/src/core-server/utils/getStoryIndexGenerator.ts index 0559055808e2..9b8dcfbb49f7 100644 --- a/code/core/src/core-server/utils/getStoryIndexGenerator.ts +++ b/code/core/src/core-server/utils/getStoryIndexGenerator.ts @@ -1,14 +1,14 @@ import { normalizeStories } from 'storybook/internal/common'; import type { DocsOptions, Options } from 'storybook/internal/types'; -import type Polka from 'polka'; +import type { Polka } from 'polka'; import { StoryIndexGenerator } from './StoryIndexGenerator'; import type { ServerChannel } from './get-server-channel'; import { useStoriesJson } from './stories-json'; export async function getStoryIndexGenerator( - app: Polka.Polka, + app: Polka, options: Options, serverChannel: ServerChannel ): Promise { diff --git a/code/core/src/core-server/utils/metadata.ts b/code/core/src/core-server/utils/metadata.ts index a0c53c3ccd0d..c050020220fa 100644 --- a/code/core/src/core-server/utils/metadata.ts +++ b/code/core/src/core-server/utils/metadata.ts @@ -2,7 +2,7 @@ import { writeFile } from 'node:fs/promises'; import { getStorybookMetadata } from 'storybook/internal/telemetry'; -import type Polka from 'polka'; +import type { Polka } from 'polka'; export async function extractStorybookMetadata(outputFile: string, configDir: string) { const storybookMetadata = await getStorybookMetadata(configDir); @@ -10,7 +10,7 @@ export async function extractStorybookMetadata(outputFile: string, configDir: st await writeFile(outputFile, JSON.stringify(storybookMetadata)); } -export function useStorybookMetadata(app: Polka.Polka, configDir?: string) { +export function useStorybookMetadata(app: Polka, configDir?: string) { app.use('/project.json', async (req, res) => { const storybookMetadata = await getStorybookMetadata(configDir); res.setHeader('Content-Type', 'application/json'); diff --git a/code/core/src/core-server/utils/server-statics.ts b/code/core/src/core-server/utils/server-statics.ts index 85455ebf5371..f665a1f160d9 100644 --- a/code/core/src/core-server/utils/server-statics.ts +++ b/code/core/src/core-server/utils/server-statics.ts @@ -6,11 +6,11 @@ import { logger } from 'storybook/internal/node-logger'; import type { Options, StorybookConfigRaw } from 'storybook/internal/types'; import picocolors from 'picocolors'; -import type Polka from 'polka'; +import type { Polka } from 'polka'; import sirv from 'sirv'; import { dedent } from 'ts-dedent'; -export async function useStatics(app: Polka.Polka, options: Options): Promise { +export async function useStatics(app: Polka, options: Options): Promise { const staticDirs = (await options.presets.apply('staticDirs')) ?? []; const faviconPath = await options.presets.apply('favicon'); diff --git a/code/core/src/core-server/utils/stories-json.test.ts b/code/core/src/core-server/utils/stories-json.test.ts index 360b218d9943..f6265f922238 100644 --- a/code/core/src/core-server/utils/stories-json.test.ts +++ b/code/core/src/core-server/utils/stories-json.test.ts @@ -6,7 +6,7 @@ import { normalizeStoriesEntry } from 'storybook/internal/common'; import { STORY_INDEX_INVALIDATED } from 'storybook/internal/core-events'; import { debounce } from 'es-toolkit/compat'; -import type Polka from 'polka'; +import type { Polka, Request, Response } from 'polka'; import Watchpack from 'watchpack'; import { csfIndexer } from '../presets/common-preset'; @@ -57,10 +57,10 @@ const getInitializedStoryIndexGenerator = async ( describe('useStoriesJson', () => { const use = vi.fn(); - const app: Polka.Polka = { use } as any; + const app: Polka = { use } as any; const end = vi.fn(); const write = vi.fn(); - const response: Polka.Response = { + const response: Response = { header: vi.fn(), send: vi.fn(), status: vi.fn(), @@ -80,7 +80,7 @@ describe('useStoriesJson', () => { Watchpack.mockClear(); }); - const request: Polka.Request = { + const request: Request = { headers: { accept: 'application/json' }, } as any; diff --git a/code/core/src/core-server/utils/stories-json.ts b/code/core/src/core-server/utils/stories-json.ts index f94a0c542ff2..029e935f77f7 100644 --- a/code/core/src/core-server/utils/stories-json.ts +++ b/code/core/src/core-server/utils/stories-json.ts @@ -5,7 +5,7 @@ import { STORY_INDEX_INVALIDATED } from 'storybook/internal/core-events'; import type { NormalizedStoriesSpecifier, StoryIndex } from 'storybook/internal/types'; import { debounce } from 'es-toolkit/compat'; -import type Polka from 'polka'; +import type { Polka } from 'polka'; import type { StoryIndexGenerator } from './StoryIndexGenerator'; import type { ServerChannel } from './get-server-channel'; @@ -32,7 +32,7 @@ export function useStoriesJson({ serverChannel, normalizedStories, }: { - app: Polka.Polka; + app: Polka; initializedStoryIndexGenerator: Promise; serverChannel: ServerChannel; workingDir?: string; diff --git a/code/core/src/preview-api/modules/preview-web/Preview.tsx b/code/core/src/preview-api/modules/preview-web/Preview.tsx index 15cd1741c1cc..5500c6c863f9 100644 --- a/code/core/src/preview-api/modules/preview-web/Preview.tsx +++ b/code/core/src/preview-api/modules/preview-web/Preview.tsx @@ -14,6 +14,12 @@ import { UPDATE_GLOBALS, UPDATE_STORY_ARGS, } from 'storybook/internal/core-events'; +import type { + ArgTypesRequestPayload, + ArgTypesResponsePayload, + RequestData, + ResponseData, +} from 'storybook/internal/core-events'; import { CalledPreviewMethodBeforeInitializationError, MissingRenderToCanvasError, @@ -35,12 +41,6 @@ import type { StoryIndex, StoryRenderOptions, } from 'storybook/internal/types'; -import type { - ArgTypesRequestPayload, - ArgTypesResponsePayload, - RequestData, - ResponseData, -} from 'storybook/internal/types'; import type { CleanupCallback } from '@storybook/csf'; import { global } from '@storybook/global'; diff --git a/code/core/src/preview-api/modules/store/csf/processCSFFile.ts b/code/core/src/preview-api/modules/store/csf/processCSFFile.ts index 8e0ccc52dd33..01d2b75f2e5c 100644 --- a/code/core/src/preview-api/modules/store/csf/processCSFFile.ts +++ b/code/core/src/preview-api/modules/store/csf/processCSFFile.ts @@ -3,7 +3,7 @@ import type { CSFFile, ModuleExports, NormalizedComponentAnnotations, -} from 'storybook/internal/csf-tools'; +} from 'storybook/internal/types'; import type { ComponentTitle, Parameters, Path, Renderer } from 'storybook/internal/types'; import { isExportStory } from '@storybook/csf'; diff --git a/code/core/src/preview-api/modules/store/sortStories.ts b/code/core/src/preview-api/modules/store/sortStories.ts index a88b23b01ca1..3d4f41e9c4be 100644 --- a/code/core/src/preview-api/modules/store/sortStories.ts +++ b/code/core/src/preview-api/modules/store/sortStories.ts @@ -2,7 +2,9 @@ import type { Addon_Comparator, Addon_StorySortParameter, Addon_StorySortParameterV7, + IndexEntry, IndexEntryLegacy, + StoryIndexEntry, } from 'storybook/internal/types'; import type { Parameters, Path, Renderer } from 'storybook/internal/types'; import type { PreparedStory } from 'storybook/internal/types'; diff --git a/code/frameworks/nextjs/src/next-image-loader-stub.ts b/code/frameworks/nextjs/src/next-image-loader-stub.ts index e85414c85d15..5c9a978d0ef7 100644 --- a/code/frameworks/nextjs/src/next-image-loader-stub.ts +++ b/code/frameworks/nextjs/src/next-image-loader-stub.ts @@ -72,4 +72,5 @@ const nextImageLoaderStub: RawLoaderDefinition = async function N nextImageLoaderStub.raw = true; +// @ts-expect-error (TODO) export = nextImageLoaderStub; diff --git a/code/frameworks/sveltekit/src/preset.ts b/code/frameworks/sveltekit/src/preset.ts index 263a6b35429d..079a6422ff2e 100644 --- a/code/frameworks/sveltekit/src/preset.ts +++ b/code/frameworks/sveltekit/src/preset.ts @@ -3,7 +3,6 @@ import { dirname, join } from 'node:path'; import type { PresetProperty } from 'storybook/internal/types'; import { withoutVitePlugins } from '@storybook/builder-vite'; -// @ts-expect-error -- TS picks up the type from preset.js instead of dist/preset.d.ts import { viteFinal as svelteViteFinal } from '@storybook/svelte-vite/preset'; import { configOverrides } from './plugins/config-overrides'; diff --git a/code/lib/cli/.eslintrc.cjs b/code/lib/cli/.eslintrc.cjs deleted file mode 100644 index 687842d5aaee..000000000000 --- a/code/lib/cli/.eslintrc.cjs +++ /dev/null @@ -1,31 +0,0 @@ - -module.exports = { - overrides: [ - { - files: 'templates/**/*', - env: { - browser: true, - }, - rules: { - 'react/no-this-in-sfc': "off", - 'react/react-in-jsx-scope': "off", - 'global-require': "off", - 'no-redeclare': "off", - 'react/prop-types': "off", - }, - }, - { - files: 'rendererAssets/**/*', - env: { - browser: true, - }, - rules: { - 'jsx-a11y/anchor-is-valid': "off", - 'react/prop-types': "off", - 'react/react-in-jsx-scope': "off", - 'import/extensions': "off", - 'import/named': "off", - }, - }, - ], -}; diff --git a/code/lib/cli/README.md b/code/lib/cli/README.md deleted file mode 100644 index ac92f2c8e096..000000000000 --- a/code/lib/cli/README.md +++ /dev/null @@ -1,49 +0,0 @@ -# Storybook - -## CLI - -Storybook CLI (_Command Line Interface_) is the easiest way to add [Storybook](https://github.com/storybookjs/storybook) to your project. - -![Screenshot](docs/getstorybook.png) - -Go to your project and run: - -```sh -cd my-app -npx sb@latest init -``` - -In addition to `init`, the CLI also has other commands: - -- `add` - add an addon and register it -- `info` - print out system information for bug reports -- `upgrade` - upgrade to the latest version of Storybook (or a specific version) -- `migrate` - run codemods to migrate your code - -See the command-line help with `-h` (including other useful commands) for details. - -## Core APIs - -This package has multiple sub-exports to can be used to gain access to storybook's APIs. - -### `storybook/components` - -This export contains a list of components very useful for building out addons. -We recommend addon-authors to use these components to ensure a consistent look and feel, and to reduce the amount of code they need to write. - -### `storybook/theming` - -This export exposes a few utility functions to help writing components that automatically adapt to the current theme. -Useful for addon authors who want to make their addons theme-aware. - -### `storybook/preview-api` - -This export contains the API that is available in the preview iframe. - -### `storybook/manager-api` - -This export contains the API that is available in the manager iframe. - -### `storybook/types` - -This export exposes a lot of TypeScript interfaces used throughout storybook, including for storybook configuration, addons etc. diff --git a/code/lib/cli/__mocks__/@aw-web-design/x-default-browser.js b/code/lib/cli/__mocks__/@aw-web-design/x-default-browser.js deleted file mode 100644 index ecd2ed7a2262..000000000000 --- a/code/lib/cli/__mocks__/@aw-web-design/x-default-browser.js +++ /dev/null @@ -1,2 +0,0 @@ -// TODO: Once we upgrade to Jest 28/29 we can probably remove this entire mock. -module.exports = {}; diff --git a/code/lib/cli/bin/index.cjs b/code/lib/cli/bin/index.cjs deleted file mode 100755 index 0aecdd1e9b9b..000000000000 --- a/code/lib/cli/bin/index.cjs +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env node - -const majorNodeVersion = parseInt(process.versions.node, 10); -if (majorNodeVersion < 18) { - console.error('To run Storybook you need to have Node.js 18 or higher'); - process.exit(1); -} - -// The Storybook CLI has a catch block for all of its commands, but if an error -// occurs before the command even runs, for instance, if an import fails, then -// such error will fall under the uncaughtException handler. -// This is the earliest moment we can catch such errors. -process.once('uncaughtException', (error) => { - if (error.message.includes('string-width')) { - console.error( - [ - '🔴 Error: It looks like you are having a known issue with package hoisting.', - 'Please check the following issue for details and solutions: https://github.com/storybookjs/storybook/issues/22431#issuecomment-1630086092\n\n', - ].join('\n') - ); - } - - throw error; -}); - -require('../dist/proxy.cjs'); diff --git a/code/lib/cli/core.cjs b/code/lib/cli/core.cjs deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/code/lib/cli/core.d.ts b/code/lib/cli/core.d.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/code/lib/cli/core.js b/code/lib/cli/core.js deleted file mode 100644 index cb0ff5c3b541..000000000000 --- a/code/lib/cli/core.js +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/code/lib/cli/core/babel/index.cjs b/code/lib/cli/core/babel/index.cjs deleted file mode 100644 index 7d4f1b2a4f93..000000000000 --- a/code/lib/cli/core/babel/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/babel'); diff --git a/code/lib/cli/core/babel/index.d.ts b/code/lib/cli/core/babel/index.d.ts deleted file mode 100644 index d0c4099635d5..000000000000 --- a/code/lib/cli/core/babel/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/babel'; -export type * from 'storybook/internal/babel'; diff --git a/code/lib/cli/core/babel/index.js b/code/lib/cli/core/babel/index.js deleted file mode 100644 index fd0581c786ed..000000000000 --- a/code/lib/cli/core/babel/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/babel'; diff --git a/code/lib/cli/core/bin/index.cjs b/code/lib/cli/core/bin/index.cjs deleted file mode 100644 index cbde91daf277..000000000000 --- a/code/lib/cli/core/bin/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/bin'); diff --git a/code/lib/cli/core/bin/index.js b/code/lib/cli/core/bin/index.js deleted file mode 100644 index cf57cd4ff43f..000000000000 --- a/code/lib/cli/core/bin/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/bin'; diff --git a/code/lib/cli/core/builder-manager/index.cjs b/code/lib/cli/core/builder-manager/index.cjs deleted file mode 100644 index 816cb718e504..000000000000 --- a/code/lib/cli/core/builder-manager/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/builder-manager'); diff --git a/code/lib/cli/core/builder-manager/index.d.ts b/code/lib/cli/core/builder-manager/index.d.ts deleted file mode 100644 index 3b1b1e34d5fa..000000000000 --- a/code/lib/cli/core/builder-manager/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/builder-manager'; -export type * from 'storybook/internal/builder-manager'; diff --git a/code/lib/cli/core/builder-manager/index.js b/code/lib/cli/core/builder-manager/index.js deleted file mode 100644 index 87947f749d4c..000000000000 --- a/code/lib/cli/core/builder-manager/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/builder-manager'; diff --git a/code/lib/cli/core/channels/index.cjs b/code/lib/cli/core/channels/index.cjs deleted file mode 100644 index 3fc5e066f43d..000000000000 --- a/code/lib/cli/core/channels/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/channels'); diff --git a/code/lib/cli/core/channels/index.d.ts b/code/lib/cli/core/channels/index.d.ts deleted file mode 100644 index e1eda45f4fac..000000000000 --- a/code/lib/cli/core/channels/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/channels'; -export type * from 'storybook/internal/channels'; diff --git a/code/lib/cli/core/channels/index.js b/code/lib/cli/core/channels/index.js deleted file mode 100644 index 9f71f6af877a..000000000000 --- a/code/lib/cli/core/channels/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/channels'; diff --git a/code/lib/cli/core/cli/bin/index.cjs b/code/lib/cli/core/cli/bin/index.cjs deleted file mode 100644 index eb9259800415..000000000000 --- a/code/lib/cli/core/cli/bin/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/cli/bin'); diff --git a/code/lib/cli/core/cli/bin/index.d.ts b/code/lib/cli/core/cli/bin/index.d.ts deleted file mode 100644 index f92e0db0f6ae..000000000000 --- a/code/lib/cli/core/cli/bin/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/cli/bin'; -export type * from 'storybook/internal/cli/bin'; diff --git a/code/lib/cli/core/cli/bin/index.js b/code/lib/cli/core/cli/bin/index.js deleted file mode 100644 index 2ff832b3cf4a..000000000000 --- a/code/lib/cli/core/cli/bin/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/cli/bin'; diff --git a/code/lib/cli/core/cli/index.cjs b/code/lib/cli/core/cli/index.cjs deleted file mode 100644 index 05e4262a5e68..000000000000 --- a/code/lib/cli/core/cli/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/cli'); diff --git a/code/lib/cli/core/cli/index.d.ts b/code/lib/cli/core/cli/index.d.ts deleted file mode 100644 index 83fe2bcc33f0..000000000000 --- a/code/lib/cli/core/cli/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/cli'; -export type * from 'storybook/internal/cli'; diff --git a/code/lib/cli/core/cli/index.js b/code/lib/cli/core/cli/index.js deleted file mode 100644 index e76461a9507c..000000000000 --- a/code/lib/cli/core/cli/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/cli'; diff --git a/code/lib/cli/core/client-logger/index.cjs b/code/lib/cli/core/client-logger/index.cjs deleted file mode 100644 index c3bec8e1d4f7..000000000000 --- a/code/lib/cli/core/client-logger/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/client-logger'); diff --git a/code/lib/cli/core/client-logger/index.d.ts b/code/lib/cli/core/client-logger/index.d.ts deleted file mode 100644 index eed6d17c08f9..000000000000 --- a/code/lib/cli/core/client-logger/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/client-logger'; -export type * from 'storybook/internal/client-logger'; diff --git a/code/lib/cli/core/client-logger/index.js b/code/lib/cli/core/client-logger/index.js deleted file mode 100644 index bad256478de1..000000000000 --- a/code/lib/cli/core/client-logger/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/client-logger'; diff --git a/code/lib/cli/core/common/index.cjs b/code/lib/cli/core/common/index.cjs deleted file mode 100644 index ded314ab42d2..000000000000 --- a/code/lib/cli/core/common/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/common'); diff --git a/code/lib/cli/core/common/index.d.ts b/code/lib/cli/core/common/index.d.ts deleted file mode 100644 index 4b5fe2012690..000000000000 --- a/code/lib/cli/core/common/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/common'; -export type * from 'storybook/internal/common'; diff --git a/code/lib/cli/core/common/index.js b/code/lib/cli/core/common/index.js deleted file mode 100644 index f3fd8e3bbc47..000000000000 --- a/code/lib/cli/core/common/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/common'; diff --git a/code/lib/cli/core/components/index.cjs b/code/lib/cli/core/components/index.cjs deleted file mode 100644 index 5c194a871e32..000000000000 --- a/code/lib/cli/core/components/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/components'); diff --git a/code/lib/cli/core/components/index.d.ts b/code/lib/cli/core/components/index.d.ts deleted file mode 100644 index c9a7cbbc07b7..000000000000 --- a/code/lib/cli/core/components/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/components'; -export type * from 'storybook/internal/components'; diff --git a/code/lib/cli/core/components/index.js b/code/lib/cli/core/components/index.js deleted file mode 100644 index 466c6c1f3fe2..000000000000 --- a/code/lib/cli/core/components/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/components'; diff --git a/code/lib/cli/core/core-events/index.cjs b/code/lib/cli/core/core-events/index.cjs deleted file mode 100644 index 217389a630ed..000000000000 --- a/code/lib/cli/core/core-events/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/core-events'); diff --git a/code/lib/cli/core/core-events/index.d.ts b/code/lib/cli/core/core-events/index.d.ts deleted file mode 100644 index 7faa3971ce7f..000000000000 --- a/code/lib/cli/core/core-events/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/core-events'; -export type * from 'storybook/internal/core-events'; diff --git a/code/lib/cli/core/core-events/index.js b/code/lib/cli/core/core-events/index.js deleted file mode 100644 index 0007b1e316da..000000000000 --- a/code/lib/cli/core/core-events/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/core-events'; diff --git a/code/lib/cli/core/core-server/index.cjs b/code/lib/cli/core/core-server/index.cjs deleted file mode 100644 index 3529da2cb172..000000000000 --- a/code/lib/cli/core/core-server/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/core-server'); diff --git a/code/lib/cli/core/core-server/index.d.ts b/code/lib/cli/core/core-server/index.d.ts deleted file mode 100644 index 6df9793536fc..000000000000 --- a/code/lib/cli/core/core-server/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/core-server'; -export type * from 'storybook/internal/core-server'; diff --git a/code/lib/cli/core/core-server/index.js b/code/lib/cli/core/core-server/index.js deleted file mode 100644 index b0f995d4decc..000000000000 --- a/code/lib/cli/core/core-server/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/core-server'; diff --git a/code/lib/cli/core/core-server/presets/common-manager.js b/code/lib/cli/core/core-server/presets/common-manager.js deleted file mode 100644 index 6187eb353297..000000000000 --- a/code/lib/cli/core/core-server/presets/common-manager.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/core-server/presets/common-manager'; diff --git a/code/lib/cli/core/core-server/presets/common-override-preset.cjs b/code/lib/cli/core/core-server/presets/common-override-preset.cjs deleted file mode 100644 index 2b1df370b898..000000000000 --- a/code/lib/cli/core/core-server/presets/common-override-preset.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/core-server/presets/common-override-preset'); diff --git a/code/lib/cli/core/core-server/presets/common-override-preset.js b/code/lib/cli/core/core-server/presets/common-override-preset.js deleted file mode 100644 index ef3f3499c497..000000000000 --- a/code/lib/cli/core/core-server/presets/common-override-preset.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/core-server/presets/common-override-preset'; diff --git a/code/lib/cli/core/core-server/presets/common-preset.cjs b/code/lib/cli/core/core-server/presets/common-preset.cjs deleted file mode 100644 index a715ffb37b4d..000000000000 --- a/code/lib/cli/core/core-server/presets/common-preset.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/core-server/presets/common-preset'); diff --git a/code/lib/cli/core/core-server/presets/common-preset.js b/code/lib/cli/core/core-server/presets/common-preset.js deleted file mode 100644 index 3104bea68f8e..000000000000 --- a/code/lib/cli/core/core-server/presets/common-preset.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/core-server/presets/common-preset'; diff --git a/code/lib/cli/core/csf-tools/index.cjs b/code/lib/cli/core/csf-tools/index.cjs deleted file mode 100644 index ff730963c65e..000000000000 --- a/code/lib/cli/core/csf-tools/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/csf-tools'); diff --git a/code/lib/cli/core/csf-tools/index.d.ts b/code/lib/cli/core/csf-tools/index.d.ts deleted file mode 100644 index d221de8eb2ed..000000000000 --- a/code/lib/cli/core/csf-tools/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/csf-tools'; -export type * from 'storybook/internal/csf-tools'; diff --git a/code/lib/cli/core/csf-tools/index.js b/code/lib/cli/core/csf-tools/index.js deleted file mode 100644 index 74c0c0100712..000000000000 --- a/code/lib/cli/core/csf-tools/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/csf-tools'; diff --git a/code/lib/cli/core/docs-tools/index.cjs b/code/lib/cli/core/docs-tools/index.cjs deleted file mode 100644 index 0049a0ebd871..000000000000 --- a/code/lib/cli/core/docs-tools/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/docs-tools'); diff --git a/code/lib/cli/core/docs-tools/index.d.ts b/code/lib/cli/core/docs-tools/index.d.ts deleted file mode 100644 index 0774f84ad6f1..000000000000 --- a/code/lib/cli/core/docs-tools/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/docs-tools'; -export type * from 'storybook/internal/docs-tools'; diff --git a/code/lib/cli/core/docs-tools/index.js b/code/lib/cli/core/docs-tools/index.js deleted file mode 100644 index a6a642d3273f..000000000000 --- a/code/lib/cli/core/docs-tools/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/docs-tools'; diff --git a/code/lib/cli/core/index.cjs b/code/lib/cli/core/index.cjs deleted file mode 100644 index 0155f9981d9a..000000000000 --- a/code/lib/cli/core/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/index'); diff --git a/code/lib/cli/core/index.d.ts b/code/lib/cli/core/index.d.ts deleted file mode 100644 index 858a2eee1874..000000000000 --- a/code/lib/cli/core/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/index'; -export type * from 'storybook/internal/index'; diff --git a/code/lib/cli/core/index.js b/code/lib/cli/core/index.js deleted file mode 100644 index a4c6ac621051..000000000000 --- a/code/lib/cli/core/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/index'; diff --git a/code/lib/cli/core/manager-api/index.cjs b/code/lib/cli/core/manager-api/index.cjs deleted file mode 100644 index 8c8b0f89bd06..000000000000 --- a/code/lib/cli/core/manager-api/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/manager-api'); diff --git a/code/lib/cli/core/manager-api/index.d.ts b/code/lib/cli/core/manager-api/index.d.ts deleted file mode 100644 index 7d7ee81f43cd..000000000000 --- a/code/lib/cli/core/manager-api/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/manager-api'; -export type * from 'storybook/internal/manager-api'; diff --git a/code/lib/cli/core/manager-api/index.js b/code/lib/cli/core/manager-api/index.js deleted file mode 100644 index 7c8cfaaae3a2..000000000000 --- a/code/lib/cli/core/manager-api/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/manager-api'; diff --git a/code/lib/cli/core/manager-errors.d.ts b/code/lib/cli/core/manager-errors.d.ts deleted file mode 100644 index ba538d31b00e..000000000000 --- a/code/lib/cli/core/manager-errors.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/manager-errors'; -export type * from 'storybook/internal/manager-errors'; diff --git a/code/lib/cli/core/manager-errors.js b/code/lib/cli/core/manager-errors.js deleted file mode 100644 index 2d64af64fbb0..000000000000 --- a/code/lib/cli/core/manager-errors.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/manager-errors'; diff --git a/code/lib/cli/core/manager/globals-module-info.cjs b/code/lib/cli/core/manager/globals-module-info.cjs deleted file mode 100644 index 3e56aa647ca3..000000000000 --- a/code/lib/cli/core/manager/globals-module-info.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/manager/globals-module-info'); diff --git a/code/lib/cli/core/manager/globals-module-info.d.ts b/code/lib/cli/core/manager/globals-module-info.d.ts deleted file mode 100644 index e3d0a6d0c1fa..000000000000 --- a/code/lib/cli/core/manager/globals-module-info.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/manager/globals-module-info'; -export type * from 'storybook/internal/manager/globals-module-info'; diff --git a/code/lib/cli/core/manager/globals-module-info.js b/code/lib/cli/core/manager/globals-module-info.js deleted file mode 100644 index ae3e18adb9f1..000000000000 --- a/code/lib/cli/core/manager/globals-module-info.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/manager/globals-module-info'; diff --git a/code/lib/cli/core/manager/globals-runtime.js b/code/lib/cli/core/manager/globals-runtime.js deleted file mode 100644 index 32ec83242a96..000000000000 --- a/code/lib/cli/core/manager/globals-runtime.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/manager/globals-runtime'; diff --git a/code/lib/cli/core/manager/globals.cjs b/code/lib/cli/core/manager/globals.cjs deleted file mode 100644 index d6ee8ec2d144..000000000000 --- a/code/lib/cli/core/manager/globals.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/manager/globals'); diff --git a/code/lib/cli/core/manager/globals.d.ts b/code/lib/cli/core/manager/globals.d.ts deleted file mode 100644 index a2b581c8ca04..000000000000 --- a/code/lib/cli/core/manager/globals.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/manager/globals'; -export type * from 'storybook/internal/manager/globals'; diff --git a/code/lib/cli/core/manager/globals.js b/code/lib/cli/core/manager/globals.js deleted file mode 100644 index 0dab1b6906f8..000000000000 --- a/code/lib/cli/core/manager/globals.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/manager/globals'; diff --git a/code/lib/cli/core/node-logger/index.cjs b/code/lib/cli/core/node-logger/index.cjs deleted file mode 100644 index 0c85d6dc5400..000000000000 --- a/code/lib/cli/core/node-logger/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/node-logger'); diff --git a/code/lib/cli/core/node-logger/index.d.ts b/code/lib/cli/core/node-logger/index.d.ts deleted file mode 100644 index d3f2a89ae0dc..000000000000 --- a/code/lib/cli/core/node-logger/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/node-logger'; -export type * from 'storybook/internal/node-logger'; diff --git a/code/lib/cli/core/node-logger/index.js b/code/lib/cli/core/node-logger/index.js deleted file mode 100644 index 1c35c8624ddf..000000000000 --- a/code/lib/cli/core/node-logger/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/node-logger'; diff --git a/code/lib/cli/core/preview-api/index.cjs b/code/lib/cli/core/preview-api/index.cjs deleted file mode 100644 index 8a7455da77ec..000000000000 --- a/code/lib/cli/core/preview-api/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/preview-api'); diff --git a/code/lib/cli/core/preview-api/index.d.ts b/code/lib/cli/core/preview-api/index.d.ts deleted file mode 100644 index 3386009da4ee..000000000000 --- a/code/lib/cli/core/preview-api/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/preview-api'; -export type * from 'storybook/internal/preview-api'; diff --git a/code/lib/cli/core/preview-api/index.js b/code/lib/cli/core/preview-api/index.js deleted file mode 100644 index e498112f799e..000000000000 --- a/code/lib/cli/core/preview-api/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/preview-api'; diff --git a/code/lib/cli/core/preview-errors.cjs b/code/lib/cli/core/preview-errors.cjs deleted file mode 100644 index ea70b9995a64..000000000000 --- a/code/lib/cli/core/preview-errors.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/preview-errors'); diff --git a/code/lib/cli/core/preview-errors.d.ts b/code/lib/cli/core/preview-errors.d.ts deleted file mode 100644 index 81c4160d2936..000000000000 --- a/code/lib/cli/core/preview-errors.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/preview-errors'; -export type * from 'storybook/internal/preview-errors'; diff --git a/code/lib/cli/core/preview-errors.js b/code/lib/cli/core/preview-errors.js deleted file mode 100644 index 2fb48796e867..000000000000 --- a/code/lib/cli/core/preview-errors.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/preview-errors'; diff --git a/code/lib/cli/core/preview/globals.cjs b/code/lib/cli/core/preview/globals.cjs deleted file mode 100644 index 91340ce6505b..000000000000 --- a/code/lib/cli/core/preview/globals.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/preview/globals'); diff --git a/code/lib/cli/core/preview/globals.d.ts b/code/lib/cli/core/preview/globals.d.ts deleted file mode 100644 index 165a3a44a8fb..000000000000 --- a/code/lib/cli/core/preview/globals.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/preview/globals'; -export type * from 'storybook/internal/preview/globals'; diff --git a/code/lib/cli/core/preview/globals.js b/code/lib/cli/core/preview/globals.js deleted file mode 100644 index c04bc1063044..000000000000 --- a/code/lib/cli/core/preview/globals.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/preview/globals'; diff --git a/code/lib/cli/core/preview/runtime.js b/code/lib/cli/core/preview/runtime.js deleted file mode 100644 index dffa3ddb106d..000000000000 --- a/code/lib/cli/core/preview/runtime.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/preview/runtime'; diff --git a/code/lib/cli/core/router/index.cjs b/code/lib/cli/core/router/index.cjs deleted file mode 100644 index 4ffedd37e521..000000000000 --- a/code/lib/cli/core/router/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/router'); diff --git a/code/lib/cli/core/router/index.d.ts b/code/lib/cli/core/router/index.d.ts deleted file mode 100644 index 961d0ed58466..000000000000 --- a/code/lib/cli/core/router/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/router'; -export type * from 'storybook/internal/router'; diff --git a/code/lib/cli/core/router/index.js b/code/lib/cli/core/router/index.js deleted file mode 100644 index 7bbbbccd732e..000000000000 --- a/code/lib/cli/core/router/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/router'; diff --git a/code/lib/cli/core/server-errors.cjs b/code/lib/cli/core/server-errors.cjs deleted file mode 100644 index 0ba992a7395b..000000000000 --- a/code/lib/cli/core/server-errors.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/server-errors'); diff --git a/code/lib/cli/core/server-errors.d.ts b/code/lib/cli/core/server-errors.d.ts deleted file mode 100644 index 4f680db9de59..000000000000 --- a/code/lib/cli/core/server-errors.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/server-errors'; -export type * from 'storybook/internal/server-errors'; diff --git a/code/lib/cli/core/server-errors.js b/code/lib/cli/core/server-errors.js deleted file mode 100644 index 53bd5c6b0774..000000000000 --- a/code/lib/cli/core/server-errors.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/server-errors'; diff --git a/code/lib/cli/core/telemetry/index.cjs b/code/lib/cli/core/telemetry/index.cjs deleted file mode 100644 index 573d88c8ed38..000000000000 --- a/code/lib/cli/core/telemetry/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/telemetry'); diff --git a/code/lib/cli/core/telemetry/index.d.ts b/code/lib/cli/core/telemetry/index.d.ts deleted file mode 100644 index e665939afdeb..000000000000 --- a/code/lib/cli/core/telemetry/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/telemetry'; -export type * from 'storybook/internal/telemetry'; diff --git a/code/lib/cli/core/telemetry/index.js b/code/lib/cli/core/telemetry/index.js deleted file mode 100644 index 203cb379cfd2..000000000000 --- a/code/lib/cli/core/telemetry/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/telemetry'; diff --git a/code/lib/cli/core/theming/create.cjs b/code/lib/cli/core/theming/create.cjs deleted file mode 100644 index 46a7e06dbb15..000000000000 --- a/code/lib/cli/core/theming/create.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/theming/create'); diff --git a/code/lib/cli/core/theming/create.d.ts b/code/lib/cli/core/theming/create.d.ts deleted file mode 100644 index dea7198ef9da..000000000000 --- a/code/lib/cli/core/theming/create.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/theming/create'; -export type * from 'storybook/internal/theming/create'; diff --git a/code/lib/cli/core/theming/create.js b/code/lib/cli/core/theming/create.js deleted file mode 100644 index f42a04fbeb52..000000000000 --- a/code/lib/cli/core/theming/create.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/theming/create'; diff --git a/code/lib/cli/core/theming/index.cjs b/code/lib/cli/core/theming/index.cjs deleted file mode 100644 index b6f2d0379538..000000000000 --- a/code/lib/cli/core/theming/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/theming'); diff --git a/code/lib/cli/core/theming/index.d.ts b/code/lib/cli/core/theming/index.d.ts deleted file mode 100644 index a68c540ba621..000000000000 --- a/code/lib/cli/core/theming/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/theming'; -export type * from 'storybook/internal/theming'; diff --git a/code/lib/cli/core/theming/index.js b/code/lib/cli/core/theming/index.js deleted file mode 100644 index b2a600a67fc7..000000000000 --- a/code/lib/cli/core/theming/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/theming'; diff --git a/code/lib/cli/core/types/index.cjs b/code/lib/cli/core/types/index.cjs deleted file mode 100644 index d6e674cadaca..000000000000 --- a/code/lib/cli/core/types/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('storybook/internal/types'); diff --git a/code/lib/cli/core/types/index.d.ts b/code/lib/cli/core/types/index.d.ts deleted file mode 100644 index 71839eb6a5ba..000000000000 --- a/code/lib/cli/core/types/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from 'storybook/internal/types'; -export type * from 'storybook/internal/types'; diff --git a/code/lib/cli/core/types/index.js b/code/lib/cli/core/types/index.js deleted file mode 100644 index 62bc04586d6d..000000000000 --- a/code/lib/cli/core/types/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from 'storybook/internal/types'; diff --git a/code/lib/cli/docs/getstorybook.png b/code/lib/cli/docs/getstorybook.png deleted file mode 100644 index 90dd790ee92d740b95f47de3497db93e3a776b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 113291 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�D8GTMEIHD#1AKo>X&XxDb)3{)@8vu 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.exports) - .sort() - .map(async ([key, input]) => { - const value = mapCoreExportToSelf(input); - if (key === './package.json') { - return; - } - if (key.startsWith('./dist')) { - return; - } - if (key === '.') { - selfPackageJson.exports['./core'] = value; - - await Promise.all( - Object.values(value).map(async (v) => { - await write(join(__dirname, '..', v), generateMapperContent(v)); - }) - ); - } else { - selfPackageJson.exports[key.replace('./', './internal/')] = value; - await Promise.all( - Object.values(value).map(async (v) => { - await write(join(__dirname, '..', v), generateMapperContent(v)); - }) - ); - } - }) - ); - - type RecordOfStrings = Record; - - selfPackageJson.typesVersions = { - '*': { - ...Object.entries(corePackageJson.typesVersions['*'] as RecordOfStrings) - .sort() - .reduce((acc, [key, value]) => { - acc['internal/' + key] = value.map((v) => v.replace('./dist/', './core/')); - return acc; - }, {}), - '*': ['./dist/index.d.ts'], - 'core-path': ['./dist/core-path.d.ts'], - - core: ['./core/index.d.ts'], - }, - }; - - await write( - join(__dirname, '../package.json'), - JSON.stringify(sortPackageJson(selfPackageJson), null, 2) + '\n' - ); -} - -run().catch((error) => { - console.error(error); - process.exit(1); -}); diff --git a/code/lib/cli/scripts/utils.ts b/code/lib/cli/scripts/utils.ts deleted file mode 100644 index 1d8b54fafb10..000000000000 --- a/code/lib/cli/scripts/utils.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { existsSync } from 'node:fs'; -import { mkdir, writeFile } from 'node:fs/promises'; -import { dirname } from 'node:path'; - -import { dedent } from 'ts-dedent'; - -export const write = async (location: string, data: string) => { - if (!existsSync(location)) { - const directory = dirname(location); - await mkdir(directory, { recursive: true }); - } - return writeFile(location, data); -}; - -export const mapCoreExportToSelf = (map: Record) => { - return Object.entries(map).reduce>((acc, [key, input]) => { - const value = input.replace('./dist/', './core/'); - acc[key] = value; - - return acc; - }, {}); -}; - -export const generateMapperContent = (input: string) => { - const value = input - .replace('./core/', '') - .replace('/index', '') - .replace('.cjs', '') - .replace('.d.ts', '') - .replace('.mjs', '') - .replace('.js', ''); - if (input.endsWith('.js')) { - return `export * from 'storybook/internal/${value}';\n`; - } - if (input.endsWith('.cjs')) { - return `module.exports = require('storybook/internal/${value}');\n`; - } - if (input.endsWith('.d.ts')) { - return dedent` - export * from 'storybook/internal/${value}'; - export type * from 'storybook/internal/${value}';\n - `; - } - // eslint-disable-next-line local-rules/no-uncategorized-errors - throw new Error(`Unexpected input: ${input}`); -}; diff --git a/code/lib/cli/src/core-path.ts b/code/lib/cli/src/core-path.ts deleted file mode 100644 index 1136c71bc9ec..000000000000 --- a/code/lib/cli/src/core-path.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { dirname } from 'node:path'; - -export const corePath = dirname(require.resolve('storybook/package.json')); diff --git a/code/lib/cli/src/index.ts b/code/lib/cli/src/index.ts deleted file mode 100644 index aba7474a42fb..000000000000 --- a/code/lib/cli/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { deprecate } from 'storybook/internal/node-logger'; - -deprecate( - 'Exports from @storybook/cli are removed. Please import from @storybook/core-common instead.' -); diff --git a/code/lib/cli/src/proxy.ts b/code/lib/cli/src/proxy.ts deleted file mode 100644 index 08376c5fef5b..000000000000 --- a/code/lib/cli/src/proxy.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { versions } from 'storybook/internal/common'; - -import { spawn } from 'child_process'; - -const args = process.argv.slice(2); - -if (['dev', 'build'].includes(args[0])) { - require('storybook/internal/cli/bin'); -} else { - const proxiedArgs = - args[0] === 'init' - ? [`create-storybook@${versions.storybook}`, ...args.slice(1)] - : [`@storybook/cli@${versions.storybook}`, ...args]; - const command = ['npx', '--yes', ...proxiedArgs]; - const child = spawn(command[0], command.slice(1), { stdio: 'inherit', shell: true }); - child.on('exit', (code) => { - if (code != null) { - process.exit(code); - } - process.exit(1); - }); -} diff --git a/code/lib/cli/tsconfig.json b/code/lib/cli/tsconfig.json deleted file mode 100644 index 2831f7bb6d03..000000000000 --- a/code/lib/cli/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "compilerOptions": {}, - "extends": "../../tsconfig.json", - "include": ["src/**/*"] -} diff --git a/code/lib/cli/vitest.config.ts b/code/lib/cli/vitest.config.ts deleted file mode 100644 index 7420176b2e46..000000000000 --- a/code/lib/cli/vitest.config.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config'; - -import { vitestCommonConfig } from '../../vitest.workspace'; - -export default mergeConfig( - vitestCommonConfig, - defineConfig({ - // Add custom config here - }) -); diff --git a/code/tsconfig.json b/code/tsconfig.json index 0ee2306040e0..db22ea5f025b 100644 --- a/code/tsconfig.json +++ b/code/tsconfig.json @@ -10,8 +10,8 @@ "isolatedModules": true, "jsx": "react", "lib": ["dom", "dom.iterable", "esnext"], - "module": "CommonJS", - "moduleResolution": "Node", + "module": "ES2022", + "moduleResolution": "bundler", "noImplicitAny": true, "noUnusedLocals": false, "skipLibCheck": true, From 858f0982433b16237ce23b4190836c8be67996c2 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 2 Jan 2025 16:03:47 +0100 Subject: [PATCH 4/9] remove CLI package --- code/core/src/common/versions.ts | 1 - code/yarn.lock | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts index 622595339dca..205c3f375fcd 100644 --- a/code/core/src/common/versions.ts +++ b/code/core/src/common/versions.ts @@ -60,7 +60,6 @@ export default { '@storybook/web-components-vite': '8.5.0-beta.7', '@storybook/web-components-webpack5': '8.5.0-beta.7', '@storybook/blocks': '8.5.0-beta.7', - 'storybook-renamed': '8.5.0-beta.7', sb: '8.5.0-beta.7', '@storybook/cli': '8.5.0-beta.7', '@storybook/codemod': '8.5.0-beta.7', diff --git a/code/yarn.lock b/code/yarn.lock index fa4f0aaef81d..87fc2c5f85ed 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -26665,24 +26665,6 @@ __metadata: languageName: node linkType: hard -"storybook-renamed@workspace:lib/cli": - version: 0.0.0-use.local - resolution: "storybook-renamed@workspace:lib/cli" - dependencies: - storybook: "workspace:*" - typescript: "npm:^5.3.2" - peerDependencies: - prettier: ^2 || ^3 - peerDependenciesMeta: - prettier: - optional: true - bin: - getstorybook: ./bin/index.cjs - sb: ./bin/index.cjs - storybook: ./bin/index.cjs - languageName: unknown - linkType: soft - "storybook@workspace:*, storybook@workspace:^, storybook@workspace:core": version: 0.0.0-use.local resolution: "storybook@workspace:core" From 2d955cd079ab692d8ec55beedb86467e79aa0058 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 2 Jan 2025 16:26:02 +0100 Subject: [PATCH 5/9] fixes --- code/addons/essentials/src/actions/manager.ts | 1 + code/addons/essentials/src/docs/manager.ts | 1 - code/frameworks/angular/src/builders/utils/run-compodoc.spec.ts | 1 + code/frameworks/angular/tsconfig.json | 1 + code/frameworks/sveltekit/src/plugins/mock-sveltekit-stores.ts | 1 - scripts/prepare/check.ts | 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/addons/essentials/src/actions/manager.ts b/code/addons/essentials/src/actions/manager.ts index 9f43dc8f053c..88cfe89adb1f 100644 --- a/code/addons/essentials/src/actions/manager.ts +++ b/code/addons/essentials/src/actions/manager.ts @@ -1 +1,2 @@ +// @ts-expect-error (no types needed for this) export * from '@storybook/addon-actions/manager'; diff --git a/code/addons/essentials/src/docs/manager.ts b/code/addons/essentials/src/docs/manager.ts index 6101f7d79261..9f14a38904c4 100644 --- a/code/addons/essentials/src/docs/manager.ts +++ b/code/addons/essentials/src/docs/manager.ts @@ -1,2 +1 @@ -// @ts-expect-error (no types needed for this) export * from '@storybook/addon-docs/manager'; diff --git a/code/frameworks/angular/src/builders/utils/run-compodoc.spec.ts b/code/frameworks/angular/src/builders/utils/run-compodoc.spec.ts index 4391c939fc40..7edb8424063b 100644 --- a/code/frameworks/angular/src/builders/utils/run-compodoc.spec.ts +++ b/code/frameworks/angular/src/builders/utils/run-compodoc.spec.ts @@ -1,4 +1,5 @@ import { BuilderContext } from '@angular-devkit/architect'; +// @ts-expect-error (TODO) import { LoggerApi } from '@angular-devkit/core/src/logger'; import { take } from 'rxjs/operators'; import { afterEach, describe, expect, it, vi } from 'vitest'; diff --git a/code/frameworks/angular/tsconfig.json b/code/frameworks/angular/tsconfig.json index 2334d7409fbb..6bdff72fb0cd 100644 --- a/code/frameworks/angular/tsconfig.json +++ b/code/frameworks/angular/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "./tsconfig.build.json", "compilerOptions": { + "module": "Preserve", "noEmit": true, "strict": false }, diff --git a/code/frameworks/sveltekit/src/plugins/mock-sveltekit-stores.ts b/code/frameworks/sveltekit/src/plugins/mock-sveltekit-stores.ts index 98ceb6cc7e5c..afa6c0142cb0 100644 --- a/code/frameworks/sveltekit/src/plugins/mock-sveltekit-stores.ts +++ b/code/frameworks/sveltekit/src/plugins/mock-sveltekit-stores.ts @@ -3,7 +3,6 @@ import { fileURLToPath } from 'node:url'; import type { Plugin } from 'vite'; -// @ts-expect-error We are building for CJS and ESM, so we have to use import.meta.url for the ESM output const filename = __filename ?? fileURLToPath(import.meta.url); const dir = dirname(filename); diff --git a/scripts/prepare/check.ts b/scripts/prepare/check.ts index 0462b6094464..bb67075d43db 100755 --- a/scripts/prepare/check.ts +++ b/scripts/prepare/check.ts @@ -40,7 +40,7 @@ run({ cwd: process.cwd() }).catch((err: unknown) => { function getTSDiagnostics(program: ts.Program, cwd: string, host: ts.CompilerHost): any { return ts.formatDiagnosticsWithColorAndContext( - ts.getPreEmitDiagnostics(program).filter((d) => d.file.fileName.startsWith(cwd)), + ts.getPreEmitDiagnostics(program).filter((d) => d.file && d.file.fileName.startsWith(cwd)), host ); } From c42b53e6f4cb8fc69a565a978a133dc756db8989 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 2 Jan 2025 16:49:49 +0100 Subject: [PATCH 6/9] fix usage of cli path --- code/package.json | 4 ++-- scripts/utils/cli-step.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/package.json b/code/package.json index 7ea7486a481a..bd38269cd23a 100644 --- a/code/package.json +++ b/code/package.json @@ -46,8 +46,8 @@ "lint:package": "sort-package-json", "local-registry": "yarn --cwd ../scripts local-registry", "publish-sandboxes": "yarn --cwd ../scripts publish", - "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.cjs dev --port 6006 --config-dir ./.storybook", - "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.cjs build --config-dir ./.storybook --webpack-stats-json", + "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./core/bin/index.cjs dev --port 6006 --config-dir ./.storybook", + "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./core/bin/index.cjs build --config-dir ./.storybook --webpack-stats-json", "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-base-dir ./ --exit-zero-on-changes --exit-once-uploaded", "storybook:vitest": "yarn test:watch --project storybook-ui", "storybook:vitest:inspect": "INSPECT=true yarn test --project storybook-ui", diff --git a/scripts/utils/cli-step.ts b/scripts/utils/cli-step.ts index ce57896aeddf..1ff36db88ddc 100644 --- a/scripts/utils/cli-step.ts +++ b/scripts/utils/cli-step.ts @@ -5,7 +5,7 @@ import type { OptionSpecifier, OptionValues } from './options'; import { createOptions, getCommand } from './options'; const require = createRequire(import.meta.url); -const cliExecutable = require.resolve('../../code/lib/cli/bin/index.cjs'); +const cliExecutable = require.resolve('../../code/core/bin/index.cjs'); const toolboxExecutable = require.resolve('../../code/lib/cli-storybook/bin/index.cjs'); const createStorybookExecutable = require.resolve('../../code/lib/create-storybook/bin/index.cjs'); From 5f51f1750436d95f623ad9a1518ab82e81167aa3 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 2 Jan 2025 16:50:41 +0100 Subject: [PATCH 7/9] fix --- code/core/src/builder-manager/index.ts | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/code/core/src/builder-manager/index.ts b/code/core/src/builder-manager/index.ts index b1cddcbe8048..4b7ef5b2c5d5 100644 --- a/code/core/src/builder-manager/index.ts +++ b/code/core/src/builder-manager/index.ts @@ -159,11 +159,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({ yield; - const coreDirOrigin = join( - dirname(require.resolve('storybook/internal/kage.json')), - 'dist', - 'manager' - ); + const coreDirOrigin = join(dirname(require.resolve('storybook/package.json')), 'dist', 'manager'); router.use( '/sb-addons', @@ -258,11 +254,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime, yield; const addonsDir = config.outdir; - const coreDirOrigin = join( - dirname(require.resolve('storybook/internal/kage.json')), - 'dist', - 'manager' - ); + const coreDirOrigin = join(dirname(require.resolve('storybook/package.json')), 'dist', 'manager'); const coreDirTarget = join(options.outputDir, `sb-manager`); // TODO: this doesn't watch, we should change this to use the esbuild watch API: https://esbuild.github.io/api/#watch From e256f9b2629ad87c2f39c00407bb2387c2920794 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 2 Jan 2025 21:26:07 +0100 Subject: [PATCH 8/9] fix --- code/core/package.json | 85 +++++++++++++++++++ .../helpers/generatePackageJsonFile.ts | 42 ++++----- 2 files changed, 106 insertions(+), 21 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index 75f3239503dc..a53babfe9dca 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -182,6 +182,91 @@ "main": "dist/index.cjs", "module": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "*": { + "*": [ + "./dist/index.d.ts" + ], + "internal/node-logger": [ + "./dist/node-logger/index.d.ts" + ], + "internal/client-logger": [ + "./dist/client-logger/index.d.ts" + ], + "internal/theming": [ + "./dist/theming/index.d.ts" + ], + "internal/theming/create": [ + "./dist/theming/create.d.ts" + ], + "internal/core-server": [ + "./dist/core-server/index.d.ts" + ], + "internal/core-events": [ + "./dist/core-events/index.d.ts" + ], + "internal/manager-errors": [ + "./dist/manager-errors.d.ts" + ], + "internal/preview-errors": [ + "./dist/preview-errors.d.ts" + ], + "internal/server-errors": [ + "./dist/server-errors.d.ts" + ], + "internal/channels": [ + "./dist/channels/index.d.ts" + ], + "internal/types": [ + "./dist/types/index.d.ts" + ], + "internal/csf-tools": [ + "./dist/csf-tools/index.d.ts" + ], + "internal/common": [ + "./dist/common/index.d.ts" + ], + "internal/builder-manager": [ + "./dist/builder-manager/index.d.ts" + ], + "internal/telemetry": [ + "./dist/telemetry/index.d.ts" + ], + "internal/preview-api": [ + "./dist/preview-api/index.d.ts" + ], + "internal/manager-api": [ + "./dist/manager-api/index.d.ts" + ], + "internal/router": [ + "./dist/router/index.d.ts" + ], + "internal/components": [ + "./dist/components/index.d.ts" + ], + "internal/docs-tools": [ + "./dist/docs-tools/index.d.ts" + ], + "internal/manager/globals-module-info": [ + "./dist/manager/globals-module-info.d.ts" + ], + "internal/manager/globals": [ + "./dist/manager/globals.d.ts" + ], + "internal/preview/globals": [ + "./dist/preview/globals.d.ts" + ], + "internal/cli": [ + "./dist/cli/index.d.ts" + ], + "internal/babel": [ + "./dist/babel/index.d.ts" + ], + "internal/cli/bin": [ + "./dist/cli/bin/index.d.ts" + ] + } + }, "bin": "./bin/index.cjs", "files": [ "dist/**/*", diff --git a/code/core/scripts/helpers/generatePackageJsonFile.ts b/code/core/scripts/helpers/generatePackageJsonFile.ts index 27a4d93e96b5..020724b8113e 100644 --- a/code/core/scripts/helpers/generatePackageJsonFile.ts +++ b/code/core/scripts/helpers/generatePackageJsonFile.ts @@ -54,30 +54,30 @@ export async function generatePackageJsonFile(entries: ReturnType>((acc, entry) => { - // if (!entry.dts) { - // return acc; - // } + pkgJson.typesVersions = { + '*': { + '*': ['./dist/index.d.ts'], + ...entries.reduce>((acc, entry) => { + if (!entry.dts) { + return acc; + } - // let main = slash(relative(cwd, entry.file).replace('src', 'dist')); - // if (main === './dist/index.ts' || main === './dist/index.tsx') { - // main = '.'; - // } - // const key = main.replace(/\/index\.tsx?/, '').replace(/\.tsx?/, ''); + let main = slash(relative(cwd, entry.file).replace('src', 'dist')); + if (main === './dist/index.ts' || main === './dist/index.tsx') { + main = '.'; + } + const key = main.replace(/\/index\.tsx?/, '').replace(/\.tsx?/, ''); - // if (key === 'dist') { - // return acc; - // } + if (key === 'dist') { + return acc; + } - // const content = ['./' + main.replace(/\.tsx?/, '.d.ts')]; - // acc[key.replace('dist/', 'internal/')] = content; - // return acc; - // }, {}), - // }, - // }; + const content = ['./' + main.replace(/\.tsx?/, '.d.ts')]; + acc[key.replace('dist/', 'internal/')] = content; + return acc; + }, {}), + }, + }; await writeFile(location, `${sortPackageJson(JSON.stringify(pkgJson, null, 2))}\n`, {}); } From 2e9cfd8a8541bcd0f491dd0d1c7080f64cd6ce44 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 3 Jan 2025 12:05:55 +0100 Subject: [PATCH 9/9] fixes --- code/.storybook/main.ts | 6 +++--- code/addons/docs/src/preset.ts | 16 ++++++++-------- code/addons/test/tsconfig.json | 2 -- code/core/tsconfig.json | 3 +-- code/frameworks/angular/tsconfig.build.json | 1 - code/frameworks/angular/tsconfig.json | 1 - .../nextjs/src/next-image-loader-stub.ts | 1 - code/lib/blocks/tsconfig.json | 8 ++------ code/renderers/svelte/tsconfig.json | 2 +- code/tsconfig.json | 2 +- scripts/tsconfig.json | 2 +- 11 files changed, 17 insertions(+), 27 deletions(-) diff --git a/code/.storybook/main.ts b/code/.storybook/main.ts index 9870741de29e..c75f60c86d22 100644 --- a/code/.storybook/main.ts +++ b/code/.storybook/main.ts @@ -2,9 +2,9 @@ import { join } from 'node:path'; import type { StorybookConfig } from '../frameworks/react-vite'; -const componentsPath = join(__dirname, '../core/src/components'); -const managerApiPath = join(__dirname, '../core/src/manager-api'); -const imageContextPath = join(__dirname, '..//frameworks/nextjs/src/image-context.ts'); +const componentsPath = join(__dirname, '../core/src/components/index.ts'); +const managerApiPath = join(__dirname, '../core/src/manager-api/index.ts'); +const imageContextPath = join(__dirname, '../frameworks/nextjs/src/image-context.ts'); const config: StorybookConfig = { stories: [ diff --git a/code/addons/docs/src/preset.ts b/code/addons/docs/src/preset.ts index 9cff707e8472..885a143f15c9 100644 --- a/code/addons/docs/src/preset.ts +++ b/code/addons/docs/src/preset.ts @@ -73,11 +73,11 @@ async function webpack( * In the future the `@storybook/theming` and `@storybook/components` can be removed, as they * should be singletons in the future due to the peerDependency on `storybook` package. */ - const cliPath = dirname(require.resolve('storybook/package.json')); - const themingPath = join(cliPath, 'core', 'theming', 'index.js'); - const themingCreatePath = join(cliPath, 'core', 'theming', 'create.js'); + const corePath = dirname(require.resolve('storybook/package.json')); + const themingPath = join(corePath, 'dist', 'theming', 'index.js'); + const themingCreatePath = join(corePath, 'dist', 'theming', 'create.js'); - const componentsPath = join(cliPath, 'core', 'components', 'index.js'); + const componentsPath = join(corePath, 'dist', 'components', 'index.js'); const blocksPath = dirname(require.resolve('@storybook/blocks/package.json')); if (Array.isArray(webpackConfig.resolve?.alias)) { alias = [...webpackConfig.resolve?.alias]; @@ -181,10 +181,10 @@ export const viteFinal = async (config: any, options: Options) => { // Use the resolvedReact preset to alias react and react-dom to either the users version or the version shipped with addon-docs const { react, reactDom, mdx } = await getResolvedReact(options); - const cliPath = dirname(require.resolve('storybook/package.json')); - const themingPath = join(cliPath, 'core', 'theming', 'index.js'); - const themingCreatePath = join(cliPath, 'core', 'theming', 'create.js'); - const componentsPath = join(cliPath, 'core', 'components', 'index.js'); + const corePath = dirname(require.resolve('storybook/package.json')); + const themingPath = join(corePath, 'dist', 'theming', 'index.js'); + const themingCreatePath = join(corePath, 'dist', 'theming', 'create.js'); + const componentsPath = join(corePath, 'dist', 'components', 'index.js'); const blocksPath = dirname(require.resolve('@storybook/blocks/package.json')); const packageDeduplicationPlugin = { diff --git a/code/addons/test/tsconfig.json b/code/addons/test/tsconfig.json index e8a15eafa0bd..d2318b7bb29f 100644 --- a/code/addons/test/tsconfig.json +++ b/code/addons/test/tsconfig.json @@ -2,8 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "rootDir": "../../../", - "module": "Preserve", - "moduleResolution": "Bundler", "types": ["vitest"], "strict": true }, diff --git a/code/core/tsconfig.json b/code/core/tsconfig.json index 2dcc611b29a4..a13eaab4f265 100644 --- a/code/core/tsconfig.json +++ b/code/core/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "resolveJsonModule": true, - "module": "ES2022" + "resolveJsonModule": true }, "include": ["src/**/*", "scripts/**/*", "*.d.ts"] } diff --git a/code/frameworks/angular/tsconfig.build.json b/code/frameworks/angular/tsconfig.build.json index e543e05b4803..6fe15d9d25ea 100644 --- a/code/frameworks/angular/tsconfig.build.json +++ b/code/frameworks/angular/tsconfig.build.json @@ -3,7 +3,6 @@ "compileOnSave": false, "compilerOptions": { "target": "ES2020", - "module": "CommonJS", "noEmit": false, "lib": ["es2020", "dom", "dom.iterable"], "experimentalDecorators": true, diff --git a/code/frameworks/angular/tsconfig.json b/code/frameworks/angular/tsconfig.json index 6bdff72fb0cd..2334d7409fbb 100644 --- a/code/frameworks/angular/tsconfig.json +++ b/code/frameworks/angular/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "compilerOptions": { - "module": "Preserve", "noEmit": true, "strict": false }, diff --git a/code/frameworks/nextjs/src/next-image-loader-stub.ts b/code/frameworks/nextjs/src/next-image-loader-stub.ts index 5c9a978d0ef7..e85414c85d15 100644 --- a/code/frameworks/nextjs/src/next-image-loader-stub.ts +++ b/code/frameworks/nextjs/src/next-image-loader-stub.ts @@ -72,5 +72,4 @@ const nextImageLoaderStub: RawLoaderDefinition = async function N nextImageLoaderStub.raw = true; -// @ts-expect-error (TODO) export = nextImageLoaderStub; diff --git a/code/lib/blocks/tsconfig.json b/code/lib/blocks/tsconfig.json index 9dad87f67d86..3416efe5e4e1 100644 --- a/code/lib/blocks/tsconfig.json +++ b/code/lib/blocks/tsconfig.json @@ -1,12 +1,8 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { - "baseUrl": ".", - "module": "esnext", - "paths": { - "storybook/internal/*": ["../../lib/cli/core/*"] - }, + "rootDir": "../../../", "strict": false }, - "extends": "../../tsconfig.json", "include": ["src/**/*"] } diff --git a/code/renderers/svelte/tsconfig.json b/code/renderers/svelte/tsconfig.json index ba474f5a2f5c..956d3494268e 100644 --- a/code/renderers/svelte/tsconfig.json +++ b/code/renderers/svelte/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "module": "ESNext" + "rootDir": "../../../" }, "include": ["src/**/*", "src/**/*.svelte", "template/**/*", "template/**/*.svelte"] } diff --git a/code/tsconfig.json b/code/tsconfig.json index db22ea5f025b..c663954f1b19 100644 --- a/code/tsconfig.json +++ b/code/tsconfig.json @@ -10,7 +10,7 @@ "isolatedModules": true, "jsx": "react", "lib": ["dom", "dom.iterable", "esnext"], - "module": "ES2022", + "module": "Preserve", "moduleResolution": "bundler", "noImplicitAny": true, "noUnusedLocals": false, diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json index 77c8d8e2da1b..228bdb63dddd 100644 --- a/scripts/tsconfig.json +++ b/scripts/tsconfig.json @@ -7,7 +7,7 @@ "jsx": "react", "moduleResolution": "bundler", "target": "es2022", - "module": "ES2022", + "module": "Preserve", "skipLibCheck": true, "allowSyntheticDefaultImports": true, "esModuleInterop": true,