Merge pull request #32507 from storybookjs/norbert/cleanup-entrypoints-core

Cleanup: Remove duplicated entrypoints in core

Author: ndelangen

code/addons/docs/src/blocks/components/TableOfContents.stories.tsx

@@ -1,10 +1,9 @@
 import React from 'react';
 
-import { styled } from 'storybook/internal/theming';
-
 import type { Meta, StoryObj } from '@storybook/react-vite';
 
 import { expect, within } from 'storybook/test';
+import { styled } from 'storybook/theming';
 
 import { Heading } from '../blocks/Heading';
 import { TableOfContents } from './TableOfContents';

code/addons/pseudo-states/src/manager/PseudoStateTool.tsx

@@ -1,11 +1,11 @@
 import React, { type ComponentProps, useCallback } from 'react';
 
 import { Form, IconButton, TooltipLinkList, WithTooltip } from 'storybook/internal/components';
-import { color, styled } from 'storybook/internal/theming';
 
 import { ButtonIcon, RefreshIcon } from '@storybook/icons';
 
 import { useGlobals } from 'storybook/manager-api';
+import { color, styled } from 'storybook/theming';
 
 import { PARAM_KEY, PSEUDO_STATES } from '../constants';
 

code/addons/pseudo-states/src/stories/CSSAtRules.stories.tsx

@@ -1,10 +1,11 @@
 import React, { type ComponentProps } from 'react';
 
 import { FORCE_REMOUNT } from 'storybook/internal/core-events';
-import { useChannel, useStoryContext } from 'storybook/internal/preview-api';
 
 import type { Meta, StoryObj } from '@storybook/react-vite';
 
+import { useChannel, useStoryContext } from 'storybook/preview-api';
+
 import { Button } from './CSSAtRules';
 import './grid.css';
 

code/addons/vitest/src/components/SidebarContextMenu.tsx

@@ -1,9 +1,10 @@
 import type { FC } from 'react';
 import React from 'react';
 
-import { type API } from 'storybook/internal/manager-api';
 import type { API_HashEntry } from 'storybook/internal/types';
 
+import { type API } from 'storybook/manager-api';
+
 import { useTestProvider } from '../use-test-provider-state';
 import { TestProviderRender } from './TestProviderRender';
 

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

@@ -105,7 +105,6 @@ export const INCLUDE_CANDIDATES = [
   'storybook/actions/decorator',
   'storybook/internal/core-events',
   'storybook/internal/csf',
-  'storybook/internal/preview-api',
   'storybook/internal/preview/runtime',
   'storybook/preview-api',
   'storybook/viewport',

code/core/build-config.ts

@@ -97,27 +97,27 @@ const config: BuildEntries = {
         entryPoint: './src/instrumenter/index.ts',
       },
       {
-        exportEntries: ['./test', './internal/test'],
+        exportEntries: ['./test'],
         entryPoint: './src/test/index.ts',
       },
       {
         exportEntries: ['./preview-api', './internal/preview-api'],
         entryPoint: './src/preview-api/index.ts',
       },
       {
-        exportEntries: ['./highlight', './internal/highlight'],
+        exportEntries: ['./highlight'],
         entryPoint: './src/highlight/index.ts',
       },
       {
-        exportEntries: ['./actions', './internal/actions'],
+        exportEntries: ['./actions'],
         entryPoint: './src/actions/index.ts',
       },
       {
-        exportEntries: ['./actions/decorator', './internal/actions/decorator'],
+        exportEntries: ['./actions/decorator'],
         entryPoint: './src/actions/decorator.ts',
       },
       {
-        exportEntries: ['./viewport', './internal/viewport'],
+        exportEntries: ['./viewport'],
         entryPoint: './src/viewport/index.ts',
       },
       {
@@ -145,19 +145,19 @@ const config: BuildEntries = {
         dts: false,
       },
       {
-        exportEntries: ['./theming', './internal/theming'],
+        exportEntries: ['./theming'],
         entryPoint: './src/theming/index.ts',
       },
       {
-        exportEntries: ['./theming/create', './internal/theming/create'],
+        exportEntries: ['./theming/create'],
         entryPoint: './src/theming/create.ts',
       },
       {
         exportEntries: ['./internal/components'],
         entryPoint: './src/components/index.ts',
       },
       {
-        exportEntries: ['./manager-api', './internal/manager-api'],
+        exportEntries: ['./manager-api'],
         entryPoint: './src/manager-api/index.ts',
       },
       {

code/core/package.json

@@ -58,14 +58,6 @@
       "types": "./dist/highlight/index.d.ts",
       "default": "./dist/highlight/index.js"
     },
-    "./internal/actions": {
-      "types": "./dist/actions/index.d.ts",
-      "default": "./dist/actions/index.js"
-    },
-    "./internal/actions/decorator": {
-      "types": "./dist/actions/decorator.d.ts",
-      "default": "./dist/actions/decorator.js"
-    },
     "./internal/babel": {
       "types": "./dist/babel/index.d.ts",
       "default": "./dist/babel/index.js"
@@ -113,18 +105,10 @@
       "types": "./dist/docs-tools/index.d.ts",
       "default": "./dist/docs-tools/index.js"
     },
-    "./internal/highlight": {
-      "types": "./dist/highlight/index.d.ts",
-      "default": "./dist/highlight/index.js"
-    },
     "./internal/instrumenter": {
       "types": "./dist/instrumenter/index.d.ts",
       "default": "./dist/instrumenter/index.js"
     },
-    "./internal/manager-api": {
-      "types": "./dist/manager-api/index.d.ts",
-      "default": "./dist/manager-api/index.js"
-    },
     "./internal/manager-errors": {
       "types": "./dist/manager-errors.d.ts",
       "default": "./dist/manager-errors.js"
@@ -163,26 +147,10 @@
       "types": "./dist/telemetry/index.d.ts",
       "default": "./dist/telemetry/index.js"
     },
-    "./internal/test": {
-      "types": "./dist/test/index.d.ts",
-      "default": "./dist/test/index.js"
-    },
-    "./internal/theming": {
-      "types": "./dist/theming/index.d.ts",
-      "default": "./dist/theming/index.js"
-    },
-    "./internal/theming/create": {
-      "types": "./dist/theming/create.d.ts",
-      "default": "./dist/theming/create.js"
-    },
     "./internal/types": {
       "types": "./dist/types/index.d.ts",
       "default": "./dist/types/index.js"
     },
-    "./internal/viewport": {
-      "types": "./dist/viewport/index.d.ts",
-      "default": "./dist/viewport/index.js"
-    },
     "./manager-api": {
       "types": "./dist/manager-api/index.d.ts",
       "default": "./dist/manager-api/index.js"

code/core/src/components/components/Button/Button.stories.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { styled } from 'storybook/internal/theming';
-
 import { FaceHappyIcon } from '@storybook/icons';
 
+import { styled } from 'storybook/theming';
+
 import preview from '../../../../../.storybook/preview';
 import { Button } from './Button';
 

code/core/src/components/components/Form/Checkbox.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { color, styled } from 'storybook/internal/theming';
+import { color, styled } from 'storybook/theming';
 
 const Input = styled.input({
   appearance: 'none',

code/core/src/components/components/Form/Radio.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { color, styled } from 'storybook/internal/theming';
+import { color, styled } from 'storybook/theming';
 
 const Input = styled.input({
   appearance: 'none',