Skip to content

Commit 8c33cba

Browse files
devongovettdevongovett
authored
chore: Enable package.json exports support (#8294)
* Enable moduleResolution: bundler * renders v3 and s2 * preemptively fix verdaccio * turn on verdaccio * fix patch * fix again * Revert "turn on verdaccio" This reverts commit 5d003ff.
1 parent 0784c3d commit 8c33cba

File tree

192 files changed

+971
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+971
-224
lines changed

‎.storybook-s2/custom-addons/provider/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {getQueryParams} from '@storybook/preview-api';
55
// Importing from src so that HMR works.
66
// Without this, all HMR updates will bubble through the index.ts and up
77
// to the root instead of stopping at the story files.
8-
import {Provider} from '@react-spectrum/s2/src/Provider';
8+
import {Provider} from '../../../packages/@react-spectrum/s2/src/Provider';
99

1010
document.body.style.margin = '0';
1111

‎.storybook-s2/docs/Icons.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {ActionButton, Text} from '@react-spectrum/s2';
44
import {H2, H3, P, Code, Pre, Link} from './typography';
55
import {highlight} from './highlight' with {type: 'macro'};
66
import {IconColors} from './Colors';
7-
import CheckmarkCircle from '../../packages/@react-spectrum/s2/s2wf-icons/S2_Icon_CheckmarkCircle_20_N.svg';
7+
import CheckmarkCircle from '@react-spectrum/s2/icons/CheckmarkCircle';
88
import {iconStyle} from '../../packages/@react-spectrum/s2/style' with {type: 'macro'};
99

1010
export function Icons() {

‎.storybook-s2/docs/Illustrations.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import linearIllustrations from '@react-spectrum/s2/spectrum-illustrations/linear/*.tsx';
22
import gradientIllustrations from '@react-spectrum/s2/spectrum-illustrations/gradient/*/*.tsx';
3-
import Paste from '@react-spectrum/s2/s2wf-icons/S2_Icon_Paste_20_N.svg';
3+
import Paste from '@react-spectrum/s2/icons/Paste';
44
import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
5-
import {ActionButton, Text} from '@react-spectrum/s2';
5+
import {ActionButton, Radio, RadioGroup} from '@react-spectrum/s2';
66
import {H2, H3, P, Code, Pre, Link} from './typography';
77
import {highlight} from './highlight' with {type: 'macro'};
8-
import { Radio, RadioGroup } from '../../packages/@react-spectrum/s2/src';
98
import { useState } from 'react';
109

1110
export function Illustrations() {

‎.storybook-s2/docs/Intro.jsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
2-
import {Button, LinkButton, ButtonGroup, Checkbox, Content, Dialog, DialogTrigger, Footer, Header, Heading, Image, InlineAlert, Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger, Switch, Text} from '@react-spectrum/s2';
3-
import NewIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_New_20_N.svg';
4-
import ImgIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Image_20_N.svg';
5-
import CopyIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Copy_20_N.svg';
6-
import CommentTextIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_CommentText_20_N.svg';
7-
import ClockPendingIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_ClockPending_20_N.svg';
8-
import CommunityIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Community_20_N.svg';
9-
import DeviceTabletIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_DeviceTablet_20_N.svg';
10-
import DeviceDesktopIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_DeviceDesktop_20_N.svg';
2+
import {Button, ButtonGroup, Checkbox, Content, Dialog, DialogTrigger, Footer, Header, Heading, Image, InlineAlert, Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger, Switch, Text} from '@react-spectrum/s2';
3+
import NewIcon from '@react-spectrum/s2/icons/New';
4+
import ImgIcon from '@react-spectrum/s2/icons/Image';
5+
import CopyIcon from '@react-spectrum/s2/icons/Copy';
6+
import CommentTextIcon from '@react-spectrum/s2/icons/CommentText';
7+
import ClockPendingIcon from '@react-spectrum/s2/icons/ClockPending';
8+
import CommunityIcon from '@react-spectrum/s2/icons/Community';
9+
import DeviceTabletIcon from '@react-spectrum/s2/icons/DeviceTablet';
10+
import DeviceDesktopIcon from '@react-spectrum/s2/icons/DeviceDesktop';
1111
import {highlight} from './highlight' with {type: 'macro'};
1212
import {H2, H3, H4, P, Pre, Code, Strong, Link} from './typography';
1313

‎.storybook-s2/preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '@react-spectrum/s2/src/page';
1+
import '@react-spectrum/s2/page.css';
22
import { themes } from '@storybook/theming';
33
import { DARK_MODE_EVENT_NAME } from 'storybook-dark-mode';
44
import { store } from 'storybook-dark-mode/dist/esm/Tool';

‎.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/index.d.ts b/index.d.ts
2+
index ba9855b0a36d5fbd70f92da611f3e1e96f203ee3..167de6defae46d391a45cc63dd11403722fb1619 100644
3+
--- a/index.d.ts
4+
+++ b/index.d.ts
5+
@@ -4,7 +4,7 @@
6+
*/
7+
export function mdxjs(
8+
options?:
9+
- | import('micromark-extension-mdx-expression/dev/lib/syntax').Options
10+
+ | Options
11+
| undefined
12+
): Extension
13+
export type Extension = import('micromark-util-types').Extension

‎.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/index.d.ts b/index.d.ts
2+
index c5da87629f94c457947bc712439c94b028cd5d81..3bec2ed83b30a40f84f51665eebf7a67d1a628c1 100644
3+
--- a/index.d.ts
4+
+++ b/index.d.ts
5+
@@ -4,7 +4,7 @@
6+
*
7+
* @type {import('unified').Plugin<[Options?]|Array<void>, Root>}
8+
*/
9+
-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>;
10+
+export default function remarkMdx(options?: void | import("micromark-extension-mdx-expression").Options | undefined): void | import("unified").Transformer<import("mdast").Root, import("mdast").Root>;
11+
export type Root = import('mdast').Root;
12+
export type Options = import('micromark-extension-mdxjs').Options;
13+
export type DoNotTouchAsThisImportItIncludesMdxInTree = typeof import("mdast-util-mdx");

‎.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/lib/index.d.ts b/lib/index.d.ts
2+
index 0e8563eb2fe2aad42400d3aad666f36df0dbc16a..d20f18817ab64c586de59eb411fd739ece028a95 100644
3+
--- a/lib/index.d.ts
4+
+++ b/lib/index.d.ts
5+
@@ -1,6 +1,6 @@
6+
/** @type {import('unified').Plugin<[Options?] | void[], string, Root>} */
7+
export default function remarkParse(
8+
- options: void | import('mdast-util-from-markdown/lib').Options | undefined
9+
+ options: void | import('mdast-util-from-markdown').Options | undefined
10+
): void
11+
export type Root = import('mdast').Root
12+
export type Options = import('mdast-util-from-markdown').Options

‎eslint.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ export default [{
312312
"@spectrum-icons/ui",
313313
"@spectrum-icons/workflow",
314314
"@spectrum-icons/illustrations",
315+
"@react-spectrum/s2/icons"
315316
],
316317
}],
317318

‎package.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@
227227
"postcss-custom-properties": "13.2.0",
228228
"postcss-import": "15.1.0",
229229
"react-refresh": "0.9.0",
230-
"remark-parse": "10.0.1",
231230
"browserslist": "4.24.0",
232231
"caniuse-lite": "1.0.30001563",
233232
"@types/react": "npm:types-react@19.0.0-rc.0",
@@ -238,7 +237,10 @@
238237
"@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",
239238
"@types/node@npm:*": "^22",
240239
"@types/node@npm:^18.0.0": "^22",
241-
"@types/node@npm:>= 8": "^22"
240+
"@types/node@npm:>= 8": "^22",
241+
"micromark-extension-mdxjs": "patch:micromark-extension-mdxjs@npm%3A1.0.0#~/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch",
242+
"remark-mdx": "patch:remark-mdx@npm%3A2.0.0-rc.2#~/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch",
243+
"remark-parse": "patch:remark-parse@npm%3A10.0.1#~/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch"
242244
},
243245
"@parcel/transformer-css": {
244246
"cssModules": {
@@ -264,7 +266,12 @@
264266
}
265267
},
266268
"alias": {
267-
"@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-18"
269+
"@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-18",
270+
"react-dom/client.js": "react-dom/client",
271+
"react-dom/index.js": "react-dom"
272+
},
273+
"@parcel/resolver-default": {
274+
"packageExports": true
268275
},
269276
"@parcel/bundler-default": {
270277
"manualSharedBundles": [

‎packages/@adobe/react-spectrum/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
"module": "dist/module.js",
88
"exports": {
99
".": {
10-
"types": "./dist/types.d.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1114
"import": "./dist/import.mjs",
1215
"require": "./dist/main.js"
1316
},

‎packages/@internationalized/date/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@internationalized/message/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@internationalized/number/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@internationalized/string/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/actiongroup/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/aria-modal-polyfill/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/autocomplete/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/breadcrumbs/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/button/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/calendar/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/checkbox/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/collections/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
"module": "dist/module.js",
88
"types": "dist/types.d.ts",
99
"exports": {
10-
"types": "./dist/types.d.ts",
10+
"source": "./src/index.ts",
11+
"types": [
12+
"./dist/types.d.ts",
13+
"./src/index.ts"
14+
],
1115
"import": "./dist/import.mjs",
1216
"require": "./dist/main.js"
1317
},

‎packages/@react-aria/color/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/combobox/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/datepicker/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/dialog/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/disclosure/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

‎packages/@react-aria/dnd/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"main": "dist/main.js",
77
"module": "dist/module.js",
88
"exports": {
9-
"types": "./dist/types.d.ts",
9+
"source": "./src/index.ts",
10+
"types": [
11+
"./dist/types.d.ts",
12+
"./src/index.ts"
13+
],
1014
"import": "./dist/import.mjs",
1115
"require": "./dist/main.js"
1216
},

0 commit comments

Comments
 (0)