Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(core): a single esbuild bundle renders Core: lazily imported modules import Core directly, not through barrels (#9055)

Cindy Zhangf277e2580c45
diff --git a/.changeset/core-single-bundle-init-order.md b/.changeset/core-single-bundle-init-order.md
new file mode 100644
index 0000000000..2385a51463
--- /dev/null
+++ b/.changeset/core-single-bundle-init-order.md
@@ -0,0 +1,7 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] An app bundled into one esbuild file (no code splitting, as no-build pages are) no longer crashes on first render with a TypeError such as "Cannot read properties of undefined (reading 'useId')" or "(reading 'useEffect')", for example when it uses `List` or `Button`. Code-split apps are unchanged and still load Core's lazy modules on demand.
+
+@cixzhang @duytbp
diff --git a/packages/core/src/AlertDialog/AlertDialog.tsx b/packages/core/src/AlertDialog/AlertDialog.tsx
index 9553b3bc91..402f865d2a 100644
--- a/packages/core/src/AlertDialog/AlertDialog.tsx
+++ b/packages/core/src/AlertDialog/AlertDialog.tsx
@@ -18,18 +18,19 @@
import React, {useId, useCallback} from 'react';
import * as stylex from '@stylexjs/stylex';
-import {Dialog} from '../Dialog';
+import {Dialog} from '../Dialog/Dialog';
import {Layout} from '../Layout/Layout';
import {LayoutContent} from '../Layout/LayoutContent';
import {LayoutFooter} from '../Layout/LayoutFooter';
-import {Stack} from '../Stack';
+import {Stack} from '../Stack/Stack';
import {Heading} from '../Heading/Heading';
import {Text} from '../Text/Text';
-import {Button, type ButtonVariant} from '../Button';
+import {Button} from '../Button/Button';
+import type {ButtonVariant} from '../Button';
import type {BaseProps} from '../BaseProps';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
-import {useTranslator} from '../i18n';
+import {useTranslator} from '../i18n/useTranslator';
import {useMediaQuery} from '../hooks/useMediaQuery';
const SMALL_SCREEN_QUERY = '(max-width: 640px)';
diff --git a/packages/core/src/BottomSheet/BottomSheet.tsx b/packages/core/src/BottomSheet/BottomSheet.tsx
index bffdec2657..d4ebd50e35 100644
--- a/packages/core/src/BottomSheet/BottomSheet.tsx
+++ b/packages/core/src/BottomSheet/BottomSheet.tsx
@@ -99,7 +99,7 @@ import {
} from '../theme/tokens.stylex';
import {useDevWarning} from '../hooks/useDevWarning';
import {useScrollLock} from '../hooks/useScrollLock';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {LayerDepthProvider} from '../Layer/LayerDepthContext';
import {ModalAnnounceProvider} from '../hooks/ModalAnnounceProvider';
import {useModalOutlet} from '../Layer/modalOutlet';
diff --git a/packages/core/src/BottomSheet/BottomSheetPanel.tsx b/packages/core/src/BottomSheet/BottomSheetPanel.tsx
index 30fa891638..1b7258f178 100644
--- a/packages/core/src/BottomSheet/BottomSheetPanel.tsx
+++ b/packages/core/src/BottomSheet/BottomSheetPanel.tsx
@@ -48,7 +48,8 @@ import {
sizeVars,
spacingVars,
} from '../theme/tokens.stylex';
-import {mergeProps, themeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
+import {themeProps} from '../utils/themeProps';
import {focusOutlineStyles} from '../utils/focusOutline.stylex';
import {layerTextReset} from '../Layer/layerTextReset.stylex';
import {layerStructureReset} from '../Layer/layerStructureReset.stylex';
diff --git a/packages/core/src/Button/Button.tsx b/packages/core/src/Button/Button.tsx
index 0d470d42b6..b2680bbc7f 100644
--- a/packages/core/src/Button/Button.tsx
+++ b/packages/core/src/Button/Button.tsx
@@ -43,8 +43,8 @@ import {
shadowVars,
focusVars,
} from '../theme/tokens.stylex';
-import {Spinner} from '../Spinner';
-import {VisuallyHidden} from '../VisuallyHidden';
+import {Spinner} from '../Spinner/Spinner';
+import {VisuallyHidden} from '../VisuallyHidden/VisuallyHidden';
import {IconDefaultSizeProvider} from '../Icon/IconDefaultSizeContext';
import {iconBoxSizeStyles, type IconSize} from '../Icon/IconSize.stylex';
@@ -57,7 +57,7 @@ import {
groupStyles as inputGroupStyles,
inputGroupItemProps,
} from '../InputGroup/groupStyles';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {useMergedRefs} from '../hooks/useMergedRefs';
import {useLinkComponent} from '../Link/useLinkComponent';
import type {LinkComponentType} from '../Link/types';
@@ -65,7 +65,7 @@ import {themeProps} from '../utils/themeProps';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';
import {usePressFeedback} from '../hooks/usePressFeedback';
-import {useTranslator} from '../i18n';
+import {useTranslator} from '../i18n/useTranslator';
import type {ButtonVariantMap} from './index';
/**
diff --git a/packages/core/src/CheckboxInput/CheckboxInput.tsx b/packages/core/src/CheckboxInput/CheckboxInput.tsx
index a3e9996370..8073810c98 100644
--- a/packages/core/src/CheckboxInput/CheckboxInput.tsx
+++ b/packages/core/src/CheckboxInput/CheckboxInput.tsx
@@ -41,17 +41,18 @@ import {FieldLabel} from '../Field/FieldLabel';
import {FieldStatus} from '../FieldStatus/FieldStatus';
import type {IconType} from '../Icon';
import type {InputStatus} from '../Field/types';
-import {Spinner} from '../Spinner';
-import {useTooltip} from '../Tooltip';
-import {mergeProps, rtlStyles} from '../utils';
+import {Spinner} from '../Spinner/Spinner';
+import {useTooltip} from '../Tooltip/useTooltip';
+import {mergeProps} from '../utils/mergeProps';
+import {rtlStyles} from '../utils/rtlStyles';
import {indicatorScope} from '../Indicator/indicator.markers.stylex';
import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';
-import {useTranslator} from '../i18n';
+import {useTranslator} from '../i18n/useTranslator';
import {useIndicatorFocusRing} from '../hooks/useIndicatorFocusRing';
import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';
import {usePressFeedback} from '../hooks/usePressFeedback';
import {useResolvedRequired} from '../hooks/useResolvedRequired';
-import {useIndicator} from '../Indicator';
+import {useIndicator} from '../Indicator/useIndicator';
import {themeProps} from '../utils/themeProps';
import {useMergedRefs} from '../hooks/useMergedRefs';
diff --git a/packages/core/src/Dialog/Dialog.tsx b/packages/core/src/Dialog/Dialog.tsx
index 475465ec16..261d77b712 100644
--- a/packages/core/src/Dialog/Dialog.tsx
+++ b/packages/core/src/Dialog/Dialog.tsx
@@ -69,7 +69,7 @@ import {
overlayPaddingReset,
} from '../Layout/padding.stylex';
import type {SpacingStep} from '../utils/types';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {chainEventHandlers} from '../utils/chainEventHandlers';
import {devWarn} from '../utils/devWarning';
import {DialogContext} from './DialogContext';
diff --git a/packages/core/src/Dialog/DialogHeader.tsx b/packages/core/src/Dialog/DialogHeader.tsx
index 303fb414f1..e36459420a 100644
--- a/packages/core/src/Dialog/DialogHeader.tsx
+++ b/packages/core/src/Dialog/DialogHeader.tsx
@@ -20,15 +20,16 @@ import {useEffect, useRef, type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
import {spacingVars, sizeVars, typeScaleVars} from '../theme/tokens.stylex';
import {LayoutHeader} from '../Layout/LayoutHeader';
-import {Button} from '../Button';
-import {Icon} from '../Icon';
+import {Button} from '../Button/Button';
+import {Icon} from '../Icon/Icon';
import {Heading} from '../Heading/Heading';
import {Text} from '../Text/Text';
import type {BaseProps} from '../BaseProps';
-import {isRenderable, mergeProps} from '../utils';
+import {isRenderable} from '../utils/isRenderable';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
import {useDialogContext} from './DialogContext';
-import {useTranslator} from '../i18n';
+import {useTranslator} from '../i18n/useTranslator';
const styles = stylex.create({
container: {
diff --git a/packages/core/src/Divider/Divider.tsx b/packages/core/src/Divider/Divider.tsx
index f08a29f365..0a16240711 100644
--- a/packages/core/src/Divider/Divider.tsx
+++ b/packages/core/src/Divider/Divider.tsx
@@ -25,7 +25,8 @@ import {
typeScaleVars,
borderVars,
} from '../theme/tokens.stylex';
-import {isRenderable, mergeProps} from '../utils';
+import {isRenderable} from '../utils/isRenderable';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
import type {DividerVariantMap} from './index';
diff --git a/packages/core/src/DropdownMenu/MenuBottomSheetActionList.tsx b/packages/core/src/DropdownMenu/MenuBottomSheetActionList.tsx
index 86f23e4123..0449745896 100644
--- a/packages/core/src/DropdownMenu/MenuBottomSheetActionList.tsx
+++ b/packages/core/src/DropdownMenu/MenuBottomSheetActionList.tsx
@@ -11,13 +11,14 @@
import React, {useRef, type ReactElement} from 'react';
import * as stylex from '@stylexjs/stylex';
-import {Divider} from '../Divider';
-import {Heading} from '../Heading';
-import {Icon, renderIconSlot} from '../Icon';
-import {List, ListItem} from '../List';
+import {Divider} from '../Divider/Divider';
+import {Heading} from '../Heading/Heading';
+import {Icon, renderIconSlot} from '../Icon/Icon';
+import {List} from '../List/List';
+import {ListItem} from '../List/ListItem';
import {useMenuPress} from '../hooks/useMenuPress';
import {colorVars, spacingVars} from '../theme/tokens.stylex';
-import {rtlStyles} from '../utils';
+import {rtlStyles} from '../utils/rtlStyles';
import {getInteractionModality} from '../utils/interactionModality';
import type {DropdownMenuItemData, DropdownMenuOption} from './DropdownMenu';
import {isModifiedClick} from './menuItemRoles';
diff --git a/packages/core/src/EmptyState/EmptyState.tsx b/packages/core/src/EmptyState/EmptyState.tsx
index 667a4413d5..5a3b6552dd 100644
--- a/packages/core/src/EmptyState/EmptyState.tsx
+++ b/packages/core/src/EmptyState/EmptyState.tsx
@@ -24,7 +24,8 @@ import {
} from '../theme/tokens.stylex';
import type {BaseProps} from '../BaseProps';
import {AnnounceRenderedText} from '../hooks/AnnounceRenderedText';
-import {isRenderable, mergeProps} from '../utils';
+import {isRenderable} from '../utils/isRenderable';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
const styles = stylex.create({
diff --git a/packages/core/src/Field/FieldLabel.tsx b/packages/core/src/Field/FieldLabel.tsx
index 6cac00136f..ecdf44e7ce 100644
--- a/packages/core/src/Field/FieldLabel.tsx
+++ b/packages/core/src/Field/FieldLabel.tsx
@@ -19,7 +19,7 @@
import {use, useMemo, useRef, type ReactNode, type RefObject} from 'react';
import * as stylex from '@stylexjs/stylex';
import type {BaseProps} from '../BaseProps';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {
colorVars,
@@ -28,9 +28,10 @@ import {
typographyVars,
typeScaleVars,
} from '../theme/tokens.stylex';
-import {Icon, renderIconSlot, type IconType} from '../Icon';
-import {Tooltip} from '../Tooltip';
-import {useTranslator} from '../i18n';
+import {Icon, renderIconSlot} from '../Icon/Icon';
+import type {IconType} from '../Icon';
+import {Tooltip} from '../Tooltip/Tooltip';
+import {useTranslator} from '../i18n/useTranslator';
import {themeProps} from '../utils/themeProps';
import {useInputContainer} from '../hooks/useInputContainer';
import {FormLayoutContext} from '../FormLayout/FormLayoutContext';
diff --git a/packages/core/src/Field/InputClearButton.tsx b/packages/core/src/Field/InputClearButton.tsx
index a9e154f095..27d2269c9b 100644
--- a/packages/core/src/Field/InputClearButton.tsx
+++ b/packages/core/src/Field/InputClearButton.tsx
@@ -18,9 +18,9 @@
import type {ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
-import {Button} from '../Button';
-import {Icon} from '../Icon';
-import {useTranslator} from '../i18n';
+import {Button} from '../Button/Button';
+import {Icon} from '../Icon/Icon';
+import {useTranslator} from '../i18n/useTranslator';
import {themeProps} from '../utils/themeProps';
const styles = stylex.create({
diff --git a/packages/core/src/Field/PanelSearchInput.tsx b/packages/core/src/Field/PanelSearchInput.tsx
index caa4c9aa12..00ce2d7607 100644
--- a/packages/core/src/Field/PanelSearchInput.tsx
+++ b/packages/core/src/Field/PanelSearchInput.tsx
@@ -42,9 +42,9 @@
import {useCallback, useState, type Ref} from 'react';
import * as stylex from '@stylexjs/stylex';
import type {StyleXStyles} from '@stylexjs/stylex';
-import {Icon} from '../Icon';
+import {Icon} from '../Icon/Icon';
import {InputClearButton} from './InputClearButton';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {
getInteractionModality,
useInteractionModalityTracking,
diff --git a/packages/core/src/FieldStatus/FieldStatus.tsx b/packages/core/src/FieldStatus/FieldStatus.tsx
index bb15284ca8..52f40138db 100644
--- a/packages/core/src/FieldStatus/FieldStatus.tsx
+++ b/packages/core/src/FieldStatus/FieldStatus.tsx
@@ -20,7 +20,7 @@
import React from 'react';
import * as stylex from '@stylexjs/stylex';
import type {BaseProps} from '../BaseProps';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {
colorVars,
radiusVars,
@@ -31,7 +31,7 @@ import {
import type {InputStatusType} from '../Field/types';
import {useEntryAnimation} from '../hooks/useEntryAnimation';
import {themeProps} from '../utils/themeProps';
-import {Icon} from '../Icon';
+import {Icon} from '../Icon/Icon';
import type {IconName} from '../Icon';
import type {FieldStatusVariantMap} from './index';
import {useFieldStatusAnnouncement} from './useFieldStatusAnnouncement';
diff --git a/packages/core/src/Heading/Heading.tsx b/packages/core/src/Heading/Heading.tsx
index b3bd051bf8..74d621ea69 100644
--- a/packages/core/src/Heading/Heading.tsx
+++ b/packages/core/src/Heading/Heading.tsx
@@ -45,7 +45,7 @@ import {
import {useTruncation} from '../Text/useTruncation';
import {resolveStyleColor} from '../Text/Text';
import type {LayerPlacement} from '../Layer';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {useMergedRefs} from '../hooks/useMergedRefs';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
diff --git a/packages/core/src/Icon/Icon.tsx b/packages/core/src/Icon/Icon.tsx
index 02eebd1570..a85d7990ed 100644
--- a/packages/core/src/Icon/Icon.tsx
+++ b/packages/core/src/Icon/Icon.tsx
@@ -38,7 +38,7 @@ import {useThemeName} from '../theme/useTheme';
import {resolveIcon} from './globalIconRegistry';
import type {IconName, NamespacedIconName} from './globalIconRegistry';
import type {IconVariant} from './index';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
import {useIconSize} from './IconDefaultSizeContext';
import {iconSizeStyles, type IconSize} from './IconSize.stylex';
diff --git a/packages/core/src/Indicator/CheckIndicator.tsx b/packages/core/src/Indicator/CheckIndicator.tsx
index 6841402d2d..9903cf1c60 100644
--- a/packages/core/src/Indicator/CheckIndicator.tsx
+++ b/packages/core/src/Indicator/CheckIndicator.tsx
@@ -34,7 +34,8 @@ import * as stylex from '@stylexjs/stylex';
import type {SVGProps} from 'react';
import {Icon} from '../Icon/Icon';
import {colorVars} from '../theme/tokens.stylex';
-import {isRenderable, mergeProps} from '../utils';
+import {isRenderable} from '../utils/isRenderable';
+import {mergeProps} from '../utils/mergeProps';
import type {IndicatorProps} from './types';
/** The check glyph matches the control sizes the indicator families share. */
diff --git a/packages/core/src/Indicator/CheckboxIndicator.tsx b/packages/core/src/Indicator/CheckboxIndicator.tsx
index a6b623626d..ca8594e71c 100644
--- a/packages/core/src/Indicator/CheckboxIndicator.tsx
+++ b/packages/core/src/Indicator/CheckboxIndicator.tsx
@@ -16,7 +16,9 @@ import {
easeVars,
radiusVars,
} from '../theme/tokens.stylex';
-import {isRenderable, mergeProps, themeProps} from '../utils';
+import {isRenderable} from '../utils/isRenderable';
+import {mergeProps} from '../utils/mergeProps';
+import {themeProps} from '../utils/themeProps';
import {indicatorScope} from './indicator.markers.stylex';
import type {IndicatorProps} from './types';
diff --git a/packages/core/src/Indicator/RadioIndicator.tsx b/packages/core/src/Indicator/RadioIndicator.tsx
index 86f726d3f8..860f77fd16 100644
--- a/packages/core/src/Indicator/RadioIndicator.tsx
+++ b/packages/core/src/Indicator/RadioIndicator.tsx
@@ -16,7 +16,9 @@ import {
easeVars,
radiusVars,
} from '../theme/tokens.stylex';
-import {isRenderable, mergeProps, themeProps} from '../utils';
+import {isRenderable} from '../utils/isRenderable';
+import {mergeProps} from '../utils/mergeProps';
+import {themeProps} from '../utils/themeProps';
import {indicatorScope} from './indicator.markers.stylex';
import type {IndicatorProps} from './types';
diff --git a/packages/core/src/Item/Item.tsx b/packages/core/src/Item/Item.tsx
index 34c3aed791..063ff2829e 100644
--- a/packages/core/src/Item/Item.tsx
+++ b/packages/core/src/Item/Item.tsx
@@ -48,7 +48,8 @@ import {
typeScaleVars,
} from '../theme/tokens.stylex';
import type {BaseProps} from '../BaseProps';
-import {isRenderable, mergeProps} from '../utils';
+import {isRenderable} from '../utils/isRenderable';
+import {mergeProps} from '../utils/mergeProps';
import {ItemDescriptionContext} from './ItemDescriptionContext';
import {ItemMarkerColumnsContext} from './ItemMarkerColumnsContext';
import {useMergedRefs} from '../hooks/useMergedRefs';
diff --git a/packages/core/src/Item/ItemSwipeLayer.tsx b/packages/core/src/Item/ItemSwipeLayer.tsx
index d778c43302..4c5a010d04 100644
--- a/packages/core/src/Item/ItemSwipeLayer.tsx
+++ b/packages/core/src/Item/ItemSwipeLayer.tsx
@@ -29,7 +29,7 @@ import {
spacingVars,
typeScaleVars,
} from '../theme/tokens.stylex';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useMediaQuery} from '../hooks/useMediaQuery';
diff --git a/packages/core/src/Layout/Layout.tsx b/packages/core/src/Layout/Layout.tsx
index ebd52dd7f7..b6b95f6306 100644
--- a/packages/core/src/Layout/Layout.tsx
+++ b/packages/core/src/Layout/Layout.tsx
@@ -24,7 +24,7 @@ import {LayoutSlotsContext, type LayoutSlots} from './LayoutSlotsContext';
import {LayoutDividerContext} from './LayoutDividerContext';
import {stack} from '../Stack/stack.stylex';
import {stackItem} from '../Stack/stackItem.stylex';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {layoutFooterMarker, layoutHeaderMarker} from './layoutEdges.stylex';
import type {BaseProps} from '../BaseProps';
import type {SizeValue, SpacingStep} from '../utils/types';
diff --git a/packages/core/src/Layout/LayoutContent.tsx b/packages/core/src/Layout/LayoutContent.tsx
index 7f901854fd..3321205dae 100644
--- a/packages/core/src/Layout/LayoutContent.tsx
+++ b/packages/core/src/Layout/LayoutContent.tsx
@@ -21,7 +21,7 @@ import {use} from 'react';
import * as stylex from '@stylexjs/stylex';
import {spacingVars} from '../theme/tokens.stylex';
import {LayoutSlotsContext} from './LayoutSlotsContext';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import type {SpacingStep} from '../utils/types';
import {themeProps} from '../utils/themeProps';
import {
diff --git a/packages/core/src/Layout/LayoutFooter.tsx b/packages/core/src/Layout/LayoutFooter.tsx
index 666c8c6eaa..c7ff873370 100644
--- a/packages/core/src/Layout/LayoutFooter.tsx
+++ b/packages/core/src/Layout/LayoutFooter.tsx
@@ -22,7 +22,7 @@ import * as stylex from '@stylexjs/stylex';
import {layoutFooterMarker} from './layoutEdges.stylex';
import {LayoutDividerContext} from './LayoutDividerContext';
import {colorVars, spacingVars} from '../theme/tokens.stylex';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import type {SizeValue, SpacingStep} from '../utils/types';
import {themeProps} from '../utils/themeProps';
import {
diff --git a/packages/core/src/Layout/LayoutHeader.tsx b/packages/core/src/Layout/LayoutHeader.tsx
index 68913e1bfc..c18ddd6928 100644
--- a/packages/core/src/Layout/LayoutHeader.tsx
+++ b/packages/core/src/Layout/LayoutHeader.tsx
@@ -23,7 +23,7 @@ import * as stylex from '@stylexjs/stylex';
import {layoutHeaderMarker} from './layoutEdges.stylex';
import {LayoutDividerContext} from './LayoutDividerContext';
import {colorVars, spacingVars} from '../theme/tokens.stylex';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import type {SizeValue, SpacingStep} from '../utils/types';
import {themeProps} from '../utils/themeProps';
import {
diff --git a/packages/core/src/List/List.tsx b/packages/core/src/List/List.tsx
index 1369cac627..ebc3fca933 100644
--- a/packages/core/src/List/List.tsx
+++ b/packages/core/src/List/List.tsx
@@ -29,7 +29,7 @@ import {
type ListEdge,
type ListMarkerStyle,
} from './ListContext';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
import {useDevWarning} from '../hooks/useDevWarning';
diff --git a/packages/core/src/List/ListItem.tsx b/packages/core/src/List/ListItem.tsx
index 7433a24c6c..78574a62e8 100644
--- a/packages/core/src/List/ListItem.tsx
+++ b/packages/core/src/List/ListItem.tsx
@@ -39,9 +39,9 @@ import {
} from '../theme/tokens.stylex';
import type {BaseProps} from '../BaseProps';
import {ListContext, type ListMarker} from './ListContext';
-import {CheckboxInput} from '../CheckboxInput';
-import {mergeProps} from '../utils';
-import {Item} from '../Item';
+import {CheckboxInput} from '../CheckboxInput/CheckboxInput';
+import {mergeProps} from '../utils/mergeProps';
+import {Item} from '../Item/Item';
import {ItemMarkerColumnsContext} from '../Item/ItemMarkerColumnsContext';
import type {ItemAlign, ItemSwipeActions, ItemSwipeBehavior} from '../Item';
import {themeProps} from '../utils/themeProps';
diff --git a/packages/core/src/Spinner/Spinner.tsx b/packages/core/src/Spinner/Spinner.tsx
index 7f7deddc90..2ad4615c98 100644
--- a/packages/core/src/Spinner/Spinner.tsx
+++ b/packages/core/src/Spinner/Spinner.tsx
@@ -21,8 +21,8 @@ import * as stylex from '@stylexjs/stylex';
import {colorVars, durationVars, spacingVars} from '../theme/tokens.stylex';
import type {BaseProps} from '../BaseProps';
import {Text} from '../Text/Text';
-import {mergeProps} from '../utils';
-import {useTranslator} from '../i18n';
+import {mergeProps} from '../utils/mergeProps';
+import {useTranslator} from '../i18n/useTranslator';
import {themeProps} from '../utils/themeProps';
// =============================================================================
diff --git a/packages/core/src/Stack/Stack.tsx b/packages/core/src/Stack/Stack.tsx
index 553666039c..867dab5b68 100644
--- a/packages/core/src/Stack/Stack.tsx
+++ b/packages/core/src/Stack/Stack.tsx
@@ -30,7 +30,7 @@ import {
paddingBlockStartStyles,
paddingBlockEndStyles,
} from '../Layout/padding.stylex';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
const overflowStyles = stylex.create({
diff --git a/packages/core/src/Stack/StackItem.tsx b/packages/core/src/Stack/StackItem.tsx
index 65257a6a1e..a2d85516fa 100644
--- a/packages/core/src/Stack/StackItem.tsx
+++ b/packages/core/src/Stack/StackItem.tsx
@@ -19,7 +19,7 @@ import {
type StackItemCrossAlignSelf,
type StackItemSize,
} from './stackItem.stylex';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {themeProps} from '../utils/themeProps';
const overflowStyles = stylex.create({
diff --git a/packages/core/src/Text/Text.tsx b/packages/core/src/Text/Text.tsx
index b11e4c0b43..9a20d0cb16 100644
--- a/packages/core/src/Text/Text.tsx
+++ b/packages/core/src/Text/Text.tsx
@@ -48,7 +48,7 @@ import {
} from './text.stylex';
import {useTruncation} from './useTruncation';
import type {LayerPlacement} from '../Layer';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
import {useMergedRefs} from '../hooks/useMergedRefs';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
diff --git a/packages/core/src/Timestamp/TimestampHoverCard.tsx b/packages/core/src/Timestamp/TimestampHoverCard.tsx
index 814f25f3ae..a93855f1c4 100644
--- a/packages/core/src/Timestamp/TimestampHoverCard.tsx
+++ b/packages/core/src/Timestamp/TimestampHoverCard.tsx
@@ -26,11 +26,11 @@
import type {ReactNode} from 'react';
import {useCallback} from 'react';
import * as stylex from '@stylexjs/stylex';
-import {HoverCard} from '../HoverCard';
-import {IconButton} from '../IconButton';
-import {Icon} from '../Icon';
+import {HoverCard} from '../HoverCard/HoverCard';
+import {IconButton} from '../IconButton/IconButton';
+import {Icon} from '../Icon/Icon';
import {useClipboard} from '../hooks/useClipboard';
-import {useTranslator} from '../i18n';
+import {useTranslator} from '../i18n/useTranslator';
import {themeProps} from '../utils/themeProps';
import {
colorVars,
diff --git a/packages/core/src/Tokenizer/TokenizerBottomSheet.tsx b/packages/core/src/Tokenizer/TokenizerBottomSheet.tsx
index 0e4b28620f..0538c5dd31 100644
--- a/packages/core/src/Tokenizer/TokenizerBottomSheet.tsx
+++ b/packages/core/src/Tokenizer/TokenizerBottomSheet.tsx
@@ -41,15 +41,15 @@ import {BottomSheet} from '../BottomSheet/BottomSheet';
import {Button} from '../Button/Button';
import {EmptyState} from '../EmptyState/EmptyState';
import {PanelSearchInput} from '../Field/PanelSearchInput';
-import {Icon} from '../Icon';
+import {Icon} from '../Icon/Icon';
import {CheckboxIndicator} from '../Indicator/CheckboxIndicator';
-import {Spinner} from '../Spinner';
+import {Spinner} from '../Spinner/Spinner';
import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';
import {useIsomorphicLayoutEffect} from '../hooks/useIsomorphicLayoutEffect';
import {useAnnounce} from '../hooks/useAnnounce';
import {useAnnounceRenderedText} from '../hooks/useAnnounceRenderedText';
import {Text} from '../Text/Text';
-import {useTranslator} from '../i18n';
+import {useTranslator} from '../i18n/useTranslator';
import {warnOnce} from '../utils/devWarning';
import type {SearchableItem, SearchSource} from '../Typeahead/types';
import {colorVars, radiusVars, spacingVars} from '../theme/tokens.stylex';
diff --git a/packages/core/src/theme/defineTheme.ts b/packages/core/src/theme/defineTheme.ts
index adf01d996d..7675152a4e 100644
--- a/packages/core/src/theme/defineTheme.ts
+++ b/packages/core/src/theme/defineTheme.ts
@@ -132,7 +132,7 @@ import {
} from './themeAdaptations';
import type {DomainTokenName} from './domainTokens';
-import {domainTokenDefaults} from './domainTokens';
+import {domainTokenDefaults} from './domainTokens/domainTokenDefaults';
import type {SyntaxThemeDefinition} from './syntax';
import {registerTheme} from './themeRegistry';
import {resolveLocalTokenContract} from './localTokens';
diff --git a/packages/core/src/theme/domainTokens/domainTokenDefaults.ts b/packages/core/src/theme/domainTokens/domainTokenDefaults.ts
new file mode 100644
index 0000000000..4675a59737
--- /dev/null
+++ b/packages/core/src/theme/domainTokens/domainTokenDefaults.ts
@@ -0,0 +1,19 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file domainTokens/domainTokenDefaults.ts
+ * @input syntaxTokenDefaults, dataTokenDefaults
+ * @output domainTokenDefaults
+ * @position Merges the domain token defaults for defineTheme. Kept out of the
+ * domainTokens barrel because defineTheme sits in a lazily imported module
+ * graph, which imports no barrel (pinned by scripts/core-single-bundle.test.mjs).
+ */
+
+import {syntaxTokenDefaults} from '../syntax/tokens';
+import {dataTokenDefaults} from './dataTokens';
+
+/** All domain token defaults merged — used by defineTheme for validation */
+export const domainTokenDefaults: Record<string, string> = {
+ ...syntaxTokenDefaults,
+ ...dataTokenDefaults,
+};
diff --git a/packages/core/src/theme/domainTokens/index.ts b/packages/core/src/theme/domainTokens/index.ts
index 8b603592f7..b095d29312 100644
--- a/packages/core/src/theme/domainTokens/index.ts
+++ b/packages/core/src/theme/domainTokens/index.ts
@@ -6,8 +6,10 @@
* @output domainTokenDefaults, DomainTokenName
* @position Token aggregator; consumed by defineTheme for validation + autocomplete
*
- * Merges all domain token defaults into a single map for defineTheme.
- * Actual token definitions live in their own directories (syntax/, dataviz/).
+ * Re-exports only. The merged map lives in domainTokenDefaults.ts so that
+ * defineTheme, inside a lazily imported module graph, imports it without a
+ * barrel. Actual token definitions live in their own directories (syntax/,
+ * dataviz/).
*/
export {syntaxTokenDefaults} from '../syntax/tokens';
@@ -16,16 +18,10 @@ export type {SyntaxTokenName} from '../syntax/tokens';
export {dataTokenDefaults} from './dataTokens';
export type {DataTokenName} from './dataTokens';
-import {syntaxTokenDefaults} from '../syntax/tokens';
-import {dataTokenDefaults} from './dataTokens';
+export {domainTokenDefaults} from './domainTokenDefaults';
+
import type {SyntaxTokenName} from '../syntax/tokens';
import type {DataTokenName} from './dataTokens';
-/** All domain token defaults merged — used by defineTheme for validation */
-export const domainTokenDefaults: Record<string, string> = {
- ...syntaxTokenDefaults,
- ...dataTokenDefaults,
-};
-
/** Union of all domain token names */
export type DomainTokenName = SyntaxTokenName | DataTokenName;
diff --git a/scripts/core-single-bundle.test.mjs b/scripts/core-single-bundle.test.mjs
new file mode 100644
index 0000000000..ea61885516
--- /dev/null
+++ b/scripts/core-single-bundle.test.mjs
@@ -0,0 +1,186 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file core-single-bundle.test.mjs
+ * @input Core's source (the lazily imported module graphs) and Core's built
+ * package (packages/core/dist), bundled by esbuild
+ * @output Pins that an app bundled as one esbuild file renders Core
+ * components, and that a code-split app still loads Core's lazy modules on
+ * demand. Core's lazy `import()`s make esbuild, bundling without code
+ * splitting, wrap every module they reach in a lazy initializer. A barrel in
+ * that set is side-effect-free, so esbuild drops its initializer call and a
+ * component such as List runs before its module is initialized ("reading
+ * 'useId' of undefined"). Modules inside a lazily imported graph therefore
+ * import Core modules directly, never through a barrel.
+ * @position Node test; the source checks need no build, the bundle checks run
+ * over Core's build output, which CI builds before the Node tests
+ */
+
+import fs from 'node:fs';
+import {createRequire} from 'node:module';
+import os from 'node:os';
+import path from 'node:path';
+import {afterAll, describe, expect, it} from 'vitest';
+
+const REPO = path.resolve(import.meta.dirname, '..');
+const CORE = path.join(REPO, 'packages/core');
+const DIST_ENTRY = path.join(CORE, 'dist/index.js');
+const require = createRequire(path.join(CORE, 'package.json'));
+const esbuild = require('esbuild');
+const {JSDOM} = createRequire(path.join(REPO, 'package.json'))('jsdom');
+
+const scratch = fs.mkdtempSync(path.join(os.tmpdir(), 'astryx-single-bundle-'));
+afterAll(() => {
+ fs.rmSync(scratch, {recursive: true, force: true});
+});
+
+const APP = `
+ import {Item, List} from '@astryxdesign/core';
+ import {createRoot} from 'react-dom/client';
+ createRoot(document.getElementById('root')).render(
+ <List><Item label="One" /></List>,
+ );
+`;
+
+/** Bundles a tiny app from Core's built package. */
+async function bundleApp(source, options = {}) {
+ const entry = path.join(scratch, 'main.jsx');
+ fs.writeFileSync(entry, source);
+ return esbuild.build({
+ entryPoints: [entry],
+ absWorkingDir: CORE,
+ nodePaths: [path.join(CORE, 'node_modules')],
+ alias: {'@astryxdesign/core': DIST_ENTRY},
+ bundle: true,
+ jsx: 'automatic',
+ define: {'process.env.NODE_ENV': '"production"'},
+ loader: {'.css': 'empty'},
+ write: false,
+ logLevel: 'silent',
+ ...options,
+ });
+}
+
+/** Runs a bundle in a DOM and reports the errors and the root's HTML. */
+async function render(bundle) {
+ const dom = new JSDOM('<div id="root"></div>', {
+ runScripts: 'outside-only',
+ pretendToBeVisual: true,
+ });
+ const errors = [];
+ dom.window.addEventListener('error', event => {
+ errors.push(String(event.error ?? event.message));
+ });
+ dom.window.console.error = (...args) => errors.push(args.join(' '));
+ try {
+ dom.window.eval(bundle);
+ } catch (error) {
+ errors.push(String(error));
+ }
+ await new Promise(resolve => setTimeout(resolve, 50));
+ const html = dom.window.document.getElementById('root').innerHTML;
+ dom.window.close();
+ return {errors, html};
+}
+
+const hasBuild = fs.existsSync(DIST_ENTRY);
+
+describe('Core in esbuild bundles', () => {
+ it('imports no barrel from inside a lazily imported module graph', async () => {
+ const result = await esbuild.build({
+ entryPoints: [path.join(CORE, 'src/index.ts')],
+ absWorkingDir: CORE,
+ bundle: true,
+ write: false,
+ metafile: true,
+ format: 'esm',
+ outdir: path.join(scratch, 'source'),
+ platform: 'browser',
+ loader: {'.css': 'empty'},
+ external: [
+ 'react',
+ 'react/*',
+ 'react-dom',
+ 'react-dom/*',
+ '@stylexjs/stylex',
+ ],
+ logLevel: 'silent',
+ });
+ const {inputs} = result.metafile;
+ const lazyRoots = Object.values(inputs).flatMap(input =>
+ input.imports
+ .filter(edge => edge.kind === 'dynamic-import')
+ .map(edge => edge.path),
+ );
+ expect(lazyRoots.length).toBeGreaterThan(0);
+ const lazy = new Set(lazyRoots);
+ const queue = [...lazyRoots];
+ while (queue.length > 0) {
+ for (const edge of inputs[queue.shift()]?.imports ?? []) {
+ if (edge.kind !== 'dynamic-import' && !lazy.has(edge.path)) {
+ lazy.add(edge.path);
+ queue.push(edge.path);
+ }
+ }
+ }
+ const barrelImports = [...lazy]
+ .filter(file => file.startsWith('src/'))
+ .flatMap(file =>
+ inputs[file].imports
+ .filter(
+ edge =>
+ edge.kind !== 'dynamic-import' &&
+ /^src\/.*\/index\.tsx?$/.test(edge.path),
+ )
+ .map(edge => `${file} -> ${edge.original}`),
+ );
+ expect(barrelImports).toEqual([]);
+ });
+
+ it.skipIf(!hasBuild)(
+ 'renders List and Item from one esbuild file without code splitting',
+ async () => {
+ const result = await bundleApp(APP, {format: 'iife'});
+ const {errors, html} = await render(result.outputFiles[0].text);
+ expect(errors).toEqual([]);
+ expect(html).toContain('role="list"');
+ expect(html).toContain('One');
+ },
+ 60_000,
+ );
+
+ it.skipIf(!hasBuild)(
+ 'keeps the bottom sheet out of the startup chunks of a code-split app',
+ async () => {
+ const result = await bundleApp(APP, {
+ format: 'esm',
+ splitting: true,
+ outdir: path.join(scratch, 'split'),
+ metafile: true,
+ });
+ const {outputs} = result.metafile;
+ const entry = Object.keys(outputs).find(
+ file => outputs[file].entryPoint != null,
+ );
+ const startup = new Set([entry]);
+ const queue = [entry];
+ while (queue.length > 0) {
+ for (const edge of outputs[queue.shift()].imports) {
+ if (edge.kind === 'import-statement' && !startup.has(edge.path)) {
+ startup.add(edge.path);
+ queue.push(edge.path);
+ }
+ }
+ }
+ const startupInputs = [...startup].flatMap(file =>
+ Object.keys(outputs[file].inputs),
+ );
+ expect(
+ startupInputs.filter(input =>
+ input.includes('BottomSheet/BottomSheet.'),
+ ),
+ ).toEqual([]);
+ },
+ 60_000,
+ );
+});