preemptively fix verdaccio

devongovett · devongovett · commit 01afe318d4e7 · 2025-05-22T17:06:27.000-07:00
diff --git 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/preview.tsx b/.storybook-s2/preview.tsx
@@ -1,4 +1,4 @@
-import '@react-spectrum/s2/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
@@ -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
@@ -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
diff --git a/package.json b/package.json
@@ -238,7 +238,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@npm:^1.0.0": "patch:micromark-extension-mdxjs@npm%3A1.0.0#~/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch",
+    "remark-mdx@npm:^2.0.0-rc.2": "patch:remark-mdx@npm%3A2.0.0-rc.2#~/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch",
+    "remark-parse@npm:^10.0.0": "patch:remark-parse@npm%3A10.0.1#~/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch"
   },
   "@parcel/transformer-css": {
     "cssModules": {
@@ -264,7 +267,9 @@
     }
   },
   "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
diff --git 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-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
@@ -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/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
@@ -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/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/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/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/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
@@ -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
@@ -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/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"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import '@react-spectrum/s2/page';`
	`1`	`+import '@react-spectrum/s2/page.css';`
`2`	`2`	`import { themes } from '@storybook/theming';`
`3`	`3`	`import { DARK_MODE_EVENT_NAME } from 'storybook-dark-mode';`
`4`	`4`	`import { store } from 'storybook-dark-mode/dist/esm/Tool';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {pointerKey} from '@testing-library/user-event/system/pointer/shared';`
	`1`	`+import {pointerKey} from '@testing-library/user-event';`
`2`	`2`
`3`	`3`	`export let pointerMap: pointerKey[] = [`
`4`	`4`	`{name: 'MouseLeft', pointerType: 'mouse', button: 'primary', height: 1, width: 1, pressure: 0.5},`