chore: Update docs to use subpaths

Makefile

@@ -129,7 +129,7 @@ website-production:
 
 check-examples:
 	node scripts/extractExamplesS2.mjs
-	yarn tsc --project dist/docs-examples/tsconfig.json
+	yarn tsgo --project dist/docs-examples/tsconfig.json
 
 starter:
 	cd starters/docs && yarn --no-immutable && yarn up react-aria-components && yarn tsc

packages/@react-spectrum/s2/exports/Accordion.ts

@@ -1,3 +1,3 @@
 export {Accordion, AccordionContext, AccordionItem, AccordionItemHeader, AccordionItemTitle, AccordionItemPanel} from '../src/Accordion';
-
 export type {AccordionProps, AccordionItemProps, AccordionItemHeaderProps, AccordionItemTitleProps, AccordionItemPanelProps, AccordionItemState, AccordionItemRenderProps} from '../src/Accordion';
+export type {Key} from '@react-types/shared';

packages/@react-spectrum/s2/exports/ActionBar.ts

@@ -1,2 +1,7 @@
 export {ActionBar, ActionBarContext} from '../src/ActionBar';
 export type {ActionBarProps} from '../src/ActionBar';
+
+export {ActionButton} from '../src/ActionButton';
+export type {ActionButtonProps} from '../src/ActionButton';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/ActionButton.ts

@@ -1,3 +1,8 @@
 export {ActionButton, ActionButtonContext} from '../src/ActionButton';
 export type {ActionButtonProps} from '../src/ActionButton';
 export type {PressEvent} from '@react-types/shared';
+
+export {NotificationBadge} from '../src/NotificationBadge';
+export type {NotificationBadgeProps} from '../src/NotificationBadge';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/ActionButtonGroup.ts

@@ -1,2 +1,7 @@
 export {ActionButtonGroup, ActionButtonGroupContext} from '../src/ActionButtonGroup';
 export type {ActionButtonGroupProps} from '../src/ActionButtonGroup';
+
+export {ActionButton} from '../src/ActionButton';
+export type {ActionButtonProps} from '../src/ActionButton';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/ActionMenu.ts

@@ -1,2 +1,13 @@
 export {ActionMenu, ActionMenuContext} from '../src/ActionMenu';
 export type {ActionMenuProps} from '../src/ActionMenu';
+
+export {MenuItem, MenuTrigger, MenuSection, SubmenuTrigger, UnavailableMenuItemTrigger} from '../src/Menu';
+export {Collection} from 'react-aria/Collection';
+export type {MenuTriggerProps, MenuItemProps, MenuSectionProps, SubmenuTriggerProps, UnavailableMenuItemTriggerProps} from '../src/Menu';
+
+export {ContextualHelpPopover} from '../src/ContextualHelp';
+export type {ContextualHelpPopoverProps} from '../src/ContextualHelp';
+
+export {Text, Keyboard, Header, Heading} from '../src/Content';
+
+export type {Key} from '@react-types/shared';

packages/@react-spectrum/s2/exports/AlertDialog.ts

@@ -1,2 +1,8 @@
 export {AlertDialog} from '../src/AlertDialog';
 export type {AlertDialogProps} from '../src/AlertDialog';
+
+export {DialogTrigger} from '../src/DialogTrigger';
+export type {DialogTriggerProps} from '../src/DialogTrigger';
+
+export {DialogContainer, useDialogContainer} from '../src/DialogContainer';
+export type {DialogContainerProps, DialogContainerValue} from '../src/DialogContainer';

packages/@react-spectrum/s2/exports/Autocomplete.ts

@@ -1,2 +1,2 @@
-export {Autocomplete} from 'react-aria-components/Autocomplete';
-export type {AutocompleteProps} from 'react-aria-components/Autocomplete';
+export {Autocomplete, useFilter} from 'react-aria-components/Autocomplete';
+export type {AutocompleteProps, Filter} from 'react-aria-components/Autocomplete';

packages/@react-spectrum/s2/exports/AvatarGroup.ts

@@ -1,2 +1,5 @@
 export {AvatarGroup, AvatarGroupContext} from '../src/AvatarGroup';
 export type {AvatarGroupProps} from '../src/AvatarGroup';
+
+export {Avatar} from '../src/Avatar';
+export type {AvatarProps} from '../src/Avatar';

packages/@react-spectrum/s2/exports/Badge.ts

@@ -1,2 +1,4 @@
 export {Badge, BadgeContext} from '../src/Badge';
 export type {BadgeProps} from '../src/Badge';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/Breadcrumbs.ts

