Make storybook/internal/csf

code/core/package.json

@@ -97,6 +97,11 @@
       "import": "./dist/csf-tools/index.js",
       "require": "./dist/csf-tools/index.cjs"
     },
+    "./csf": {
+      "types": "./dist/csf/index.d.ts",
+      "import": "./dist/csf/index.js",
+      "require": "./dist/csf/index.cjs"
+    },
     "./common": {
       "types": "./dist/common/index.d.ts",
       "import": "./dist/common/index.js",
@@ -219,6 +224,9 @@
       "csf-tools": [
         "./dist/csf-tools/index.d.ts"
       ],
+      "csf": [
+        "./dist/csf/index.d.ts"
+      ],
       "common": [
         "./dist/common/index.d.ts"
       ],

code/core/scripts/entries.ts

@@ -25,6 +25,7 @@ export const getEntries = (cwd: string) => {
     define('src/channels/index.ts', ['browser', 'node'], true),
     define('src/types/index.ts', ['browser', 'node'], true, ['react']),
     define('src/csf-tools/index.ts', ['node'], true),
+    define('src/csf/index.ts', ['browser', 'node'], true),
     define('src/common/index.ts', ['node'], true),
     define('src/builder-manager/index.ts', ['node'], true),
     define('src/telemetry/index.ts', ['node'], true),

code/core/src/types/modules/csf-factories.ts → code/core/src/csf/index.ts

@@ -1,12 +1,15 @@
-import { composeConfigs, normalizeProjectAnnotations } from '@storybook/core/preview-api';
-
-import type { Args, ComponentAnnotations, Renderer, StoryAnnotations } from './csf';
 import type {
+  Args,
+  ComponentAnnotations,
   NormalizedComponentAnnotations,
   NormalizedProjectAnnotations,
   NormalizedStoryAnnotations,
   ProjectAnnotations,
-} from './story';
+  Renderer,
+  StoryAnnotations,
+} from '@storybook/core/types';
+
+import { composeConfigs, normalizeProjectAnnotations } from '@storybook/core/preview-api';
 
 export interface Preview<TRenderer extends Renderer> {
   readonly _tag: 'Preview';

code/core/src/manager/globals/exports.ts

@@ -963,9 +963,9 @@ export default {
     'UPDATE_QUERY_PARAMS',
     'UPDATE_STORY_ARGS',
   ],
-  'storybook/internal/types': ['Addon_TypesEnum', 'definePreview'],
-  '@storybook/types': ['Addon_TypesEnum', 'definePreview'],
-  '@storybook/core/types': ['Addon_TypesEnum', 'definePreview'],
+  'storybook/internal/types': ['Addon_TypesEnum'],
+  '@storybook/types': ['Addon_TypesEnum'],
+  '@storybook/core/types': ['Addon_TypesEnum'],
   'storybook/internal/manager-errors': [
     'Category',
     'ProviderDoesNotExtendBaseProviderError',

code/core/src/types/index.ts

@@ -1,7 +1,6 @@
 /// <reference path="../typings.d.ts" />
 
 export * from './modules/csf';
-export * from './modules/csf-factories';
 export * from './modules/addons';
 export * from './modules/story';
 export * from './modules/core-common';

code/lib/cli/core/csf/index.cjs

@@ -0,0 +1 @@
+module.exports = require('@storybook/core/csf');

code/lib/cli/core/csf/index.d.ts

@@ -0,0 +1,2 @@
+export * from '@storybook/core/csf';
+export type * from '@storybook/core/csf';

code/lib/cli/core/csf/index.js

@@ -0,0 +1 @@
+export * from '@storybook/core/csf';

code/lib/cli/package.json

@@ -103,6 +103,11 @@
       "import": "./core/types/index.js",
       "require": "./core/types/index.cjs"
     },
+    "./internal/csf": {
+      "types": "./core/csf/index.d.ts",
+      "import": "./core/csf/index.js",
+      "require": "./core/csf/index.cjs"
+    },
     "./internal/csf-tools": {
       "types": "./core/csf-tools/index.d.ts",
       "import": "./core/csf-tools/index.js",
@@ -233,6 +238,9 @@
       "internal/core-server": [
         "./core/core-server/index.d.ts"
       ],
+      "internal/csf": [
+        "./core/csf/index.d.ts"
+      ],
       "internal/csf-tools": [
         "./core/csf-tools/index.d.ts"
       ],

code/renderers/react/src/preview.tsx

@@ -1,16 +1,15 @@
 import type { ComponentType } from 'react';
 
+import { definePreview as definePreviewBase } from 'storybook/internal/csf';
+import type { Meta, Preview, Story } from 'storybook/internal/csf';
 import type {
   Args,
+  ArgsStoryFn,
   ComponentAnnotations,
-  Meta,
-  Preview,
-  Story,
+  DecoratorFunction,
+  Renderer,
   StoryAnnotations,
 } from 'storybook/internal/types';
-import { definePreview as definePreviewBase } from 'storybook/internal/types';
-
-import type { ArgsStoryFn, DecoratorFunction, LoaderFunction, Renderer } from '@storybook/csf';
 
 import type { AddMocks } from 'src/public-types';
 import type { RemoveIndexSignature, SetOptional, Simplify, UnionToIntersection } from 'type-fest';