Skip to content

Core: Fix cyclical dependency in core addons #31750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JReinhold merged 5 commits into from
Jun 12, 2025
Merged

Core: Fix cyclical dependency in core addons #31750

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
668edc4
relatively import preview annotations of core addons
JReinhold Jun 11, 2025
3896d4d
remove unneeded preview entrypoints for core addons
JReinhold Jun 11, 2025
94d6ea8
Merge branch 'next' into jeppe/fix-preview-api-bicycle
JReinhold Jun 11, 2025
47097e3
cleanup, fix unit tests
JReinhold Jun 11, 2025
d051121
Merge branch 'jeppe/fix-preview-api-bicycle' of github.com:storybookj…
JReinhold Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 0 additions & 192 deletions code/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,66 +83,6 @@
"import": "./dist/core-server/presets/common-override-preset.js",
"require": "./dist/core-server/presets/common-override-preset.cjs"
},
"./internal/backgrounds": {
"types": "./dist/backgrounds/index.d.ts",
"import": "./dist/backgrounds/index.js",
"require": "./dist/backgrounds/index.cjs"
},
"./backgrounds": {
"types": "./dist/backgrounds/index.d.ts",
"import": "./dist/backgrounds/index.js",
"require": "./dist/backgrounds/index.cjs"
},
"./internal/backgrounds/preview": {
"types": "./dist/backgrounds/preview.d.ts",
"import": "./dist/backgrounds/preview.js",
"require": "./dist/backgrounds/preview.cjs"
},
"./backgrounds/preview": {
"types": "./dist/backgrounds/preview.d.ts",
"import": "./dist/backgrounds/preview.js",
"require": "./dist/backgrounds/preview.cjs"
},
"./internal/measure": {
"types": "./dist/measure/index.d.ts",
"import": "./dist/measure/index.js",
"require": "./dist/measure/index.cjs"
},
"./measure": {
"types": "./dist/measure/index.d.ts",
"import": "./dist/measure/index.js",
"require": "./dist/measure/index.cjs"
},
"./internal/measure/preview": {
"types": "./dist/measure/preview.d.ts",
"import": "./dist/measure/preview.js",
"require": "./dist/measure/preview.cjs"
},
"./measure/preview": {
"types": "./dist/measure/preview.d.ts",
"import": "./dist/measure/preview.js",
"require": "./dist/measure/preview.cjs"
},
"./internal/outline": {
"types": "./dist/outline/index.d.ts",
"import": "./dist/outline/index.js",
"require": "./dist/outline/index.cjs"
},
"./outline": {
"types": "./dist/outline/index.d.ts",
"import": "./dist/outline/index.js",
"require": "./dist/outline/index.cjs"
},
"./internal/outline/preview": {
"types": "./dist/outline/preview.d.ts",
"import": "./dist/outline/preview.js",
"require": "./dist/outline/preview.cjs"
},
"./outline/preview": {
"types": "./dist/outline/preview.d.ts",
"import": "./dist/outline/preview.js",
"require": "./dist/outline/preview.cjs"
},
"./internal/highlight": {
"types": "./dist/highlight/index.d.ts",
"import": "./dist/highlight/index.js",
Expand All @@ -153,16 +93,6 @@
"import": "./dist/highlight/index.js",
"require": "./dist/highlight/index.cjs"
},
"./internal/highlight/preview": {
"types": "./dist/highlight/preview.d.ts",
"import": "./dist/highlight/preview.js",
"require": "./dist/highlight/preview.cjs"
},
"./highlight/preview": {
"types": "./dist/highlight/preview.d.ts",
"import": "./dist/highlight/preview.js",
"require": "./dist/highlight/preview.cjs"
},
"./internal/actions": {
"types": "./dist/actions/index.d.ts",
"import": "./dist/actions/index.js",
Expand All @@ -173,16 +103,6 @@
"import": "./dist/actions/index.js",
"require": "./dist/actions/index.cjs"
},
"./internal/actions/preview": {
"types": "./dist/actions/preview.d.ts",
"import": "./dist/actions/preview.js",
"require": "./dist/actions/preview.cjs"
},
"./actions/preview": {
"types": "./dist/actions/preview.d.ts",
"import": "./dist/actions/preview.js",
"require": "./dist/actions/preview.cjs"
},
"./internal/actions/decorator": {
"types": "./dist/actions/decorator.d.ts",
"import": "./dist/actions/decorator.js"
Expand All @@ -191,26 +111,6 @@
"types": "./dist/actions/decorator.d.ts",
"import": "./dist/actions/decorator.js"
},
"./internal/controls/preview": {
"types": "./dist/controls/preview.d.ts",
"import": "./dist/controls/preview.js",
"require": "./dist/controls/preview.cjs"
},
"./controls/preview": {
"types": "./dist/controls/preview.d.ts",
"import": "./dist/controls/preview.js",
"require": "./dist/controls/preview.cjs"
},
"./internal/component-testing": {
"types": "./dist/component-testing/index.d.ts",
"import": "./dist/component-testing/index.js",
"require": "./dist/component-testing/index.cjs"
},
"./internal/component-testing/preview": {
"types": "./dist/component-testing/preview.d.ts",
"import": "./dist/component-testing/preview.js",
"require": "./dist/component-testing/preview.cjs"
},
"./internal/viewport": {
"types": "./dist/viewport/index.d.ts",
"import": "./dist/viewport/index.js",
Expand All @@ -221,16 +121,6 @@
"import": "./dist/viewport/index.js",
"require": "./dist/viewport/index.cjs"
},
"./internal/viewport/preview": {
"types": "./dist/viewport/preview.d.ts",
"import": "./dist/viewport/preview.js",
"require": "./dist/viewport/preview.cjs"
},
"./viewport/preview": {
"types": "./dist/viewport/preview.d.ts",
"import": "./dist/viewport/preview.js",
"require": "./dist/viewport/preview.cjs"
},
"./internal/controls": {
"types": "./dist/controls/index.d.ts",
"import": "./dist/controls/index.js",
Expand Down Expand Up @@ -368,16 +258,6 @@
"import": "./dist/instrumenter/index.js",
"require": "./dist/instrumenter/index.cjs"
},
"./internal/test/preview": {
"types": "./dist/test/preview.d.ts",
"import": "./dist/test/preview.js",
"require": "./dist/test/preview.cjs"
},
"./test/preview": {
"types": "./dist/test/preview.d.ts",
"import": "./dist/test/preview.js",
"require": "./dist/test/preview.cjs"
},
"./internal/test": {
"types": "./dist/test/index.d.ts",
"import": "./dist/test/index.js",
Expand Down Expand Up @@ -426,96 +306,30 @@
"internal/core-server": [
"./dist/core-server/index.d.ts"
],
"internal/backgrounds": [
"./dist/backgrounds/index.d.ts"
],
"backgrounds": [
"./dist/backgrounds/index.d.ts"
],
"internal/backgrounds/preview": [
"./dist/backgrounds/preview.d.ts"
],
"backgrounds/preview": [
"./dist/backgrounds/preview.d.ts"
],
"internal/measure": [
"./dist/measure/index.d.ts"
],
"measure": [
"./dist/measure/index.d.ts"
],
"internal/measure/preview": [
"./dist/measure/preview.d.ts"
],
"measure/preview": [
"./dist/measure/preview.d.ts"
],
"internal/outline": [
"./dist/outline/index.d.ts"
],
"outline": [
"./dist/outline/index.d.ts"
],
"internal/outline/preview": [
"./dist/outline/preview.d.ts"
],
"outline/preview": [
"./dist/outline/preview.d.ts"
],
"internal/highlight": [
"./dist/highlight/index.d.ts"
],
"highlight": [
"./dist/highlight/index.d.ts"
],
"internal/highlight/preview": [
"./dist/highlight/preview.d.ts"
],
"highlight/preview": [
"./dist/highlight/preview.d.ts"
],
"internal/actions": [
"./dist/actions/index.d.ts"
],
"actions": [
"./dist/actions/index.d.ts"
],
"internal/actions/preview": [
"./dist/actions/preview.d.ts"
],
"actions/preview": [
"./dist/actions/preview.d.ts"
],
"internal/actions/decorator": [
"./dist/actions/decorator.d.ts"
],
"actions/decorator": [
"./dist/actions/decorator.d.ts"
],
"internal/controls/preview": [
"./dist/controls/preview.d.ts"
],
"controls/preview": [
"./dist/controls/preview.d.ts"
],
"internal/component-testing": [
"./dist/component-testing/index.d.ts"
],
"internal/component-testing/preview": [
"./dist/component-testing/preview.d.ts"
],
"internal/viewport": [
"./dist/viewport/index.d.ts"
],
"viewport": [
"./dist/viewport/index.d.ts"
],
"internal/viewport/preview": [
"./dist/viewport/preview.d.ts"
],
"viewport/preview": [
"./dist/viewport/preview.d.ts"
],
"internal/controls": [
"./dist/controls/index.d.ts"
],
Expand Down Expand Up @@ -597,12 +411,6 @@
"internal/instrumenter": [
"./dist/instrumenter/index.d.ts"
],
"internal/test/preview": [
"./dist/test/preview.d.ts"
],
"test/preview": [
"./dist/test/preview.d.ts"
],
"internal/test": [
"./dist/test/index.d.ts"
],
Expand Down
16 changes: 0 additions & 16 deletions code/core/scripts/dts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,19 @@ async function run() {
'storybook/theming',

'storybook/test',
'storybook/test/preview',

'storybook/measure',
'storybook/measure/preview',

'storybook/highlight',
'storybook/highlight/preview',

'storybook/outline',
'storybook/outline/preview',

'storybook/backgrounds',
'storybook/backgrounds/preview',

'storybook/actions',
'storybook/actions/preview',
'storybook/actions/decorator',

'storybook/controls/preview',

'storybook/viewport',
'storybook/viewport/preview',

'storybook/internal/builder-manager',
'storybook/internal/channels',
'storybook/internal/client-logger',
'storybook/internal/common',
'storybook/internal/component-testing',
'storybook/internal/component-testing/preview',
'storybook/internal/components',
'storybook/internal/core-events',
'storybook/internal/core-server',
Expand Down
33 changes: 0 additions & 33 deletions code/core/scripts/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,14 @@ export const getEntries = (cwd: string) => {
]),
define('src/core-server/presets/common-override-preset.ts', ['node'], false),

define('src/backgrounds/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/backgrounds/preview.ts', ['browser', 'node'], true, ['react'], [], [], true),

define('src/measure/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/measure/preview.ts', ['browser', 'node'], true, ['react'], [], [], true),

define('src/outline/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/outline/preview.ts', ['browser', 'node'], true, ['react'], [], [], true),

define('src/highlight/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/highlight/preview.ts', ['browser', 'node'], true, ['react'], [], [], true),

define('src/actions/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/actions/preview.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/actions/decorator.ts', ['browser'], true, ['react'], [], [], true),

define('src/controls/preview.ts', ['browser', 'node'], true, ['react'], [], [], true),

define('src/component-testing/index.ts', ['browser', 'node'], true, ['react'], [], []),
define('src/component-testing/preview.ts', ['browser', 'node'], true, ['react'], [], []),
define('src/viewport/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/viewport/preview.ts', ['browser', 'node'], true, ['react'], [], [], true),

define('src/controls/index.ts', ['browser', 'node'], true, ['react']),
define('src/controls/preview.ts', ['browser', 'node'], true, ['react']),
define('src/controls/decorator.ts', ['browser'], true, ['react']),

define('src/core-events/index.ts', ['browser', 'node'], true),
Expand Down Expand Up @@ -82,22 +65,6 @@ export const getEntries = (cwd: string) => {
define('src/bin/index.ts', ['node'], false),

define('src/instrumenter/index.ts', ['browser', 'node'], true),
define(
'src/test/preview.ts',
['browser', 'node'],
true,
['util', 'react'],
[],
[
'@testing-library/jest-dom',
'@testing-library/user-event',
'chai',
'@vitest/expect',
'@vitest/spy',
'@vitest/utils',
],
true
),
define(
'src/test/index.ts',
['browser', 'node'],
Expand Down
1 change: 0 additions & 1 deletion code/core/src/backgrounds/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions code/core/src/component-testing/index.ts
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions code/core/src/csf/core-annotations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import componentTestingAnnotations from 'storybook/internal/component-testing/preview';
import type { StorybookTypes } from 'storybook/internal/types';

import actionAnnotations, { type ActionsTypes } from 'storybook/actions/preview';
import backgroundsAnnotations, { type BackgroundTypes } from 'storybook/backgrounds/preview';
import { type ControlsTypes } from 'storybook/controls/preview';
import highlightAnnotations, { type HighlightTypes } from 'storybook/highlight/preview';
import measureAnnotations, { type MeasureTypes } from 'storybook/measure/preview';
import outlineAnnotations, { type OutlineTypes } from 'storybook/outline/preview';
import testAnnotations, { type TestTypes } from 'storybook/test/preview';
import viewportAnnotations, { type ViewportTypes } from 'storybook/viewport/preview';
import actionAnnotations, { type ActionsTypes } from '../actions/preview';
import backgroundsAnnotations, { type BackgroundTypes } from '../backgrounds/preview';
import componentTestingAnnotations from '../component-testing/preview';
import { type ControlsTypes } from '../controls/preview';
import highlightAnnotations, { type HighlightTypes } from '../highlight/preview';
import measureAnnotations, { type MeasureTypes } from '../measure/preview';
import outlineAnnotations, { type OutlineTypes } from '../outline/preview';
import testAnnotations, { type TestTypes } from '../test/preview';
import viewportAnnotations, { type ViewportTypes } from '../viewport/preview';

export type CoreTypes = StorybookTypes &
ActionsTypes &
Expand Down
1 change: 0 additions & 1 deletion code/core/src/measure/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion code/core/src/outline/index.ts
View file
Open in desktop

This file was deleted.

Loading