@@ -1,2 +1,3 @@
 export {Breadcrumbs, Breadcrumb, BreadcrumbsContext} from '../src/Breadcrumbs';
 export type {BreadcrumbsProps, BreadcrumbProps} from '../src/Breadcrumbs';
+export type {Key} from '@react-types/shared';

packages/@react-spectrum/s2/exports/Button.ts

@@ -1,3 +1,5 @@
 export {Button, ButtonContext} from '../src/Button';
 export type {ButtonProps} from '../src/Button';
 export type {PressEvent} from '@react-types/shared';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/ButtonGroup.ts

@@ -1,2 +1,7 @@
 export {ButtonGroup, ButtonGroupContext} from '../src/ButtonGroup';
 export type {ButtonGroupProps} from '../src/ButtonGroup';
+
+export {Button} from '../src/Button';
+export type {ButtonProps} from '../src/Button';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/Card.ts

@@ -1,2 +1,6 @@
 export {Card, CardPreview, CollectionCardPreview, AssetCard, UserCard, ProductCard, CardContext} from '../src/Card';
 export type {CardProps, CardPreviewProps, AssetCardProps, ProductCardProps, UserCardProps} from '../src/Card';
+
+export {Text, Content, Footer} from '../src/Content';
+export {Image} from '../src/Image';
+export type {ImageProps} from '../src/Image';

packages/@react-spectrum/s2/exports/CardView.ts

@@ -2,3 +2,13 @@ export {CardView, CardViewContext} from '../src/CardView';
 export {Collection} from 'react-aria/Collection';
 export type {CardViewProps} from '../src/CardView';
 export type {Selection, Key, SelectionMode} from '@react-types/shared';
+
+export {SkeletonCollection} from '../src/SkeletonCollection';
+export type {SkeletonCollectionProps} from '../src/SkeletonCollection';
+
+export {Card, CardPreview, CollectionCardPreview, AssetCard, UserCard, ProductCard, CardContext} from '../src/Card';
+export type {CardProps, CardPreviewProps, AssetCardProps, ProductCardProps, UserCardProps} from '../src/Card';
+
+export {Text, Content, Footer} from '../src/Content';
+export {Image} from '../src/Image';
+export type {ImageProps} from '../src/Image';

packages/@react-spectrum/s2/exports/CheckboxGroup.ts

@@ -1,2 +1,5 @@
 export {CheckboxGroup, CheckboxGroupContext} from '../src/CheckboxGroup';
 export type {CheckboxGroupProps} from '../src/CheckboxGroup';
+
+export {Checkbox} from '../src/Checkbox';
+export type {CheckboxProps} from '../src/Checkbox';

packages/@react-spectrum/s2/exports/ColorSwatchPicker.ts

@@ -2,3 +2,6 @@ export {ColorSwatchPicker, ColorSwatchPickerContext} from '../src/ColorSwatchPic
 export type {ColorSwatchPickerProps} from '../src/ColorSwatchPicker';
 export {parseColor, getColorChannels} from 'react-aria-components/ColorSwatchPicker';
 export type {ColorSpace, ColorChannel, Color, ColorFormat, ColorAxes, ColorChannelRange} from 'react-aria-components/ColorSwatchPicker';
+
+export {ColorSwatch} from '../src/ColorSwatch';
+export type {ColorSwatchProps} from '../src/ColorSwatch';

packages/@react-spectrum/s2/exports/ComboBox.ts

@@ -1,3 +1,5 @@
 export {ComboBox, ComboBoxItem, ComboBoxSection, ComboBoxContext} from '../src/ComboBox';
 export type {ComboBoxProps, ComboBoxItemProps, ComboBoxSectionProps} from '../src/ComboBox';
 export type {Key} from '@react-types/shared';
+
+export {Text, Header, Heading} from '../src/Content';

packages/@react-spectrum/s2/exports/ContextualHelp.ts

@@ -1,2 +1,4 @@
 export {ContextualHelp, ContextualHelpContext, ContextualHelpPopover} from '../src/ContextualHelp';
 export type {ContextualHelpProps, ContextualHelpStyleProps, ContextualHelpPopoverProps} from '../src/ContextualHelp';
+
+export {Heading, Content, Footer} from '../src/Content';

packages/@react-spectrum/s2/exports/CustomDialog.ts

@@ -1,2 +1,13 @@
 export {CustomDialog} from '../src/CustomDialog';
 export type {CustomDialogProps} from '../src/CustomDialog';
