Maintenance: Merge @storybook/core with storybook

code/.storybook/bench.stories.tsx

@@ -49,7 +49,7 @@ export default {
                 subEntry !== 'metafile' ? `${pkgName} - ${subEntry}` : pkgName,
               ];
             })
-            .concat([['core - core', '@storybook/core - core - TOO BIG PLEASE UPLOAD MANUALLY']])
+            .concat([['core - core', 'core - TOO BIG PLEASE UPLOAD MANUALLY']])
         ),
       },
     },

code/.storybook/main.ts

@@ -2,8 +2,8 @@ import { join } from 'node:path';
 
 import { defineMain } from '../frameworks/react-vite/src/node';
 
-const componentsPath = join(__dirname, '../core/src/components');
-const managerApiPath = join(__dirname, '../core/src/manager-api');
+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 = defineMain({

code/.storybook/vitest.config.ts

@@ -42,7 +42,7 @@ export default mergeConfig(
         '**/Zoom.stories.tsx', // expected to fail in Vitest because of fetching /iframe.html to cause ECONNREFUSED
         '**/lib/blocks/src/**', // won't work because of /~https://github.com/storybookjs/storybook/issues/29783
       ],
-      // TODO: bring this back once portable stories support @storybook/core/preview-api hooks
+      // TODO: bring this back once portable stories support storybook/internal/preview-api hooks
       // @ts-expect-error this type does not exist but the property does!
       testNamePattern: /^(?!.*(UseState)).*$/,
       browser: {

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

code/addons/a11y/src/preview.tsx

@@ -58,6 +58,7 @@ export const experimental_afterEach: AfterEach<any> = async ({
         if (getIsVitestStandaloneRun()) {
           if (hasViolations && getMode() === 'failed') {
             if (!vitestMatchersExtended) {
+              // @ts-expect-error (unknown why vitest-axe is not typed correctly)
               const { toHaveNoViolations } = await import('vitest-axe/matchers');
               expect.extend({ toHaveNoViolations });
               vitestMatchersExtended = true;

code/addons/docs/src/compiler/index.test.ts

@@ -36,9 +36,9 @@ describe('mdx3', () => {
       function _createMdxContent(props) {
         return _jsx("style", {
           children: \`
-      h1 {
-        color: blue;
-      }
+        h1 {
+          color: blue;
+        }
       \`
         });
       }
@@ -645,23 +645,23 @@ describe('docs-mdx-compiler-plugin', () => {
             title: "Example/Introduction"
           }), "\\n", _jsx("style", {
             children: \`
-      .subheading {
-        --mediumdark: '#999999';
-        font-weight: 900;
-        font-size: 13px;
-        color: #999;
-        letter-spacing: 6px;
-        line-height: 24px;
-        text-transform: uppercase;
-        margin-bottom: 12px;
-        margin-top: 40px;
-      }
-      .link-list {
-        display: grid;
-        grid-template-columns: 1fr;
-        grid-template-rows: 1fr 1fr;
-        row-gap: 10px;
-      }
+        .subheading {
+          --mediumdark: '#999999';
+          font-weight: 900;
+          font-size: 13px;
+          color: #999;
+          letter-spacing: 6px;
+          line-height: 24px;
+          text-transform: uppercase;
+          margin-bottom: 12px;
+          margin-top: 40px;
+        }
+        .link-list {
+          display: grid;
+          grid-template-columns: 1fr;
+          grid-template-rows: 1fr 1fr;
+          row-gap: 10px;
+        }
       \`
           })]
         });

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

code/addons/essentials/src/actions/manager.ts

@@ -1 +1,2 @@
+// @ts-expect-error (no types needed for this)
 export * from '@storybook/addon-actions/manager';

code/addons/essentials/src/backgrounds/manager.ts

@@ -1 +1,2 @@
+// @ts-expect-error (no types)
 export * from '@storybook/addon-backgrounds/manager';

code/addons/essentials/src/outline/manager.ts

@@ -1 +1,2 @@
+// @ts-expect-error (no types)
 export * from '@storybook/addon-outline/manager';

code/addons/essentials/src/viewport/manager.ts

@@ -1 +1,2 @@
+// @ts-expect-error (no types)
 export * from '@storybook/addon-viewport/manager';

code/addons/test/src/node/boot-test-runner.test.ts

@@ -1,12 +1,11 @@
 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,
-} 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,10 +1,9 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 import { createVitest as actualCreateVitest } from 'vitest/node';
 
+import { Channel, type ChannelTransport } from 'storybook/internal/channels';
 import { experimental_MockUniversalStore } from 'storybook/internal/core-server';
-
-import { Channel, type ChannelTransport } from '@storybook/core/channels';
-import type { StoryIndex } from '@storybook/types';
+import type { StoryIndex } from 'storybook/internal/types';
 
 import path from 'pathe';
 

code/addons/test/src/postinstall.ts

@@ -557,7 +557,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/addons/test/src/utils.ts

@@ -2,7 +2,6 @@ import { type StorybookTheme, useTheme } from 'storybook/internal/theming';
 import type { StorybookConfig } from 'storybook/internal/types';
 
 import Filter from 'ansi-to-html';
-// eslint-disable-next-line depend/ban-dependencies
 import stripAnsi from 'strip-ansi';
 
 export function isTestAssertionError(error: unknown) {

code/addons/test/tsconfig.json

@@ -2,8 +2,6 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "../../../",
-    "module": "Preserve",
-    "moduleResolution": "Bundler",
     "types": ["vitest"],
     "strict": true
   },

code/builders/builder-vite/src/vite-server.ts

@@ -32,10 +32,12 @@ export async function createViteServer(options: Options, devServer: Server) {
   const ipRegex = /^(?:\d{1,3}\.){3}\d{1,3}$|^(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}$/;
 
   if (
+    // @ts-expect-error (unknown)
     !(config.server.allowedHosts as string[])?.length &&
     options.host &&
     !ipRegex.test(options.host)
   ) {
+    // @ts-expect-error (unknown)
     config.server.allowedHosts = [options.host.toLowerCase()];
   }
 

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, IgnorePlugin, ProgressPlugin } from 'webpack';
 import webpackDevMiddleware from 'webpack-dev-middleware';
@@ -32,6 +31,8 @@ export const printDuration = (startTime: [number, number]) =>
     .replace(' s', ' seconds')
     .replace(' m', ' minutes');
 
+const corePath = dirname(require.resolve('storybook/package.json'));
+
 let compilation: ReturnType<typeof webpackDevMiddleware> | undefined;
 let reject: (reason?: any) => void;
 

code/lib/cli/bin/index.cjs → code/core/bin/index.cjs

@@ -23,4 +23,4 @@ process.once('uncaughtException', (error) => {
   throw error;
 });
 
-require('../dist/proxy.cjs');
+require('../dist/bin/index.cjs');