Skip to content

Commit 7949b77

Browse files
authored
Merge branch 'next' into optimize-startup
2 parents d4414b7 + 950fdaa commit 7949b77

File tree

11 files changed

+22
-40
lines changed

11 files changed

+22
-40
lines changed

code/addons/docs/src/blocks/components/ArgsTable/ArgValue.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { SyntaxHighlighter, WithTooltipPure, codeCommon } from 'storybook/intern
55

66
import { ChevronSmallDownIcon, ChevronSmallUpIcon } from '@storybook/icons';
77

8-
import { uniq } from 'es-toolkit/compat';
8+
import uniq from 'es-toolkit/compat/uniq';
99
import memoize from 'memoizerific';
1010
import { styled } from 'storybook/theming';
1111

code/addons/docs/src/blocks/components/ArgsTable/ArgsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { includeConditionalArg } from 'storybook/internal/csf';
77

88
import { DocumentIcon, UndoIcon } from '@storybook/icons';
99

10-
import { pickBy } from 'es-toolkit/compat';
10+
import pickBy from 'es-toolkit/compat/pickBy';
1111
import { transparentize } from 'polished';
1212
import { styled } from 'storybook/theming';
1313

code/addons/docs/src/blocks/controls/Color.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Form, TooltipNote, WithTooltip } from 'storybook/internal/components';
66
import { MarkupIcon } from '@storybook/icons';
77

88
import convert from 'color-convert';
9-
import { debounce } from 'es-toolkit/compat';
9+
import debounce from 'es-toolkit/compat/debounce';
1010
import { HexColorPicker, HslaStringColorPicker, RgbaStringColorPicker } from 'react-colorful';
1111
import { styled } from 'storybook/theming';
1212

code/addons/docs/src/blocks/controls/Object.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Button, Form, IconButton } from 'storybook/internal/components';
55

66
import { AddIcon, EyeCloseIcon, EyeIcon, SubtractIcon } from '@storybook/icons';
77

8-
import { cloneDeep } from 'es-toolkit/compat';
8+
import cloneDeep from 'es-toolkit/compat/cloneDeep';
99
import { type Theme, styled, useTheme } from 'storybook/theming';
1010

1111
import { getControlId, getControlSetterButtonId } from './helpers';

code/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
"@rolldown/pluginutils": "1.0.0-beta.18",
232232
"@storybook/docs-mdx": "4.0.0-next.1",
233233
"@tanstack/react-virtual": "^3.3.0",
234-
"@testing-library/dom": "10.4.0",
234+
"@testing-library/dom": "^10.4.1",
235235
"@testing-library/react": "^14.0.0",
236236
"@types/cross-spawn": "^6.0.6",
237237
"@types/detect-port": "^1.3.0",

code/core/src/core-server/utils/stories-json.test.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
55
import { normalizeStoriesEntry } from 'storybook/internal/common';
66
import { STORY_INDEX_INVALIDATED } from 'storybook/internal/core-events';
77

8-
import { debounce } from 'es-toolkit/compat';
8+
import debounce from 'es-toolkit/compat/debounce';
99
import type { Polka, Request, Response } from 'polka';
1010
import Watchpack from 'watchpack';
1111

@@ -16,7 +16,7 @@ import type { ServerChannel } from './get-server-channel';
1616
import { DEBOUNCE, useStoriesJson } from './stories-json';
1717

1818
vi.mock('watchpack');
19-
vi.mock('es-toolkit/compat');
19+
vi.mock('es-toolkit/compat/debounce');
2020
vi.mock('storybook/internal/node-logger');
2121

2222
vi.mock('../utils/constants', () => {
@@ -575,7 +575,11 @@ describe('useStoriesJson', () => {
575575

576576
it('debounces invalidation events', async () => {
577577
vi.mocked(debounce).mockImplementation(
578-
(await vi.importActual<typeof import('es-toolkit/compat')>('es-toolkit/compat')).debounce
578+
(
579+
await vi.importActual<typeof import('es-toolkit/compat/debounce')>(
580+
'es-toolkit/compat/debounce'
581+
)
582+
).default
579583
);
580584

581585
const mockServerChannel = { emit: vi.fn() } as any as ServerChannel;

code/core/src/core-server/utils/stories-json.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { basename } from 'node:path';
44
import { STORY_INDEX_INVALIDATED } from 'storybook/internal/core-events';
55
import type { NormalizedStoriesSpecifier, StoryIndex } from 'storybook/internal/types';
66

7-
import { debounce } from 'es-toolkit/compat';
7+
import debounce from 'es-toolkit/compat/debounce';
88
import type { Polka } from 'polka';
99

1010
import type { StoryIndexGenerator } from './StoryIndexGenerator';

code/core/src/manager/components/sidebar/useLastViewed.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useCallback, useEffect, useMemo, useRef } from 'react';
22

3-
import { debounce } from 'es-toolkit/compat';
3+
import debounce from 'es-toolkit/compat/debounce';
44
import store from 'store2';
55

66
import type { Selection, StoryRef } from './types';

code/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
"@types/node": "^22.0.0",
9797
"@types/react": "^18.0.0",
9898
"@vitest/expect@npm:3.2.4": "patch:@vitest/expect@npm%3A3.2.4#~/.yarn/patches/@vitest-expect-npm-3.2.4-97c526d5cc.patch",
99+
"aria-query@5.3.0": "^5.3.0",
99100
"esbuild": "^0.25.3",
100101
"playwright": "1.52.0",
101102
"playwright-core": "1.52.0",

code/renderers/react/src/docs/lib/defaultValues/createFromRawDefaultProp.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import {
55
isTooLongForDefaultValueSummary,
66
} from 'storybook/internal/docs-tools';
77

8-
import { isFunction, isPlainObject, isString } from 'es-toolkit/compat';
8+
import isFunction from 'es-toolkit/compat/isFunction';
9+
import isPlainObject from 'es-toolkit/compat/isPlainObject';
10+
import isString from 'es-toolkit/compat/isString';
911
import type reactElementToJSXStringType from 'react-element-to-jsx-string';
1012
// @ts-expect-error (this is needed, because our bundling prefers the `browser` field, but that yields CJS)
1113
import reactElementToJSXStringRaw from 'react-element-to-jsx-string/dist/esm/index.js';

0 commit comments

Comments
 (0)