+
+export {DialogTrigger} from '../src/DialogTrigger';
+export type {DialogTriggerProps} from '../src/DialogTrigger';
+
+export {DialogContainer, useDialogContainer} from '../src/DialogContainer';
+export type {DialogContainerProps, DialogContainerValue} from '../src/DialogContainer';
+
+export {CloseButton} from '../src/CloseButton';
+export type {CloseButtonProps} from '../src/CloseButton';
+
+export {Heading} from '../src/Content';

packages/@react-spectrum/s2/exports/DateRangePicker.ts

@@ -1,3 +1,4 @@
 export {DateRangePicker, DateRangePickerContext} from '../src/DateRangePicker';
 export type {DateRangePickerProps} from '../src/DateRangePicker';
 export type {DateValue, DateRange} from 'react-aria-components/DateRangePicker';
+export type {RangeValue} from '@react-types/shared';

packages/@react-spectrum/s2/exports/Dialog.ts

@@ -1,2 +1,19 @@
 export {Dialog} from '../src/Dialog';
 export type {DialogProps} from '../src/Dialog';
+
+export {DialogTrigger} from '../src/DialogTrigger';
+export type {DialogTriggerProps} from '../src/DialogTrigger';
+
+export {DialogContainer, useDialogContainer} from '../src/DialogContainer';
+export type {DialogContainerProps, DialogContainerValue} from '../src/DialogContainer';
+
+export {Heading, Header, Content, Footer} from '../src/Content';
+
+export {ButtonGroup, ButtonGroupContext} from '../src/ButtonGroup';
+export type {ButtonGroupProps} from '../src/ButtonGroup';
+
+export {Button} from '../src/Button';
+export type {ButtonProps} from '../src/Button';
+
+export {Image, ImageContext} from '../src/Image';
+export type {ImageProps} from '../src/Image';

packages/@react-spectrum/s2/exports/DropZone.ts

@@ -1,2 +1,5 @@
 export {DropZone, DropZoneContext} from '../src/DropZone';
 export type {DropZoneProps} from '../src/DropZone';
+
+export {IllustratedMessage} from '../src/IllustratedMessage';
+export {Heading, Content} from '../src/Content';

packages/@react-spectrum/s2/exports/FullscreenDialog.ts

@@ -1,2 +1,16 @@
 export {FullscreenDialog} from '../src/FullscreenDialog';
 export type {FullscreenDialogProps} from '../src/FullscreenDialog';
+
+export {DialogTrigger} from '../src/DialogTrigger';
+export type {DialogTriggerProps} from '../src/DialogTrigger';
+
+export {DialogContainer, useDialogContainer} from '../src/DialogContainer';
+export type {DialogContainerProps, DialogContainerValue} from '../src/DialogContainer';
+
+export {Heading, Header, Content} from '../src/Content';
+
+export {ButtonGroup, ButtonGroupContext} from '../src/ButtonGroup';
+export type {ButtonGroupProps} from '../src/ButtonGroup';
+
+export {Button} from '../src/Button';
+export type {ButtonProps} from '../src/Button';

packages/@react-spectrum/s2/exports/IllustratedMessage.ts

@@ -1 +1,2 @@
 export {IllustratedMessage, IllustratedMessageContext} from '../src/IllustratedMessage';
+export {Heading, Content} from '../src/Content';

packages/@react-spectrum/s2/exports/InlineAlert.ts

@@ -1,2 +1,4 @@
 export {InlineAlert, InlineAlertContext} from '../src/InlineAlert';
 export type {InlineAlertProps} from '../src/InlineAlert';
+
+export {Heading, Content} from '../src/Content';

packages/@react-spectrum/s2/exports/LinkButton.ts

@@ -1,3 +1,5 @@
 export {LinkButton, LinkButtonContext} from '../src/Button';
 export type {LinkButtonProps} from '../src/Button';
 export type {PressEvent} from '@react-types/shared';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/ListView.ts

@@ -2,3 +2,5 @@ export {ListView, ListViewContext, ListViewItem} from '../src/ListView';
 export {Collection} from 'react-aria/Collection';
 export type {ListViewProps, ListViewItemProps} from '../src/ListView';
 export type {Selection, Key, SelectionMode} from '@react-types/shared';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/Menu.ts

