From 7d09876cf76234027e974852638859bccdef4620 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Thu, 20 Mar 2025 21:03:05 +0100
Subject: [PATCH] Refactor package.json and related files to remove toolbar
 entries, update TypeScript definitions, and adjust imports for better
 integration. Ensure consistency in external dependencies and improve code
 organization.

---
 code/core/package.json                           | 16 ----------------
 code/core/scripts/dts.ts                         |  1 +
 code/core/scripts/entries.ts                     |  2 --
 .../components/components/tooltip/ListItem.tsx   |  3 +--
 .../src/toolbar/components/ToolbarManager.tsx    |  3 +--
 .../src/toolbar/components/ToolbarMenuButton.tsx |  3 +--
 scripts/prepare/tools.ts                         |  3 ++-
 7 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/code/core/package.json b/code/core/package.json
index 099f716d107..59f66b654b6 100644
--- a/code/core/package.json
+++ b/code/core/package.json
@@ -134,16 +134,6 @@
       "types": "./dist/controls/decorator.d.ts",
       "import": "./dist/controls/decorator.js"
     },
-    "./internal/toolbar": {
-      "types": "./dist/toolbar/index.d.ts",
-      "import": "./dist/toolbar/index.js",
-      "require": "./dist/toolbar/index.cjs"
-    },
-    "./internal/toolbar/preview": {
-      "types": "./dist/toolbar/preview.d.ts",
-      "import": "./dist/toolbar/preview.js",
-      "require": "./dist/toolbar/preview.cjs"
-    },
     "./internal/toolbar/manager": {
       "import": "./dist/toolbar/manager.js"
     },
@@ -369,12 +359,6 @@
       "internal/controls/decorator": [
         "./dist/controls/decorator.d.ts"
       ],
-      "internal/toolbar": [
-        "./dist/toolbar/index.d.ts"
-      ],
-      "internal/toolbar/preview": [
-        "./dist/toolbar/preview.d.ts"
-      ],
       "internal/core-events": [
         "./dist/core-events/index.d.ts"
       ],
diff --git a/code/core/scripts/dts.ts b/code/core/scripts/dts.ts
index 6c65b351bdf..fff03ef2a2a 100644
--- a/code/core/scripts/dts.ts
+++ b/code/core/scripts/dts.ts
@@ -27,6 +27,7 @@ async function run() {
     'storybook/test/spy',
     'storybook/test/preview',
 
+    'storybook/internal/toolbar/manager',
     'storybook/actions',
     'storybook/actions/preview',
     'storybook/actions/manager',
diff --git a/code/core/scripts/entries.ts b/code/core/scripts/entries.ts
index f27687d9c4d..a459dc93ea5 100644
--- a/code/core/scripts/entries.ts
+++ b/code/core/scripts/entries.ts
@@ -27,8 +27,6 @@ export const getEntries = (cwd: string) => {
     define('src/controls/manager.tsx', ['browser'], false, ['react']),
     define('src/controls/decorator.ts', ['browser'], true, ['react']),
 
-    define('src/toolbar/index.ts', ['browser', 'node'], true, ['react']),
-    define('src/toolbar/preview.ts', ['browser', 'node'], true, ['react']),
     define('src/toolbar/manager.tsx', ['browser'], false, ['react']),
 
     define('src/core-events/index.ts', ['browser', 'node'], true),
diff --git a/code/core/src/components/components/tooltip/ListItem.tsx b/code/core/src/components/components/tooltip/ListItem.tsx
index 66e35fe41ad..5cc56b102a2 100644
--- a/code/core/src/components/components/tooltip/ListItem.tsx
+++ b/code/core/src/components/components/tooltip/ListItem.tsx
@@ -1,5 +1,4 @@
-import type { ComponentProps, ReactNode, SyntheticEvent } from 'react';
-import React from 'react';
+import React, { type ComponentProps, type ReactNode, type SyntheticEvent } from 'react';
 
 import memoize from 'memoizerific';
 import { styled } from 'storybook/theming';
diff --git a/code/core/src/toolbar/components/ToolbarManager.tsx b/code/core/src/toolbar/components/ToolbarManager.tsx
index 7f1e7b4a695..a379b939856 100644
--- a/code/core/src/toolbar/components/ToolbarManager.tsx
+++ b/code/core/src/toolbar/components/ToolbarManager.tsx
@@ -1,5 +1,4 @@
-import type { FC } from 'react';
-import React from 'react';
+import React, { type FC } from 'react';
 
 import { Separator } from 'storybook/internal/components';
 
diff --git a/code/core/src/toolbar/components/ToolbarMenuButton.tsx b/code/core/src/toolbar/components/ToolbarMenuButton.tsx
index 30e4aa5365a..05a07d87989 100644
--- a/code/core/src/toolbar/components/ToolbarMenuButton.tsx
+++ b/code/core/src/toolbar/components/ToolbarMenuButton.tsx
@@ -1,5 +1,4 @@
-import type { FC } from 'react';
-import React from 'react';
+import React, { type FC } from 'react';
 
 import { IconButton, Icons, type IconsProps } from 'storybook/internal/components';
 
diff --git a/scripts/prepare/tools.ts b/scripts/prepare/tools.ts
index 580c3034cce..bf278b38ec4 100644
--- a/scripts/prepare/tools.ts
+++ b/scripts/prepare/tools.ts
@@ -31,7 +31,7 @@ export const dts = async (entry: string, externals: string[], tsconfig: string)
   const dir = dirname(entry).replace('src', 'dist');
   const out = await rollup.rollup({
     input: entry,
-    external: [...externals, 'ast-types'].map((dep) => new RegExp(`^${dep}($|\\/|\\\\)`)),
+    external: [...externals, 'ast-types', 'react'].map((dep) => new RegExp(`^${dep}($|\\/|\\\\)`)),
     output: { file: entry.replace('src', 'dist').replace('.ts', '.d.ts'), format: 'es' },
     plugins: [
       rpd.dts({
@@ -40,6 +40,7 @@ export const dts = async (entry: string, externals: string[], tsconfig: string)
         compilerOptions: {
           esModuleInterop: true,
           baseUrl: '.',
+          jsx: ts.JsxEmit.React,
           declaration: true,
           noEmit: false,
           emitDeclarationOnly: true,