add bin to core

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';

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';
 

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,

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"
       ]
     }

code/core/scripts/dts.ts

@@ -17,24 +17,24 @@ async function run() {
     ...Object.keys((pkg as any).peerDependencies || {}),
     ...nodeInternals,
     'typescript',
-    '@storybook/core',
+    'storybook',
 
-    '@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/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);

code/core/scripts/helpers/generatePackageJsonFile.ts

@@ -73,7 +73,7 @@ export async function generatePackageJsonFile(entries: ReturnType<typeof getEntr
         }
 
         const content = ['./' + main.replace(/\.tsx?/, '.d.ts')];
-        acc[key.replace('dist/', '')] = content;
+        acc[key.replace('dist/', 'internal/')] = content;
         return acc;
       }, {}),
     },

code/core/scripts/helpers/sourcefiles.ts

@@ -82,6 +82,7 @@ async function generateFrameworksFile(prettierConfig: prettier.Options | null):
 
 const localAlias = {
   '@storybook/core': join(__dirname, '..', '..', 'src'),
+  'storybook/internal': join(__dirname, '..', '..', 'src'),
   storybook: join(__dirname, '..', '..', 'src'),
 };
 async function generateExportsFile(prettierConfig: prettier.Options | null): Promise<void> {

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<EsbuildContextOptions>(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(

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'

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'
   );

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';
 

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';

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;

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';
 

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) => {

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(

code/core/src/channels/postmessage/index.ts

@@ -1,8 +1,8 @@
 /// <reference path="../../typings.d.ts" />
-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';

code/core/src/channels/websocket/index.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../typings.d.ts" />
-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';

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';

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';

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';

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;

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';

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';

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';

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';

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';
 

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';

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';
 

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');

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';

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();
     });
   });
 

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';

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();
     });
   });
 

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';

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<Pick<PackageJson, 'dependencies' | 'devDependencies'>>;

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();
     });
   });
 

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';

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();
     });
   });
 

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';

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(),

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';
 

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';
 

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,

code/core/src/common/utils/__tests__/template.test.ts

@@ -18,7 +18,7 @@ const BASE_HTML_CONTENTS = '<script>console.log("base script!");</script>';
 const BASE_BODY_HTML_CONTENTS = '<div>story contents</div>';
 const BODY_HTML_CONTENTS = '<div>custom body contents</div>';
 
-const base = dirname(require.resolve('@storybook/core/package.json'));
+const base = dirname(require.resolve('storybook/package.json'));
 
 describe('server.getPreviewHeadHtml', () => {
   afterEach(() => {

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;

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],

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,

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`.

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';
 

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';

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';
 

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';
 

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';

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';

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';

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';
 

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';

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';
 

code/core/src/common/utils/template.ts

@@ -8,7 +8,7 @@ export function getPreviewBodyTemplate(
   configDirPath: string,
   interpolations?: Record<string, string>
 ) {
-  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<string, string>
 ) {
-  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');
 

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';
 

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';

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',

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',

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';
 

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(

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',

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';
 

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';

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;

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';

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';

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';
 

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';
 

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';
 

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';

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';

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<ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement> {

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;

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;

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',

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';
 

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';

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';
 

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';

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];

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,

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 {

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';
 

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));
 

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';
 

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)

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';
 

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%',

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';
 

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';

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';

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';

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';
 

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';