@@ -2,3 +2,8 @@ export {MenuItem, MenuTrigger, Menu, MenuSection, SubmenuTrigger, UnavailableMen
 export {Collection} from 'react-aria/Collection';
 export type {MenuTriggerProps, MenuProps, MenuItemProps, MenuSectionProps, SubmenuTriggerProps, UnavailableMenuItemTriggerProps} from '../src/Menu';
 export type {Selection, Key, SelectionMode} from '@react-types/shared';
+
+export {ContextualHelpPopover} from '../src/ContextualHelp';
+export type {ContextualHelpPopoverProps} from '../src/ContextualHelp';
+
+export {Text, Keyboard, Heading, Header, Content} from '../src/Content';

packages/@react-spectrum/s2/exports/Picker.ts

@@ -2,3 +2,5 @@ export {Picker, PickerItem, PickerSection, PickerContext} from '../src/Picker';
 export {Collection} from 'react-aria/Collection';
 export type {PickerProps, PickerItemProps, PickerSectionProps} from '../src/Picker';
 export type {Key} from '@react-types/shared';
+
+export {Text, Header, Heading} from '../src/Content';

packages/@react-spectrum/s2/exports/Popover.ts

@@ -1,2 +1,5 @@
 export {Popover} from '../src/Popover';
 export type {PopoverProps} from '../src/Popover';
+
+export {DialogTrigger} from '../src/DialogTrigger';
+export type {DialogTriggerProps} from '../src/DialogTrigger';

packages/@react-spectrum/s2/exports/SegmentedControl.ts

@@ -1,2 +1,5 @@
 export {SegmentedControl, SegmentedControlItem, SegmentedControlContext} from '../src/SegmentedControl';
 export type {SegmentedControlProps, SegmentedControlItemProps} from '../src/SegmentedControl';
+
+export {Text} from '../src/Content';
+export type {Key} from '@react-types/shared';

packages/@react-spectrum/s2/exports/SelectBoxGroup.ts

@@ -1,2 +1,5 @@
 export {SelectBox, SelectBoxGroup, SelectBoxGroupContext} from '../src/SelectBoxGroup';
 export type {SelectBoxProps, SelectBoxGroupProps} from '../src/SelectBoxGroup';
+
+export {Text} from '../src/Content';
+export type {Key, Selection} from '@react-types/shared';

packages/@react-spectrum/s2/exports/Tabs.ts

@@ -1,2 +1,7 @@
 export {Tabs, TabList, Tab, TabPanel, TabsContext} from '../src/Tabs';
 export type {TabsProps, TabProps, TabListProps, TabPanelProps} from '../src/Tabs';
+
+export {Collection} from 'react-aria/Collection';
+export {Text} from '../src/Content';
+
+export type {Key} from '@react-types/shared';

packages/@react-spectrum/s2/exports/TagGroup.ts

@@ -2,3 +2,5 @@ export {TagGroup, Tag, TagGroupContext} from '../src/TagGroup';
 export {Collection} from 'react-aria/Collection';
 export type {TagGroupProps, TagProps} from '../src/TagGroup';
 export type {Selection, Key, SelectionMode} from '@react-types/shared';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/ToggleButton.ts

@@ -1,2 +1,4 @@
 export {ToggleButton, ToggleButtonContext} from '../src/ToggleButton';
 export type {ToggleButtonProps} from '../src/ToggleButton';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/ToggleButtonGroup.ts

@@ -1,2 +1,8 @@
 export {ToggleButtonGroup, ToggleButtonGroupContext} from '../src/ToggleButtonGroup';
 export type {ToggleButtonGroupProps} from '../src/ToggleButtonGroup';
+
+export {ToggleButton} from '../src/ToggleButton';
+export type {ToggleButtonProps} from '../src/ToggleButton';
+
+export {Text} from '../src/Content';
+export type {Selection, Key, SelectionMode} from '@react-types/shared';

packages/@react-spectrum/s2/exports/TreeView.ts

@@ -2,3 +2,5 @@ export {TreeView, TreeViewItem, TreeViewItemContent, TreeViewLoadMoreItem} from
 export {Collection} from 'react-aria/Collection';
 export type {TreeViewProps, TreeViewItemProps, TreeViewItemContentProps, TreeViewLoadMoreItemProps} from '../src/TreeView';
 export type {Selection, Key, SelectionMode} from '@react-types/shared';
+
+export {Text} from '../src/Content';

packages/@react-spectrum/s2/exports/index.ts

@@ -179,7 +179,7 @@ export type {DateValue, DateRange} from 'react-aria-components/RangeCalendar';
 export type {TimeValue} from 'react-aria-components/TimeField';
 export type {FileTriggerProps} from 'react-aria-components/FileTrigger';
 export type {TooltipTriggerComponentProps as TooltipTriggerProps} from 'react-aria-components/Tooltip';
-export type {SortDescriptor, SortDirection, Key, Selection, RouterConfig, PressEvent} from '@react-types/shared';
+export type {SortDescriptor, SortDirection, Key, Selection, RouterConfig, PressEvent, RangeValue} from '@react-types/shared';
 export type {ColorSpace, ColorChannel, Color, ColorFormat, ColorAxes, ColorChannelRange} from 'react-stately/Color';
 export type {ListOptions, ListData} from 'react-stately/useListData';
 export type {TreeOptions, TreeData} from 'react-stately/useTreeData';

packages/@react-spectrum/s2/src/Popover.tsx

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Popover as AriaPopover, PopoverProps as AriaPopoverProps} from 'react-aria-components/Popover';
+import {Popover as AriaPopover, PopoverProps as AriaPopoverProps, OverlayArrow} from 'react-aria-components/Popover';
 import {ColorSchemeContext} from './Provider';
 import {composeRenderProps} from 'react-aria-components/composeRenderProps';
 import {ContextValue} from 'react-aria-components/slots';
