diff --git a/.circleci/comment.js b/.circleci/comment.js index c2af610eb7d..fdee6db0ccf 100644 --- a/.circleci/comment.js +++ b/.circleci/comment.js @@ -11,7 +11,7 @@ async function run() { let pr; // If we aren't running on a PR commit, double check if this is a branch created for a fork. If so, we'll need to // comment the build link on the fork. - if (!process.env.CIRCLE_PULL_REQUEST) { + if (true) { try { const commit = await octokit.git.getCommit({ owner: 'adobe', @@ -41,7 +41,7 @@ async function run() { break; } } - } else if (process.env.CIRCLE_BRANCH === 'main') { + } else if (true) { //If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build await octokit.repos.createCommitComment({ owner: 'adobe', diff --git a/.circleci/config.yml b/.circleci/config.yml index 95442fd2782..3fe47378d9a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -870,9 +870,6 @@ workflows: requires: - install - verdaccio: - filters: - branches: - only: main requires: - install - v-docs: diff --git a/.storybook-s2/custom-addons/provider/index.js b/.storybook-s2/custom-addons/provider/index.js index 367299c1551..deecfa6bec2 100644 --- a/.storybook-s2/custom-addons/provider/index.js +++ b/.storybook-s2/custom-addons/provider/index.js @@ -1,23 +1,17 @@ import React, {useEffect, useState} from 'react'; import {addons} from '@storybook/preview-api'; import {makeDecorator} from '@storybook/preview-api'; -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 +// 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 '../../../packages/@react-spectrum/s2/src/Provider'; document.body.style.margin = '0'; -const providerValuesFromUrl = Object.entries(getQueryParams()).reduce((acc, [k, v]) => { - if (k.includes('providerSwitcher-')) { - return { ...acc, [k.replace('providerSwitcher-', '')]: v }; - } - return acc; -}, {}); - function ProviderUpdater(props) { - let [localeValue, setLocale] = useState(providerValuesFromUrl.locale || undefined); + let params = new URLSearchParams(document.location.search); + let localeParam = params.get('providerSwitcher-locale') || undefined; + let [localeValue, setLocale] = useState(localeParam); useEffect(() => { let channel = addons.getChannel(); diff --git a/.storybook-s2/custom-addons/provider/register.js b/.storybook-s2/custom-addons/provider/register.js index ec994ea2f60..d61694aea44 100644 --- a/.storybook-s2/custom-addons/provider/register.js +++ b/.storybook-s2/custom-addons/provider/register.js @@ -1,18 +1,11 @@ import {addons, types} from '@storybook/manager-api'; -import {getQueryParams} from '@storybook/preview-api'; import {locales} from '../../constants'; import React, {useEffect, useState} from 'react'; -const providerValuesFromUrl = Object.entries(getQueryParams()).reduce((acc, [k, v]) => { - if (k.includes('providerSwitcher-')) { - return { ...acc, [k.replace('providerSwitcher-', '')]: v }; - } - return acc; -}, {}); - function ProviderFieldSetter({api}) { - let [values, setValues] = useState({locale: providerValuesFromUrl.locale || undefined}); + let localeParam = api.getQueryParam('providerSwitcher-locale') || undefined; + let [values, setValues] = useState({locale: localeParam}); let channel = addons.getChannel(); let onLocaleChange = (e) => { let newValue = e.target.value || undefined; diff --git a/.storybook-s2/docs/Icons.jsx b/.storybook-s2/docs/Icons.jsx index ec38009c279..e275afba22c 100644 --- a/.storybook-s2/docs/Icons.jsx +++ b/.storybook-s2/docs/Icons.jsx @@ -1,4 +1,4 @@ -import icons from '@react-spectrum/s2/s2wf-icons/*.svg'; +import icons from '../../packages/@react-spectrum/s2/s2wf-icons/*.svg'; import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'}; import {ActionButton, Text} from '@react-spectrum/s2'; import {H2, H3, P, Code, Pre, Link} from './typography'; diff --git a/.storybook-s2/main.ts b/.storybook-s2/main.ts index 6c0d906a774..949e310ac7f 100644 --- a/.storybook-s2/main.ts +++ b/.storybook-s2/main.ts @@ -31,6 +31,9 @@ const config: StorybookConfig = { framework: { name: "storybook-react-parcel", options: {}, + }, + core: { + disableWhatsNewNotifications: true } // typescript: { // reactDocgen: 'react-docgen-typescript', diff --git a/.storybook/custom-addons/descriptions/register.js b/.storybook/custom-addons/descriptions/register.js index 9878e6714b4..2ece754638d 100644 --- a/.storybook/custom-addons/descriptions/register.js +++ b/.storybook/custom-addons/descriptions/register.js @@ -1,8 +1,6 @@ - -import {addons, types} from '@storybook/manager-api'; +import {addons, types, useParameter} from '@storybook/manager-api'; import { AddonPanel } from '@storybook/components'; import React from 'react'; -import { useParameter } from '@storybook/api'; const ADDON_ID = 'descriptionAddon'; const PANEL_ID = `${ADDON_ID}/panel`; @@ -19,10 +17,10 @@ addons.register(ADDON_ID, (api) => { addons.add(PANEL_ID, { type: types.PANEL, title: 'Description', - render: ({ active }) => ( + render: ({active}) => ( - ), + ) }); }); diff --git a/.storybook/custom-addons/provider/index.js b/.storybook/custom-addons/provider/index.js index 9415413196f..537375ce04a 100644 --- a/.storybook/custom-addons/provider/index.js +++ b/.storybook/custom-addons/provider/index.js @@ -1,24 +1,21 @@ import React, {useEffect, useState} from 'react'; import {addons} from '@storybook/preview-api'; import {makeDecorator} from '@storybook/preview-api'; -import {getQueryParams} from '@storybook/preview-api'; import {Provider} from '@react-spectrum/provider'; import {expressThemes, themes, defaultTheme} from '../../constants'; document.body.style.margin = '0'; -const providerValuesFromUrl = Object.entries(getQueryParams()).reduce((acc, [k, v]) => { - if (k.includes('providerSwitcher-')) { - return { ...acc, [k.replace('providerSwitcher-', '')]: v }; - } - return acc; -}, {}); - function ProviderUpdater(props) { - let [localeValue, setLocale] = useState(providerValuesFromUrl.locale || undefined); - let [themeValue, setTheme] = useState(providerValuesFromUrl.theme || undefined); - let [scaleValue, setScale] = useState(providerValuesFromUrl.scale || undefined); - let [expressValue, setExpress] = useState(providerValuesFromUrl.express === 'true'); + let params = new URLSearchParams(document.location.search); + let localeParam = params.get("providerSwitcher-locale") || undefined; + let [localeValue, setLocale] = useState(localeParam); + let themeParam = params.get("providerSwitcher-theme") || undefined; + let [themeValue, setTheme] = useState(themeParam); + let scaleParam = params.get("providerSwitcher-scale") || undefined; + let [scaleValue, setScale] = useState(scaleParam); + let expressParam = params.get("providerSwitcher-express") || undefined; + let [expressValue, setExpress] = useState(expressParam === 'true'); let [storyReady, setStoryReady] = useState(window.parent === window || window.parent !== window.top); // reduce content flash because it takes a moment to get the provider details // Typically themes are provided with both light + dark, and both scales. // To build our selector to see all themes, we need to hack it a bit. @@ -27,6 +24,7 @@ function ProviderUpdater(props) { useEffect(() => { let channel = addons.getChannel(); let providerUpdate = (event) => { + console.log('providerUpdate', event); setLocale(event.locale); setTheme(event.theme === 'Auto' ? undefined : event.theme); setScale(event.scale === 'Auto' ? undefined : event.scale); @@ -42,6 +40,7 @@ function ProviderUpdater(props) { }, []); if (props.options.mainElement == null) { + console.log('mainElement is null', storyReady); return (
@@ -50,6 +49,7 @@ function ProviderUpdater(props) { ); } else { + console.log('mainElement is not null'); return ( {storyReady && props.children} diff --git a/.storybook/custom-addons/provider/register.js b/.storybook/custom-addons/provider/register.js index e8d2d923ed9..b9706d82357 100644 --- a/.storybook/custom-addons/provider/register.js +++ b/.storybook/custom-addons/provider/register.js @@ -1,15 +1,7 @@ - import {addons, types} from '@storybook/manager-api'; -import {getQueryParams} from '@storybook/preview-api'; import {locales} from '../../constants'; import React, {useEffect, useState} from 'react'; -const providerValuesFromUrl = Object.entries(getQueryParams()).reduce((acc, [k, v]) => { - if (k.includes('providerSwitcher-')) { - return { ...acc, [k.replace('providerSwitcher-', '')]: v }; - } - return acc; -}, {}); let THEMES = [ {label: 'Auto', value: ''}, @@ -37,7 +29,17 @@ let TOAST_POSITIONS = [ ]; function ProviderFieldSetter({api}) { - let [values, setValues] = useState({locale: providerValuesFromUrl.locale || undefined, theme: providerValuesFromUrl.theme || undefined, scale: providerValuesFromUrl.scale || undefined, express: providerValuesFromUrl.express === 'true'}); + let localeParam = api.getQueryParam('providerSwitcher-locale') || undefined; + let themeParam = api.getQueryParam('providerSwitcher-theme') || undefined; + let scaleParam = api.getQueryParam('providerSwitcher-scale') || undefined; + let expressParam = api.getQueryParam('providerSwitcher-express') || undefined; + + let [values, setValues] = useState({ + locale: localeParam, + theme: themeParam, + scale: scaleParam, + express: expressParam === 'true' + }); let channel = addons.getChannel(); let onLocaleChange = (e) => { let newValue = e.target.value || undefined; @@ -73,6 +75,7 @@ function ProviderFieldSetter({api}) { }; useEffect(() => { let storySwapped = () => { + console.log('storySwapped', values); channel.emit('provider/updated', values); }; channel.on('rsp/ready-for-update', storySwapped); @@ -119,6 +122,7 @@ function ProviderFieldSetter({api}) { } addons.register('ProviderSwitcher', (api) => { + console.log('ProviderSwitcher registering'); addons.add('ProviderSwitcher', { title: 'viewport', type: types.TOOL, diff --git a/.storybook/custom-addons/scrolling/index.js b/.storybook/custom-addons/scrolling/index.js index 6e016d9ed43..8806ef97da6 100644 --- a/.storybook/custom-addons/scrolling/index.js +++ b/.storybook/custom-addons/scrolling/index.js @@ -1,11 +1,12 @@ import {addons} from '@storybook/preview-api'; import clsx from 'clsx'; -import {getQueryParams} from '@storybook/preview-api'; import React, {useEffect, useState} from 'react'; function ScrollingDecorator(props) { let {children} = props; - let [isScrolling, setScrolling] = useState(getQueryParams()?.scrolling === 'true' || false); + let params = new URLSearchParams(document.location.search); + let scrolling = params.get('scrolling') || undefined; + let [isScrolling, setScrolling] = useState(scrolling === 'true' || false); useEffect(() => { let channel = addons.getChannel(); diff --git a/.storybook/custom-addons/scrolling/register.js b/.storybook/custom-addons/scrolling/register.js index b25f1be3087..97517f0b68b 100644 --- a/.storybook/custom-addons/scrolling/register.js +++ b/.storybook/custom-addons/scrolling/register.js @@ -1,10 +1,10 @@ import {addons, types} from '@storybook/manager-api'; -import {getQueryParams} from '@storybook/preview-api'; import React, {useEffect, useState} from 'react'; const ScrollingToolbar = ({api}) => { let channel = addons.getChannel(); - let [isScrolling, setScrolling] = useState(getQueryParams()?.scrolling === 'true' || false); + let scrolling = api.getQueryParam('scrolling'); + let [isScrolling, setScrolling] = useState(scrolling === 'true' || false); let onChange = () => { setScrolling((old) => { channel.emit('scrolling/updated', !old); diff --git a/.storybook/custom-addons/strictmode/index.js b/.storybook/custom-addons/strictmode/index.js index 61ae2a95651..34df03f1940 100644 --- a/.storybook/custom-addons/strictmode/index.js +++ b/.storybook/custom-addons/strictmode/index.js @@ -1,10 +1,11 @@ import {addons, makeDecorator} from '@storybook/preview-api'; -import {getQueryParams} from '@storybook/preview-api'; import React, {StrictMode, useEffect, useState} from 'react'; function StrictModeDecorator(props) { let {children} = props; - let [isStrict, setStrict] = useState(getQueryParams()?.strict !== 'false'); + let params = new URLSearchParams(document.location.search); + let strictParam = params.get("strict") || undefined; + let [isStrict, setStrict] = useState(strictParam !== 'false'); useEffect(() => { let channel = addons.getChannel(); diff --git a/.storybook/custom-addons/strictmode/register.js b/.storybook/custom-addons/strictmode/register.js index c4d1b2b9068..d94cd2fcafc 100644 --- a/.storybook/custom-addons/strictmode/register.js +++ b/.storybook/custom-addons/strictmode/register.js @@ -1,15 +1,15 @@ import {addons, types} from '@storybook/manager-api'; -import {getQueryParams} from '@storybook/preview-api'; import React, {useEffect, useState} from 'react'; const StrictModeToolBar = ({api}) => { let channel = addons.getChannel(); - let [isStrict, setStrict] = useState(getQueryParams()?.strict !== 'false'); + let strictParam = api.getQueryParam('strict'); + let [isStrict, setStrict] = useState(strictParam !== 'false'); let onChange = () => { setStrict((old) => { channel.emit('strict/updated', !old); return !old; - }) + }); }; useEffect(() => { diff --git a/.storybook/main.js b/.storybook/main.js index 95b64e2cdbb..e9986a2e7a6 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -11,11 +11,11 @@ module.exports = { "@storybook/addon-a11y", "@storybook/addon-controls", "storybook-dark-mode", - './custom-addons/provider/register', - './custom-addons/descriptions/register', - './custom-addons/theme/register', - './custom-addons/strictmode/register', - './custom-addons/scrolling/register' + './custom-addons/provider/register.js', + './custom-addons/descriptions/register.js', + './custom-addons/theme/register.js', + './custom-addons/strictmode/register.js', + './custom-addons/scrolling/register.js' ], typescript: { @@ -26,5 +26,9 @@ module.exports = { framework: { name: "storybook-react-parcel", options: {}, + }, + + core: { + disableWhatsNewNotifications: true } }; diff --git a/.yarn/patches/@storybook-addon-docs-npm-8.6.14-12ab3f55f8.patch b/.yarn/patches/@storybook-addon-docs-npm-8.6.14-12ab3f55f8.patch new file mode 100644 index 00000000000..70df4fb5e0d --- /dev/null +++ b/.yarn/patches/@storybook-addon-docs-npm-8.6.14-12ab3f55f8.patch @@ -0,0 +1,570 @@ +diff --git a/dist/index.d.ts b/dist/index.d.ts +index 73034b75e2303b40fee8898b973e28e216c90043..9aa139b8a225219f7f957cacc087c3185480f1c5 100644 +--- a/dist/index.d.ts ++++ b/dist/index.d.ts +@@ -1,6 +1,7 @@ + import * as core_dist_types from 'storybook/internal/types'; + export * from '@storybook/blocks'; + import { Renderer, DocsRenderFunction, ModuleExports, ModuleExport } from 'storybook/internal/types'; ++import { JSX } from 'react'; + + declare class DocsRenderer { + render: DocsRenderFunction; +diff --git a/node_modules/@mdx-js/react/index.d.ts b/node_modules/@mdx-js/react/index.d.ts +new file mode 100644 +index 0000000000000000000000000000000000000000..64e67c04d069e74a089d30fb7a6b04bacbd817ea +--- /dev/null ++++ b/node_modules/@mdx-js/react/index.d.ts +@@ -0,0 +1,2 @@ ++export { MDXProvider, useMDXComponents } from "./lib/index.js"; ++//# sourceMappingURL=index.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@mdx-js/react/index.d.ts.map b/node_modules/@mdx-js/react/index.d.ts.map +new file mode 100644 +index 0000000000000000000000000000000000000000..ca7a93a9a2807d2076f2cc871f10d62d40e1265d +--- /dev/null ++++ b/node_modules/@mdx-js/react/index.d.ts.map +@@ -0,0 +1 @@ ++{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":""} +\ No newline at end of file +diff --git a/node_modules/@mdx-js/react/index.js b/node_modules/@mdx-js/react/index.js +new file mode 100644 +index 0000000000000000000000000000000000000000..e686091e3244f2d7d01b3ba740a5a2b306e6c915 +--- /dev/null ++++ b/node_modules/@mdx-js/react/index.js +@@ -0,0 +1 @@ ++export {MDXProvider, useMDXComponents} from './lib/index.js' +diff --git a/node_modules/@mdx-js/react/lib/index.d.ts b/node_modules/@mdx-js/react/lib/index.d.ts +new file mode 100644 +index 0000000000000000000000000000000000000000..5ec0eb759afa8af975a26cdbd4526871e2aba38b +--- /dev/null ++++ b/node_modules/@mdx-js/react/lib/index.d.ts +@@ -0,0 +1,43 @@ ++/** ++ * Get current components from the MDX Context. ++ * ++ * @param {Readonly | MergeComponents | null | undefined} [components] ++ * Additional components to use or a function that creates them (optional). ++ * @returns {MDXComponents} ++ * Current components. ++ */ ++export function useMDXComponents(components?: Readonly | MergeComponents | null | undefined): MDXComponents; ++/** ++ * Provider for MDX context. ++ * ++ * @param {Readonly} properties ++ * Properties. ++ * @returns {ReactElement} ++ * Element. ++ * @satisfies {Component} ++ */ ++export function MDXProvider(properties: Readonly): React.ReactElement; ++/** ++ * Custom merge function. ++ */ ++export type MergeComponents = (currentComponents: Readonly) => MDXComponents; ++/** ++ * Configuration for `MDXProvider`. ++ */ ++export type Props = { ++ /** ++ * Children (optional). ++ */ ++ children?: React.ReactNode | null | undefined; ++ /** ++ * Additional components to use or a function that creates them (optional). ++ */ ++ components?: Readonly | MergeComponents | null | undefined; ++ /** ++ * Turn off outer component context (default: `false`). ++ */ ++ disableParentContext?: boolean | null | undefined; ++}; ++import type { MDXComponents } from 'mdx/types.js'; ++import React from 'react'; ++//# sourceMappingURL=index.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@mdx-js/react/lib/index.d.ts.map b/node_modules/@mdx-js/react/lib/index.d.ts.map +new file mode 100644 +index 0000000000000000000000000000000000000000..ca824c1faf5b696a44e66d2e55490e341e992c50 +--- /dev/null ++++ b/node_modules/@mdx-js/react/lib/index.d.ts.map +@@ -0,0 +1 @@ ++{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":"AA8BA;;;;;;;GAOG;AACH,8CALW,QAAQ,CAAC,aAAa,CAAC,GAAG,eAAe,GAAG,IAAI,GAAG,SAAS,GAE1D,aAAa,CAkBzB;AAED;;;;;;;;GAQG;AACH,wCANW,QAAQ,CAAC,KAAK,CAAC,GAEb,kBAAY,CAsBxB;;;;kDA1EU,QAAQ,CAAC,aAAa,CAAC,KAErB,aAAa;;;;;;;;eAKZ,eAAS,GAAG,IAAI,GAAG,SAAS;;;;iBAE5B,QAAQ,CAAC,aAAa,CAAC,GAAG,eAAe,GAAG,IAAI,GAAG,SAAS;;;;2BAE5D,OAAO,GAAG,IAAI,GAAG,SAAS;;mCAlBR,cAAc;kBAsB5B,OAAO"} +\ No newline at end of file +diff --git a/node_modules/@mdx-js/react/lib/index.js b/node_modules/@mdx-js/react/lib/index.js +new file mode 100644 +index 0000000000000000000000000000000000000000..1cbddcbe00ece714da844cddfa08c09a03a0b04a +--- /dev/null ++++ b/node_modules/@mdx-js/react/lib/index.js +@@ -0,0 +1,83 @@ ++/** ++ * @import {MDXComponents} from 'mdx/types.js' ++ * @import {Component, ReactElement, ReactNode} from 'react' ++ */ ++ ++/** ++ * @callback MergeComponents ++ * Custom merge function. ++ * @param {Readonly} currentComponents ++ * Current components from the context. ++ * @returns {MDXComponents} ++ * Additional components. ++ * ++ * @typedef Props ++ * Configuration for `MDXProvider`. ++ * @property {ReactNode | null | undefined} [children] ++ * Children (optional). ++ * @property {Readonly | MergeComponents | null | undefined} [components] ++ * Additional components to use or a function that creates them (optional). ++ * @property {boolean | null | undefined} [disableParentContext=false] ++ * Turn off outer component context (default: `false`). ++ */ ++ ++import React from 'react' ++ ++/** @type {Readonly} */ ++const emptyComponents = {} ++ ++const MDXContext = React.createContext(emptyComponents) ++ ++/** ++ * Get current components from the MDX Context. ++ * ++ * @param {Readonly | MergeComponents | null | undefined} [components] ++ * Additional components to use or a function that creates them (optional). ++ * @returns {MDXComponents} ++ * Current components. ++ */ ++export function useMDXComponents(components) { ++ const contextComponents = React.useContext(MDXContext) ++ ++ // Memoize to avoid unnecessary top-level context changes ++ return React.useMemo( ++ function () { ++ // Custom merge via a function prop ++ if (typeof components === 'function') { ++ return components(contextComponents) ++ } ++ ++ return {...contextComponents, ...components} ++ }, ++ [contextComponents, components] ++ ) ++} ++ ++/** ++ * Provider for MDX context. ++ * ++ * @param {Readonly} properties ++ * Properties. ++ * @returns {ReactElement} ++ * Element. ++ * @satisfies {Component} ++ */ ++export function MDXProvider(properties) { ++ /** @type {Readonly} */ ++ let allComponents ++ ++ if (properties.disableParentContext) { ++ allComponents = ++ typeof properties.components === 'function' ++ ? properties.components(emptyComponents) ++ : properties.components || emptyComponents ++ } else { ++ allComponents = useMDXComponents(properties.components) ++ } ++ ++ return React.createElement( ++ MDXContext.Provider, ++ {value: allComponents}, ++ properties.children ++ ) ++} +diff --git a/node_modules/@mdx-js/react/license b/node_modules/@mdx-js/react/license +new file mode 100644 +index 0000000000000000000000000000000000000000..e32ca93c3eb1fae03a4209196a1170145c2bb30d +--- /dev/null ++++ b/node_modules/@mdx-js/react/license +@@ -0,0 +1,21 @@ ++The MIT License (MIT) ++ ++Copyright (c) 2017 Compositor and Vercel, Inc. ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so, subject to the following conditions: ++ ++The above copyright notice and this permission notice shall be included in ++all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++THE SOFTWARE. +diff --git a/node_modules/@mdx-js/react/package.json b/node_modules/@mdx-js/react/package.json +new file mode 100644 +index 0000000000000000000000000000000000000000..dbc8a0855642dd1acaba3f5facc77464d155e3c8 +--- /dev/null ++++ b/node_modules/@mdx-js/react/package.json +@@ -0,0 +1,73 @@ ++{ ++ "name": "@mdx-js/react", ++ "version": "3.1.0", ++ "description": "React context for MDX", ++ "license": "MIT", ++ "keywords": [ ++ "jsx", ++ "markdown", ++ "mdx", ++ "react", ++ "remark" ++ ], ++ "homepage": "https://mdxjs.com", ++ "repository": { ++ "type": "git", ++ "url": "https://github.com/mdx-js/mdx", ++ "directory": "packages/react/" ++ }, ++ "bugs": "https://github.com/mdx-js/mdx/issues", ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/unified" ++ }, ++ "author": "John Otander (https://johno.com)", ++ "contributors": [ ++ "John Otander (https://johno.com)", ++ "Tim Neutkens ", ++ "Matija Marohnić ", ++ "Titus Wormer (https://wooorm.com)", ++ "JounQin (https://www.1stg.me)", ++ "Christian Murphy " ++ ], ++ "type": "module", ++ "sideEffects": false, ++ "exports": "./index.js", ++ "files": [ ++ "lib/", ++ "index.d.ts.map", ++ "index.d.ts", ++ "index.js" ++ ], ++ "dependencies": { ++ "@types/mdx": "^2.0.0" ++ }, ++ "peerDependencies": { ++ "@types/react": ">=16", ++ "react": ">=16" ++ }, ++ "devDependencies": {}, ++ "scripts": { ++ "test": "npm run test-coverage", ++ "test-api": "node --conditions development --loader=../../script/jsx-loader.js test/index.jsx", ++ "test-coverage": "c8 --100 --reporter lcov npm run test-api" ++ }, ++ "xo": { ++ "overrides": [ ++ { ++ "extends": "xo-react", ++ "files": [ ++ "**/*.jsx" ++ ], ++ "rules": { ++ "react/jsx-no-bind": "off", ++ "react/react-in-jsx-scope": "off" ++ } ++ } ++ ], ++ "prettier": true, ++ "rules": { ++ "n/file-extension-in-import": "off" ++ } ++ } ++} +diff --git a/node_modules/@mdx-js/react/readme.md b/node_modules/@mdx-js/react/readme.md +new file mode 100644 +index 0000000000000000000000000000000000000000..8909e98e940a1de44ae7a62ff63483a6f70d891c +--- /dev/null ++++ b/node_modules/@mdx-js/react/readme.md +@@ -0,0 +1,275 @@ ++# `@mdx-js/react` ++ ++[![Build][build-badge]][build] ++[![Coverage][coverage-badge]][coverage] ++[![Downloads][downloads-badge]][downloads] ++[![Size][size-badge]][size] ++[![Sponsors][sponsors-badge]][collective] ++[![Backers][backers-badge]][collective] ++[![Chat][chat-badge]][chat] ++ ++React context for MDX. ++ ++ ++ ++## Contents ++ ++* [What is this?](#what-is-this) ++* [When should I use this?](#when-should-i-use-this) ++* [Install](#install) ++* [Use](#use) ++* [API](#api) ++ * [`MDXProvider(properties?)`](#mdxproviderproperties) ++ * [`useMDXComponents(components?)`](#usemdxcomponentscomponents) ++ * [`MergeComponents`](#mergecomponents) ++ * [`Props`](#props) ++* [Types](#types) ++* [Compatibility](#compatibility) ++* [Security](#security) ++* [Contribute](#contribute) ++* [License](#license) ++ ++## What is this? ++ ++This package is a *context* based components provider for combining React with ++MDX. ++ ++## When should I use this? ++ ++This package is **not needed** for MDX to work with React. ++See [¶ MDX provider in § Using MDX][use-provider] for when and how to use an MDX ++provider. ++ ++If you use Next.js, **do not use this**. ++Add an `mdx-components.tsx` (in `src/` or `/`) file instead. ++See [Configuring MDX on `nextjs.org`][next-configuring-mdx] for more info. ++ ++## Install ++ ++This package is [ESM only][esm]. ++In Node.js (version 16+), install with [npm][]: ++ ++```sh ++npm install @mdx-js/react ++``` ++ ++In Deno with [`esm.sh`][esmsh]: ++ ++```tsx ++import {MDXProvider} from 'https://esm.sh/@mdx-js/react@3' ++``` ++ ++In browsers with [`esm.sh`][esmsh]: ++ ++```html ++ ++``` ++ ++## Use ++ ++```tsx ++/** ++ * @import {MDXComponents} from 'mdx/types.js' ++ */ ++ ++import {MDXProvider} from '@mdx-js/react' ++import Post from './post.mdx' ++// ^-- Assumes an integration is used to compile MDX to JS, such as ++// `@mdx-js/esbuild`, `@mdx-js/loader`, `@mdx-js/node-loader`, or ++// `@mdx-js/rollup`, and that it is configured with ++// `options.providerImportSource: '@mdx-js/react'`. ++ ++/** @type {MDXComponents} */ ++const components = { ++ em(properties) { ++ return ++ } ++} ++ ++console.log( ++ ++ ++ ++) ++``` ++ ++> 👉 **Note**: you don’t have to use `MDXProvider` and can pass components ++> directly: ++> ++> ```diff ++> - ++> - ++> - ++> + ++> ``` ++ ++See [¶ React in § Getting started][start-react] for how to get started with MDX ++and React. ++See [¶ MDX provider in § Using MDX][use-provider] for how to use an MDX ++provider. ++ ++## API ++ ++This package exports the identifiers [`MDXProvider`][api-mdx-provider] and ++[`useMDXComponents`][api-use-mdx-components]. ++There is no default export. ++ ++### `MDXProvider(properties?)` ++ ++Provider for MDX context. ++ ++###### Parameters ++ ++* `properties` ([`Props`][api-props]) ++ — configuration ++ ++##### Returns ++ ++Element (`JSX.Element`). ++ ++### `useMDXComponents(components?)` ++ ++Get current components from the MDX Context. ++ ++###### Parameters ++ ++* `components` ([`MDXComponents` from `mdx/types.js`][mdx-types-components] ++ or [`MergeComponents`][api-merge-components], optional) ++ — additional components to use or a function that creates them ++ ++###### Returns ++ ++Current components ([`MDXComponents` from ++`mdx/types.js`][mdx-types-components]). ++ ++### `MergeComponents` ++ ++Custom merge function (TypeScript type). ++ ++###### Parameters ++ ++* `components` ([`MDXComponents` from `mdx/types.js`][mdx-types-components]) ++ — current components from the context ++ ++###### Returns ++ ++Additional components ([`MDXComponents` from ++`mdx/types.js`][mdx-types-components]). ++ ++### `Props` ++ ++Configuration for `MDXProvider` (TypeScript type). ++ ++###### Fields ++ ++* `children` ([`ReactNode` from `react`][react-node], ++ optional) ++ — children ++* `components` ([`MDXComponents` from `mdx/types.js`][mdx-types-components] ++ or [`MergeComponents`][api-merge-components], optional) ++ — additional components to use or a function that creates them ++* `disableParentContext` (`boolean`, default: `false`) ++ — turn off outer component context ++ ++## Types ++ ++This package is fully typed with [TypeScript][]. ++It exports the additional types [`MergeComponents`][api-merge-components] and ++[`Props`][api-props]. ++ ++For types to work, make sure the TypeScript `JSX` namespace is typed. ++This is done by installing and using the types of your framework, as in ++[`@types/react`](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react). ++ ++## Compatibility ++ ++Projects maintained by the unified collective are compatible with maintained ++versions of Node.js. ++ ++When we cut a new major release, we drop support for unmaintained versions of ++Node. ++This means we try to keep the current release line, `@mdx-js/react@^3`, ++compatible with Node.js 16. ++ ++## Security ++ ++See [§ Security][security] on our website for information. ++ ++## Contribute ++ ++See [§ Contribute][contribute] on our website for ways to get started. ++See [§ Support][support] for ways to get help. ++ ++This project has a [code of conduct][coc]. ++By interacting with this repository, organization, or community you agree to ++abide by its terms. ++ ++## License ++ ++[MIT][] © Compositor and [Vercel][] ++ ++[build-badge]: https://github.com/mdx-js/mdx/workflows/main/badge.svg ++ ++[build]: https://github.com/mdx-js/mdx/actions ++ ++[coverage-badge]: https://img.shields.io/codecov/c/github/mdx-js/mdx/main.svg ++ ++[coverage]: https://codecov.io/github/mdx-js/mdx ++ ++[downloads-badge]: https://img.shields.io/npm/dm/@mdx-js/react.svg ++ ++[downloads]: https://www.npmjs.com/package/@mdx-js/react ++ ++[size-badge]: https://img.shields.io/bundlejs/size/@mdx-js/react ++ ++[size]: https://bundlejs.com/?q=@mdx-js/react ++ ++[sponsors-badge]: https://opencollective.com/unified/sponsors/badge.svg ++ ++[backers-badge]: https://opencollective.com/unified/backers/badge.svg ++ ++[collective]: https://opencollective.com/unified ++ ++[chat-badge]: https://img.shields.io/badge/chat-discussions-success.svg ++ ++[chat]: https://github.com/mdx-js/mdx/discussions ++ ++[npm]: https://docs.npmjs.com/cli/install ++ ++[contribute]: https://mdxjs.com/community/contribute/ ++ ++[support]: https://mdxjs.com/community/support/ ++ ++[coc]: https://github.com/mdx-js/.github/blob/main/code-of-conduct.md ++ ++[mit]: https://github.com/mdx-js/mdx/blob/main/packages/react/license ++ ++[vercel]: https://vercel.com ++ ++[start-react]: https://mdxjs.com/getting-started/#react ++ ++[use-provider]: https://mdxjs.com/docs/using-mdx/#mdx-provider ++ ++[esm]: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c ++ ++[esmsh]: https://esm.sh ++ ++[security]: https://mdxjs.com/getting-started/#security ++ ++[typescript]: https://www.typescriptlang.org ++ ++[mdx-types-components]: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/HEAD/types/mdx/types.d.ts#L65 ++ ++[react-node]: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/HEAD/types/react/index.d.ts#L244 ++ ++[next-configuring-mdx]: https://nextjs.org/docs/pages/building-your-application/configuring/mdx ++ ++[api-mdx-provider]: #mdxproviderproperties ++ ++[api-merge-components]: #mergecomponents ++ ++[api-props]: #props ++ ++[api-use-mdx-components]: #usemdxcomponentscomponents diff --git a/eslint.config.mjs b/eslint.config.mjs index 7a94bf740f3..18f46c815c4 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -53,7 +53,12 @@ export default [{ "examples/**/*", "starters/**/*", "packages/@react-spectrum/s2/icon.d.ts", - "packages/@react-spectrum/s2/spectrum-illustrations" + "packages/@react-spectrum/s2/spectrum-illustrations", + "packages/dev/parcel-config-storybook/*", + "packages/dev/parcel-resolver-storybook/*", + "packages/dev/parcel-transformer-storybook/*", + "packages/dev/storybook-builder-parcel/*", + "packages/dev/storybook-react-parcel/*" ], }, ...compat.extends("eslint:recommended"), { plugins: { diff --git a/lib/jestResolver.js b/lib/jestResolver.js index c9197a57923..9f5f9a85170 100644 --- a/lib/jestResolver.js +++ b/lib/jestResolver.js @@ -44,7 +44,7 @@ module.exports = (request, options) => { ...options, // https://github.com/microsoft/accessibility-insights-web/pull/5421#issuecomment-1109168149 packageFilter: pkg => { - if (!pkg.name?.startsWith('@tailwind') && pkg.name !== 'tailwindcss') { + if (!pkg.name?.startsWith('@tailwind') && pkg.name !== 'tailwindcss' && !pkg.name?.startsWith('storybook') && !pkg.name?.startsWith('@storybook')) { delete pkg['exports']; delete pkg['module']; } diff --git a/package.json b/package.json index 2ca9dad9daf..8ecac6ed5a4 100644 --- a/package.json +++ b/package.json @@ -101,23 +101,21 @@ "@react-spectrum/s2-icon-builder": "^0.2.0", "@spectrum-css/component-builder": "workspace:^", "@spectrum-css/vars": "^2.3.0", - "@storybook/addon-a11y": "patch:@storybook/addon-a11y@npm%3A^7.6.19#~/.yarn/patches/@storybook-addon-a11y-npm-7.6.19-04b470eae0.patch", - "@storybook/addon-actions": "^7.6.19", - "@storybook/addon-controls": "^7.6.19", - "@storybook/addon-essentials": "^7.6.19", - "@storybook/addon-interactions": "^7.6.19", - "@storybook/addon-links": "^7.6.19", - "@storybook/addon-onboarding": "1.0.8", - "@storybook/addon-themes": "^7.6.19", - "@storybook/api": "^7.6.19", - "@storybook/components": "^7.6.19", - "@storybook/jest": "^0.2.3", - "@storybook/manager-api": "^7.6.19", - "@storybook/preview": "^7.6.19", - "@storybook/preview-api": "^7.6.19", - "@storybook/react": "^7.6.19", - "@storybook/test-runner": "^0.16.0", - "@storybook/testing-library": "^0.2.2", + "@storybook/addon-a11y": "^8.6.7", + "@storybook/addon-actions": "^8.6.7", + "@storybook/addon-controls": "^8.6.7", + "@storybook/addon-essentials": "^8.6.7", + "@storybook/addon-interactions": "^8.6.7", + "@storybook/addon-jest": "^8.6.7", + "@storybook/addon-links": "^8.6.7", + "@storybook/addon-onboarding": "^8.6.7", + "@storybook/addon-themes": "^8.6.7", + "@storybook/components": "^8.6.7", + "@storybook/manager-api": "^8.6.7", + "@storybook/preview": "^8.6.7", + "@storybook/preview-api": "^8.6.7", + "@storybook/react": "^8.6.7", + "@storybook/test-runner": "^0.22.0", "@stylistic/eslint-plugin-ts": "^2.9.0", "@swc/core": "^1.3.36", "@swc/jest": "^0.2.36", @@ -128,7 +126,6 @@ "@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/react": "npm:types-react@19.0.0-rc.0", "@types/react-dom": "npm:types-react-dom@19.0.0-rc.0", - "@types/storybook__react": "^4.0.2", "@yarnpkg/types": "^4.0.0", "autoprefixer": "^9.6.0", "axe-core": "^4.6.3", @@ -185,6 +182,7 @@ "postcss": "^8.4.24", "postcss-custom-properties": "^13.2.0", "postcss-import": "^15.1.0", + "prettier": "^3.3.3", "prop-types": "^15.6.0", "raf": "^3.4.0", "react": "^19.1.0", @@ -198,9 +196,9 @@ "rimraf": "^2.6.3", "sharp": "^0.33.5", "sinon": "^7.3.1", - "storybook": "^7.6.19", - "storybook-dark-mode": "^3.0.3", - "storybook-react-parcel": "^0.0.1", + "storybook": "^8.6.7", + "storybook-dark-mode": "^4.0.2", + "storybook-react-parcel": "workspace:^", "tailwind-variants": "patch:tailwind-variants@npm%3A0.3.1#~/.yarn/patches/tailwind-variants-npm-0.3.1-48888516de.patch", "tailwindcss": "^4.0.0", "tailwindcss-animate": "^1.0.7", @@ -221,6 +219,7 @@ "@babel/preset-env": "7.24.4", "@babel/traverse": "7.24.1", "@babel/types": "7.24.0", + "@mdx-js/react": "2.0.0-rc.2", "postcss": "8.4.24", "postcss-custom-properties": "13.2.0", "postcss-import": "15.1.0", @@ -232,10 +231,13 @@ "recast": "0.23.6", "ast-types": "0.16.1", "svgo": "^3", + "react": "18.3.1", + "react-dom": "18.3.1", "@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", + "@storybook/addon-docs@npm:8.6.14": "patch:@storybook/addon-docs@npm%3A8.6.14#~/.yarn/patches/@storybook-addon-docs-npm-8.6.14-12ab3f55f8.patch", "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" @@ -263,11 +265,6 @@ "hover": "is-hovered" } }, - "alias": { - "@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/@internationalized/date/docs/Calendar.mdx b/packages/@internationalized/date/docs/Calendar.mdx index 3344ba9d710..c5795fdb039 100644 --- a/packages/@internationalized/date/docs/Calendar.mdx +++ b/packages/@internationalized/date/docs/Calendar.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@internationalized/date'; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription, renderHTMLfromMarkdown} from '@react-spectrum/docs'; -import packageData from '@internationalized/date/package.json'; +import packageData from '../package.json'; import tableStyles from '@adobe/spectrum-css-temp/components/table/vars.css'; import styles from '@react-spectrum/docs/src/docs.css'; import typographyStyles from '@adobe/spectrum-css-temp/components/typography/vars.css'; diff --git a/packages/@internationalized/date/docs/CalendarDate.mdx b/packages/@internationalized/date/docs/CalendarDate.mdx index a14440ba735..2cf3586e91d 100644 --- a/packages/@internationalized/date/docs/CalendarDate.mdx +++ b/packages/@internationalized/date/docs/CalendarDate.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@internationalized/date'; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/date/package.json'; +import packageData from '../package.json'; --- category: Date and Time diff --git a/packages/@internationalized/date/docs/CalendarDateTime.mdx b/packages/@internationalized/date/docs/CalendarDateTime.mdx index 3796777ed49..4d9d6f6d9f8 100644 --- a/packages/@internationalized/date/docs/CalendarDateTime.mdx +++ b/packages/@internationalized/date/docs/CalendarDateTime.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@internationalized/date'; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/date/package.json'; +import packageData from '../package.json'; --- category: Date and Time diff --git a/packages/@internationalized/date/docs/DateFormatter.mdx b/packages/@internationalized/date/docs/DateFormatter.mdx index 9c32aa7e764..acd692e562a 100644 --- a/packages/@internationalized/date/docs/DateFormatter.mdx +++ b/packages/@internationalized/date/docs/DateFormatter.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@internationalized/date'; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/date/package.json'; +import packageData from '../package.json'; --- category: Date and Time diff --git a/packages/@internationalized/date/docs/Time.mdx b/packages/@internationalized/date/docs/Time.mdx index 0a6d7f59e94..01c71fc98e0 100644 --- a/packages/@internationalized/date/docs/Time.mdx +++ b/packages/@internationalized/date/docs/Time.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@internationalized/date'; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/date/package.json'; +import packageData from '../package.json'; --- category: Date and Time diff --git a/packages/@internationalized/date/docs/ZonedDateTime.mdx b/packages/@internationalized/date/docs/ZonedDateTime.mdx index 543f89db6dd..b0a477a0729 100644 --- a/packages/@internationalized/date/docs/ZonedDateTime.mdx +++ b/packages/@internationalized/date/docs/ZonedDateTime.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@internationalized/date'; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/date/package.json'; +import packageData from '../package.json'; --- category: Date and Time diff --git a/packages/@internationalized/date/docs/index.mdx b/packages/@internationalized/date/docs/index.mdx index bc05f69d73e..7410c8f3faf 100644 --- a/packages/@internationalized/date/docs/index.mdx +++ b/packages/@internationalized/date/docs/index.mdx @@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs'; export default Layout; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/date/package.json'; +import packageData from '../package.json'; --- category: Date and Time diff --git a/packages/@internationalized/number/docs/NumberFormatter.mdx b/packages/@internationalized/number/docs/NumberFormatter.mdx index f74776d1c39..02587093b53 100644 --- a/packages/@internationalized/number/docs/NumberFormatter.mdx +++ b/packages/@internationalized/number/docs/NumberFormatter.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@internationalized/number'; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/number/package.json'; +import packageData from '../package.json'; --- category: Numbers diff --git a/packages/@internationalized/number/docs/NumberParser.mdx b/packages/@internationalized/number/docs/NumberParser.mdx index 438d22e7f8a..60adb2244de 100644 --- a/packages/@internationalized/number/docs/NumberParser.mdx +++ b/packages/@internationalized/number/docs/NumberParser.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@internationalized/number'; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/number/package.json'; +import packageData from '../package.json'; --- category: Numbers diff --git a/packages/@internationalized/number/docs/index.mdx b/packages/@internationalized/number/docs/index.mdx index a839844a100..783a86e9b55 100644 --- a/packages/@internationalized/number/docs/index.mdx +++ b/packages/@internationalized/number/docs/index.mdx @@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs'; export default Layout; import {HeaderInfo, FunctionAPI, ClassAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@internationalized/number/package.json'; +import packageData from '../package.json'; --- category: Numbers diff --git a/packages/@react-aria/autocomplete/docs/useAutocomplete.mdx b/packages/@react-aria/autocomplete/docs/useAutocomplete.mdx index 35c4f8f9d60..a77e1a341fa 100644 --- a/packages/@react-aria/autocomplete/docs/useAutocomplete.mdx +++ b/packages/@react-aria/autocomplete/docs/useAutocomplete.mdx @@ -12,7 +12,7 @@ export default Layout; import docs from 'docs:@react-aria/autocomplete'; import {FunctionAPI, HeaderInfo, InterfaceType, TypeContext, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@react-aria/autocomplete/package.json'; +import packageData from '../package.json'; import statelyDocs from 'docs:@react-stately/autocomplete'; import {InlineAlert, Content, Heading} from '@adobe/react-spectrum'; diff --git a/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx b/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx index 335733047b7..244332d69b2 100644 --- a/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx +++ b/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx @@ -15,7 +15,7 @@ import collectionsDocs from 'docs:@react-types/shared/src/collections.d.ts'; import {FunctionAPI, HeaderInfo, InterfaceType, TypeContext, TypeLink, PageDescription} from '@react-spectrum/docs'; import i18nDocs from 'docs:@react-aria/i18n'; import overlaysDocs from 'docs:@react-aria/overlays'; -import packageData from '@react-aria/autocomplete/package.json'; +import packageData from '../package.json'; import selectionDocs from 'docs:@react-stately/selection'; import statelyDocs from 'docs:@react-stately/combobox'; import Anatomy from './anatomy.svg'; diff --git a/packages/@react-aria/breadcrumbs/docs/useBreadcrumbs.mdx b/packages/@react-aria/breadcrumbs/docs/useBreadcrumbs.mdx index d5251d2ad77..3bd7dd12eee 100644 --- a/packages/@react-aria/breadcrumbs/docs/useBreadcrumbs.mdx +++ b/packages/@react-aria/breadcrumbs/docs/useBreadcrumbs.mdx @@ -13,7 +13,7 @@ export default Layout; import docs from 'docs:@react-aria/breadcrumbs'; import {HeaderInfo, FunctionAPI, TypeContext, InterfaceType, PageDescription} from '@react-spectrum/docs'; import {Keyboard} from '@react-spectrum/text'; -import packageData from '@react-aria/breadcrumbs/package.json'; +import packageData from '../package.json'; import Anatomy from './anatomy.svg'; --- diff --git a/packages/@react-aria/button/docs/useButton.mdx b/packages/@react-aria/button/docs/useButton.mdx index d22f8dcb6c7..cd2eccf700b 100644 --- a/packages/@react-aria/button/docs/useButton.mdx +++ b/packages/@react-aria/button/docs/useButton.mdx @@ -14,7 +14,7 @@ import docs from 'docs:@react-aria/button'; import typesDocs from 'docs:@react-types/shared/src/events.d.ts'; import {HeaderInfo, FunctionAPI, TypeLink, PageDescription} from '@react-spectrum/docs'; import {Keyboard} from '@react-spectrum/text'; -import packageData from '@react-aria/button/package.json'; +import packageData from '../package.json'; --- category: Buttons diff --git a/packages/@react-aria/button/docs/useToggleButton.mdx b/packages/@react-aria/button/docs/useToggleButton.mdx index 37e1481a7a7..c61df4ccc52 100644 --- a/packages/@react-aria/button/docs/useToggleButton.mdx +++ b/packages/@react-aria/button/docs/useToggleButton.mdx @@ -14,7 +14,7 @@ import docs from 'docs:@react-aria/button'; import statelyDocs from 'docs:@react-stately/toggle'; import {HeaderInfo, FunctionAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; import {Keyboard} from '@react-spectrum/text'; -import packageData from '@react-aria/button/package.json'; +import packageData from '../package.json'; --- category: Buttons diff --git a/packages/@react-aria/button/docs/useToggleButtonGroup.mdx b/packages/@react-aria/button/docs/useToggleButtonGroup.mdx index f46f37cd6e5..5d9c6d7fe82 100644 --- a/packages/@react-aria/button/docs/useToggleButtonGroup.mdx +++ b/packages/@react-aria/button/docs/useToggleButtonGroup.mdx @@ -14,7 +14,7 @@ import docs from 'docs:@react-aria/button'; import statelyDocs from 'docs:@react-stately/toggle'; import {HeaderInfo, FunctionAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; import {Keyboard} from '@react-spectrum/text'; -import packageData from '@react-aria/button/package.json'; +import packageData from '../package.json'; import ChevronRight from '@spectrum-icons/workflow/ChevronRight'; import Anatomy from './ToggleButtonGroupAnatomy.svg'; diff --git a/packages/@react-aria/calendar/docs/useCalendar.mdx b/packages/@react-aria/calendar/docs/useCalendar.mdx index 659d2d6ee3f..39c75e2a5cf 100644 --- a/packages/@react-aria/calendar/docs/useCalendar.mdx +++ b/packages/@react-aria/calendar/docs/useCalendar.mdx @@ -14,7 +14,7 @@ import docs from 'docs:@react-aria/calendar'; import statelyDocs from 'docs:@react-stately/calendar'; import i18nDocs from 'docs:@internationalized/date'; import {FunctionAPI, HeaderInfo, InterfaceType, TypeContext, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@react-aria/calendar/package.json'; +import packageData from '../package.json'; import Anatomy from './calendar-anatomy.svg'; import ChevronRight from '@spectrum-icons/workflow/ChevronRight'; import {Keyboard} from '@react-spectrum/text'; diff --git a/packages/@react-aria/calendar/docs/useRangeCalendar.mdx b/packages/@react-aria/calendar/docs/useRangeCalendar.mdx index 5a5626b31eb..c00a1656677 100644 --- a/packages/@react-aria/calendar/docs/useRangeCalendar.mdx +++ b/packages/@react-aria/calendar/docs/useRangeCalendar.mdx @@ -14,7 +14,7 @@ import docs from 'docs:@react-aria/calendar'; import statelyDocs from 'docs:@react-stately/calendar'; import i18nDocs from 'docs:@internationalized/date'; import {FunctionAPI, HeaderInfo, InterfaceType, TypeContext, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@react-aria/calendar/package.json'; +import packageData from '../package.json'; import Anatomy from './rangecalendar-anatomy.svg'; import ChevronRight from '@spectrum-icons/workflow/ChevronRight'; import {Keyboard} from '@react-spectrum/text'; diff --git a/packages/@react-aria/checkbox/docs/useCheckbox.mdx b/packages/@react-aria/checkbox/docs/useCheckbox.mdx index 8bd6e38c7da..a3567a072b6 100644 --- a/packages/@react-aria/checkbox/docs/useCheckbox.mdx +++ b/packages/@react-aria/checkbox/docs/useCheckbox.mdx @@ -16,7 +16,7 @@ import focusDocs from 'docs:@react-aria/focus'; import statelyDocs from 'docs:@react-stately/toggle'; import {HeaderInfo, FunctionAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; import {Keyboard} from '@react-spectrum/text'; -import packageData from '@react-aria/checkbox/package.json'; +import packageData from '../package.json'; import Anatomy from './checkbox-anatomy.svg'; import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard'; import tailwindPreview from 'url:./tailwind-example.png'; diff --git a/packages/@react-aria/checkbox/docs/useCheckboxGroup.mdx b/packages/@react-aria/checkbox/docs/useCheckboxGroup.mdx index ab8873c23d2..983568dc3c0 100644 --- a/packages/@react-aria/checkbox/docs/useCheckboxGroup.mdx +++ b/packages/@react-aria/checkbox/docs/useCheckboxGroup.mdx @@ -16,7 +16,7 @@ import focusDocs from 'docs:@react-aria/focus'; import statelyDocs from 'docs:@react-stately/checkbox'; import {HeaderInfo, FunctionAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; import {Keyboard} from '@react-spectrum/text'; -import packageData from '@react-aria/checkbox/package.json'; +import packageData from '../package.json'; import Anatomy from './checkboxgroup-anatomy.svg'; import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard'; import buttongroupPreview from 'url:./buttongroup-example.png'; diff --git a/packages/@react-aria/color/docs/useColorArea.mdx b/packages/@react-aria/color/docs/useColorArea.mdx index d6b9155c186..f1fd720c71b 100644 --- a/packages/@react-aria/color/docs/useColorArea.mdx +++ b/packages/@react-aria/color/docs/useColorArea.mdx @@ -14,7 +14,7 @@ import ChevronRight from '@spectrum-icons/workflow/ChevronRight'; import docs from 'docs:@react-aria/color'; import statelyDocs from 'docs:@react-stately/color'; import {HeaderInfo, FunctionAPI, TypeContext, InterfaceType, TypeLink, PageDescription} from '@react-spectrum/docs'; -import packageData from '@react-aria/color/package.json'; +import packageData from '../package.json'; import Anatomy from './ColorAreaAnatomy.svg'; --- @@ -436,7 +436,7 @@ function ColorSwatch(props) { let {colorSwatchProps, color} = useColorSwatch(props); return ( -