chore: Enable package.json exports support

.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';
 

.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() {

.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() {

.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';
 

.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';

.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

.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");

.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

eslint.config.mjs

@@ -312,6 +312,7 @@ export default [{
                 "@spectrum-icons/ui",
                 "@spectrum-icons/workflow",
                 "@spectrum-icons/illustrations",
+                "@react-spectrum/s2/icons"
             ],
         }],
 

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": [

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"
     },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },

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"
   },