Skip to content

Commit 01afe31

Browse files
devongovettdevongovett
committed
preemptively fix verdaccio
1 parent 8b25dbf commit 01afe31

File tree

18 files changed

+106
-36
lines changed

18 files changed

+106
-36
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/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/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

Whitespace-only changes.

‎package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,10 @@
238238
"@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",
239239
"@types/node@npm:*": "^22",
240240
"@types/node@npm:^18.0.0": "^22",
241-
"@types/node@npm:>= 8": "^22"
241+
"@types/node@npm:>= 8": "^22",
242+
"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",
243+
"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",
244+
"remark-parse@npm:^10.0.0": "patch:remark-parse@npm%3A10.0.1#~/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch"
242245
},
243246
"@parcel/transformer-css": {
244247
"cssModules": {
@@ -264,7 +267,9 @@
264267
}
265268
},
266269
"alias": {
267-
"@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-18"
270+
"@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-18",
271+
"react-dom/client.js": "react-dom/client",
272+
"react-dom/index.js": "react-dom"
268273
},
269274
"@parcel/resolver-default": {
270275
"packageExports": true

‎packages/@react-aria/test-utils/src/userEventMaps.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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';
22

33
export let pointerMap: pointerKey[] = [
44
{name: 'MouseLeft', pointerType: 'mouse', button: 'primary', height: 1, width: 1, pressure: 0.5},

‎packages/@react-spectrum/badge/chromatic-fc/Badge.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import {Badge} from '..';
1414
import {BadgeStory, renderVariants} from '../chromatic/Badge.stories';
15-
import CheckmarkCircle from '@spectrum-icons/workflow/src/CheckmarkCircle';
15+
import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
1616
import {ComponentMeta} from '@storybook/react';
1717
import React from 'react';
1818
import {Text} from '@react-spectrum/text';

‎packages/@react-spectrum/badge/chromatic/Badge.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import {Badge} from '../';
14-
import CheckmarkCircle from '@spectrum-icons/workflow/src/CheckmarkCircle';
14+
import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
1515
import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
1616
import {Flex} from '@react-spectrum/layout';
1717
import React from 'react';

‎packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.Languages.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {Content} from '@react-spectrum/view';
1414
import {Flex} from '@react-spectrum/layout';
1515
import {Heading} from '@react-spectrum/text';
1616
import {IllustratedMessage} from '..';
17-
import NotFound from '@spectrum-icons/illustrations/src/NotFound';
17+
import NotFound from '@spectrum-icons/illustrations/NotFound';
1818
import React from 'react';
1919

2020
type IllustratedMessageStory = ComponentStoryObj<typeof IllustratedMessage>;

‎packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.stories.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
*/
1212
import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
1313
import {Content} from '@react-spectrum/view';
14-
import Error from '@spectrum-icons/illustrations/src/Error';
14+
import Error from '@spectrum-icons/illustrations/Error';
1515
import {Heading} from '@react-spectrum/text';
1616
import {IllustratedMessage} from '../';
1717
import {Link} from '@react-spectrum/link';
18-
import NoSearchResults from '@spectrum-icons/illustrations/src/NoSearchResults';
19-
import NotFound from '@spectrum-icons/illustrations/src/NotFound';
18+
import NoSearchResults from '@spectrum-icons/illustrations/NoSearchResults';
19+
import NotFound from '@spectrum-icons/illustrations/NotFound';
2020
import React from 'react';
2121
import Timeout from '@spectrum-icons/illustrations/Timeout';
2222
import Unauthorized from '@spectrum-icons/illustrations/Unauthorized';

‎packages/@react-spectrum/labeledvalue/docs/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @ts-ignore
12
import {DateTime, LabeledValueBaseProps} from '@react-spectrum/labeledvalue/src/LabeledValue';
23
import {RangeValue} from '@react-types/shared';
34
import {ReactElement} from 'react';

‎packages/@react-spectrum/table/test/TableSizing.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {HidingColumns} from '../stories/HidingColumns';
2222
import {Key} from '@react-types/shared';
2323
import {Provider} from '@react-spectrum/provider';
2424
import React, {useRef} from 'react';
25-
import {resizingTests} from '@react-aria/table/test/tableResizingTests';
25+
import {resizingTests} from '../../../@react-aria/table/test/tableResizingTests';
2626
import {Scale} from '@react-types/provider';
2727
import {setInteractionModality} from '@react-aria/interactions';
2828
import {theme} from '@react-spectrum/theme-default';

‎packages/dev/parcel-resolver-docs/DocsResolver.js

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ const NodeResolver = require('@parcel/node-resolver-core').default;
1515
const path = require('path');
1616

1717
module.exports = new Resolver({
18-
async resolve({dependency, options, specifier}) {
18+
loadConfig({options}) {
19+
return new NodeResolver({
20+
fs: options.inputFS,
21+
projectRoot: options.projectRoot,
22+
extensions: ['ts', 'tsx', 'd.ts', 'js'],
23+
mainFields: ['source', 'types', 'main']
24+
});
25+
},
26+
async resolve({dependency, options, specifier, config: resolver}) {
1927
if (dependency.specifier.startsWith('docs:') || dependency.specifier.startsWith('apiCheck:') || dependency.pipeline === 'docs' || dependency.pipeline === 'docs-json' || dependency.pipeline === 'apiCheck') {
20-
const resolver = new NodeResolver({
21-
fs: options.inputFS,
22-
projectRoot: options.projectRoot,
23-
extensions: ['ts', 'tsx', 'd.ts', 'js'],
24-
mainFields: ['source', 'types', 'main']
25-
});
26-
2728
let resolved = await resolver.resolve({
2829
filename: specifier,
2930
specifierType: dependency.specifierType,
@@ -53,5 +54,17 @@ module.exports = new Resolver({
5354
let baseDir = process.env.DOCS_ENV === 'production' ? 'docs' : 'packages';
5455
return {filePath: path.join(options.projectRoot, baseDir, specifier)};
5556
}
57+
58+
if (/^((@(react-spectrum|react-aria|react-stately|internationalized|spectrum-icons|adobe\/react-spectrum))|react-aria-components|react-aria|react-stately)\/.*package.json$/.test(specifier)) {
59+
let resolved = await resolver.resolve({
60+
filename: specifier,
61+
specifierType: dependency.specifierType,
62+
parent: dependency.resolveFrom,
63+
env: dependency.env,
64+
sourcePath: dependency.sourcePath
65+
});
66+
67+
return resolved;
68+
}
5669
}
5770
});

‎scripts/buildBranchAPI.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ async function build() {
8686
scripts: {
8787
build: 'yarn parcel build packages/@react-spectrum/actiongroup',
8888
postinstall: 'patch-package'
89+
},
90+
'@parcel/resolver-default': {
91+
packageExports: true
8992
}
9093
};
9194

‎scripts/buildPublishedAPI.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ async function build() {
7272
scripts: {
7373
build: 'yarn parcel build packages/@react-spectrum/actiongroup',
7474
postinstall: 'patch-package'
75+
},
76+
'@parcel/resolver-default': {
77+
packageExports: true
7578
}
7679
};
7780

@@ -105,6 +108,9 @@ async function build() {
105108
scripts: {
106109
build: 'yarn parcel build packages/@react-spectrum/actiongroup',
107110
postinstall: 'patch-package'
111+
},
112+
'@parcel/resolver-default': {
113+
packageExports: true
108114
}
109115
};
110116

‎scripts/buildWebsite.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ async function build() {
8484
postinstall: 'patch-package',
8585
createRssFeed: "node scripts/createFeed.mjs"
8686
},
87-
'@parcel/transformer-css': packageJSON['@parcel/transformer-css']
87+
'@parcel/transformer-css': packageJSON['@parcel/transformer-css'],
88+
'@parcel/resolver-default': {
89+
packageExports: true
90+
}
8891
};
8992

9093

@@ -162,19 +165,6 @@ async function build() {
162165
// Install dependencies from npm
163166
await run('yarn', ['--no-immutable'], {cwd: dir, stdio: 'inherit'});
164167

165-
// Copy package.json for each package into docs dir so we can find the correct version numbers
166-
for (let p of packages) {
167-
if (fs.existsSync(path.join(dir, 'node_modules', p))) {
168-
fs.copySync(path.join(dir, 'node_modules', p), path.join(dir, 'docs', p));
169-
}
170-
}
171-
172-
// Patch react-aria-components package.json for example CSS.
173-
let p = path.join(dir, 'docs', 'react-aria-components', 'package.json');
174-
let json = JSON.parse(fs.readFileSync(p));
175-
json.sideEffects = ['*.css'];
176-
fs.writeFileSync(p, JSON.stringify(json, false, 2));
177-
178168
// Build the website
179169
await run('yarn', ['build'], {cwd: dir, stdio: 'inherit'});
180170

‎yarn.lock

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24017,7 +24017,7 @@ __metadata:
2401724017
languageName: node
2401824018
linkType: hard
2401924019

24020-
"micromark-extension-mdxjs@npm:^1.0.0":
24020+
"micromark-extension-mdxjs@npm:1.0.0":
2402124021
version: 1.0.0
2402224022
resolution: "micromark-extension-mdxjs@npm:1.0.0"
2402324023
dependencies:
@@ -24033,6 +24033,22 @@ __metadata:
2403324033
languageName: node
2403424034
linkType: hard
2403524035

24036+
"micromark-extension-mdxjs@patch:micromark-extension-mdxjs@npm%3A1.0.0#~/.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch":
24037+
version: 1.0.0
24038+
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"
24039+
dependencies:
24040+
acorn: "npm:^8.0.0"
24041+
acorn-jsx: "npm:^5.0.0"
24042+
micromark-extension-mdx-expression: "npm:^1.0.0"
24043+
micromark-extension-mdx-jsx: "npm:^1.0.0"
24044+
micromark-extension-mdx-md: "npm:^1.0.0"
24045+
micromark-extension-mdxjs-esm: "npm:^1.0.0"
24046+
micromark-util-combine-extensions: "npm:^1.0.0"
24047+
micromark-util-types: "npm:^1.0.0"
24048+
checksum: 10c0/642b86dffa985c1ed3f128b45b8837f1b068fa9382cee827ca2c892b4fa368aab38ebae605490a584092fbfeaaddb8e4c09c2c5cf7371cc0221c75ed00f27134
24049+
languageName: node
24050+
linkType: hard
24051+
2403624052
"micromark-factory-destination@npm:^1.0.0":
2403724053
version: 1.0.0
2403824054
resolution: "micromark-factory-destination@npm:1.0.0"
@@ -28401,7 +28417,7 @@ __metadata:
2840128417
languageName: node
2840228418
linkType: hard
2840328419

28404-
"remark-mdx@npm:^2.0.0-rc.2":
28420+
"remark-mdx@npm:2.0.0-rc.2":
2840528421
version: 2.0.0-rc.2
2840628422
resolution: "remark-mdx@npm:2.0.0-rc.2"
2840728423
dependencies:
@@ -28411,6 +28427,16 @@ __metadata:
2841128427
languageName: node
2841228428
linkType: hard
2841328429

28430+
"remark-mdx@patch:remark-mdx@npm%3A2.0.0-rc.2#~/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch":
28431+
version: 2.0.0-rc.2
28432+
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"
28433+
dependencies:
28434+
mdast-util-mdx: "npm:^1.0.0"
28435+
micromark-extension-mdxjs: "npm:^1.0.0"
28436+
checksum: 10c0/a4ec91b738d0609c88b6d565474770f268e461d5b0a27f258640f3d74273c715386a43d052313a58f6624b8349bd054ef9a3a4b957afbcafd5bd710714daaeb6
28437+
languageName: node
28438+
linkType: hard
28439+
2841428440
"remark-parse@npm:10.0.1":
2841528441
version: 10.0.1
2841628442
resolution: "remark-parse@npm:10.0.1"

0 commit comments

Comments
 (0)