@@ -21,7 +21,6 @@ import {getAllowedOverrides, heightProperties, UnsafeStyles, widthProperties} fr
 import {lightDark, setColorScheme, style} from '../style' with {type: 'macro'};
 import {mergeRefs} from 'react-aria/mergeRefs';
 import {mergeStyles} from '../style/runtime';
-import {OverlayArrow} from 'react-aria-components/OverlayArrow';
 import {StyleString} from '../style/types' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
 import {useLocale} from 'react-aria/I18nProvider';

packages/@react-spectrum/s2/src/TableView.tsx

@@ -13,9 +13,7 @@
 import {ActionButton, ActionButtonContext} from './ActionButton';
 import {baseColor, centerPadding, colorMix, focusRing, fontRelative, lightDark, setColorScheme, space, style} from '../style' with {type: 'macro'};
 import {Button, ButtonContext} from 'react-aria-components/Button';
-
 import {ButtonGroup} from './ButtonGroup';
-
 import {
   CellRenderProps,
   ColumnRenderProps,
@@ -35,7 +33,6 @@ import {
   ResizableTableContainer,
   RowRenderProps,
   TableBodyRenderProps,
-  TableLayout,
   TableLoadMoreItem,
   TableRenderProps,
   useTableOptions
@@ -69,7 +66,7 @@ import {CheckboxContext as RACCheckboxContext} from 'react-aria-components/Check
 // @ts-ignore
 import {Popover as RACPopover} from 'react-aria-components/Popover';
 import React, {createContext, CSSProperties, FormEvent, FormHTMLAttributes, ForwardedRef, forwardRef, ReactElement, ReactNode, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
-import {Rect, Virtualizer} from 'react-aria-components/Virtualizer';
+import {Rect, TableLayout, Virtualizer} from 'react-aria-components/Virtualizer';
 import SortDownArrow from '../s2wf-icons/S2_Icon_SortDown_20_N.svg';
 import SortUpArrow from '../s2wf-icons/S2_Icon_SortUp_20_N.svg';
 import {Button as SpectrumButton} from './Button';

packages/@react-spectrum/s2/src/Tooltip.tsx

@@ -15,14 +15,13 @@ import {
   TooltipProps as AriaTooltipProps,
   TooltipTrigger as AriaTooltipTrigger,
   TooltipTriggerComponentProps as AriaTooltipTriggerComponentProps,
+  OverlayArrow,
   TooltipRenderProps
 } from 'react-aria-components/Tooltip';
-
 import {centerPadding, setColorScheme, style} from '../style' with {type: 'macro'};
 import {ColorScheme, ColorSchemeContext} from './Provider';
 import {createContext, forwardRef, MutableRefObject, ReactNode, useCallback, useContext, useState} from 'react';
 import {DOMProps, DOMRef, GlobalDOMAttributes} from '@react-types/shared';
-import {OverlayArrow} from 'react-aria-components/OverlayArrow';
 import {UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
 import {useLocale} from 'react-aria/I18nProvider';

packages/dev/codemods/src/use-subpaths/src/codemod.test.ts

@@ -126,3 +126,23 @@ import { Button, ButtonContext } from 'react-aria-components/Button';
 import type { ButtonProps } from 'react-aria-components/Button';
 `
 );
+
+test(
+  'sorts exact match candidates first',
+  `
+import {Group, GroupProps} from 'react-aria-components';
+`,
+  `
+import { Group, GroupProps } from 'react-aria-components/Group';
+`
+);
+
+test(
+  'combines related imports',
+  `
+import {RangeCalendar, CalendarCell, Heading} from 'react-aria-components';
+`,
+  `
+import { RangeCalendar, CalendarCell, Heading } from 'react-aria-components/RangeCalendar';
+`
+);