diff --git a/.storybook-s2/custom-addons/provider/index.js b/.storybook-s2/custom-addons/provider/index.js
index 49535c86d83..367299c1551 100644
--- a/.storybook-s2/custom-addons/provider/index.js
+++ b/.storybook-s2/custom-addons/provider/index.js
@@ -5,7 +5,7 @@ import {getQueryParams} from '@storybook/preview-api';
 // Importing from src so that HMR works.
 // Without this, all HMR updates will bubble through the index.ts and up 
 // to the root instead of stopping at the story files.
-import {Provider} from '@react-spectrum/s2/src/Provider';
+import {Provider} from '../../../packages/@react-spectrum/s2/src/Provider';
 
 document.body.style.margin = '0';
 
diff --git a/.storybook-s2/docs/Icons.jsx b/.storybook-s2/docs/Icons.jsx
index cff7168b49f..ec38009c279 100644
--- a/.storybook-s2/docs/Icons.jsx
+++ b/.storybook-s2/docs/Icons.jsx
@@ -4,7 +4,7 @@ import {ActionButton, Text} from '@react-spectrum/s2';
 import {H2, H3, P, Code, Pre, Link} from './typography';
 import {highlight} from './highlight' with {type: 'macro'};
 import {IconColors} from './Colors';
-import CheckmarkCircle from '../../packages/@react-spectrum/s2/s2wf-icons/S2_Icon_CheckmarkCircle_20_N.svg';
+import CheckmarkCircle from '@react-spectrum/s2/icons/CheckmarkCircle';
 import {iconStyle} from '../../packages/@react-spectrum/s2/style' with {type: 'macro'};
 
 export function Icons() {
diff --git a/.storybook-s2/docs/Illustrations.jsx b/.storybook-s2/docs/Illustrations.jsx
index 9acd33ca2f1..be762bc1773 100644
--- a/.storybook-s2/docs/Illustrations.jsx
+++ b/.storybook-s2/docs/Illustrations.jsx
@@ -1,11 +1,10 @@
 import linearIllustrations from '@react-spectrum/s2/spectrum-illustrations/linear/*.tsx';
 import gradientIllustrations from '@react-spectrum/s2/spectrum-illustrations/gradient/*/*.tsx';
-import Paste from '@react-spectrum/s2/s2wf-icons/S2_Icon_Paste_20_N.svg';
+import Paste from '@react-spectrum/s2/icons/Paste';
 import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
-import {ActionButton, Text} from '@react-spectrum/s2';
+import {ActionButton, Radio, RadioGroup} from '@react-spectrum/s2';
 import {H2, H3, P, Code, Pre, Link} from './typography';
 import {highlight} from './highlight' with {type: 'macro'};
-import { Radio, RadioGroup } from '../../packages/@react-spectrum/s2/src';
 import { useState } from 'react';
 
 export function Illustrations() {
diff --git a/.storybook-s2/docs/Intro.jsx b/.storybook-s2/docs/Intro.jsx
index ddf2c7c810e..4537dec0158 100644
--- a/.storybook-s2/docs/Intro.jsx
+++ b/.storybook-s2/docs/Intro.jsx
@@ -1,13 +1,13 @@
 import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
-import {Button, LinkButton, ButtonGroup, Checkbox, Content, Dialog, DialogTrigger, Footer, Header, Heading, Image, InlineAlert, Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger, Switch, Text} from '@react-spectrum/s2';
-import NewIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_New_20_N.svg';
-import ImgIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Image_20_N.svg';
-import CopyIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Copy_20_N.svg';
-import CommentTextIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_CommentText_20_N.svg';
-import ClockPendingIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_ClockPending_20_N.svg';
-import CommunityIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Community_20_N.svg';
-import DeviceTabletIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_DeviceTablet_20_N.svg';
-import DeviceDesktopIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_DeviceDesktop_20_N.svg';
+import {Button, ButtonGroup, Checkbox, Content, Dialog, DialogTrigger, Footer, Header, Heading, Image, InlineAlert, Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger, Switch, Text} from '@react-spectrum/s2';
+import NewIcon from '@react-spectrum/s2/icons/New';
+import ImgIcon from '@react-spectrum/s2/icons/Image';
+import CopyIcon from '@react-spectrum/s2/icons/Copy';
+import CommentTextIcon from '@react-spectrum/s2/icons/CommentText';
+import ClockPendingIcon from '@react-spectrum/s2/icons/ClockPending';
+import CommunityIcon from '@react-spectrum/s2/icons/Community';
+import DeviceTabletIcon from '@react-spectrum/s2/icons/DeviceTablet';
+import DeviceDesktopIcon from '@react-spectrum/s2/icons/DeviceDesktop';
 import {highlight} from './highlight' with {type: 'macro'};
 import {H2, H3, H4, P, Pre, Code, Strong, Link} from './typography';
 
diff --git a/.storybook-s2/preview.tsx b/.storybook-s2/preview.tsx
index 760fd9885c9..ced19394cb9 100644
--- a/.storybook-s2/preview.tsx
+++ b/.storybook-s2/preview.tsx
@@ -1,4 +1,4 @@
-import '@react-spectrum/s2/src/page';
+import '@react-spectrum/s2/page.css';
 import { themes } from '@storybook/theming';
 import { DARK_MODE_EVENT_NAME } from 'storybook-dark-mode';
 import { store } from 'storybook-dark-mode/dist/esm/Tool';
diff --git a/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch b/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch
new file mode 100644
index 00000000000..aed9a389b4c
--- /dev/null
+++ b/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch
@@ -0,0 +1,13 @@
+diff --git a/index.d.ts b/index.d.ts
+index ba9855b0a36d5fbd70f92da611f3e1e96f203ee3..167de6defae46d391a45cc63dd11403722fb1619 100644
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -4,7 +4,7 @@
+  */
+ export function mdxjs(
+   options?:
+-    | import('micromark-extension-mdx-expression/dev/lib/syntax').Options
++    | Options
+     | undefined
+ ): Extension
+ export type Extension = import('micromark-util-types').Extension
diff --git a/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch b/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch
new file mode 100644
index 00000000000..b138a5ee33c
--- /dev/null
+++ b/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch
@@ -0,0 +1,13 @@
+diff --git a/index.d.ts b/index.d.ts
+index c5da87629f94c457947bc712439c94b028cd5d81..3bec2ed83b30a40f84f51665eebf7a67d1a628c1 100644
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -4,7 +4,7 @@
+  *
+  * @type {import('unified').Plugin<[Options?]|Array<void>, Root>}
+  */
+-export default function remarkMdx(options?: void | import("micromark-extension-mdx-expression/dev/lib/syntax").Options | undefined): void | import("unified").Transformer<import("mdast").Root, import("mdast").Root>;
++export default function remarkMdx(options?: void | import("micromark-extension-mdx-expression").Options | undefined): void | import("unified").Transformer<import("mdast").Root, import("mdast").Root>;
+ export type Root = import('mdast').Root;
+ export type Options = import('micromark-extension-mdxjs').Options;
+ export type DoNotTouchAsThisImportItIncludesMdxInTree = typeof import("mdast-util-mdx");
diff --git a/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch b/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch
new file mode 100644
index 00000000000..23f24014422
--- /dev/null
+++ b/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/index.d.ts b/lib/index.d.ts
+index 0e8563eb2fe2aad42400d3aad666f36df0dbc16a..d20f18817ab64c586de59eb411fd739ece028a95 100644
+--- a/lib/index.d.ts
++++ b/lib/index.d.ts
+@@ -1,6 +1,6 @@
+ /** @type {import('unified').Plugin<[Options?] | void[], string, Root>} */
+ export default function remarkParse(
+-  options: void | import('mdast-util-from-markdown/lib').Options | undefined
++  options: void | import('mdast-util-from-markdown').Options | undefined
+ ): void
+ export type Root = import('mdast').Root
+ export type Options = import('mdast-util-from-markdown').Options
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 7e48b91477f..7a94bf740f3 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -312,6 +312,7 @@ export default [{
                 "@spectrum-icons/ui",
                 "@spectrum-icons/workflow",
                 "@spectrum-icons/illustrations",
+                "@react-spectrum/s2/icons"
             ],
         }],
 
diff --git a/package.json b/package.json
index 800bf981ed2..8ed215dad1d 100644
--- a/package.json
+++ b/package.json
@@ -227,7 +227,6 @@
     "postcss-custom-properties": "13.2.0",
     "postcss-import": "15.1.0",
     "react-refresh": "0.9.0",
-    "remark-parse": "10.0.1",
     "browserslist": "4.24.0",
     "caniuse-lite": "1.0.30001563",
     "@types/react": "npm:types-react@19.0.0-rc.0",
@@ -238,7 +237,10 @@
     "@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.1#~/.yarn/patches/@testing-library-user-event-npm-14.6.1-5da7e1d4e2.patch",
     "@types/node@npm:*": "^22",
     "@types/node@npm:^18.0.0": "^22",
-    "@types/node@npm:>= 8": "^22"
+    "@types/node@npm:>= 8": "^22",
+    "micromark-extension-mdxjs": "patch:micromark-extension-mdxjs@npm%3A1.0.0#~/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch",
+    "remark-mdx": "patch:remark-mdx@npm%3A2.0.0-rc.2#~/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch",
+    "remark-parse": "patch:remark-parse@npm%3A10.0.1#~/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch"
   },
   "@parcel/transformer-css": {
     "cssModules": {
@@ -264,7 +266,12 @@
     }
   },
   "alias": {
-    "@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-18"
+    "@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-18",
+    "react-dom/client.js": "react-dom/client",
+    "react-dom/index.js": "react-dom"
+  },
+  "@parcel/resolver-default": {
+    "packageExports": true
   },
   "@parcel/bundler-default": {
     "manualSharedBundles": [
diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index 934370ff374..ade67723ac2 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -7,7 +7,10 @@
   "module": "dist/module.js",
   "exports": {
     ".": {
-      "types": "./dist/types.d.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
       "import": "./dist/import.mjs",
       "require": "./dist/main.js"
     },
diff --git a/packages/@internationalized/date/package.json b/packages/@internationalized/date/package.json
index 8736fc0f086..2448bc592fc 100644
--- a/packages/@internationalized/date/package.json
+++ b/packages/@internationalized/date/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@internationalized/message/package.json b/packages/@internationalized/message/package.json
index 0117bf8b81d..a5a43816c0b 100644
--- a/packages/@internationalized/message/package.json
+++ b/packages/@internationalized/message/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@internationalized/number/package.json b/packages/@internationalized/number/package.json
index 0eb9b0bcd51..d26d8557dd7 100644
--- a/packages/@internationalized/number/package.json
+++ b/packages/@internationalized/number/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@internationalized/string/package.json b/packages/@internationalized/string/package.json
index 05ac27fb14d..60ae000c889 100644
--- a/packages/@internationalized/string/package.json
+++ b/packages/@internationalized/string/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/actiongroup/package.json b/packages/@react-aria/actiongroup/package.json
index 48c55e1b075..cb24046f9a1 100644
--- a/packages/@react-aria/actiongroup/package.json
+++ b/packages/@react-aria/actiongroup/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/aria-modal-polyfill/package.json b/packages/@react-aria/aria-modal-polyfill/package.json
index 8b72f957c4a..31ca3c6c998 100644
--- a/packages/@react-aria/aria-modal-polyfill/package.json
+++ b/packages/@react-aria/aria-modal-polyfill/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/autocomplete/package.json b/packages/@react-aria/autocomplete/package.json
index 6d8c142dc24..d3b827cfd95 100644
--- a/packages/@react-aria/autocomplete/package.json
+++ b/packages/@react-aria/autocomplete/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/breadcrumbs/package.json b/packages/@react-aria/breadcrumbs/package.json
index f42b4002805..5b5d4574c05 100644
--- a/packages/@react-aria/breadcrumbs/package.json
+++ b/packages/@react-aria/breadcrumbs/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/button/package.json b/packages/@react-aria/button/package.json
index c15ee0bc907..0cdfeb4d51c 100644
--- a/packages/@react-aria/button/package.json
+++ b/packages/@react-aria/button/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/calendar/package.json b/packages/@react-aria/calendar/package.json
index 70095b1f8bc..7634871892a 100644
--- a/packages/@react-aria/calendar/package.json
+++ b/packages/@react-aria/calendar/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/checkbox/package.json b/packages/@react-aria/checkbox/package.json
index f6b20c062be..99e2c372395 100644
--- a/packages/@react-aria/checkbox/package.json
+++ b/packages/@react-aria/checkbox/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/collections/package.json b/packages/@react-aria/collections/package.json
index 347ce5199de..227dd0b91ae 100644
--- a/packages/@react-aria/collections/package.json
+++ b/packages/@react-aria/collections/package.json
@@ -7,7 +7,11 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/color/package.json b/packages/@react-aria/color/package.json
index 492c18adf1d..12ce9381527 100644
--- a/packages/@react-aria/color/package.json
+++ b/packages/@react-aria/color/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/combobox/package.json b/packages/@react-aria/combobox/package.json
index 878fa73e9ec..b3915458bc9 100644
--- a/packages/@react-aria/combobox/package.json
+++ b/packages/@react-aria/combobox/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/datepicker/package.json b/packages/@react-aria/datepicker/package.json
index a12563ca8de..1f085d8ba3f 100644
--- a/packages/@react-aria/datepicker/package.json
+++ b/packages/@react-aria/datepicker/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/dialog/package.json b/packages/@react-aria/dialog/package.json
index 5d8bc63089e..fe1aa349d5b 100644
--- a/packages/@react-aria/dialog/package.json
+++ b/packages/@react-aria/dialog/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/disclosure/package.json b/packages/@react-aria/disclosure/package.json
index 6359f56fffe..de157ba0f89 100644
--- a/packages/@react-aria/disclosure/package.json
+++ b/packages/@react-aria/disclosure/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/dnd/package.json b/packages/@react-aria/dnd/package.json
index 0843448d058..768ae0ed825 100644
--- a/packages/@react-aria/dnd/package.json
+++ b/packages/@react-aria/dnd/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/focus/package.json b/packages/@react-aria/focus/package.json
index 375465f4d2e..510cb6dbb59 100644
--- a/packages/@react-aria/focus/package.json
+++ b/packages/@react-aria/focus/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/form/package.json b/packages/@react-aria/form/package.json
index a9d252f3dce..76cc8f68040 100644
--- a/packages/@react-aria/form/package.json
+++ b/packages/@react-aria/form/package.json
@@ -7,7 +7,11 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/grid/package.json b/packages/@react-aria/grid/package.json
index cf67a991fff..22bf76b80d2 100644
--- a/packages/@react-aria/grid/package.json
+++ b/packages/@react-aria/grid/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/gridlist/package.json b/packages/@react-aria/gridlist/package.json
index 00996ebb5e9..af201e4d5a3 100644
--- a/packages/@react-aria/gridlist/package.json
+++ b/packages/@react-aria/gridlist/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/i18n/package.json b/packages/@react-aria/i18n/package.json
index 13eac67aee4..99e7b4525ec 100644
--- a/packages/@react-aria/i18n/package.json
+++ b/packages/@react-aria/i18n/package.json
@@ -7,11 +7,16 @@
   "module": "dist/module.js",
   "exports": {
     ".": {
-      "types": "./dist/types.d.ts",
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
       "import": "./dist/import.mjs",
       "require": "./dist/main.js"
     },
     "./server": {
+      "source": "./src/server.tsx",
       "import": "./server/index.mjs",
       "require": "./server/index.js"
     }
diff --git a/packages/@react-aria/interactions/package.json b/packages/@react-aria/interactions/package.json
index 7d8af8a49dc..67ea64edce6 100644
--- a/packages/@react-aria/interactions/package.json
+++ b/packages/@react-aria/interactions/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/label/package.json b/packages/@react-aria/label/package.json
index ede2360aae7..f520070c9a8 100644
--- a/packages/@react-aria/label/package.json
+++ b/packages/@react-aria/label/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/landmark/package.json b/packages/@react-aria/landmark/package.json
index 395f6580590..2e7677434c1 100644
--- a/packages/@react-aria/landmark/package.json
+++ b/packages/@react-aria/landmark/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/link/package.json b/packages/@react-aria/link/package.json
index 229a8786efe..b026ab67482 100644
--- a/packages/@react-aria/link/package.json
+++ b/packages/@react-aria/link/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/listbox/package.json b/packages/@react-aria/listbox/package.json
index e5db74cd9ac..0d20b20c3c5 100644
--- a/packages/@react-aria/listbox/package.json
+++ b/packages/@react-aria/listbox/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/live-announcer/package.json b/packages/@react-aria/live-announcer/package.json
index 33b372e15d1..ebbd38c8a45 100644
--- a/packages/@react-aria/live-announcer/package.json
+++ b/packages/@react-aria/live-announcer/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/menu/package.json b/packages/@react-aria/menu/package.json
index 68ca384ba8b..eff53702336 100644
--- a/packages/@react-aria/menu/package.json
+++ b/packages/@react-aria/menu/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/meter/package.json b/packages/@react-aria/meter/package.json
index 324773d26a6..8cfcc683bfd 100644
--- a/packages/@react-aria/meter/package.json
+++ b/packages/@react-aria/meter/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/numberfield/package.json b/packages/@react-aria/numberfield/package.json
index be0e8813250..ad11c2f3318 100644
--- a/packages/@react-aria/numberfield/package.json
+++ b/packages/@react-aria/numberfield/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/overlays/package.json b/packages/@react-aria/overlays/package.json
index 22a791b0128..110ad78e387 100644
--- a/packages/@react-aria/overlays/package.json
+++ b/packages/@react-aria/overlays/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/progress/package.json b/packages/@react-aria/progress/package.json
index 344b7fab545..1015c4d726e 100644
--- a/packages/@react-aria/progress/package.json
+++ b/packages/@react-aria/progress/package.json
@@ -6,7 +6,11 @@
   "main": "dist/index.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/index.js"
   },
diff --git a/packages/@react-aria/radio/package.json b/packages/@react-aria/radio/package.json
index d5fca96dbeb..c0b01bf242c 100644
--- a/packages/@react-aria/radio/package.json
+++ b/packages/@react-aria/radio/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/searchfield/package.json b/packages/@react-aria/searchfield/package.json
index 6f4c8bd2aa9..925352ef415 100644
--- a/packages/@react-aria/searchfield/package.json
+++ b/packages/@react-aria/searchfield/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/select/package.json b/packages/@react-aria/select/package.json
index 6f94cb92e0d..cddc029bbf0 100644
--- a/packages/@react-aria/select/package.json
+++ b/packages/@react-aria/select/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/selection/package.json b/packages/@react-aria/selection/package.json
index e716d235023..6630f6e2608 100644
--- a/packages/@react-aria/selection/package.json
+++ b/packages/@react-aria/selection/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/separator/package.json b/packages/@react-aria/separator/package.json
index 0c969a28a44..f08f767f5b9 100644
--- a/packages/@react-aria/separator/package.json
+++ b/packages/@react-aria/separator/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/slider/package.json b/packages/@react-aria/slider/package.json
index dcac8cd08a1..05d7e9ea2e1 100644
--- a/packages/@react-aria/slider/package.json
+++ b/packages/@react-aria/slider/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/spinbutton/package.json b/packages/@react-aria/spinbutton/package.json
index 19e47bcc4b0..fa6f76abe90 100644
--- a/packages/@react-aria/spinbutton/package.json
+++ b/packages/@react-aria/spinbutton/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/ssr/package.json b/packages/@react-aria/ssr/package.json
index 1fb018ccc7a..76d5d5fd722 100644
--- a/packages/@react-aria/ssr/package.json
+++ b/packages/@react-aria/ssr/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/steplist/package.json b/packages/@react-aria/steplist/package.json
index a09605933b5..8c1fb7deaed 100644
--- a/packages/@react-aria/steplist/package.json
+++ b/packages/@react-aria/steplist/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/switch/package.json b/packages/@react-aria/switch/package.json
index 2359ece5cd9..24adedac4bd 100644
--- a/packages/@react-aria/switch/package.json
+++ b/packages/@react-aria/switch/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/table/package.json b/packages/@react-aria/table/package.json
index 3df0fb7a106..90251b0ecf2 100644
--- a/packages/@react-aria/table/package.json
+++ b/packages/@react-aria/table/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/tabs/package.json b/packages/@react-aria/tabs/package.json
index f3c56e9162b..b9fc8ffce80 100644
--- a/packages/@react-aria/tabs/package.json
+++ b/packages/@react-aria/tabs/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/tag/package.json b/packages/@react-aria/tag/package.json
index 5cf7689dee0..e8b916c2435 100644
--- a/packages/@react-aria/tag/package.json
+++ b/packages/@react-aria/tag/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/test-utils/package.json b/packages/@react-aria/test-utils/package.json
index 740bd636370..bee8d809383 100644
--- a/packages/@react-aria/test-utils/package.json
+++ b/packages/@react-aria/test-utils/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/test-utils/src/userEventMaps.ts b/packages/@react-aria/test-utils/src/userEventMaps.ts
index ae355d83c9a..890e9cc1655 100644
--- a/packages/@react-aria/test-utils/src/userEventMaps.ts
+++ b/packages/@react-aria/test-utils/src/userEventMaps.ts
@@ -1,4 +1,4 @@
-import {pointerKey} from '@testing-library/user-event/system/pointer/shared';
+import {pointerKey} from '@testing-library/user-event';
 
 export let pointerMap: pointerKey[] = [
   {name: 'MouseLeft', pointerType: 'mouse', button: 'primary', height: 1, width: 1, pressure: 0.5},
diff --git a/packages/@react-aria/textfield/package.json b/packages/@react-aria/textfield/package.json
index 0a2847dea5d..769a521f2e2 100644
--- a/packages/@react-aria/textfield/package.json
+++ b/packages/@react-aria/textfield/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/toast/package.json b/packages/@react-aria/toast/package.json
index ad226c0bb12..44d5478d2d7 100644
--- a/packages/@react-aria/toast/package.json
+++ b/packages/@react-aria/toast/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/toggle/package.json b/packages/@react-aria/toggle/package.json
index 0e9dc0dcc9f..09c5bb169e7 100644
--- a/packages/@react-aria/toggle/package.json
+++ b/packages/@react-aria/toggle/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/toolbar/package.json b/packages/@react-aria/toolbar/package.json
index 7223af21ede..a95f00f7a62 100644
--- a/packages/@react-aria/toolbar/package.json
+++ b/packages/@react-aria/toolbar/package.json
@@ -7,7 +7,11 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/tooltip/package.json b/packages/@react-aria/tooltip/package.json
index 752dcbbc086..5565af3c73b 100644
--- a/packages/@react-aria/tooltip/package.json
+++ b/packages/@react-aria/tooltip/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/tree/package.json b/packages/@react-aria/tree/package.json
index 0edbfbd6768..eb0d331a134 100644
--- a/packages/@react-aria/tree/package.json
+++ b/packages/@react-aria/tree/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/utils/package.json b/packages/@react-aria/utils/package.json
index e67ce517a01..50cb0e37050 100644
--- a/packages/@react-aria/utils/package.json
+++ b/packages/@react-aria/utils/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/virtualizer/package.json b/packages/@react-aria/virtualizer/package.json
index e68f0cd2b2c..142f6c04ade 100644
--- a/packages/@react-aria/virtualizer/package.json
+++ b/packages/@react-aria/virtualizer/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-aria/visually-hidden/package.json b/packages/@react-aria/visually-hidden/package.json
index 5fbe1a9b44a..b169f9034f1 100644
--- a/packages/@react-aria/visually-hidden/package.json
+++ b/packages/@react-aria/visually-hidden/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/accordion/package.json b/packages/@react-spectrum/accordion/package.json
index 7b126f47c50..baa227d9303 100644
--- a/packages/@react-spectrum/accordion/package.json
+++ b/packages/@react-spectrum/accordion/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/actionbar/package.json b/packages/@react-spectrum/actionbar/package.json
index 4cc38b2d0c4..82be4ae27d8 100644
--- a/packages/@react-spectrum/actionbar/package.json
+++ b/packages/@react-spectrum/actionbar/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/actiongroup/package.json b/packages/@react-spectrum/actiongroup/package.json
index 2c13bc87d71..be13d0610d9 100644
--- a/packages/@react-spectrum/actiongroup/package.json
+++ b/packages/@react-spectrum/actiongroup/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/autocomplete/package.json b/packages/@react-spectrum/autocomplete/package.json
index 22b6d04a604..29807389406 100644
--- a/packages/@react-spectrum/autocomplete/package.json
+++ b/packages/@react-spectrum/autocomplete/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/avatar/package.json b/packages/@react-spectrum/avatar/package.json
index 84a778938f1..3b45fa3e695 100644
--- a/packages/@react-spectrum/avatar/package.json
+++ b/packages/@react-spectrum/avatar/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/badge/chromatic-fc/Badge.stories.tsx b/packages/@react-spectrum/badge/chromatic-fc/Badge.stories.tsx
index cc06ea58250..a671fff3d5e 100644
--- a/packages/@react-spectrum/badge/chromatic-fc/Badge.stories.tsx
+++ b/packages/@react-spectrum/badge/chromatic-fc/Badge.stories.tsx
@@ -12,7 +12,7 @@
 
 import {Badge} from '..';
 import {BadgeStory, renderVariants} from '../chromatic/Badge.stories';
-import CheckmarkCircle from '@spectrum-icons/workflow/src/CheckmarkCircle';
+import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
 import {ComponentMeta} from '@storybook/react';
 import React from 'react';
 import {Text} from '@react-spectrum/text';
diff --git a/packages/@react-spectrum/badge/chromatic/Badge.stories.tsx b/packages/@react-spectrum/badge/chromatic/Badge.stories.tsx
index 12702fbc7cc..b4b94261c7f 100644
--- a/packages/@react-spectrum/badge/chromatic/Badge.stories.tsx
+++ b/packages/@react-spectrum/badge/chromatic/Badge.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {Badge} from '../';
-import CheckmarkCircle from '@spectrum-icons/workflow/src/CheckmarkCircle';
+import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
 import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
 import {Flex} from '@react-spectrum/layout';
 import React from 'react';
diff --git a/packages/@react-spectrum/badge/package.json b/packages/@react-spectrum/badge/package.json
index 6914a0d734a..c19fc9f3971 100644
--- a/packages/@react-spectrum/badge/package.json
+++ b/packages/@react-spectrum/badge/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/breadcrumbs/package.json b/packages/@react-spectrum/breadcrumbs/package.json
index ab1f766eec4..c2c68f340bc 100644
--- a/packages/@react-spectrum/breadcrumbs/package.json
+++ b/packages/@react-spectrum/breadcrumbs/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/button/package.json b/packages/@react-spectrum/button/package.json
index b4cbd3b9dd1..2cd68acc99b 100644
--- a/packages/@react-spectrum/button/package.json
+++ b/packages/@react-spectrum/button/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/buttongroup/package.json b/packages/@react-spectrum/buttongroup/package.json
index 3eb4f002f0e..6decb88fa72 100644
--- a/packages/@react-spectrum/buttongroup/package.json
+++ b/packages/@react-spectrum/buttongroup/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/calendar/package.json b/packages/@react-spectrum/calendar/package.json
index 8b9e3729a3e..d17070d83a5 100644
--- a/packages/@react-spectrum/calendar/package.json
+++ b/packages/@react-spectrum/calendar/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx b/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx
index d12df3d13e3..44a5758bf4d 100644
--- a/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx
+++ b/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx
@@ -14,7 +14,7 @@ import {ActionButton} from '@react-spectrum/button';
 import {Calendar} from '../';
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, parseZonedDateTime, today, ZonedDateTime} from '@internationalized/date';
 import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
-import {Custom454Calendar} from '@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from '@react-types/calendar';
 import {Flex} from '@react-spectrum/layout';
 import {Item, Picker, Section} from '@react-spectrum/picker';
@@ -289,7 +289,7 @@ function ControlledFocus(props) {
   );
 }
 
-function CustomCalendar(props) { 
+function CustomCalendar(props) {
   return (
     <ControlledFocus {...props} createCalendar={() => new Custom454Calendar()} focusedValue={new CalendarDate(2023, 2, 5)} />
   );
diff --git a/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx b/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx
index 21592bda299..a014ac868fc 100644
--- a/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx
+++ b/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx
@@ -13,7 +13,7 @@
 import {action} from '@storybook/addon-actions';
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, isWeekend, parseZonedDateTime, today} from '@internationalized/date';
 import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
-import {Custom454Calendar} from '@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from '@react-types/calendar';
 import {Flex} from '@react-spectrum/layout';
 import {RangeCalendar} from '../';
diff --git a/packages/@react-spectrum/card/package.json b/packages/@react-spectrum/card/package.json
index 032f1945317..4531024cf0a 100644
--- a/packages/@react-spectrum/card/package.json
+++ b/packages/@react-spectrum/card/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/checkbox/package.json b/packages/@react-spectrum/checkbox/package.json
index 6d44c028d3b..9d387f98d84 100644
--- a/packages/@react-spectrum/checkbox/package.json
+++ b/packages/@react-spectrum/checkbox/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/color/package.json b/packages/@react-spectrum/color/package.json
index 29c159cd0b1..b4c68b87539 100644
--- a/packages/@react-spectrum/color/package.json
+++ b/packages/@react-spectrum/color/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/combobox/package.json b/packages/@react-spectrum/combobox/package.json
index c85b626b74d..9d1d1fe2b7a 100644
--- a/packages/@react-spectrum/combobox/package.json
+++ b/packages/@react-spectrum/combobox/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/contextualhelp/package.json b/packages/@react-spectrum/contextualhelp/package.json
index bf96336474f..526ca459b5f 100644
--- a/packages/@react-spectrum/contextualhelp/package.json
+++ b/packages/@react-spectrum/contextualhelp/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/datepicker/package.json b/packages/@react-spectrum/datepicker/package.json
index f12ea379cc4..16c60be87ac 100644
--- a/packages/@react-spectrum/datepicker/package.json
+++ b/packages/@react-spectrum/datepicker/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx b/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx
index f53d6ae8a6f..652a420d328 100644
--- a/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx
+++ b/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx
@@ -17,7 +17,7 @@ import {chain} from '@react-aria/utils';
 import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
 import {Content} from '@react-spectrum/view';
 import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Custom454Calendar} from '@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
 import {DatePicker} from '../';
 import {DateValue} from '@react-types/calendar';
 import {Flex} from '@react-spectrum/layout';
diff --git a/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx b/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx
index b71709b0f80..c142d595698 100644
--- a/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx
+++ b/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx
@@ -14,7 +14,7 @@ import {action} from '@storybook/addon-actions';
 import {ActionButton} from '@react-spectrum/button';
 import {CalendarDate, getLocalTimeZone, isWeekend, parseDate, today, toZoned} from '@internationalized/date';
 import {chain} from '@react-aria/utils';
-import {Custom454Calendar} from '@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
 import {DateRange} from '@react-types/datepicker';
 import {DateRangePicker} from '../';
 import {DateValue} from '@react-types/calendar';
diff --git a/packages/@react-spectrum/dialog/package.json b/packages/@react-spectrum/dialog/package.json
index efe9cb31d45..296b8f38879 100644
--- a/packages/@react-spectrum/dialog/package.json
+++ b/packages/@react-spectrum/dialog/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/divider/package.json b/packages/@react-spectrum/divider/package.json
index f941a88dd86..5dd91af73c0 100644
--- a/packages/@react-spectrum/divider/package.json
+++ b/packages/@react-spectrum/divider/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/dnd/package.json b/packages/@react-spectrum/dnd/package.json
index e58816ae939..aa44be9bf93 100644
--- a/packages/@react-spectrum/dnd/package.json
+++ b/packages/@react-spectrum/dnd/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/dropzone/package.json b/packages/@react-spectrum/dropzone/package.json
index 1d1cd6838e1..acc1f7801a6 100644
--- a/packages/@react-spectrum/dropzone/package.json
+++ b/packages/@react-spectrum/dropzone/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx b/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx
index b78564d7dff..5140b4b1069 100644
--- a/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx
+++ b/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx
@@ -15,7 +15,7 @@ import {Button} from '@react-spectrum/button';
 import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';
 import {classNames} from '@react-spectrum/utils';
 import {Content} from '@react-spectrum/view';
-import {Draggable} from '@react-aria/dnd/stories/dnd.stories';
+import {Draggable} from '../../../@react-aria/dnd/stories/dnd.stories';
 import {DropEvent, FileDropItem, TextDropItem, useDrag} from 'react-aria';
 import {DropZone} from '../';
 import File from '@spectrum-icons/illustrations/File';
diff --git a/packages/@react-spectrum/filetrigger/package.json b/packages/@react-spectrum/filetrigger/package.json
index 50b9579fddd..4358c322084 100644
--- a/packages/@react-spectrum/filetrigger/package.json
+++ b/packages/@react-spectrum/filetrigger/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/form/package.json b/packages/@react-spectrum/form/package.json
index e30ad5d9e8b..2212db05183 100644
--- a/packages/@react-spectrum/form/package.json
+++ b/packages/@react-spectrum/form/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/icon/package.json b/packages/@react-spectrum/icon/package.json
index 515892d9d4e..375ed1aec49 100644
--- a/packages/@react-spectrum/icon/package.json
+++ b/packages/@react-spectrum/icon/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.Languages.stories.tsx b/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.Languages.stories.tsx
index 3175105913a..0fcde5ffd3c 100644
--- a/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.Languages.stories.tsx
+++ b/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.Languages.stories.tsx
@@ -14,7 +14,7 @@ import {Content} from '@react-spectrum/view';
 import {Flex} from '@react-spectrum/layout';
 import {Heading} from '@react-spectrum/text';
 import {IllustratedMessage} from '..';
-import NotFound from '@spectrum-icons/illustrations/src/NotFound';
+import NotFound from '@spectrum-icons/illustrations/NotFound';
 import React from 'react';
 
 type IllustratedMessageStory = ComponentStoryObj<typeof IllustratedMessage>;
diff --git a/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.stories.tsx b/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.stories.tsx
index 694bd89e31a..bff05ac488c 100644
--- a/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.stories.tsx
+++ b/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.stories.tsx
@@ -11,12 +11,12 @@
  */
 import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
 import {Content} from '@react-spectrum/view';
-import Error from '@spectrum-icons/illustrations/src/Error';
+import Error from '@spectrum-icons/illustrations/Error';
 import {Heading} from '@react-spectrum/text';
 import {IllustratedMessage} from '../';
 import {Link} from '@react-spectrum/link';
-import NoSearchResults from '@spectrum-icons/illustrations/src/NoSearchResults';
-import NotFound from '@spectrum-icons/illustrations/src/NotFound';
+import NoSearchResults from '@spectrum-icons/illustrations/NoSearchResults';
+import NotFound from '@spectrum-icons/illustrations/NotFound';
 import React from 'react';
 import Timeout from '@spectrum-icons/illustrations/Timeout';
 import Unauthorized from '@spectrum-icons/illustrations/Unauthorized';
diff --git a/packages/@react-spectrum/illustratedmessage/package.json b/packages/@react-spectrum/illustratedmessage/package.json
index 7aad5eb5885..f605cb0b745 100644
--- a/packages/@react-spectrum/illustratedmessage/package.json
+++ b/packages/@react-spectrum/illustratedmessage/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/image/package.json b/packages/@react-spectrum/image/package.json
index 0559d0834d2..722b8214971 100644
--- a/packages/@react-spectrum/image/package.json
+++ b/packages/@react-spectrum/image/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/inlinealert/package.json b/packages/@react-spectrum/inlinealert/package.json
index a9734f9697e..60118c25673 100644
--- a/packages/@react-spectrum/inlinealert/package.json
+++ b/packages/@react-spectrum/inlinealert/package.json
@@ -7,7 +7,11 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/label/package.json b/packages/@react-spectrum/label/package.json
index 279a5fff250..024877a3072 100644
--- a/packages/@react-spectrum/label/package.json
+++ b/packages/@react-spectrum/label/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/labeledvalue/docs/types.ts b/packages/@react-spectrum/labeledvalue/docs/types.ts
index afe1e2a0b81..8724027ba71 100644
--- a/packages/@react-spectrum/labeledvalue/docs/types.ts
+++ b/packages/@react-spectrum/labeledvalue/docs/types.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import {DateTime, LabeledValueBaseProps} from '@react-spectrum/labeledvalue/src/LabeledValue';
 import {RangeValue} from '@react-types/shared';
 import {ReactElement} from 'react';
diff --git a/packages/@react-spectrum/labeledvalue/package.json b/packages/@react-spectrum/labeledvalue/package.json
index a92b8b28d3c..a4d7ec7aef1 100644
--- a/packages/@react-spectrum/labeledvalue/package.json
+++ b/packages/@react-spectrum/labeledvalue/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/layout/package.json b/packages/@react-spectrum/layout/package.json
index 43581735376..b78915b088f 100644
--- a/packages/@react-spectrum/layout/package.json
+++ b/packages/@react-spectrum/layout/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/link/package.json b/packages/@react-spectrum/link/package.json
index f67556394c9..2470f32d34d 100644
--- a/packages/@react-spectrum/link/package.json
+++ b/packages/@react-spectrum/link/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/list/package.json b/packages/@react-spectrum/list/package.json
index 2a16ffec26c..a3feb300e47 100644
--- a/packages/@react-spectrum/list/package.json
+++ b/packages/@react-spectrum/list/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx b/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx
index 0b9bcf38f42..d46025df339 100644
--- a/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx
+++ b/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx
@@ -1,7 +1,7 @@
 import {action} from '@storybook/addon-actions';
 import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
 import {DragBetweenListsExample, DragBetweenListsRootOnlyExample, DragExample, DragIntoItemExample, ReorderExample} from './ListViewDnDExamples';
-import {Droppable} from '@react-aria/dnd/stories/dnd.stories';
+import {Droppable} from '../../../@react-aria/dnd/stories/dnd.stories';
 import {Flex} from '@react-spectrum/layout';
 import {ListView} from '../';
 import React from 'react';
diff --git a/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx b/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx
index d2c56d02abe..057991599eb 100644
--- a/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx
+++ b/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx
@@ -1,7 +1,7 @@
 import {action} from '@storybook/addon-actions';
 import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
 import {DragBetweenListsComplex, DragBetweenListsOverride, DragExampleUtilHandlers, FinderDropUtilHandlers, InsertExampleUtilHandlers, ItemDropExampleUtilHandlers, ReorderExampleUtilHandlers, RootDropExampleUtilHandlers} from './ListViewDnDUtilExamples';
-import {Droppable} from '@react-aria/dnd/stories/dnd.stories';
+import {Droppable} from '../../../@react-aria/dnd/stories/dnd.stories';
 import {Flex} from '@react-spectrum/layout';
 import {ListView} from '../';
 import React from 'react';
diff --git a/packages/@react-spectrum/listbox/package.json b/packages/@react-spectrum/listbox/package.json
index 1b87eeb7355..39f8f24b964 100644
--- a/packages/@react-spectrum/listbox/package.json
+++ b/packages/@react-spectrum/listbox/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/menu/package.json b/packages/@react-spectrum/menu/package.json
index 203bfa9842c..ce64458a837 100644
--- a/packages/@react-spectrum/menu/package.json
+++ b/packages/@react-spectrum/menu/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/meter/package.json b/packages/@react-spectrum/meter/package.json
index 862dd4c52f6..d7946e31cc4 100644
--- a/packages/@react-spectrum/meter/package.json
+++ b/packages/@react-spectrum/meter/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/numberfield/package.json b/packages/@react-spectrum/numberfield/package.json
index 24700bc996a..f4fdb9432ba 100644
--- a/packages/@react-spectrum/numberfield/package.json
+++ b/packages/@react-spectrum/numberfield/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/overlays/package.json b/packages/@react-spectrum/overlays/package.json
index a17ec509ea2..928d900bec1 100644
--- a/packages/@react-spectrum/overlays/package.json
+++ b/packages/@react-spectrum/overlays/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/picker/package.json b/packages/@react-spectrum/picker/package.json
index 19e3a37bc4a..1450e860eec 100644
--- a/packages/@react-spectrum/picker/package.json
+++ b/packages/@react-spectrum/picker/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/progress/package.json b/packages/@react-spectrum/progress/package.json
index 11e39366fd2..64c41009517 100644
--- a/packages/@react-spectrum/progress/package.json
+++ b/packages/@react-spectrum/progress/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/provider/package.json b/packages/@react-spectrum/provider/package.json
index dca655cbe96..d591022a540 100644
--- a/packages/@react-spectrum/provider/package.json
+++ b/packages/@react-spectrum/provider/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/radio/package.json b/packages/@react-spectrum/radio/package.json
index 554b226927e..d56f77549cd 100644
--- a/packages/@react-spectrum/radio/package.json
+++ b/packages/@react-spectrum/radio/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/s2/icon.d.ts b/packages/@react-spectrum/s2/icon.d.ts
new file mode 100644
index 00000000000..56c5f4c1156
--- /dev/null
+++ b/packages/@react-spectrum/s2/icon.d.ts
@@ -0,0 +1,5 @@
+import type {ReactNode} from 'react';
+import type {IconProps} from './src/Icon';
+
+declare function Icon(props: IconProps): ReactNode;
+export default Icon;
diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json
index 634f4326b52..636e1aaa9eb 100644
--- a/packages/@react-spectrum/s2/package.json
+++ b/packages/@react-spectrum/s2/package.json
@@ -17,26 +17,45 @@
   "source": "src/index.ts",
   "exports": {
     ".": {
-      "types": "./dist/types.d.ts",
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
       "module": "./dist/module.mjs",
       "import": "./dist/module.mjs",
       "require": "./dist/main.cjs"
     },
-    "./page.css": "./page.css",
+    "./page.css": {
+      "source": "./src/page.ts",
+      "default": "./page.css"
+    },
     "./style": {
-      "types": "./style/dist/types.d.ts",
+      "source": "./style/index.ts",
+      "types": [
+        "./style/dist/types.d.ts",
+        "./style/index.ts"
+      ],
       "module": "./style/dist/module.mjs",
       "import": "./style/dist/module.mjs",
       "require": "./style/dist/main.cjs"
     },
     "./icons/*": {
-      "types": "./icons/*.d.ts",
+      "source": "./s2wf-icons/S2_Icon_*_20_N.svg",
+      "types": [
+        "./icons/*.d.ts",
+        "./icon.d.ts"
+      ],
       "module": "./icons/*.mjs",
       "import": "./icons/*.mjs",
       "require": "./icons/*.cjs"
     },
     "./illustrations/*": {
-      "types": "./illustrations/*.d.ts",
+      "source": "./spectrum-illustrations/*.tsx",
+      "types": [
+        "./illustrations/*.d.ts",
+        "./icon.d.ts"
+      ],
       "module": "./illustrations/*.mjs",
       "import": "./illustrations/*.mjs",
       "require": "./illustrations/*.cjs"
diff --git a/packages/@react-spectrum/searchfield/package.json b/packages/@react-spectrum/searchfield/package.json
index 022cf67055f..f02d0d7e617 100644
--- a/packages/@react-spectrum/searchfield/package.json
+++ b/packages/@react-spectrum/searchfield/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/searchwithin/package.json b/packages/@react-spectrum/searchwithin/package.json
index 031e7bebde2..ccab9f54bc4 100644
--- a/packages/@react-spectrum/searchwithin/package.json
+++ b/packages/@react-spectrum/searchwithin/package.json
@@ -7,7 +7,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/slider/package.json b/packages/@react-spectrum/slider/package.json
index a459306b25d..84602adcba8 100644
--- a/packages/@react-spectrum/slider/package.json
+++ b/packages/@react-spectrum/slider/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/statuslight/package.json b/packages/@react-spectrum/statuslight/package.json
index 3d0eb851278..561b6f262c3 100644
--- a/packages/@react-spectrum/statuslight/package.json
+++ b/packages/@react-spectrum/statuslight/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/steplist/package.json b/packages/@react-spectrum/steplist/package.json
index 704af0f9ba9..43c2b23ecba 100644
--- a/packages/@react-spectrum/steplist/package.json
+++ b/packages/@react-spectrum/steplist/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/story-utils/package.json b/packages/@react-spectrum/story-utils/package.json
index 658552952ab..d1094ea32fb 100644
--- a/packages/@react-spectrum/story-utils/package.json
+++ b/packages/@react-spectrum/story-utils/package.json
@@ -7,7 +7,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/switch/package.json b/packages/@react-spectrum/switch/package.json
index ce81eceb5e4..acf169afc18 100644
--- a/packages/@react-spectrum/switch/package.json
+++ b/packages/@react-spectrum/switch/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/table/package.json b/packages/@react-spectrum/table/package.json
index c7e310f68e8..a591848271a 100644
--- a/packages/@react-spectrum/table/package.json
+++ b/packages/@react-spectrum/table/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/table/test/TableSizing.test.tsx b/packages/@react-spectrum/table/test/TableSizing.test.tsx
index cddb75e8ea6..3c82d3a3223 100644
--- a/packages/@react-spectrum/table/test/TableSizing.test.tsx
+++ b/packages/@react-spectrum/table/test/TableSizing.test.tsx
@@ -22,7 +22,7 @@ import {HidingColumns} from '../stories/HidingColumns';
 import {Key} from '@react-types/shared';
 import {Provider} from '@react-spectrum/provider';
 import React, {useRef} from 'react';
-import {resizingTests} from '@react-aria/table/test/tableResizingTests';
+import {resizingTests} from '../../../@react-aria/table/test/tableResizingTests';
 import {Scale} from '@react-types/provider';
 import {setInteractionModality} from '@react-aria/interactions';
 import {theme} from '@react-spectrum/theme-default';
diff --git a/packages/@react-spectrum/tabs/package.json b/packages/@react-spectrum/tabs/package.json
index 927ea1e4a54..e0c74a5bbaa 100644
--- a/packages/@react-spectrum/tabs/package.json
+++ b/packages/@react-spectrum/tabs/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/tag/package.json b/packages/@react-spectrum/tag/package.json
index 3db895a191a..da0cf8ac57b 100644
--- a/packages/@react-spectrum/tag/package.json
+++ b/packages/@react-spectrum/tag/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/test-utils/package.json b/packages/@react-spectrum/test-utils/package.json
index 736444ae289..fc4878186d2 100644
--- a/packages/@react-spectrum/test-utils/package.json
+++ b/packages/@react-spectrum/test-utils/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/text/package.json b/packages/@react-spectrum/text/package.json
index 6b6bf5837b9..4036c64139d 100644
--- a/packages/@react-spectrum/text/package.json
+++ b/packages/@react-spectrum/text/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/textfield/package.json b/packages/@react-spectrum/textfield/package.json
index 3493367c09c..84484c9ea24 100644
--- a/packages/@react-spectrum/textfield/package.json
+++ b/packages/@react-spectrum/textfield/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/theme-dark/package.json b/packages/@react-spectrum/theme-dark/package.json
index 62cbd9351e1..2268f2eb237 100644
--- a/packages/@react-spectrum/theme-dark/package.json
+++ b/packages/@react-spectrum/theme-dark/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/theme-default/package.json b/packages/@react-spectrum/theme-default/package.json
index 4d1e183447c..9e13f8ba3ad 100644
--- a/packages/@react-spectrum/theme-default/package.json
+++ b/packages/@react-spectrum/theme-default/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/theme-express/package.json b/packages/@react-spectrum/theme-express/package.json
index e81e9a4a205..a9e375e07f1 100644
--- a/packages/@react-spectrum/theme-express/package.json
+++ b/packages/@react-spectrum/theme-express/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/theme-light/package.json b/packages/@react-spectrum/theme-light/package.json
index 166042178ea..27138a979a2 100644
--- a/packages/@react-spectrum/theme-light/package.json
+++ b/packages/@react-spectrum/theme-light/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/toast/package.json b/packages/@react-spectrum/toast/package.json
index fbce29711a4..6b66be6e2a9 100644
--- a/packages/@react-spectrum/toast/package.json
+++ b/packages/@react-spectrum/toast/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/tooltip/package.json b/packages/@react-spectrum/tooltip/package.json
index 6c51c1d0982..502f8d1ab3c 100644
--- a/packages/@react-spectrum/tooltip/package.json
+++ b/packages/@react-spectrum/tooltip/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/tree/package.json b/packages/@react-spectrum/tree/package.json
index 7a1febcfc0f..5db241e1bfe 100644
--- a/packages/@react-spectrum/tree/package.json
+++ b/packages/@react-spectrum/tree/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/utils/package.json b/packages/@react-spectrum/utils/package.json
index 23373b098da..7036503b2d3 100644
--- a/packages/@react-spectrum/utils/package.json
+++ b/packages/@react-spectrum/utils/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/view/package.json b/packages/@react-spectrum/view/package.json
index 86a150d5209..3194258cab6 100644
--- a/packages/@react-spectrum/view/package.json
+++ b/packages/@react-spectrum/view/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-spectrum/well/package.json b/packages/@react-spectrum/well/package.json
index 6d9c1b6d95b..649402d3bd9 100644
--- a/packages/@react-spectrum/well/package.json
+++ b/packages/@react-spectrum/well/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/autocomplete/package.json b/packages/@react-stately/autocomplete/package.json
index 2c25e427b87..afd82990307 100644
--- a/packages/@react-stately/autocomplete/package.json
+++ b/packages/@react-stately/autocomplete/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/calendar/package.json b/packages/@react-stately/calendar/package.json
index 8887ca318d3..e02d7e299fb 100644
--- a/packages/@react-stately/calendar/package.json
+++ b/packages/@react-stately/calendar/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/checkbox/package.json b/packages/@react-stately/checkbox/package.json
index e50e4d23425..d7ae6953ce6 100644
--- a/packages/@react-stately/checkbox/package.json
+++ b/packages/@react-stately/checkbox/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/collections/package.json b/packages/@react-stately/collections/package.json
index 9c0164e156e..c85386110ce 100644
--- a/packages/@react-stately/collections/package.json
+++ b/packages/@react-stately/collections/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/color/package.json b/packages/@react-stately/color/package.json
index aff939dc959..3cbf4cd178d 100644
--- a/packages/@react-stately/color/package.json
+++ b/packages/@react-stately/color/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/combobox/package.json b/packages/@react-stately/combobox/package.json
index b900f88b061..c0a098344ae 100644
--- a/packages/@react-stately/combobox/package.json
+++ b/packages/@react-stately/combobox/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/data/package.json b/packages/@react-stately/data/package.json
index e8108d8f8ff..917d034aadf 100644
--- a/packages/@react-stately/data/package.json
+++ b/packages/@react-stately/data/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/datepicker/package.json b/packages/@react-stately/datepicker/package.json
index 9088da012f0..dce34adf20d 100644
--- a/packages/@react-stately/datepicker/package.json
+++ b/packages/@react-stately/datepicker/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/disclosure/package.json b/packages/@react-stately/disclosure/package.json
index 431a62f44ef..59ea515b025 100644
--- a/packages/@react-stately/disclosure/package.json
+++ b/packages/@react-stately/disclosure/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/dnd/package.json b/packages/@react-stately/dnd/package.json
index d6f7a528d3c..e4c98b636c1 100644
--- a/packages/@react-stately/dnd/package.json
+++ b/packages/@react-stately/dnd/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/flags/package.json b/packages/@react-stately/flags/package.json
index d731ae5db1f..c278f062747 100644
--- a/packages/@react-stately/flags/package.json
+++ b/packages/@react-stately/flags/package.json
@@ -7,7 +7,11 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/form/package.json b/packages/@react-stately/form/package.json
index cb5682bc645..97381418eb5 100644
--- a/packages/@react-stately/form/package.json
+++ b/packages/@react-stately/form/package.json
@@ -7,7 +7,11 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/grid/package.json b/packages/@react-stately/grid/package.json
index 4268b9a23ce..bf405a94730 100644
--- a/packages/@react-stately/grid/package.json
+++ b/packages/@react-stately/grid/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/layout/package.json b/packages/@react-stately/layout/package.json
index c072c7b3692..4050d94edd1 100644
--- a/packages/@react-stately/layout/package.json
+++ b/packages/@react-stately/layout/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/list/package.json b/packages/@react-stately/list/package.json
index d7a3f6fc0f7..5b44310f961 100644
--- a/packages/@react-stately/list/package.json
+++ b/packages/@react-stately/list/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/menu/package.json b/packages/@react-stately/menu/package.json
index b3593b2b8a1..7275a0ffc64 100644
--- a/packages/@react-stately/menu/package.json
+++ b/packages/@react-stately/menu/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/numberfield/package.json b/packages/@react-stately/numberfield/package.json
index 597fa4e11ca..3149c332208 100644
--- a/packages/@react-stately/numberfield/package.json
+++ b/packages/@react-stately/numberfield/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/overlays/package.json b/packages/@react-stately/overlays/package.json
index 53bf0acb868..d03bded7cf2 100644
--- a/packages/@react-stately/overlays/package.json
+++ b/packages/@react-stately/overlays/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/radio/package.json b/packages/@react-stately/radio/package.json
index 0ed35834284..1d56c8f7701 100644
--- a/packages/@react-stately/radio/package.json
+++ b/packages/@react-stately/radio/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/searchfield/package.json b/packages/@react-stately/searchfield/package.json
index 4203775a9fc..9525f3ade61 100644
--- a/packages/@react-stately/searchfield/package.json
+++ b/packages/@react-stately/searchfield/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/select/package.json b/packages/@react-stately/select/package.json
index aa574becb47..0b5aa98fbec 100644
--- a/packages/@react-stately/select/package.json
+++ b/packages/@react-stately/select/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/selection/package.json b/packages/@react-stately/selection/package.json
index d032c473105..1b7f54bbacc 100644
--- a/packages/@react-stately/selection/package.json
+++ b/packages/@react-stately/selection/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/slider/package.json b/packages/@react-stately/slider/package.json
index 9c04992e880..b180732602d 100644
--- a/packages/@react-stately/slider/package.json
+++ b/packages/@react-stately/slider/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/steplist/package.json b/packages/@react-stately/steplist/package.json
index 65a4f66a1c2..748cd2b40c9 100644
--- a/packages/@react-stately/steplist/package.json
+++ b/packages/@react-stately/steplist/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/table/package.json b/packages/@react-stately/table/package.json
index b6edfc9cc04..e6d62809769 100644
--- a/packages/@react-stately/table/package.json
+++ b/packages/@react-stately/table/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/tabs/package.json b/packages/@react-stately/tabs/package.json
index abad8073a4e..b96f211c5a4 100644
--- a/packages/@react-stately/tabs/package.json
+++ b/packages/@react-stately/tabs/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/toast/package.json b/packages/@react-stately/toast/package.json
index dc102f240ac..aabd2cae031 100644
--- a/packages/@react-stately/toast/package.json
+++ b/packages/@react-stately/toast/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/toggle/package.json b/packages/@react-stately/toggle/package.json
index ec8147b1264..ddb550839a0 100644
--- a/packages/@react-stately/toggle/package.json
+++ b/packages/@react-stately/toggle/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/tooltip/package.json b/packages/@react-stately/tooltip/package.json
index 068ee58ba6e..8de119caa1a 100644
--- a/packages/@react-stately/tooltip/package.json
+++ b/packages/@react-stately/tooltip/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/tree/package.json b/packages/@react-stately/tree/package.json
index 62c301ea32c..d41a9ba2177 100644
--- a/packages/@react-stately/tree/package.json
+++ b/packages/@react-stately/tree/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/utils/package.json b/packages/@react-stately/utils/package.json
index 93a332e29c5..ba8421eeb5a 100644
--- a/packages/@react-stately/utils/package.json
+++ b/packages/@react-stately/utils/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/@react-stately/virtualizer/package.json b/packages/@react-stately/virtualizer/package.json
index 2b11cc5e977..239669f5ed2 100644
--- a/packages/@react-stately/virtualizer/package.json
+++ b/packages/@react-stately/virtualizer/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/packages/dev/parcel-resolver-docs/DocsResolver.js b/packages/dev/parcel-resolver-docs/DocsResolver.js
index 29037a428b5..e98e5cc59a1 100644
--- a/packages/dev/parcel-resolver-docs/DocsResolver.js
+++ b/packages/dev/parcel-resolver-docs/DocsResolver.js
@@ -15,15 +15,16 @@ const NodeResolver = require('@parcel/node-resolver-core').default;
 const path = require('path');
 
 module.exports = new Resolver({
-  async resolve({dependency, options, specifier}) {
+  loadConfig({options}) {
+    return new NodeResolver({
+      fs: options.inputFS,
+      projectRoot: options.projectRoot,
+      extensions: ['ts', 'tsx', 'd.ts', 'js'],
+      mainFields: ['source', 'types', 'main']
+    });
+  },
+  async resolve({dependency, options, specifier, config: resolver}) {
     if (dependency.specifier.startsWith('docs:') || dependency.specifier.startsWith('apiCheck:') || dependency.pipeline === 'docs' || dependency.pipeline === 'docs-json' || dependency.pipeline === 'apiCheck') {
-      const resolver = new NodeResolver({
-        fs: options.inputFS,
-        projectRoot: options.projectRoot,
-        extensions: ['ts', 'tsx', 'd.ts', 'js'],
-        mainFields: ['source', 'types', 'main']
-      });
-
       let resolved = await resolver.resolve({
         filename: specifier,
         specifierType: dependency.specifierType,
@@ -53,5 +54,17 @@ module.exports = new Resolver({
       let baseDir = process.env.DOCS_ENV === 'production' ? 'docs' : 'packages';
       return {filePath: path.join(options.projectRoot, baseDir, specifier)};
     }
+
+    if (/^((@(react-spectrum|react-aria|react-stately|internationalized|spectrum-icons|adobe\/react-spectrum))|react-aria-components|react-aria|react-stately)\/.*package.json$/.test(specifier)) {
+      let resolved = await resolver.resolve({
+        filename: specifier,
+        specifierType: dependency.specifierType,
+        parent: dependency.resolveFrom,
+        env: dependency.env,
+        sourcePath: dependency.sourcePath
+      });
+
+      return resolved;
+    }
   }
 });
diff --git a/packages/react-aria-components/package.json b/packages/react-aria-components/package.json
index 417edbb9ea7..b1cd6f5495a 100644
--- a/packages/react-aria-components/package.json
+++ b/packages/react-aria-components/package.json
@@ -9,7 +9,11 @@
   "source": "src/index.ts",
   "exports": {
     ".": {
-      "types": "./dist/types.d.ts",
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
       "import": "./dist/import.mjs",
       "require": "./dist/main.js"
     },
diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json
index 0059a26ff33..3e14aba1274 100644
--- a/packages/react-aria/package.json
+++ b/packages/react-aria/package.json
@@ -7,7 +7,11 @@
   "module": "dist/module.js",
   "exports": {
     ".": {
-      "types": "./dist/types.d.ts",
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
       "import": "./dist/import.mjs",
       "require": "./dist/main.js"
     },
diff --git a/packages/react-stately/package.json b/packages/react-stately/package.json
index bdc8c7b3707..c426d1ff95d 100644
--- a/packages/react-stately/package.json
+++ b/packages/react-stately/package.json
@@ -6,7 +6,11 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": [
+      "./dist/types.d.ts",
+      "./src/index.ts"
+    ],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/plop-templates/@react-aria/package.json.hbs b/plop-templates/@react-aria/package.json.hbs
index 8af00339c23..1eb5eb34f0a 100644
--- a/plop-templates/@react-aria/package.json.hbs
+++ b/plop-templates/@react-aria/package.json.hbs
@@ -8,7 +8,8 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": ["./dist/types.d.ts", "./src/index.ts"],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/plop-templates/@react-spectrum/package.json.hbs b/plop-templates/@react-spectrum/package.json.hbs
index d6786adb858..f41a9c9bda6 100644
--- a/plop-templates/@react-spectrum/package.json.hbs
+++ b/plop-templates/@react-spectrum/package.json.hbs
@@ -8,7 +8,8 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": ["./dist/types.d.ts", "./src/index.ts"],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/plop-templates/@react-stately/package.json.hbs b/plop-templates/@react-stately/package.json.hbs
index eb0eff477a3..9c25fd010fc 100644
--- a/plop-templates/@react-stately/package.json.hbs
+++ b/plop-templates/@react-stately/package.json.hbs
@@ -8,7 +8,8 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": ["./dist/types.d.ts", "./src/index.ts"],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/plop-templates/@scope/package.json.hbs b/plop-templates/@scope/package.json.hbs
index 1a5079de2dd..07cbc05b174 100644
--- a/plop-templates/@scope/package.json.hbs
+++ b/plop-templates/@scope/package.json.hbs
@@ -8,7 +8,8 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "types": "./dist/types.d.ts",
+    "source": "./src/index.ts",
+    "types": ["./dist/types.d.ts", "./src/index.ts"],
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
diff --git a/scripts/buildBranchAPI.js b/scripts/buildBranchAPI.js
index fc79ba27f9c..f98c7f173b2 100644
--- a/scripts/buildBranchAPI.js
+++ b/scripts/buildBranchAPI.js
@@ -86,6 +86,9 @@ async function build() {
     scripts: {
       build: 'yarn parcel build packages/@react-spectrum/actiongroup',
       postinstall: 'patch-package'
+    },
+    '@parcel/resolver-default': {
+      packageExports: true
     }
   };
 
diff --git a/scripts/buildPublishedAPI.js b/scripts/buildPublishedAPI.js
index c7c0f75af18..2bb68efdcd8 100644
--- a/scripts/buildPublishedAPI.js
+++ b/scripts/buildPublishedAPI.js
@@ -72,6 +72,9 @@ async function build() {
     scripts: {
       build: 'yarn parcel build packages/@react-spectrum/actiongroup',
       postinstall: 'patch-package'
+    },
+    '@parcel/resolver-default': {
+      packageExports: true
     }
   };
 
@@ -105,6 +108,9 @@ async function build() {
     scripts: {
       build: 'yarn parcel build packages/@react-spectrum/actiongroup',
       postinstall: 'patch-package'
+    },
+    '@parcel/resolver-default': {
+      packageExports: true
     }
   };
 
diff --git a/scripts/buildWebsite.js b/scripts/buildWebsite.js
index 5051412549d..a7c8bc0faa1 100644
--- a/scripts/buildWebsite.js
+++ b/scripts/buildWebsite.js
@@ -84,7 +84,10 @@ async function build() {
       postinstall: 'patch-package',
       createRssFeed: "node scripts/createFeed.mjs"
     },
-    '@parcel/transformer-css': packageJSON['@parcel/transformer-css']
+    '@parcel/transformer-css': packageJSON['@parcel/transformer-css'],
+    '@parcel/resolver-default': {
+      packageExports: true
+    }
   };
 
 
@@ -162,19 +165,6 @@ async function build() {
   // Install dependencies from npm
   await run('yarn', ['--no-immutable'], {cwd: dir, stdio: 'inherit'});
 
-  // Copy package.json for each package into docs dir so we can find the correct version numbers
-  for (let p of packages) {
-    if (fs.existsSync(path.join(dir, 'node_modules', p))) {
-      fs.copySync(path.join(dir, 'node_modules', p), path.join(dir, 'docs', p));
-    }
-  }
-
-  // Patch react-aria-components package.json for example CSS.
-  let p = path.join(dir, 'docs', 'react-aria-components', 'package.json');
-  let json = JSON.parse(fs.readFileSync(p));
-  json.sideEffects = ['*.css'];
-  fs.writeFileSync(p, JSON.stringify(json, false, 2));
-
   // Build the website
   await run('yarn', ['build'], {cwd: dir, stdio: 'inherit'});
 
diff --git a/tsconfig.json b/tsconfig.json
index b05da2d90c7..a703b0a76eb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,7 +16,7 @@
     // allows importing of json files, needed for locales as of right now
     "resolveJsonModule": true,
     // Search under node_modules for non-relative imports.
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "module": "esnext",
     // Process & infer types from .js files.
     "allowJs": true,
diff --git a/yarn.lock b/yarn.lock
index 4ef455f53d1..af1558d0a76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24017,7 +24017,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromark-extension-mdxjs@npm:^1.0.0":
+"micromark-extension-mdxjs@npm:1.0.0":
   version: 1.0.0
   resolution: "micromark-extension-mdxjs@npm:1.0.0"
   dependencies:
@@ -24033,6 +24033,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromark-extension-mdxjs@patch:micromark-extension-mdxjs@npm%3A1.0.0#~/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch":
+  version: 1.0.0
+  resolution: "micromark-extension-mdxjs@patch:micromark-extension-mdxjs@npm%3A1.0.0#~/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch::version=1.0.0&hash=5369db"
+  dependencies:
+    acorn: "npm:^8.0.0"
+    acorn-jsx: "npm:^5.0.0"
+    micromark-extension-mdx-expression: "npm:^1.0.0"
+    micromark-extension-mdx-jsx: "npm:^1.0.0"
+    micromark-extension-mdx-md: "npm:^1.0.0"
+    micromark-extension-mdxjs-esm: "npm:^1.0.0"
+    micromark-util-combine-extensions: "npm:^1.0.0"
+    micromark-util-types: "npm:^1.0.0"
+  checksum: 10c0/642b86dffa985c1ed3f128b45b8837f1b068fa9382cee827ca2c892b4fa368aab38ebae605490a584092fbfeaaddb8e4c09c2c5cf7371cc0221c75ed00f27134
+  languageName: node
+  linkType: hard
+
 "micromark-factory-destination@npm:^1.0.0":
   version: 1.0.0
   resolution: "micromark-factory-destination@npm:1.0.0"
@@ -28401,7 +28417,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"remark-mdx@npm:^2.0.0-rc.2":
+"remark-mdx@npm:2.0.0-rc.2":
   version: 2.0.0-rc.2
   resolution: "remark-mdx@npm:2.0.0-rc.2"
   dependencies:
@@ -28411,6 +28427,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"remark-mdx@patch:remark-mdx@npm%3A2.0.0-rc.2#~/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch":
+  version: 2.0.0-rc.2
+  resolution: "remark-mdx@patch:remark-mdx@npm%3A2.0.0-rc.2#~/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch::version=2.0.0-rc.2&hash=c7e3eb"
+  dependencies:
+    mdast-util-mdx: "npm:^1.0.0"
+    micromark-extension-mdxjs: "npm:^1.0.0"
+  checksum: 10c0/a4ec91b738d0609c88b6d565474770f268e461d5b0a27f258640f3d74273c715386a43d052313a58f6624b8349bd054ef9a3a4b957afbcafd5bd710714daaeb6
+  languageName: node
+  linkType: hard
+
 "remark-parse@npm:10.0.1":
   version: 10.0.1
   resolution: "remark-parse@npm:10.0.1"
@@ -28422,6 +28448,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"remark-parse@patch:remark-parse@npm%3A10.0.1#~/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch":
+  version: 10.0.1
+  resolution: "remark-parse@patch:remark-parse@npm%3A10.0.1#~/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch::version=10.0.1&hash=53e21c"
+  dependencies:
+    "@types/mdast": "npm:^3.0.0"
+    mdast-util-from-markdown: "npm:^1.0.0"
+    unified: "npm:^10.0.0"
+  checksum: 10c0/a35712b4edc27af4b81b5697c3c259e3e45743dc9a41bbf53b5960eefebe0c8199bc21639dd0acaeec2c040d7dab8b66f35ef93ff6cf84168143eeefc76be910
+  languageName: node
+  linkType: hard
+
 "remark-rehype@npm:^10.0.0":
   version: 10.1.0
   resolution: "remark-rehype@npm:10.1.0"