From fec285bf7ea93a4f4fa9a45c30128175666402c7 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 14:38:34 +0200 Subject: [PATCH 01/48] changeset pre enter alpha --- .changeset/pre.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 00000000000..2d3dbfe45e7 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,21 @@ +{ + "mode": "pre", + "tag": "alpha", + "initialVersions": { + "cm6-graphql": "0.0.15", + "codemirror-graphql": "2.0.13", + "graphiql": "3.4.0", + "@graphiql/plugin-code-exporter": "3.0.5", + "@graphiql/plugin-explorer": "3.1.1", + "@graphiql/react": "0.23.0", + "@graphiql/toolkit": "0.9.2", + "graphql-language-service": "5.2.2", + "graphql-language-service-cli": "3.4.2", + "graphql-language-service-server": "2.13.2", + "monaco-graphql": "1.5.3", + "vscode-graphql": "0.11.2", + "vscode-graphql-execution": "0.2.6", + "vscode-graphql-syntax": "1.3.6" + }, + "changesets": [] +} From 3c1a345acd9bf07b45bc230009cb57c51c425673 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 15:39:11 +0200 Subject: [PATCH 02/48] [graphiql-react/graphiql] new looks of tabs (#3644) * new looks of tabs * add graphiql react too * all fixes * more polishing * more * more * more * more * more * prettier * polish changeset * disable shrinking while changing the operation name * Update packages/graphiql-react/src/ui/tabs.css Co-authored-by: Ted Thibodeau Jr * yarn i * apply new design changes * prettier * Update .changeset/thirty-spoons-call.md * fix cypress * this fix locally --------- Co-authored-by: Ted Thibodeau Jr --- .changeset/thirty-spoons-call.md | 8 ++ .../src/index.css | 2 +- packages/graphiql-react/package.json | 2 +- packages/graphiql-react/src/style/root.css | 2 +- packages/graphiql-react/src/ui/tabs.css | 94 +++++++++++----- packages/graphiql-react/src/ui/tabs.tsx | 32 +++--- packages/graphiql/src/components/GraphiQL.tsx | 104 +++++++++--------- packages/graphiql/src/style.css | 38 +++---- yarn.lock | 98 +---------------- 9 files changed, 166 insertions(+), 214 deletions(-) create mode 100644 .changeset/thirty-spoons-call.md diff --git a/.changeset/thirty-spoons-call.md b/.changeset/thirty-spoons-call.md new file mode 100644 index 00000000000..4853b541b98 --- /dev/null +++ b/.changeset/thirty-spoons-call.md @@ -0,0 +1,8 @@ +--- +"graphiql": major +"@graphiql/react": minor +--- + +- new looks of tabs + +- fix `disableTabs` when `Add tab` button is still shown diff --git a/packages/graphiql-plugin-code-exporter/src/index.css b/packages/graphiql-plugin-code-exporter/src/index.css index 716d01d954c..16af4b1b6f9 100644 --- a/packages/graphiql-plugin-code-exporter/src/index.css +++ b/packages/graphiql-plugin-code-exporter/src/index.css @@ -133,7 +133,7 @@ } & .CodeMirror { box-shadow: var(--popover-box-shadow); - border-radius: calc(var(--border-radius-12)); + border-radius: var(--border-radius-12); padding: var(--px-16); } } diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index 205548dc1f1..77b14bb8b4f 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -59,7 +59,7 @@ "codemirror": "^5.65.3", "codemirror-graphql": "^2.0.13", "copy-to-clipboard": "^3.2.0", - "framer-motion": "^6.5.1", + "framer-motion": "^10.0.0", "graphql-language-service": "^5.2.2", "markdown-it": "^14.1.0", "set-value": "^4.1.0" diff --git a/packages/graphiql-react/src/style/root.css b/packages/graphiql-react/src/style/root.css index 5f18fa336c6..8c8dbcfa09f 100644 --- a/packages/graphiql-react/src/style/root.css +++ b/packages/graphiql-react/src/style/root.css @@ -68,7 +68,7 @@ /* Layout */ --sidebar-width: 60px; --toolbar-width: 40px; - --session-header-height: 51px; + --session-header-height: 38.5px; } @media (prefers-color-scheme: dark) { diff --git a/packages/graphiql-react/src/ui/tabs.css b/packages/graphiql-react/src/ui/tabs.css index d3ddb46e7e8..66cd5b73361 100644 --- a/packages/graphiql-react/src/ui/tabs.css +++ b/packages/graphiql-react/src/ui/tabs.css @@ -1,46 +1,84 @@ .graphiql-tabs { + --bg: hsl(var(--color-base)); + display: flex; align-items: center; - overflow-x: auto; - padding: var(--px-12); + gap: var(--px-8); + /* reset browser defaults */ + padding: 0; + margin: 0; + list-style: none; +} - & > :not(:first-child) { - margin-left: var(--px-12); - } +/* trick to shrink multiple tabs, instead of overflow container */ +.graphiql-tabs, +.graphiql-tab { + min-width: 0; } .graphiql-tab { - align-items: stretch; - border-radius: var(--border-radius-8); - color: hsla(var(--color-neutral), var(--alpha-secondary)); + border-radius: var(--border-radius-8) var(--border-radius-8) 0 0; + background: hsla(var(--color-neutral), var(--alpha-background-light)); + position: relative; display: flex; + max-width: 140px; - & > button.graphiql-tab-close { - visibility: hidden; - } - &.graphiql-tab-active > button.graphiql-tab-close, - &:hover > button.graphiql-tab-close, - &:focus-within > button.graphiql-tab-close { - visibility: unset; + /* disable shrinking while changing the operation name */ + &:not(:focus-within) { + transform: none !important; } + &:hover, + &:focus-within, &.graphiql-tab-active { - background-color: hsla(var(--color-neutral), var(--alpha-background-heavy)); - color: hsla(var(--color-neutral), 1); + background: var(--bg); + color: hsl(var(--color-neutral)); + + .graphiql-tab-close { + display: block; + } } -} -button.graphiql-tab-button { - padding: var(--px-4) 0 var(--px-4) var(--px-8); -} + .graphiql-tab-button { + border-radius: var(--border-radius-8) var(--border-radius-8) 0 0; + overflow: hidden; + text-overflow: ellipsis; + padding: var(--px-4) 28px var(--px-4) var(--px-8); -button.graphiql-tab-close { - align-items: center; - display: flex; - padding: var(--px-4) var(--px-8); + &:hover { + background: none; + } + } + + .graphiql-tab-close { + position: absolute; + right: min(var(--px-4), 5%); + top: 50%; + transform: translateY(-50%); + display: none; + background: var(--bg); + box-shadow: -10px 0 10px 0 var(--bg); + padding: var(--px-6); + line-height: 0; + + & > svg { + height: var(--px-8); + width: var(--px-8); + } + + &:hover { + background: var(--bg); + color: hsl(var(--color-neutral)); + overflow: hidden; /* bg in `:before` will not overflow from radius area */ - & > svg { - height: var(--px-8); - width: var(--px-8); + /* trick to add 2nd bg with opacity */ + &:before { + content: ''; + position: absolute; + inset: 0; + z-index: -1; + background: hsla(var(--color-neutral), 0.3); + } + } } } diff --git a/packages/graphiql-react/src/ui/tabs.tsx b/packages/graphiql-react/src/ui/tabs.tsx index cc5947f13c1..dfbaa793975 100644 --- a/packages/graphiql-react/src/ui/tabs.tsx +++ b/packages/graphiql-react/src/ui/tabs.tsx @@ -2,9 +2,7 @@ import { forwardRef, ReactNode } from 'react'; import { clsx } from 'clsx'; import { Reorder } from 'framer-motion'; import { CloseIcon } from '../icons'; -import { createComponentGroup } from '../utility/component-group'; import { UnStyledButton } from './button'; -import { Tooltip } from './tooltip'; import './tabs.css'; @@ -21,7 +19,7 @@ const TabRoot = forwardRef( {...props} ref={ref} value={value} - aria-selected={isActive ? 'true' : undefined} + aria-selected={isActive} role="tab" className={clsx( 'graphiql-tab', @@ -38,36 +36,34 @@ TabRoot.displayName = 'Tab'; const TabButton = forwardRef< HTMLButtonElement, JSX.IntrinsicElements['button'] ->((props, ref) => ( +>(({ children, className, ...props }, ref) => ( - {props.children} + {children} )); TabButton.displayName = 'Tab.Button'; const TabClose = forwardRef( (props, ref) => ( - - - - - + + + ), ); TabClose.displayName = 'Tab.Close'; -export const Tab = createComponentGroup(TabRoot, { +export const Tab = Object.assign(TabRoot, { Button: TabButton, Close: TabClose, }); diff --git a/packages/graphiql/src/components/GraphiQL.tsx b/packages/graphiql/src/components/GraphiQL.tsx index cbc85c95775..a2757cca3b4 100644 --- a/packages/graphiql/src/components/GraphiQL.tsx +++ b/packages/graphiql/src/components/GraphiQL.tsx @@ -456,18 +456,7 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) { } }, []); - const addTab = ( - - - - - ); + const hasMultipleTabs = editorContext.tabs.length > 1; const className = props.className ? ` ${props.className}` : ''; @@ -556,48 +545,55 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) {
{!props.disableTabs && ( - - {editorContext.tabs.length > 1 && ( - <> + <> + {hasMultipleTabs && ( + {editorContext.tabs.map((tab, index) => ( - - { - executionContext.stop(); - editorContext.changeTab(index); - }} + + - {tab.title} - - { - if (editorContext.activeTabIndex === index) { + { executionContext.stop(); - } - editorContext.closeTab(index); - }} - /> - + editorContext.changeTab(index); + }} + > + {tab.title} + + { + if (editorContext.activeTabIndex === index) { + executionContext.stop(); + } + editorContext.closeTab(index); + }} + /> + + ))} - {addTab} - + )} - + + + + + )} -
- {editorContext.tabs.length === 1 && addTab} - {logo} -
+ {logo}
svg { - color: hsla(var(--color-neutral), var(--alpha-secondary)); - display: block; - height: var(--px-16); - width: var(--px-16); -} - -/* The right-hand-side of the session header */ -.graphiql-container .graphiql-session-header-right { - align-items: center; - display: flex; + & > svg { + color: hsla(var(--color-neutral), var(--alpha-secondary)); + display: block; + height: var(--px-16); + width: var(--px-16); + } } /* The GraphiQL logo */ @@ -98,13 +96,15 @@ button.graphiql-tab-add > svg { color: hsla(var(--color-neutral), var(--alpha-secondary)); font-size: var(--font-size-h4); font-weight: var(--font-weight-medium); - padding: var(--px-12) var(--px-16); } /* Undo default link styling for the default GraphiQL logo link */ .graphiql-container .graphiql-logo .graphiql-logo-link { color: hsla(var(--color-neutral), var(--alpha-secondary)); text-decoration: none; + &:focus { + outline: hsla(var(--color-neutral), var(--alpha-background-heavy)) auto 1px; + } } /* The editor of the session */ @@ -117,17 +117,13 @@ button.graphiql-tab-add > svg { /* All editors (query, variable, headers) */ .graphiql-container .graphiql-editors { background-color: hsl(var(--color-base)); - border-radius: calc(var(--border-radius-12)); + border-radius: var(--border-radius-12); box-shadow: var(--popover-box-shadow); display: flex; flex: 1; flex-direction: column; } -.graphiql-container .graphiql-editors.full-height { - margin-top: calc(var(--px-8) - var(--session-header-height)); -} - /* The query editor and the toolbar */ .graphiql-container .graphiql-query-editor { border-bottom: 1px solid diff --git a/yarn.lock b/yarn.lock index 5c643f4cf43..f745afb4301 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3160,59 +3160,6 @@ resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-4.2.1.tgz#1fead437f3957ceebe2e8c3f46beccdb9bc575b8" integrity sha512-EWUguj2kd7ldmrF9F+vI5hUOralPd+sdsUnYbRy33vZTuZkduC1shE9TtEMEjAQwyfyMb4ole5KtjF8MsnQOlA== -"@motionone/animation@^10.12.0": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.15.1.tgz#4a85596c31cbc5100ae8eb8b34c459fb0ccf6807" - integrity sha512-mZcJxLjHor+bhcPuIFErMDNyrdb2vJur8lSfMCsuCB4UyV8ILZLvK+t+pg56erv8ud9xQGK/1OGPt10agPrCyQ== - dependencies: - "@motionone/easing" "^10.15.1" - "@motionone/types" "^10.15.1" - "@motionone/utils" "^10.15.1" - tslib "^2.3.1" - -"@motionone/dom@10.12.0": - version "10.12.0" - resolved "https://registry.yarnpkg.com/@motionone/dom/-/dom-10.12.0.tgz#ae30827fd53219efca4e1150a5ff2165c28351ed" - integrity sha512-UdPTtLMAktHiqV0atOczNYyDd/d8Cf5fFsd1tua03PqTwwCe/6lwhLSQ8a7TbnQ5SN0gm44N1slBfj+ORIhrqw== - dependencies: - "@motionone/animation" "^10.12.0" - "@motionone/generators" "^10.12.0" - "@motionone/types" "^10.12.0" - "@motionone/utils" "^10.12.0" - hey-listen "^1.0.8" - tslib "^2.3.1" - -"@motionone/easing@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.15.1.tgz#95cf3adaef34da6deebb83940d8143ede3deb693" - integrity sha512-6hIHBSV+ZVehf9dcKZLT7p5PEKHGhDwky2k8RKkmOvUoYP3S+dXsKupyZpqx5apjd9f+php4vXk4LuS+ADsrWw== - dependencies: - "@motionone/utils" "^10.15.1" - tslib "^2.3.1" - -"@motionone/generators@^10.12.0": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.15.1.tgz#dc6abb11139d1bafe758a41c134d4c753a9b871c" - integrity sha512-67HLsvHJbw6cIbLA/o+gsm7h+6D4Sn7AUrB/GPxvujse1cGZ38F5H7DzoH7PhX+sjvtDnt2IhFYF2Zp1QTMKWQ== - dependencies: - "@motionone/types" "^10.15.1" - "@motionone/utils" "^10.15.1" - tslib "^2.3.1" - -"@motionone/types@^10.12.0", "@motionone/types@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.15.1.tgz#89441b54285012795cbba8612cbaa0fa420db3eb" - integrity sha512-iIUd/EgUsRZGrvW0jqdst8st7zKTzS9EsKkP+6c6n4MPZoQHwiHuVtTQLD6Kp0bsBLhNzKIBlHXponn/SDT4hA== - -"@motionone/utils@^10.12.0", "@motionone/utils@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.15.1.tgz#6b5f51bde75be88b5411e084310299050368a438" - integrity sha512-p0YncgU+iklvYr/Dq4NobTRdAPv9PveRDUXabPEeOjBLSO/1FNB2phNTZxOxpi1/GZwYpAoECEa0Wam+nsmhSw== - dependencies: - "@motionone/types" "^10.15.1" - hey-listen "^1.0.8" - tslib "^2.3.1" - "@n1ru4l/push-pull-async-iterable-iterator@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-3.1.0.tgz#be450c97d1c7cd6af1a992d53232704454345df9" @@ -9703,27 +9650,15 @@ fraction.js@^4.2.0: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== -framer-motion@^6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-6.5.1.tgz#802448a16a6eb764124bf36d8cbdfa6dd6b931a7" - integrity sha512-o1BGqqposwi7cgDrtg0dNONhkmPsUFDaLcKXigzuTFC5x58mE8iyTazxSudFzmT6MEyJKfjjU8ItoMe3W+3fiw== +framer-motion@^10.0.0: + version "10.18.0" + resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-10.18.0.tgz#1f4fc51403996ea7170af885bd44a7079d255950" + integrity sha512-oGlDh1Q1XqYPksuTD/usb0I70hq95OUzmL9+6Zd+Hs4XV0oaISBa/UUMSjYiq6m8EUF32132mOJ8xVZS+I0S6w== dependencies: - "@motionone/dom" "10.12.0" - framesync "6.0.1" - hey-listen "^1.0.8" - popmotion "11.0.3" - style-value-types "5.0.0" - tslib "^2.1.0" + tslib "^2.4.0" optionalDependencies: "@emotion/is-prop-valid" "^0.8.2" -framesync@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/framesync/-/framesync-6.0.1.tgz#5e32fc01f1c42b39c654c35b16440e07a25d6f20" - integrity sha512-fUY88kXvGiIItgNC7wcTOl0SNRCVXMKSWW2Yzfmn7EKNc+MpCzcz9DhdHcdjbrtN3c6R4H5dTY2jiCpPdysEjA== - dependencies: - tslib "^2.1.0" - fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -10368,11 +10303,6 @@ helpertypes@^0.0.18: resolved "https://registry.yarnpkg.com/helpertypes/-/helpertypes-0.0.18.tgz#fd2bf5d3351cc7d80f7876732361d3adba63e5b4" integrity sha512-XRhfbSEmR+poXUC5/8AbmYNJb2riOT6qPzjGJZr0S9YedHiaY+/tzPYzWMUclYMEdCYo/1l8PDYrQFCj02v97w== -hey-listen@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68" - integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q== - highlight.js@^10.2.0: version "10.5.0" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.5.0.tgz#3f09fede6a865757378f2d9ebdcbc15ba268f98f" @@ -14434,16 +14364,6 @@ pluralize@^8.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== -popmotion@11.0.3: - version "11.0.3" - resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-11.0.3.tgz#565c5f6590bbcddab7a33a074bb2ba97e24b0cc9" - integrity sha512-Y55FLdj3UxkR7Vl3s7Qr4e9m0onSnP8W7d/xQLsoJM40vs6UKHFdygs6SWryasTZYqugMjm3BepCF4CWXDiHgA== - dependencies: - framesync "6.0.1" - hey-listen "^1.0.8" - style-value-types "5.0.0" - tslib "^2.1.0" - possible-typed-array-names@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" @@ -16936,14 +16856,6 @@ style-mod@^4.0.0: resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.0.0.tgz#97e7c2d68b592975f2ca7a63d0dd6fcacfe35a01" integrity sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw== -style-value-types@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/style-value-types/-/style-value-types-5.0.0.tgz#76c35f0e579843d523187989da866729411fc8ad" - integrity sha512-08yq36Ikn4kx4YU6RD7jWEv27v4V+PUsOGa4n/as8Et3CuODMJQ00ENeAVXAeydX4Z2j1XHZF1K2sX4mGl18fA== - dependencies: - hey-listen "^1.0.8" - tslib "^2.1.0" - styled-jsx@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.1.tgz#839a1c3aaacc4e735fed0781b8619ea5d0009d1f" From 5d90e0eed58214c5926e6e0edb196971b15b1121 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 16:01:09 +0200 Subject: [PATCH 03/48] [2] GraphiQL x Vite v5 (#3679) * new looks of tabs * add graphiql react too * all fixes * more polishing * more * more * more * more * more * prettier * polish changeset * disable shrinking while changing the operation name * Update packages/graphiql-react/src/ui/tabs.css Co-authored-by: Ted Thibodeau Jr * yarn i * apply new design changes * prettier * vite more more more * fix demo * fix cspell * fix dev * update cypress to v13 * upd cache key * Update .changeset/thirty-spoons-call.md * Update packages/graphiql/vite.config.mts * merge * add changeset * yarn.lock --------- Co-authored-by: Ted Thibodeau Jr --- .changeset/rich-jobs-kick.md | 5 + .gitignore | 7 +- examples/graphiql-webpack/src/index.jsx | 2 +- package.json | 5 +- .../src/create-fetcher/lib.ts | 2 +- packages/graphiql/index.html | 43 ++ packages/graphiql/package.json | 40 +- packages/graphiql/postcss.config.js | 12 +- packages/graphiql/resources/dev.html | 42 ++ packages/graphiql/resources/renderExample.js | 5 +- packages/graphiql/test/e2e-server.js | 14 +- packages/graphiql/vite.config.mts | 68 +++ resources/custom-words.txt | 1 + yarn.lock | 440 +++++++++++++++++- 14 files changed, 632 insertions(+), 54 deletions(-) create mode 100644 .changeset/rich-jobs-kick.md create mode 100644 packages/graphiql/index.html create mode 100644 packages/graphiql/resources/dev.html create mode 100644 packages/graphiql/vite.config.mts diff --git a/.changeset/rich-jobs-kick.md b/.changeset/rich-jobs-kick.md new file mode 100644 index 00000000000..f4fd0dd3cdb --- /dev/null +++ b/.changeset/rich-jobs-kick.md @@ -0,0 +1,5 @@ +--- +'graphiql': major +--- + +migrate from `webpack` to `vite` diff --git a/.gitignore b/.gitignore index b6865f3e8a3..157428f1bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -41,12 +41,7 @@ packages/codemirror-graphql/*.d.ts packages/codemirror-graphql/*.map !packages/codemirror-graphql/*.config.js -packages/graphiql/index.html -packages/graphiql/dev.html -packages/graphiql/analyzer.html -packages/graphiql/graphiql*.js -packages/graphiql/*.css -packages/graphiql/*.map packages/graphiql/cypress/screenshots/ +packages/graphiql/cypress/videos/ packages/graphiql/typedoc/ packages/graphiql/webpack/ diff --git a/examples/graphiql-webpack/src/index.jsx b/examples/graphiql-webpack/src/index.jsx index ea0adb4c667..06f6b88da5b 100644 --- a/examples/graphiql-webpack/src/index.jsx +++ b/examples/graphiql-webpack/src/index.jsx @@ -5,7 +5,7 @@ import { GraphiQL } from 'graphiql'; import { explorerPlugin } from '@graphiql/plugin-explorer'; import { getSnippets } from './snippets'; import { codeExporterPlugin } from '@graphiql/plugin-code-exporter'; -import 'graphiql/graphiql.css'; +import 'graphiql/style.css'; import '@graphiql/plugin-explorer/dist/style.css'; import '@graphiql/plugin-code-exporter/dist/style.css'; import { createGraphiQLFetcher } from '@graphiql/toolkit'; diff --git a/package.json b/package.json index 3250086fa90..86ddb582e0e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "yarn build-clean && yarn tsc && yarn build:nontsc", "build-bundles": "yarn prebuild-bundles && yarn wsrun:noexamples --stages build-bundles", - "build-bundles-clean": "rimraf '{packages,examples,plugins}/**/{bundle,cdn,webpack}' && yarn workspace graphiql build-bundles-clean", + "build-bundles-clean": "rimraf '{packages,examples,plugins}/**/{bundle,cdn,webpack}'", "build-clean": "yarn tsc --clean", "build-docs": "rimraf packages/graphiql/typedoc && typedoc packages", "build:nontsc": "yarn wsrun:noexamples --exclude-missing --serial build", @@ -46,8 +46,7 @@ "check": "yarn tsc --noEmit", "cypress-open": "yarn workspace graphiql cypress-open", "dev-graphiql": "yarn workspace graphiql dev", - "e2e": "yarn run e2e:build && yarn workspace graphiql e2e", - "e2e:build": "WEBPACK_SERVE=1 yarn workspace graphiql build-bundles", + "e2e": "yarn workspace graphiql e2e", "eslint": "NODE_OPTIONS=--max-old-space-size=4096 ESLINT_USE_FLAT_CONFIG=false eslint --max-warnings=0 --ignore-path .gitignore --cache .", "format": "yarn eslint --fix && yarn pretty", "jest": "jest", diff --git a/packages/graphiql-toolkit/src/create-fetcher/lib.ts b/packages/graphiql-toolkit/src/create-fetcher/lib.ts index f04c2f86979..2a39a03c466 100644 --- a/packages/graphiql-toolkit/src/create-fetcher/lib.ts +++ b/packages/graphiql-toolkit/src/create-fetcher/lib.ts @@ -192,7 +192,7 @@ export const createMultipartFetcher = ( */ export const getWsFetcher = ( options: CreateFetcherOptions, - fetcherOpts: FetcherOpts | undefined, + fetcherOpts?: FetcherOpts, ) => { if (options.wsClient) { return createWebsocketsFetcherFromClient(options.wsClient); diff --git a/packages/graphiql/index.html b/packages/graphiql/index.html new file mode 100644 index 00000000000..2dd5643bdac --- /dev/null +++ b/packages/graphiql/index.html @@ -0,0 +1,43 @@ + + + + + + + GraphiQL + + + +
+
Loading…
+
+ + + + diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index a54b6ca62d2..104f9f4c8c3 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -17,34 +17,26 @@ }, "license": "MIT", "main": "dist/index.js", - "module": "esm/index.js", + "module": "dist/index.mjs", "types": "dist/index.d.ts", "files": [ - "dist", - "esm", - "src", - "graphiql.js", - "graphiql.min.js", - "graphiql.min.js.map", - "graphiql.css", - "graphiql.min.css", - "graphiql.min.css.map" + "dist" ], + "exports": { + "./package.json": "./package.json", + "./style.css": "./dist/style.css", + ".": { + "require": "./dist/index.js", + "import": "./dist/index.mjs", + "types": "./dist/index.d.ts" + } + }, "scripts": { - "analyze-bundle": "cross-env NODE_ENV=production ANALYZE=1 yarn webpack -p", - "build": "yarn build-clean && yarn build-cjs && yarn build-esm", - "build-bundles": "yarn build-bundles-clean && yarn build-bundles-webpack", - "build-bundles-clean": "rimraf 'graphiql.*{js,css}' *.html", - "build-bundles-webpack": "cross-env yarn webpack --mode development --bail", - "build-cjs": "tsc", - "build-clean": "rimraf esm dist webpack *.html", - "build-esm": "tsc --project ./tsconfig.esm.json", - "check": "tsc --noEmit", "cypress-open": "yarn e2e-server 'cypress open'", - "dev": "cross-env NODE_ENV=development webpack-dev-server --config resources/webpack.config.js", + "build": "vite build && UMD=true vite build", + "dev": "concurrently 'cross-env PORT=8080 node test/e2e-server' vite", "e2e": "yarn e2e-server 'cypress run'", - "e2e-server": "start-server-and-test 'cross-env PORT=8080 node test/e2e-server' 'http-get://localhost:8080/graphql?query={test { id }}'", - "webpack": "webpack-cli --config resources/webpack.config.js" + "e2e-server": "start-server-and-test 'cross-env PORT=8080 node test/e2e-server' 'http-get://localhost:8080/graphql?query={test { id }}'" }, "dependencies": { "@graphiql/react": "^0.23.0" @@ -78,6 +70,7 @@ "mini-css-extract-plugin": "^2.7.2", "postcss": "8.4.31", "postcss-import": "15.1.0", + "postcss-lightningcss": "^1.0.0", "postcss-loader": "7.0.2", "postcss-preset-env": "^8.0.1", "prop-types": "15.7.2", @@ -92,6 +85,9 @@ "style-loader": "^3.3.1", "subscriptions-transport-ws": "0.11.0", "typescript": "^4.6.3", + "vite": "^5.3.5", + "vite-plugin-commonjs": "^0.10.1", + "vite-plugin-dts": "^3.9.1", "webpack": "5.76.0", "webpack-bundle-analyzer": "^3.6.1", "webpack-cli": "^5.0.1", diff --git a/packages/graphiql/postcss.config.js b/packages/graphiql/postcss.config.js index 0212e4d5f0a..31470672ba7 100644 --- a/packages/graphiql/postcss.config.js +++ b/packages/graphiql/postcss.config.js @@ -1,9 +1,9 @@ -module.exports = ({ options, webpackLoaderContext }) => ({ +module.exports = { plugins: { // https://github.com/postcss/postcss-import/issues/442#issuecomment-822427606 - 'postcss-import': { root: webpackLoaderContext.context }, - // contains autoprefixer, etc - 'postcss-preset-env': options['postcss-preset-env'] || false, - cssnano: process.env.NODE_ENV === 'production' ? options.cssnano : false, + 'postcss-import': '', + 'postcss-lightningcss': { + browsers: '>= .25%', + }, }, -}); +}; diff --git a/packages/graphiql/resources/dev.html b/packages/graphiql/resources/dev.html new file mode 100644 index 00000000000..e045c495c4b --- /dev/null +++ b/packages/graphiql/resources/dev.html @@ -0,0 +1,42 @@ + + + + + + + GraphiQL + + + + + + + +
+
Loading…
+
+ + + diff --git a/packages/graphiql/resources/renderExample.js b/packages/graphiql/resources/renderExample.js index b2fc32c7d25..24dc18371f5 100644 --- a/packages/graphiql/resources/renderExample.js +++ b/packages/graphiql/resources/renderExample.js @@ -1,4 +1,4 @@ -/* global React, ReactDOM, GraphiQL, GraphQLVersion */ +/* global React, ReactDOM, GraphiQL */ /** * UMD GraphiQL Example @@ -83,6 +83,7 @@ function getSchemaUrl() { // how you can customize GraphiQL by providing different values or // additional child elements. const root = ReactDOM.createRoot(document.getElementById('graphiql')); +const graphqlVersion = GraphiQL.GraphQL.version; root.render( React.createElement(GraphiQL, { @@ -100,7 +101,7 @@ root.render( defaultEditorToolsVisibility: true, isHeadersEditorEnabled: true, shouldPersistHeaders: true, - inputValueDeprecation: GraphQLVersion.includes('15.5') ? undefined : true, + inputValueDeprecation: !graphqlVersion.includes('15.5'), onTabChange, forcedTheme: parameters.forcedTheme, }), diff --git a/packages/graphiql/test/e2e-server.js b/packages/graphiql/test/e2e-server.js index 38b2f9f08ac..8dcedb36d85 100644 --- a/packages/graphiql/test/e2e-server.js +++ b/packages/graphiql/test/e2e-server.js @@ -35,8 +35,18 @@ app.post('/graphql-error/graphql', (_req, res, next) => { next(); }); -app.use(express.static(path.resolve(__dirname, '../'))); -app.use('index.html', express.static(path.resolve(__dirname, '../dev.html'))); +const IS_DEV = process.env.npm_lifecycle_script.endsWith(' vite'); + +if (IS_DEV) { + app.get('/', (req, res) => { + res.redirect('http://localhost:5173'); + }); +} else { + app.get('/', (req, res) => { + res.sendFile(path.resolve(__dirname, '../resources/dev.html')); + }); + app.use(express.static(path.resolve(__dirname, '../'))); +} // messy but it allows close const server = createServer(app); diff --git a/packages/graphiql/vite.config.mts b/packages/graphiql/vite.config.mts new file mode 100644 index 00000000000..23959e9a1d9 --- /dev/null +++ b/packages/graphiql/vite.config.mts @@ -0,0 +1,68 @@ +import { defineConfig } from 'vite'; +import packageJSON from './package.json'; +import dts from 'vite-plugin-dts'; +import commonjs from 'vite-plugin-commonjs'; + +const umdConfig = defineConfig({ + define: { + 'process.env.NODE_ENV': `"${process.env.NODE_ENV}"`, + }, + // To bundle `const { createClient } = require('graphql-ws')` in `createWebsocketsFetcherFromUrl` function + plugins: [commonjs()], + build: { + sourcemap: true, + emptyOutDir: false, + lib: { + entry: 'src/cdn.ts', + // 👇 The name of the exposed global variable. Required when the formats option includes umd or iife + name: 'GraphiQL', + fileName: 'index', + formats: ['umd'], + }, + rollupOptions: { + external: ['react', 'react-dom'], + output: { + globals: { + react: 'React', + 'react-dom': 'ReactDOM', + }, + }, + }, + }, +}); + +const esmConfig = defineConfig({ + build: { + minify: false, + sourcemap: true, + lib: { + entry: 'src/index.ts', + fileName: 'index', + formats: ['cjs', 'es'], + }, + rollupOptions: { + external: [ + // Exclude peer dependencies and dependencies from bundle + ...Object.keys(packageJSON.peerDependencies), + ...Object.keys(packageJSON.dependencies), + ], + }, + }, + server: { + // prevent browser window from opening automatically + open: false, + proxy: { + '/graphql': 'http://localhost:8080', + '/bad/graphql': 'http://localhost:8080', + '/http-error/graphql': 'http://localhost:8080', + '/graphql-error/graphql': 'http://localhost:8080', + '/subscriptions': { + target: 'ws://localhost:8081', + ws: true, + }, + }, + }, + plugins: [dts({ rollupTypes: true })], +}); + +export default process.env.UMD === 'true' ? umdConfig : esmConfig; diff --git a/resources/custom-words.txt b/resources/custom-words.txt index a1a3f38758d..5d561bbcc04 100644 --- a/resources/custom-words.txt +++ b/resources/custom-words.txt @@ -114,6 +114,7 @@ linenumber linenumbers linkify listbox +lightningcss listvalues lostplan maint diff --git a/yarn.lock b/yarn.lock index f745afb4301..b6e238ca50c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3160,6 +3160,49 @@ resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-4.2.1.tgz#1fead437f3957ceebe2e8c3f46beccdb9bc575b8" integrity sha512-EWUguj2kd7ldmrF9F+vI5hUOralPd+sdsUnYbRy33vZTuZkduC1shE9TtEMEjAQwyfyMb4ole5KtjF8MsnQOlA== +"@microsoft/api-extractor-model@7.28.13": + version "7.28.13" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.28.13.tgz#96fbc52155e0d07e0eabbd9699065b77702fe33a" + integrity sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw== + dependencies: + "@microsoft/tsdoc" "0.14.2" + "@microsoft/tsdoc-config" "~0.16.1" + "@rushstack/node-core-library" "4.0.2" + +"@microsoft/api-extractor@7.43.0": + version "7.43.0" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.43.0.tgz#41c42677bc71cd8e0f23c63c56802d85044e65cd" + integrity sha512-GFhTcJpB+MI6FhvXEI9b2K0snulNLWHqC/BbcJtyNYcKUiw7l3Lgis5ApsYncJ0leALX7/of4XfmXk+maT111w== + dependencies: + "@microsoft/api-extractor-model" "7.28.13" + "@microsoft/tsdoc" "0.14.2" + "@microsoft/tsdoc-config" "~0.16.1" + "@rushstack/node-core-library" "4.0.2" + "@rushstack/rig-package" "0.5.2" + "@rushstack/terminal" "0.10.0" + "@rushstack/ts-command-line" "4.19.1" + lodash "~4.17.15" + minimatch "~3.0.3" + resolve "~1.22.1" + semver "~7.5.4" + source-map "~0.6.1" + typescript "5.4.2" + +"@microsoft/tsdoc-config@~0.16.1": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz#b786bb4ead00d54f53839a458ce626c8548d3adf" + integrity sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw== + dependencies: + "@microsoft/tsdoc" "0.14.2" + ajv "~6.12.6" + jju "~1.4.0" + resolve "~1.19.0" + +"@microsoft/tsdoc@0.14.2": + version "0.14.2" + resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb" + integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug== + "@n1ru4l/push-pull-async-iterable-iterator@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-3.1.0.tgz#be450c97d1c7cd6af1a992d53232704454345df9" @@ -3654,7 +3697,7 @@ estree-walker "^2.0.1" picomatch "^2.2.2" -"@rollup/pluginutils@^5.0.5": +"@rollup/pluginutils@^5.0.5", "@rollup/pluginutils@^5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0" integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g== @@ -3743,6 +3786,44 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.0.tgz#baf9b65023ea2ecc5e6ec68f787a0fecfd8ee84c" integrity sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag== +"@rushstack/node-core-library@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-4.0.2.tgz#e26854a3314b279d57e8abdb4acce7797d02f554" + integrity sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg== + dependencies: + fs-extra "~7.0.1" + import-lazy "~4.0.0" + jju "~1.4.0" + resolve "~1.22.1" + semver "~7.5.4" + z-schema "~5.0.2" + +"@rushstack/rig-package@0.5.2": + version "0.5.2" + resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.5.2.tgz#0e23a115904678717a74049661931c0b37dd5495" + integrity sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA== + dependencies: + resolve "~1.22.1" + strip-json-comments "~3.1.1" + +"@rushstack/terminal@0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@rushstack/terminal/-/terminal-0.10.0.tgz#e81909fa0e5c8016b6df4739f0f381f44358269f" + integrity sha512-UbELbXnUdc7EKwfH2sb8ChqNgapUOdqcCIdQP4NGxBpTZV2sQyeekuK3zmfQSa/MN+/7b4kBogl2wq0vpkpYGw== + dependencies: + "@rushstack/node-core-library" "4.0.2" + supports-color "~8.1.1" + +"@rushstack/ts-command-line@4.19.1": + version "4.19.1" + resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.19.1.tgz#288ee54dd607e558a8be07705869c16c31b5c3ef" + integrity sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg== + dependencies: + "@rushstack/terminal" "0.10.0" + "@types/argparse" "1.0.38" + argparse "~1.0.9" + string-argv "~0.3.1" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -3989,6 +4070,11 @@ dependencies: "@types/estree" "*" +"@types/argparse@1.0.38": + version "1.0.38" + resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9" + integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA== + "@types/aria-query@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc" @@ -4924,6 +5010,28 @@ loupe "^3.1.1" tinyrainbow "^1.2.0" +"@volar/language-core@1.11.1", "@volar/language-core@~1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.11.1.tgz#ecdf12ea8dc35fb8549e517991abcbf449a5ad4f" + integrity sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw== + dependencies: + "@volar/source-map" "1.11.1" + +"@volar/source-map@1.11.1", "@volar/source-map@~1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.11.1.tgz#535b0328d9e2b7a91dff846cab4058e191f4452f" + integrity sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg== + dependencies: + muggle-string "^0.3.1" + +"@volar/typescript@~1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.11.1.tgz#ba86c6f326d88e249c7f5cfe4b765be3946fd627" + integrity sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ== + dependencies: + "@volar/language-core" "1.11.1" + path-browserify "^1.0.1" + "@vscode/vsce-sign-alpine-arm64@2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-alpine-arm64/-/vsce-sign-alpine-arm64-2.0.2.tgz#4accc485e55aa6ff04b195b47f722ead57daa58e" @@ -5056,6 +5164,17 @@ estree-walker "^2.0.2" source-map-js "^1.2.0" +"@vue/compiler-core@3.4.36": + version "3.4.36" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.36.tgz#4e28dfcbaa8a85e135f7a94c44372b6d52329e42" + integrity sha512-qBkndgpwFKdupmOPoiS10i7oFdN7a+4UNDlezD0GlQ1kuA1pNrscg9g12HnB5E8hrWSuEftRsbJhL1HI2zpJhg== + dependencies: + "@babel/parser" "^7.24.7" + "@vue/shared" "3.4.36" + entities "^5.0.0" + estree-walker "^2.0.2" + source-map-js "^1.2.0" + "@vue/compiler-dom@3.4.35": version "3.4.35" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.35.tgz#cd0881f1b4ed655cd96367bce4845f87023a5a2d" @@ -5064,6 +5183,14 @@ "@vue/compiler-core" "3.4.35" "@vue/shared" "3.4.35" +"@vue/compiler-dom@^3.3.0": + version "3.4.36" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.36.tgz#32f5f65d1fb242211df2ddc65a336779cd8b974c" + integrity sha512-eEIjy4GwwZTFon/Y+WO8tRRNGqylaRlA79T1RLhUpkOzJ7EtZkkb8MurNfkqY6x6Qiu0R7ESspEF7GkPR/4yYg== + dependencies: + "@vue/compiler-core" "3.4.36" + "@vue/shared" "3.4.36" + "@vue/compiler-sfc@3.4.35": version "3.4.35" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.35.tgz#16f87dd3bdab64cef14d3a6fcf53f8673e404071" @@ -5087,6 +5214,21 @@ "@vue/compiler-dom" "3.4.35" "@vue/shared" "3.4.35" +"@vue/language-core@1.8.27", "@vue/language-core@^1.8.27": + version "1.8.27" + resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-1.8.27.tgz#2ca6892cb524e024a44e554e4c55d7a23e72263f" + integrity sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA== + dependencies: + "@volar/language-core" "~1.11.1" + "@volar/source-map" "~1.11.1" + "@vue/compiler-dom" "^3.3.0" + "@vue/shared" "^3.3.0" + computeds "^0.0.1" + minimatch "^9.0.3" + muggle-string "^0.3.1" + path-browserify "^1.0.1" + vue-template-compiler "^2.7.14" + "@vue/reactivity@3.4.35": version "3.4.35" resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.35.tgz#dfbb4f5371da1290ac86e3313d0e9a68bb0ab38d" @@ -5125,6 +5267,11 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.35.tgz#5432f4b1c79e763fcf78cc830faf59ff01248968" integrity sha512-hvuhBYYDe+b1G8KHxsQ0diDqDMA8D9laxWZhNAjE83VZb5UDaXl9Xnz7cGdDSyiHM90qqI/CyGMcpBpiDy6VVQ== +"@vue/shared@3.4.36", "@vue/shared@^3.3.0": + version "3.4.36" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.36.tgz#7551f41684966acb6a307152b49a8308e7f69203" + integrity sha512-fdPLStwl1sDfYuUftBaUVn2pIrVFDASYerZSrlBvVBfylObPA1gtcWJHy5Ox8jLEJ524zBibss488Q3SZtU1uA== + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -5439,7 +5586,7 @@ ajv@6.5.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -5608,7 +5755,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.7: +argparse@^1.0.7, argparse@~1.0.9: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -6304,6 +6451,16 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4 node-releases "^2.0.14" update-browserslist-db "^1.0.16" +browserslist@^4.19.1: + version "4.23.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" + integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== + dependencies: + caniuse-lite "^1.0.30001646" + electron-to-chromium "^1.5.4" + node-releases "^2.0.18" + update-browserslist-db "^1.1.0" + browserslist@^4.23.1: version "4.23.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.2.tgz#244fe803641f1c19c28c48c4b6ec9736eb3d32ed" @@ -6474,6 +6631,11 @@ caniuse-lite@^1.0.30001640: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd" integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg== +caniuse-lite@^1.0.30001646: + version "1.0.30001650" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001650.tgz#dd1eba0938e39536d184c3c99b2569a13788bc16" + integrity sha512-fgEc7hP/LB7iicdXHUI9VsBsMZmUmlVJeQP2qqQW+3lkqVhbmjEU8zp+h5stWeilX+G7uXuIUIIlWlDw9jdt8g== + capital-case@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" @@ -6922,6 +7084,11 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" +commander@^10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@^2.18.0, commander@^2.20.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -7018,6 +7185,11 @@ compression@^1.7.4: safe-buffer "5.1.2" vary "~1.1.2" +computeds@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/computeds/-/computeds-0.0.1.tgz#215b08a4ba3e08a11ff6eee5d6d8d7166a97ce2e" + integrity sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -7642,6 +7814,11 @@ dayjs@^1.10.4: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== +de-indent@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" + integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg== + debounce-promise@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/debounce-promise/-/debounce-promise-3.1.2.tgz#320fb8c7d15a344455cd33cee5ab63530b6dc7c5" @@ -7847,6 +8024,11 @@ detect-indent@^6.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd" integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA== +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== + detect-libc@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" @@ -8073,6 +8255,11 @@ electron-to-chromium@^1.4.820: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.1.tgz#24640bd4dcfaccb6d82bb4c3f4c7311503241581" integrity sha512-FKbOCOQ5QRB3VlIbl1LZQefWIYwszlBloaXcY2rbfpu9ioJnNh3TK03YtIDKDo3WKBi8u+YV4+Fn2CkEozgf4w== +electron-to-chromium@^1.5.4: + version "1.5.5" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.5.tgz#03bfdf422bdd2c05ee2657efedde21264a1a566b" + integrity sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA== + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -8145,6 +8332,11 @@ entities@^4.4.0, entities@^4.5.0: resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== +entities@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-5.0.0.tgz#b2ab51fe40d995817979ec79dd621154c3c0f62b" + integrity sha512-BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA== + envinfo@^7.7.3: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" @@ -8260,6 +8452,11 @@ es-module-lexer@^0.9.0, es-module-lexer@^0.9.3: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== +es-module-lexer@^1.2.1: + version "1.5.4" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78" + integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw== + es-object-atoms@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" @@ -9227,7 +9424,7 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== -fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1: +fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.7, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -9688,7 +9885,7 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^7.0.1: +fs-extra@^7.0.1, fs-extra@~7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== @@ -10599,6 +10796,11 @@ import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.3.0: parent-module "^1.0.0" resolve-from "^4.0.0" +import-lazy@~4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" + integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== + import-local@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" @@ -10815,6 +11017,13 @@ is-ci@^3.0.1: dependencies: ci-info "^3.2.0" +is-core-module@^2.1.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" + integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA== + dependencies: + hasown "^2.0.2" + is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1: version "2.14.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.14.0.tgz#43b8ef9f46a6a08888db67b1ffd4ec9e3dfd59d1" @@ -11870,6 +12079,11 @@ jiti@^1.18.2: resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== +jju@~1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" + integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA== + joi@^17.3.0: version "17.4.0" resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.0.tgz#b5c2277c8519e016316e49ababd41a1908d9ef20" @@ -12192,6 +12406,11 @@ klona@^2.0.5: resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== +kolorist@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c" + integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ== + language-subtag-registry@^0.3.20: version "0.3.23" resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7" @@ -12249,6 +12468,74 @@ lie@~3.3.0: dependencies: immediate "~3.0.5" +lightningcss-darwin-arm64@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.26.0.tgz#1fda92d523dd1ef2fc8042d17153a5ded2de4726" + integrity sha512-n4TIvHO1NY1ondKFYpL2ZX0bcC2y6yjXMD6JfyizgR8BCFNEeArINDzEaeqlfX9bXz73Bpz/Ow0nu+1qiDrBKg== + +lightningcss-darwin-x64@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.26.0.tgz#eb311b9aa661948c6e92971f499afcaf453d2235" + integrity sha512-Rf9HuHIDi1R6/zgBkJh25SiJHF+dm9axUZW/0UoYCW1/8HV0gMI0blARhH4z+REmWiU1yYT/KyNF3h7tHyRXUg== + +lightningcss-freebsd-x64@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.26.0.tgz#85d01defc5b2d9af3cba1d5d2f253d356c8cdc56" + integrity sha512-C/io7POAxp6sZxFSVGezjajMlCKQ8KSwISLLGRq8xLQpQMokYrUoqYEwmIX8mLmF6C/CZPk0gFmRSzd8biWM0g== + +lightningcss-linux-arm-gnueabihf@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.26.0.tgz#c14fe3aaf152b0318367030734d3e08fdf6add86" + integrity sha512-Aag9kqXqkyPSW+dXMgyWk66C984Nay2pY8Nws+67gHlDzV3cWh7TvFlzuaTaVFMVqdDTzN484LSK3u39zFBnzg== + +lightningcss-linux-arm64-gnu@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.26.0.tgz#3b2d8cae1f112bf3ae26ea81eccc02efb81b5f09" + integrity sha512-iJmZM7fUyVjH+POtdiCtExG+67TtPUTer7K/5A8DIfmPfrmeGvzfRyBltGhQz13Wi15K1lf2cPYoRaRh6vcwNA== + +lightningcss-linux-arm64-musl@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.26.0.tgz#df309b1acafbded280171db44eb615f2d26e2cab" + integrity sha512-XxoEL++tTkyuvu+wq/QS8bwyTXZv2y5XYCMcWL45b8XwkiS8eEEEej9BkMGSRwxa5J4K+LDeIhLrS23CpQyfig== + +lightningcss-linux-x64-gnu@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.26.0.tgz#29a82a15d463298bd263686d4c23243ba8824d3d" + integrity sha512-1dkTfZQAYLj8MUSkd6L/+TWTG8V6Kfrzfa0T1fSlXCXQHrt1HC1/UepXHtKHDt/9yFwyoeayivxXAsApVxn6zA== + +lightningcss-linux-x64-musl@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.26.0.tgz#831cf950d824e88d6e00f3fc2f33ef6f50850004" + integrity sha512-yX3Rk9m00JGCUzuUhFEojY+jf/6zHs3XU8S8Vk+FRbnr4St7cjyMXdNjuA2LjiT8e7j8xHRCH8hyZ4H/btRE4A== + +lightningcss-win32-arm64-msvc@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.26.0.tgz#77790f68891e01a520df1a97dc669b0f5546ac3c" + integrity sha512-X/597/cFnCogy9VItj/+7Tgu5VLbAtDF7KZDPdSw0MaL6FL940th1y3HiOzFIlziVvAtbo0RB3NAae1Oofr+Tw== + +lightningcss-win32-x64-msvc@1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.26.0.tgz#ff69764eceada846eab0d721d653518d5ba8049b" + integrity sha512-pYS3EyGP3JRhfqEFYmfFDiZ9/pVNfy8jVIYtrx9TVNusVyDK3gpW1w/rbvroQ4bDJi7grdUtyrYU6V2xkY/bBw== + +lightningcss@^1.22.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.26.0.tgz#ca2ff6ebabb044c6e49e57f9491a6f85db03b256" + integrity sha512-a/XZ5hdgifrofQJUArr5AiJjx26SwMam3SJUSMjgebZbESZ96i+6Qsl8tLi0kaUsdMzBWXh9sN1Oe6hp2/dkQw== + dependencies: + detect-libc "^1.0.3" + optionalDependencies: + lightningcss-darwin-arm64 "1.26.0" + lightningcss-darwin-x64 "1.26.0" + lightningcss-freebsd-x64 "1.26.0" + lightningcss-linux-arm-gnueabihf "1.26.0" + lightningcss-linux-arm64-gnu "1.26.0" + lightningcss-linux-arm64-musl "1.26.0" + lightningcss-linux-x64-gnu "1.26.0" + lightningcss-linux-x64-musl "1.26.0" + lightningcss-win32-arm64-msvc "1.26.0" + lightningcss-win32-x64-msvc "1.26.0" + lilconfig@^2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4" @@ -12421,6 +12708,11 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== + lodash.includes@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" @@ -12431,6 +12723,11 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg== +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== + lodash.isinteger@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" @@ -12481,7 +12778,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0: +lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0, lodash@~4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -12624,7 +12921,7 @@ magic-string@^0.30.0: dependencies: "@jridgewell/sourcemap-codec" "^1.4.15" -magic-string@^0.30.10: +magic-string@^0.30.1, magic-string@^0.30.10, magic-string@^0.30.8: version "0.30.11" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.11.tgz#301a6f93b3e8c2cb13ac1a7a673492c0dfd12954" integrity sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A== @@ -13357,6 +13654,13 @@ minimatch@^9.0.0, minimatch@^9.0.3, minimatch@^9.0.4: dependencies: brace-expansion "^2.0.1" +minimatch@~3.0.3: + version "3.0.8" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" + integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== + dependencies: + brace-expansion "^1.1.7" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -13463,6 +13767,11 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +muggle-string@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.3.1.tgz#e524312eb1728c63dd0b2ac49e3282e6ed85963a" + integrity sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg== + multicast-dns@^7.2.5: version "7.2.5" resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" @@ -13597,6 +13906,11 @@ node-releases@^2.0.14, node-releases@^2.0.2: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== +node-releases@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== + nopt@^7.2.1: version "7.2.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" @@ -14184,6 +14498,11 @@ patch-package@^7.0.2: tmp "^0.0.33" yaml "^2.2.2" +path-browserify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" + integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== + path-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f" @@ -14227,7 +14546,7 @@ path-key@^4.0.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== -path-parse@^1.0.7: +path-parse@^1.0.6, path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -14549,6 +14868,14 @@ postcss-lab-function@^5.0.0: "@csstools/postcss-progressive-custom-properties" "^2.0.0" postcss-value-parser "^4.2.0" +postcss-lightningcss@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postcss-lightningcss/-/postcss-lightningcss-1.0.0.tgz#a755fd04d5a20f2673afb15afe317a6563ddb8c1" + integrity sha512-sLNRVh+DINZHf5b31KUZnv3w4sf/CEdmvYP5JWzyyB8++E6WdaE7yxsrhfXiUFqISNBXcSrKfAF/MtTZrYAlbg== + dependencies: + browserslist "^4.19.1" + lightningcss "^1.22.0" + postcss-loader@7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.2.tgz#b53ff44a26fba3688eee92a048c7f2d4802e23bb" @@ -15698,7 +16025,7 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999" integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ== -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.4: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.4, resolve@~1.22.1: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -15716,6 +16043,14 @@ resolve@^2.0.0-next.5: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@~1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" + integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== + dependencies: + is-core-module "^2.1.0" + path-parse "^1.0.6" + responselike@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" @@ -16033,6 +16368,13 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== +semver@~7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -16576,6 +16918,11 @@ string-argv@0.3.1: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== +string-argv@~0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" + integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== + string-env-interpolation@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152" @@ -16836,7 +17183,7 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -strip-json-comments@3.1.1, strip-json-comments@^3.0.0, strip-json-comments@^3.1.1: +strip-json-comments@3.1.1, strip-json-comments@^3.0.0, strip-json-comments@^3.1.1, strip-json-comments@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -16887,7 +17234,7 @@ success-symbol@^0.1.0: resolved "https://registry.yarnpkg.com/success-symbol/-/success-symbol-0.1.0.tgz#24022e486f3bf1cdca094283b769c472d3b72897" integrity sha1-JAIuSG878c3KCUKDt2nEctO3KJc= -supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0, supports-color@^8.1.1: +supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0, supports-color@^8.1.1, supports-color@~8.1.1: version "8.1.1" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== @@ -17501,6 +17848,11 @@ typedoc@^0.19.2: shelljs "^0.8.4" typedoc-default-themes "^0.11.4" +typescript@5.4.2: + version "5.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372" + integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ== + typescript@^4.2.3, typescript@^4.6.3: version "4.7.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" @@ -17865,6 +18217,11 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" +validator@^13.7.0: + version "13.12.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-13.12.0.tgz#7d78e76ba85504da3fee4fd1922b385914d4b35f" + integrity sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg== + value-or-promise@^1.0.11, value-or-promise@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" @@ -17951,6 +18308,39 @@ vite-node@2.0.4: tinyrainbow "^1.2.0" vite "^5.0.0" +vite-plugin-commonjs@^0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.1.tgz#18585abc6020adaee733150847972f55a1f88c55" + integrity sha512-taP8R9kYGlCW5OzkVR0UIWRCnG6rSxeWWuA7tnU5b9t5MniibOnDY219NhisTeDhJAeGT8cEnrhVWZ9A5yD+vg== + dependencies: + acorn "^8.8.2" + fast-glob "^3.2.12" + magic-string "^0.30.1" + vite-plugin-dynamic-import "^1.5.0" + +vite-plugin-dts@^3.9.1: + version "3.9.1" + resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-3.9.1.tgz#625ad388ec3956708ccec7960550a7b0a8e8909e" + integrity sha512-rVp2KM9Ue22NGWB8dNtWEr+KekN3rIgz1tWD050QnRGlriUCmaDwa7qA5zDEjbXg5lAXhYMSBJtx3q3hQIJZSg== + dependencies: + "@microsoft/api-extractor" "7.43.0" + "@rollup/pluginutils" "^5.1.0" + "@vue/language-core" "^1.8.27" + debug "^4.3.4" + kolorist "^1.8.0" + magic-string "^0.30.8" + vue-tsc "^1.8.27" + +vite-plugin-dynamic-import@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/vite-plugin-dynamic-import/-/vite-plugin-dynamic-import-1.5.0.tgz#a28f4768da977f0e448009489617aec259180b63" + integrity sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g== + dependencies: + acorn "^8.8.2" + es-module-lexer "^1.2.1" + fast-glob "^3.2.12" + magic-string "^0.30.1" + vite-plugin-monaco-editor@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/vite-plugin-monaco-editor/-/vite-plugin-monaco-editor-1.1.0.tgz#a6238c2e13d5e98dd54a1bc51f6f189325219de3" @@ -18089,6 +18479,23 @@ vscode-uri@^3.0.2, vscode-uri@^3.0.3: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== +vue-template-compiler@^2.7.14: + version "2.7.16" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b" + integrity sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ== + dependencies: + de-indent "^1.0.2" + he "^1.2.0" + +vue-tsc@^1.8.27: + version "1.8.27" + resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.27.tgz#feb2bb1eef9be28017bb9e95e2bbd1ebdd48481c" + integrity sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg== + dependencies: + "@volar/typescript" "~1.11.1" + "@vue/language-core" "1.8.27" + semver "^7.5.4" + vue@^3.2.0: version "3.4.35" resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.35.tgz#9ad23525919eece40153fdf8675d07ddd879eb33" @@ -19016,6 +19423,17 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +z-schema@~5.0.2: + version "5.0.6" + resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.6.tgz#46d6a687b15e4a4369e18d6cb1c7b8618fc256c5" + integrity sha512-+XR1GhnWklYdfr8YaZv/iu+vY+ux7V5DS5zH1DQf6bO5ufrt/5cgNhVO5qyhsjFXvsqQb/f08DWE9b6uPscyAg== + dependencies: + lodash.get "^4.4.2" + lodash.isequal "^4.5.0" + validator "^13.7.0" + optionalDependencies: + commander "^10.0.0" + zod@3.21.4: version "3.21.4" resolved "https://registry.yarnpkg.com/zod/-/zod-3.21.4.tgz#10882231d992519f0a10b5dd58a38c9dabbb64db" From 11aacd0b0e8da85dafa2967c543e9025e8db03c5 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 16:19:30 +0200 Subject: [PATCH 04/48] [3] remove unused webpack deps (#3681) * new looks of tabs * add graphiql react too * all fixes * more polishing * more * more * more * more * more * prettier * polish changeset * disable shrinking while changing the operation name * Update packages/graphiql-react/src/ui/tabs.css Co-authored-by: Ted Thibodeau Jr * yarn i * apply new design changes * prettier * vite more more more * fix demo * fix cspell * fix dev * update cypress to v13 * upd cache key * remove webpack deps * fix `yarn jest --coverage` * Update .changeset/thirty-spoons-call.md * Update packages/graphiql/vite.config.mts * merge * add changeset * yarn.lock * yarn.lock --------- Co-authored-by: Ted Thibodeau Jr --- package.json | 2 + packages/graphiql/.babelrc.js | 1 - packages/graphiql/babel.config.js | 1 - packages/graphiql/package.json | 23 - packages/graphiql/resources/index.html.ejs | 51 - packages/graphiql/resources/renderExample.js | 4 +- packages/graphiql/resources/webpack.config.js | 133 -- yarn.lock | 1284 +---------------- 8 files changed, 30 insertions(+), 1469 deletions(-) delete mode 100644 packages/graphiql/.babelrc.js delete mode 100644 packages/graphiql/babel.config.js delete mode 100644 packages/graphiql/resources/index.html.ejs delete mode 100644 packages/graphiql/resources/webpack.config.js diff --git a/package.json b/package.json index 86ddb582e0e..6798fa16fc3 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,8 @@ "gen-agenda": "wgutils agenda gen" }, "dependencies": { + "identity-obj-proxy": "^3.0.0", + "babel-plugin-macros": "^3.1.0", "@babel/cli": "^7.21.0", "@babel/core": "^7.21.0", "@babel/plugin-proposal-class-properties": "^7.18.6", diff --git a/packages/graphiql/.babelrc.js b/packages/graphiql/.babelrc.js deleted file mode 100644 index b76123ca373..00000000000 --- a/packages/graphiql/.babelrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./babel.config'); diff --git a/packages/graphiql/babel.config.js b/packages/graphiql/babel.config.js deleted file mode 100644 index 4c05afbee70..00000000000 --- a/packages/graphiql/babel.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../babel.config'); diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index 104f9f4c8c3..23d505ad8a5 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -51,47 +51,24 @@ "@cypress/webpack-preprocessor": "^5.5.0", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "14.0.0", - "@types/codemirror": "^0.0.90", - "@types/node": "^16.18.4", "@types/testing-library__jest-dom": "5.14.5", - "babel-loader": "^9.1.2", - "babel-plugin-macros": "^3.1.0", "cross-env": "^7.0.2", - "css-loader": "^6.7.3", - "cssnano": "^5.1.15", "cypress": "^13.13.2", "express": "^4.19.2", - "fork-ts-checker-webpack-plugin": "7.3.0", "graphql": "^16.8.1", "graphql-http": "^1.19.0", "graphql-subscriptions": "^2.0.0", - "html-webpack-plugin": "^5.5.0", - "identity-obj-proxy": "^3.0.0", - "mini-css-extract-plugin": "^2.7.2", "postcss": "8.4.31", "postcss-import": "15.1.0", "postcss-lightningcss": "^1.0.0", - "postcss-loader": "7.0.2", - "postcss-preset-env": "^8.0.1", - "prop-types": "15.7.2", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-hot-loader": "^4.12.20", - "react-test-renderer": "^18.2.0", - "require-context.macro": "^1.2.2", - "rimraf": "^3.0.2", - "serve": "^11.3.0", "start-server-and-test": "^1.10.11", - "style-loader": "^3.3.1", "subscriptions-transport-ws": "0.11.0", "typescript": "^4.6.3", "vite": "^5.3.5", "vite-plugin-commonjs": "^0.10.1", "vite-plugin-dts": "^3.9.1", - "webpack": "5.76.0", - "webpack-bundle-analyzer": "^3.6.1", - "webpack-cli": "^5.0.1", - "webpack-dev-server": "^4.11.1", "ws": "8.17.1" } } diff --git a/packages/graphiql/resources/index.html.ejs b/packages/graphiql/resources/index.html.ejs deleted file mode 100644 index f3512006ed6..00000000000 --- a/packages/graphiql/resources/index.html.ejs +++ /dev/null @@ -1,51 +0,0 @@ - - - - - GraphiQL - - - - - - - - - -
Loading...
- - - - diff --git a/packages/graphiql/resources/renderExample.js b/packages/graphiql/resources/renderExample.js index 24dc18371f5..a6ef4aa8a06 100644 --- a/packages/graphiql/resources/renderExample.js +++ b/packages/graphiql/resources/renderExample.js @@ -8,8 +8,8 @@ * * It is used by: * - the netlify demo - * - end to end tests - * - webpack dev server + * - end-to-end tests + * - vite dev server */ // Parse the search string to get url parameters. diff --git a/packages/graphiql/resources/webpack.config.js b/packages/graphiql/resources/webpack.config.js deleted file mode 100644 index 15b1f7d8619..00000000000 --- a/packages/graphiql/resources/webpack.config.js +++ /dev/null @@ -1,133 +0,0 @@ -const path = require('node:path'); -const webpack = require('webpack'); - -const HtmlWebpackPlugin = require('html-webpack-plugin'); -const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); -const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); -const graphql = require('graphql'); -const rimraf = require('rimraf'); - -const relPath = (...args) => path.resolve(__dirname, ...args); -const rootPath = (...args) => relPath('../', ...args); - -const resultConfig = ({ isDev = false }) => { - const isHMR = Boolean(isDev && process.env.WEBPACK_SERVE); - - const config = { - mode: isDev ? 'development' : 'production', - entry: './cdn.ts', - context: rootPath('src'), - output: { - path: rootPath(), - library: 'GraphiQL', - libraryTarget: 'window', - libraryExport: 'default', - filename: isDev ? 'graphiql.js' : 'graphiql.min.js', - }, - devServer: { - hot: true, - // bypass simple localhost CORS restrictions by setting - // these to 127.0.0.1 in /etc/hosts - allowedHosts: ['local.example.com', 'graphiql.com'], - setupMiddlewares(middlewares, devServer) { - require('../test/beforeDevServer')(devServer.app); - - return middlewares; - }, - }, - devtool: isDev ? 'cheap-module-source-map' : 'source-map', - externals: { - react: 'React', - 'react-dom': 'ReactDOM', - }, - - module: { - rules: [ - // for graphql module, which uses .mjs - { - type: 'javascript/auto', - test: /\.mjs$/, - use: [], - include: /node_modules/, - exclude: /\.(ts|d\.ts|d\.ts\.map)$/, - }, - // i think we need to add another rule for - // codemirror-graphql esm.js files to load - { - test: /\.(js|jsx|ts|tsx|mjs)$/, - use: [{ loader: 'babel-loader' }], - exclude: /\.(d\.ts|d\.ts\.map|spec\.tsx)$/, - }, - { - test: /\.css$/, - use: [{ loader: MiniCssExtractPlugin.loader }, 'css-loader'], - }, - { - test: /\.css$/, - exclude: /graphiql-react/, - use: ['postcss-loader'], - }, - ], - }, - - plugins: [ - // in order to prevent async modules for CDN builds - // until we can guarantee it will work with the CDN properly - // and so that graphiql.min.js can retain parity - new webpack.optimize.LimitChunkCountPlugin({ - maxChunks: 1, - }), - - new HtmlWebpackPlugin({ - template: relPath('index.html.ejs'), - inject: 'head', - filename: isDev && !isHMR ? 'dev.html' : 'index.html', - graphqlVersion: JSON.stringify(graphql.version), - }), - new MiniCssExtractPlugin({ - // Options similar to the same options in webpackOptions.output - // both options are optional - filename: isDev ? 'graphiql.css' : 'graphiql.min.css', - chunkFilename: '[id].css', - }), - new ForkTsCheckerWebpackPlugin({ - async: isDev, - typescript: { - configFile: rootPath('tsconfig.json'), - }, - }), - new (class { - apply(compiler) { - compiler.hooks.done.tap('Remove LICENSE', () => { - console.log('Remove LICENSE.txt'); - rimraf.sync('./*.LICENSE.txt'); - }); - } - })(), - ], - resolve: { - extensions: ['.mjs', '.js', '.json', '.jsx', '.css', '.ts', '.tsx'], - modules: [ - rootPath('node_modules'), - rootPath('../', '../', 'node_modules'), - ], - }, - }; - - if (process.env.ANALYZE) { - config.plugins.push( - new BundleAnalyzerPlugin({ - analyzerMode: 'static', - openAnalyzer: false, - reportFilename: rootPath('analyzer.html'), - }), - ); - } - return config; -}; -const configs = [resultConfig({ isDev: true })]; -if (!process.env.WEBPACK_SERVE) { - configs.push(resultConfig({ isDev: false })); -} -module.exports = configs; diff --git a/yarn.lock b/yarn.lock index b6e238ca50c..475b56b132e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2037,188 +2037,11 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-vue/-/dict-vue-2.0.1.tgz#7514875f760ae755d2a6ef1fd00917d107682fe1" integrity sha512-n9So2C2Zw+uSDRzb2h9wq3PjZBqoHx+vBvu6a34H2qpumNjZ6HaEronrzX5tXJJXzOtocIQYrLxdd128TAU3+g== -"@csstools/cascade-layer-name-parser@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.1.tgz#5957adeb71be8159e543d37a9c48e124dcd6c32e" - integrity sha512-SAAi5DpgJJWkfTvWSaqkgyIsTawa83hMwKrktkj6ra2h+q6ZN57vOGZ6ySHq6RSo+CbP64fA3aPChPBRDDUgtw== - -"@csstools/color-helpers@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-1.0.0.tgz#7097722a51da1e9e622345ca000261f1ae6e8f58" - integrity sha512-tgqtiV8sU/VaWYjOB3O7PWs7HR/MmOLl2kTYRW2qSsTSEniJq7xmyAYFB1LPpXvvQcE5u2ih2dK9fyc8BnrAGQ== - -"@csstools/css-calc@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.0.0.tgz#f93e4cc9d80b504467aee1b5251bb2fd8be435a7" - integrity sha512-Xw0b/Jr+vLGGYD8cxsGWPaY5n1GtVC6G4tcga+eZPXZzRjjZHorPwW739UgtXzL2Da1RLxNE73c0r/KvmizPsw== - -"@csstools/css-parser-algorithms@^2.0.0", "@csstools/css-parser-algorithms@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.0.1.tgz#ff02629c7c95d1f4f8ea84d5ef1173461610535e" - integrity sha512-B9/8PmOtU6nBiibJg0glnNktQDZ3rZnGn/7UmDfrm2vMtrdlXO3p7ErE95N0up80IRk9YEtB5jyj/TmQ1WH3dw== - -"@csstools/css-tokenizer@^2.0.0", "@csstools/css-tokenizer@^2.0.1": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.1.0.tgz#fee4de3d444db3ce9007f3af6474af8ba3e4b930" - integrity sha512-dtqFyoJBHUxGi9zPZdpCKP1xk8tq6KPHJ/NY4qWXiYo6IcSGwzk3L8x2XzZbbyOyBs9xQARoGveU2AsgLj6D2A== - -"@csstools/media-query-list-parser@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.0.1.tgz#d85a366811563a5d002755ed10e5212a1613c91d" - integrity sha512-X2/OuzEbjaxhzm97UJ+95GrMeT29d1Ib+Pu+paGLuRWZnWRK9sI9r3ikmKXPWGA1C4y4JEdBEFpp9jEqCvLeRA== - -"@csstools/postcss-cascade-layers@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-3.0.1.tgz#d839386e90428b448e3f75276bc01d516e852a0d" - integrity sha512-dD8W98dOYNOH/yX4V4HXOhfCOnvVAg8TtsL+qCGNoKXuq5z2C/d026wGWgySgC8cajXXo/wNezS31Glj5GcqrA== - dependencies: - "@csstools/selector-specificity" "^2.0.2" - postcss-selector-parser "^6.0.10" - -"@csstools/postcss-color-function@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-2.1.0.tgz#2ed0320b4f7e0d7718280e273f88ba4164eae7e7" - integrity sha512-XBoCClLyWchlYGHGlmMOa6M2UXZNrZm63HVfsvgD/z1RPm/s3+FhHyT6VkDo+OvEBPhCgn6xz4IeCu4pRctKDQ== - dependencies: - "@csstools/color-helpers" "^1.0.0" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" - postcss-value-parser "^4.2.0" - -"@csstools/postcss-font-format-keywords@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-2.0.2.tgz#d798d96f4af6cddcfee459f598c976e6011042d2" - integrity sha512-iKYZlIs6JsNT7NKyRjyIyezTCHLh4L4BBB3F5Nx7Dc4Z/QmBgX+YJFuUSar8IM6KclGiAUFGomXFdYxAwJydlA== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-hwb-function@^2.0.0": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-2.1.1.tgz#a86efbae9f95236022d6bed83e06357a3bfb4de7" - integrity sha512-XijKzdxBdH2hU6IcPWmnaU85FKEF1XE5hGy0d6dQC6XznFUIRu1T4uebL3krayX40m4xIcxfCBsQm5zphzVrtg== - dependencies: - "@csstools/color-helpers" "^1.0.0" - postcss-value-parser "^4.2.0" - -"@csstools/postcss-ic-unit@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-2.0.2.tgz#5a5e481c53977deec3d63793788eec924d4c5f7d" - integrity sha512-N84qGTJkfLTPj2qOG5P4CIqGjpZBbjOEMKMn+UjO5wlb9lcBTfBsxCF0lQsFdWJUzBHYFOz19dL66v71WF3Pig== - dependencies: - "@csstools/postcss-progressive-custom-properties" "^2.0.0" - postcss-value-parser "^4.2.0" - -"@csstools/postcss-is-pseudo-class@^3.0.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-3.1.1.tgz#81b0f3ba388bf3c8966e1a4413e1839beef7960e" - integrity sha512-hhiacuby4YdUnnxfCYCRMBIobyJImozf0u+gHSbQ/tNOdwvmrZtVROvgW7zmfYuRkHVDNZJWZslq2v5jOU+j/A== - dependencies: - "@csstools/selector-specificity" "^2.0.0" - postcss-selector-parser "^6.0.10" - -"@csstools/postcss-logical-float-and-clear@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-float-and-clear/-/postcss-logical-float-and-clear-1.0.1.tgz#d255ea7aad18880930b63d8a04164f56182f2ecf" - integrity sha512-eO9z2sMLddvlfFEW5Fxbjyd03zaO7cJafDurK4rCqyRt9P7aaWwha0LcSzoROlcZrw1NBV2JAp2vMKfPMQO1xw== - -"@csstools/postcss-logical-resize@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-resize/-/postcss-logical-resize-1.0.1.tgz#826d3de929d7d786c32c2c118f78e813a1c2cdec" - integrity sha512-x1ge74eCSvpBkDDWppl+7FuD2dL68WP+wwP2qvdUcKY17vJksz+XoE1ZRV38uJgS6FNUwC0AxrPW5gy3MxsDHQ== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-logical-viewport-units@^1.0.0": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-1.0.2.tgz#b968c57e1459429b48b24e2c250ca0904d71df6e" - integrity sha512-nnKFywBqRMYjv5jyjSplD/nbAnboUEGFfdxKw1o34Y1nvycgqjQavhKkmxbORxroBBIDwC5y6SfgENcPPUcOxQ== - dependencies: - "@csstools/css-tokenizer" "^2.0.0" - -"@csstools/postcss-media-queries-aspect-ratio-number-values@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-1.0.1.tgz#fd6a8e50c2d6d46a5c95b6cdc5563a091fa2f0fa" - integrity sha512-V9yQqXdje6OfqDf6EL5iGOpi6N0OEczwYK83rql9UapQwFEryXlAehR5AqH8QqLYb6+y31wUXK6vMxCp0920Zg== - dependencies: - "@csstools/css-parser-algorithms" "^2.0.0" - "@csstools/css-tokenizer" "^2.0.0" - "@csstools/media-query-list-parser" "^2.0.0" - -"@csstools/postcss-nested-calc@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-2.0.2.tgz#a0857650ef88b1aa7b094c7ea8ea1378c35695e0" - integrity sha512-jbwrP8rN4e7LNaRcpx3xpMUjhtt34I9OV+zgbcsYAAk6k1+3kODXJBf95/JMYWhu9g1oif7r06QVUgfWsKxCFw== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-normalize-display-values@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-2.0.1.tgz#35dc188c5b4713cf902959fe3c8ce613fcb7543e" - integrity sha512-TQT5g3JQ5gPXC239YuRK8jFceXF9d25ZvBkyjzBGGoW5st5sPXFVQS8OjYb9IJ/K3CdfK4528y483cgS2DJR/w== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-oklab-function@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-2.1.0.tgz#0f9b914574549e617942a40297ffe76da76809c6" - integrity sha512-U/odSNjOVhagNRu+RDaNVbn8vaqA9GyCOoneQA2je7697KOrtRDc7/POrYsP7QioO2aaezDzKNX02wBzc99fkQ== - dependencies: - "@csstools/color-helpers" "^1.0.0" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" - postcss-value-parser "^4.2.0" - -"@csstools/postcss-progressive-custom-properties@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-2.1.0.tgz#df35da0e85a6d5e1d8e4c9a0ba9032e8486e8b9d" - integrity sha512-tRX1rinsXajZlc4WiU7s9Y6O9EdSHScT997zDsvDUjQ1oZL2nvnL6Bt0s9KyQZZTdC3lrG2PIdBqdOIWXSEPlQ== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-scope-pseudo-class@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-2.0.2.tgz#6325e1e3b321093c59b008ec670bb772e17f06fe" - integrity sha512-6Pvo4uexUCXt+Hz5iUtemQAcIuCYnL+ePs1khFR6/xPgC92aQLJ0zGHonWoewiBE+I++4gXK3pr+R1rlOFHe5w== - dependencies: - postcss-selector-parser "^6.0.10" - -"@csstools/postcss-stepped-value-functions@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-2.1.0.tgz#8ca134a7f70e00b14f5796fb32ed33a656ba0b1b" - integrity sha512-CkEo9BF8fQeMoXW3biXjlgTLY7PA4UFihn6leq7hPoRzIguLUI0WZIVgsITGXfX8LXmkhCSTjXO2DLYu/LUixQ== - dependencies: - "@csstools/css-calc" "^1.0.0" - "@csstools/css-parser-algorithms" "^2.0.1" - "@csstools/css-tokenizer" "^2.0.1" - -"@csstools/postcss-text-decoration-shorthand@^2.0.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-2.2.1.tgz#1accf54487d74aa7ccade2e674c7290bb2ce10ae" - integrity sha512-Ow6/cWWdjjVvA83mkm3kLRvvWsbzoe1AbJCxkpC+c9ibUjyS8pifm+LpZslQUKcxRVQ69ztKHDBEbFGTDhNeUw== - dependencies: - "@csstools/color-helpers" "^1.0.0" - postcss-value-parser "^4.2.0" - -"@csstools/postcss-trigonometric-functions@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-2.0.1.tgz#2ecede7066187cf08423f8318ef5796cda75351f" - integrity sha512-uGmmVWGHozyWe6+I4w321fKUC034OB1OYW0ZP4ySHA23n+r9y93K+1yrmW+hThpSfApKhaWySoD4I71LLlFUYQ== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-unset-value@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-2.0.1.tgz#67091dd6cff556bff896c95053eb070cc6b21c25" - integrity sha512-oJ9Xl29/yU8U7/pnMJRqAZd4YXNCfGEdcP4ywREuqm/xMqcgDNDppYRoCGDt40aaZQIEKBS79LytUDN/DHf0Ew== - "@csstools/selector-specificity@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-1.0.0.tgz#91c560df2ed8d9700e4c7ed4ac21a3a322c9d975" integrity sha512-RkYG5KiGNX0fJ5YoI0f4Wfq2Yo74D25Hru4fxTOioYdQvHBxcrrtTTyT5Ozzh2ejcNrhFy7IEts2WyEY7yi5yw== -"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.1", "@csstools/selector-specificity@^2.0.2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz#c9c61d9fe5ca5ac664e1153bb0aa0eba1c6d6308" - integrity sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw== - "@cypress/request@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.1.tgz#72d7d5425236a2413bd3d8bb66d02d9dc3168960" @@ -4058,11 +3881,6 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== -"@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== - "@types/acorn@^4.0.0": version "4.0.6" resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.6.tgz#d61ca5480300ac41a7d973dd5b84d0a591154a22" @@ -4646,11 +4464,6 @@ resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.62.0.tgz#b4d6d192d5aeb75e91d0adef689c3ecef9879da7" integrity sha512-iGlQJ1w5e3qPUryroO6v4lxg3ql1ztdTCwQW3xEwFawdyPLoeUSv48SYfMwc7kQA7h6ThUqflZIjgKAykeF9oA== -"@types/webpack-env@^1.14.0": - version "1.15.2" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.2.tgz#927997342bb9f4a5185a86e6579a0a18afc33b0a" - integrity sha512-67ZgZpAlhIICIdfQrB5fnDvaKFcDxpKibxznfYRVAT4mQE41Dido/3Ty+E3xGBmTogc5+0Qb8tWhna+5B8z1iQ== - "@types/ws@8.2.2": version "8.2.2" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21" @@ -5467,11 +5280,6 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -"@zeit/schemas@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@zeit/schemas/-/schemas-2.6.0.tgz#004e8e553b4cd53d538bd38eac7bcbf58a867fe3" - integrity sha512-uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg== - abab@^2.0.3, abab@^2.0.5: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" @@ -5576,16 +5384,6 @@ ajv-keywords@^5.0.0: dependencies: fast-deep-equal "^3.1.3" -ajv@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9" - integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg== - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -5606,13 +5404,6 @@ ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0: require-from-string "^2.0.2" uri-js "^4.2.2" -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= - dependencies: - string-width "^2.0.0" - ansi-colors@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -5732,7 +5523,7 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -arch@^2.1.0, arch@^2.2.0: +arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== @@ -5745,11 +5536,6 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -arg@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arg/-/arg-2.0.0.tgz#c06e7ff69ab05b3a4a03ebe0407fac4cba657545" - integrity sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w== - arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -5985,11 +5771,6 @@ async-each@^1.0.0: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - async@^3.2.0, async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" @@ -6005,18 +5786,6 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -autoprefixer@^10.4.13: - version "10.4.13" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8" - integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg== - dependencies: - browserslist "^4.21.4" - caniuse-lite "^1.0.30001426" - fraction.js "^4.2.0" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" - available-typed-arrays@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" @@ -6281,16 +6050,6 @@ better-path-resolve@1.0.0: dependencies: is-windows "^1.0.0" -bfj@^6.1.1: - version "6.1.2" - resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f" - integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw== - dependencies: - bluebird "^3.5.5" - check-types "^8.0.3" - hoopy "^0.1.4" - tryer "^1.0.1" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -6322,7 +6081,7 @@ blob-util@^2.0.2: resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb" integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ== -bluebird@3.7.2, bluebird@^3.4.1, bluebird@^3.5.1, bluebird@^3.5.5, bluebird@^3.7.1, bluebird@^3.7.2: +bluebird@3.7.2, bluebird@^3.4.1, bluebird@^3.5.1, bluebird@^3.7.1, bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -6360,19 +6119,6 @@ boolbase@^1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -boxen@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" - integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw== - dependencies: - ansi-align "^2.0.0" - camelcase "^4.0.0" - chalk "^2.0.1" - cli-boxes "^1.0.0" - string-width "^2.0.0" - term-size "^1.2.0" - widest-line "^2.0.0" - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -6441,7 +6187,7 @@ browserslist@4.20.2: node-releases "^2.0.2" picocolors "^1.0.0" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4.21.4, browserslist@^4.22.2, browserslist@^4.23.0: +browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4.22.2, browserslist@^4.23.0: version "4.23.1" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.1.tgz#ce4af0534b3d37db5c1a4ca98b9080f985041e96" integrity sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw== @@ -6596,11 +6342,6 @@ camelcase-keys@^6.2.2: map-obj "^4.0.0" quick-lru "^4.0.1" -camelcase@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= - camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -6611,17 +6352,7 @@ camelcase@^6.0.0, camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== - dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001328, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001629: +caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001328, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001629: version "1.0.30001639" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz#972b3a6adeacdd8f46af5fc7f771e9639f6c1521" integrity sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg== @@ -6671,15 +6402,6 @@ chai@^5.1.1: loupe "^3.1.0" pathval "^2.0.0" -chalk@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -6699,7 +6421,7 @@ chalk@^1.0.0, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -6789,11 +6511,6 @@ check-more-types@2.24.0, check-more-types@^2.24.0: resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600" integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA= -check-types@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" - integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ== - cheerio-select@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823" @@ -6892,11 +6609,6 @@ clear-module@^4.1.2: parent-module "^2.0.0" resolve-from "^5.0.0" -cli-boxes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM= - cli-cursor@^2.0.0, cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -6941,14 +6653,6 @@ client-only@0.0.1, client-only@^0.0.1: resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1" integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA== -clipboardy@1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-1.2.3.tgz#0526361bf78724c1f20be248d428e365433c07ef" - integrity sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA== - dependencies: - arch "^2.1.0" - execa "^0.8.0" - cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -7067,11 +6771,6 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colord@^2.9.1: - version "2.9.3" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" - integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== - colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16: version "2.0.19" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" @@ -7089,7 +6788,7 @@ commander@^10.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== -commander@^2.18.0, commander@^2.20.0, commander@~2.20.3: +commander@^2.20.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -7104,11 +6803,6 @@ commander@^6.1.0, commander@^6.2.1: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - commander@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" @@ -7152,26 +6846,13 @@ compatfactory@^0.0.13: dependencies: helpertypes "^0.0.18" -compressible@~2.0.14, compressible@~2.0.16: +compressible@~2.0.16: version "2.0.18" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== dependencies: mime-db ">= 1.43.0 < 2" -compression@1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db" - integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.14" - debug "2.6.9" - on-headers "~1.0.1" - safe-buffer "5.1.2" - vary "~1.1.2" - compression@^1.7.4: version "1.7.4" resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" @@ -7250,11 +6931,6 @@ constant-case@^3.0.4: tslib "^2.0.3" upper-case "^2.0.2" -content-disposition@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= - content-disposition@0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" @@ -7399,7 +7075,7 @@ cross-env@^7.0.2: dependencies: cross-spawn "^7.0.1" -cross-spawn@^5.0.1, cross-spawn@^5.1.0: +cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= @@ -7511,27 +7187,6 @@ cspell@^5.15.2: strip-ansi "^6.0.1" vscode-uri "^3.0.3" -css-blank-pseudo@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-5.0.2.tgz#3df5cd950f64de960974da05e76954fd3d7442f9" - integrity sha512-aCU4AZ7uEcVSUzagTlA9pHciz7aWPKA/YzrEkpdSopJ2pvhIxiQ5sYeMz1/KByxlIo4XBdvMNJAVKMg/GRnhfw== - dependencies: - postcss-selector-parser "^6.0.10" - -css-declaration-sorter@^6.3.1: - version "6.3.1" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec" - integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w== - -css-has-pseudo@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-5.0.2.tgz#8798118c705d858b7aeb9d839a39edd901c1cc83" - integrity sha512-q+U+4QdwwB7T9VEW/LyO6CFrLAeLqOykC5mDqJXc7aKZAhDbq7BvGT13VGJe+IwBfdN2o3Xdw2kJ5IxwV1Sc9Q== - dependencies: - "@csstools/selector-specificity" "^2.0.1" - postcss-selector-parser "^6.0.10" - postcss-value-parser "^4.2.0" - css-loader@^6.7.3: version "6.7.3" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd" @@ -7546,11 +7201,6 @@ css-loader@^6.7.3: postcss-value-parser "^4.2.0" semver "^7.3.8" -css-prefers-color-scheme@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-8.0.2.tgz#a0671f54eb19ed0d30b952574c0af11ec355fb6d" - integrity sha512-OvFghizHJ45x7nsJJUSYLyQNTzsCU8yWjxAc/nhPQg1pbs18LMoET8N3kOweFDPy0JV0OSXN2iqRFhPBHYOeMA== - css-select@^4.1.3: version "4.2.1" resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" @@ -7562,14 +7212,6 @@ css-select@^4.1.3: domutils "^2.8.0" nth-check "^2.0.1" -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - css-tree@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" @@ -7588,72 +7230,11 @@ css.escape@^1.5.1: resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s= -cssdb@^7.4.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.4.1.tgz#61d55c0173126689922a219e15e131e4b5caf422" - integrity sha512-0Q8NOMpXJ3iTDDbUv9grcmQAfdDx4qz+fN/+Md2FGbevT+6+bJNQ2LjB2YIUlLbpBTM32idU1Sb+tb/uGt6/XQ== - cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^5.2.14: - version "5.2.14" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8" - integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A== - dependencies: - css-declaration-sorter "^6.3.1" - cssnano-utils "^3.1.0" - postcss-calc "^8.2.3" - postcss-colormin "^5.3.1" - postcss-convert-values "^5.1.3" - postcss-discard-comments "^5.1.2" - postcss-discard-duplicates "^5.1.0" - postcss-discard-empty "^5.1.1" - postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.7" - postcss-merge-rules "^5.1.4" - postcss-minify-font-values "^5.1.0" - postcss-minify-gradients "^5.1.1" - postcss-minify-params "^5.1.4" - postcss-minify-selectors "^5.2.1" - postcss-normalize-charset "^5.1.0" - postcss-normalize-display-values "^5.1.0" - postcss-normalize-positions "^5.1.1" - postcss-normalize-repeat-style "^5.1.1" - postcss-normalize-string "^5.1.0" - postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.1" - postcss-normalize-url "^5.1.0" - postcss-normalize-whitespace "^5.1.1" - postcss-ordered-values "^5.1.3" - postcss-reduce-initial "^5.1.2" - postcss-reduce-transforms "^5.1.0" - postcss-svgo "^5.1.0" - postcss-unique-selectors "^5.1.1" - -cssnano-utils@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" - integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== - -cssnano@^5.1.15: - version "5.1.15" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf" - integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw== - dependencies: - cssnano-preset-default "^5.2.14" - lilconfig "^2.0.3" - yaml "^1.10.2" - -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== - dependencies: - css-tree "^1.1.2" - cssom@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" @@ -8135,11 +7716,6 @@ dom-serializer@^1.0.1, dom-serializer@^1.3.2: domhandler "^4.2.0" entities "^2.0.0" -dom-walk@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" - integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== - domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" @@ -8203,7 +7779,7 @@ dset@^3.1.2: resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.2.tgz#89c436ca6450398396dc6538ea00abc0c54cd45a" integrity sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q== -duplexer@^0.1.1, duplexer@~0.1.1: +duplexer@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== @@ -8233,11 +7809,6 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^2.6.1: - version "2.7.4" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" - integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== - ejs@^3.1.6: version "3.1.9" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" @@ -9165,32 +8736,6 @@ execa@4.1.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" - integrity sha1-2NdrvBtVIX7RkP1t1J08d07PyNo= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -9308,7 +8853,7 @@ expect@^29.0.0: jest-message-util "^29.5.0" jest-util "^29.5.0" -express@^4.16.3, express@^4.17.3, express@^4.19.2: +express@^4.17.3, express@^4.19.2: version "4.19.2" resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== @@ -9409,11 +8954,6 @@ fast-decode-uri-component@^1.0.1: resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543" integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg== -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -9452,7 +8992,7 @@ fast-querystring@^1.1.1: dependencies: fast-decode-uri-component "^1.0.1" -fast-url-parser@1.1.3, fast-url-parser@^1.1.3: +fast-url-parser@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= @@ -9612,11 +9152,6 @@ filename-regex@^2.0.0: resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= -filesize@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" - integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== - fill-range@^2.1.0: version "2.2.4" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" @@ -9779,24 +9314,6 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -fork-ts-checker-webpack-plugin@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.3.0.tgz#a9c984a018493962360d7c7e77a67b44a2d5f3aa" - integrity sha512-IN+XTzusCjR5VgntYFgxbxVx3WraPRnKehBFrf00cMSrtUuW9MsG9dhL6MWpY6MkjC3wVwoujfCDgZZCQwbswA== - dependencies: - "@babel/code-frame" "^7.16.7" - chalk "^4.1.2" - chokidar "^3.5.3" - cosmiconfig "^7.0.1" - deepmerge "^4.2.2" - fs-extra "^10.0.0" - memfs "^3.4.1" - minimatch "^3.0.4" - node-abort-controller "^3.0.1" - schema-utils "^3.1.1" - semver "^7.3.5" - tapable "^2.2.1" - form-data-encoder@^1.7.1: version "1.7.2" resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz#1f1ae3dccf58ed4690b86d87e4f57c654fbab040" @@ -9842,11 +9359,6 @@ forwarded@0.2.0: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== -fraction.js@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" - integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== - framer-motion@^10.0.0: version "10.18.0" resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-10.18.0.tgz#1f4fc51403996ea7170af885bd44a7079d255950" @@ -10046,11 +9558,6 @@ get-stdin@^8.0.0: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= - get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -10219,14 +9726,6 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" -global@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" - integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== - dependencies: - min-document "^2.19.0" - process "^0.11.10" - globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -10377,14 +9876,6 @@ graphql@^16.8.1: resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07" integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw== -gzip-size@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" - integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== - dependencies: - duplexer "^0.1.1" - pify "^4.0.1" - handle-thing@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" @@ -10510,13 +10001,6 @@ highlight.js@^9.15.6: resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c" integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg== -hoist-non-react-statics@^3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" - integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== - dependencies: - react-is "^16.7.0" - homedir-polyfill@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -10524,11 +10008,6 @@ homedir-polyfill@^1.0.0: dependencies: parse-passwd "^1.0.0" -hoopy@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" - integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== - hosted-git-info@^2.1.4: version "2.8.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" @@ -12401,11 +11880,6 @@ kleur@^4.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780" integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ== -klona@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" - integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== - kolorist@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c" @@ -12536,11 +12010,6 @@ lightningcss@^1.22.0: lightningcss-win32-arm64-msvc "1.26.0" lightningcss-win32-x64-msvc "1.26.0" -lilconfig@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4" - integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg== - lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -12658,7 +12127,7 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== -loader-utils@^1.0.0, loader-utils@^1.1.0: +loader-utils@^1.0.0: version "1.4.2" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== @@ -12748,7 +12217,7 @@ lodash.isstring@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw== -lodash.memoize@4.x, lodash.memoize@^4.1.2: +lodash.memoize@4.x: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= @@ -12773,11 +12242,6 @@ lodash.startcase@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" integrity sha1-lDbjTtJgk+1/+uGTYUQ1CRXZrdg= -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0, lodash@~4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -13129,11 +12593,6 @@ mdast-util-to-string@^4.0.0: dependencies: "@types/mdast" "^4.0.0" -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - mdn-data@2.0.30: version "2.0.30" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" @@ -13149,7 +12608,7 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -memfs@^3.4.1, memfs@^3.4.3: +memfs@^3.4.3: version "3.4.13" resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345" integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg== @@ -13532,18 +12991,6 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" - integrity sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ== - -mime-types@2.1.18: - version "2.1.18" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" - integrity sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ== - dependencies: - mime-db "~1.33.0" - mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" @@ -13581,37 +13028,16 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -min-document@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= - dependencies: - dom-walk "^0.1.0" - min-indent@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@^2.7.2: - version "2.7.2" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz#e049d3ea7d3e4e773aad585c6cb329ce0c7b72d7" - integrity sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw== - dependencies: - schema-utils "^4.0.0" - minimalistic-assert@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - minimatch@5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" @@ -13950,11 +13376,6 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= - normalize-url@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" @@ -14131,7 +13552,7 @@ on-finished@2.4.1: dependencies: ee-first "1.1.1" -on-headers@~1.0.1, on-headers@~1.0.2: +on-headers@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== @@ -14186,11 +13607,6 @@ opencollective-postinstall@^2.0.2: resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== -opener@^1.5.1: - version "1.5.2" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" - integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== - optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -14526,11 +13942,6 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-is-inside@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= - path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -14564,11 +13975,6 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= -path-to-regexp@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" - integrity sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ== - path-to-regexp@^2.2.1: version "2.4.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704" @@ -14688,163 +14094,6 @@ possible-typed-array-names@^1.0.0: resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== -postcss-attribute-case-insensitive@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-6.0.2.tgz#e843091859323342e461878d201ee70278809e01" - integrity sha512-IRuCwwAAQbgaLhxQdQcIIK0dCVXg3XDUnzgKD8iwdiYdwU4rMWRWyl/W9/0nA4ihVpq5pyALiHB2veBJ0292pw== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-calc@^8.2.3: - version "8.2.4" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" - integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== - dependencies: - postcss-selector-parser "^6.0.9" - postcss-value-parser "^4.2.0" - -postcss-clamp@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz#7263e95abadd8c2ba1bd911b0b5a5c9c93e02363" - integrity sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-color-functional-notation@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-5.0.2.tgz#6d03c928aa3a13487703af86c301bdcd501e7430" - integrity sha512-M6ygxWOyd6eWf3sd1Lv8xi4SeF4iBPfJvkfMU4ITh8ExJc1qhbvh/U8Cv/uOvBgUVOMDdScvCdlg8+hREQzs7w== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-color-hex-alpha@^9.0.0: - version "9.0.2" - resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-9.0.2.tgz#6d3ed50342802469880981a1999515d003ff7d79" - integrity sha512-SfPjgr//VQ/DOCf80STIAsdAs7sbIbxATvVmd+Ec7JvR8onz9pjawhq3BJM3Pie40EE3TyB0P6hft16D33Nlyg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-color-rebeccapurple@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-8.0.2.tgz#c0f2dcf1ef4dd393314920aa181cca8c390a2648" - integrity sha512-xWf/JmAxVoB5bltHpXk+uGRoGFwu4WDAR7210el+iyvTdqiKpDhtcT8N3edXMoVJY0WHFMrKMUieql/wRNiXkw== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-colormin@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f" - integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - colord "^2.9.1" - postcss-value-parser "^4.2.0" - -postcss-convert-values@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393" - integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA== - dependencies: - browserslist "^4.21.4" - postcss-value-parser "^4.2.0" - -postcss-custom-media@^9.1.0: - version "9.1.2" - resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-9.1.2.tgz#0e9c34b0b5325edc2c5f42f47543cb64d777764b" - integrity sha512-osM9g4UKq4XKimAC7RAXroqi3BXpxfwTswAJQiZdrBjWGFGEyxQrY5H2eDWI8F+MEvEUfYDxA8scqi3QWROCSw== - dependencies: - "@csstools/cascade-layer-name-parser" "^1.0.0" - "@csstools/css-parser-algorithms" "^2.0.0" - "@csstools/css-tokenizer" "^2.0.0" - "@csstools/media-query-list-parser" "^2.0.0" - -postcss-custom-properties@^13.1.0: - version "13.1.4" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.1.4.tgz#590e5770137011001602806da51243b6c82c1cde" - integrity sha512-iSAdaZrM3KMec8cOSzeTUNXPYDlhqsMJHpt62yrjwG6nAnMtRHPk5JdMzGosBJtqEahDolvD5LNbcq+EZ78o5g== - dependencies: - "@csstools/cascade-layer-name-parser" "^1.0.0" - "@csstools/css-parser-algorithms" "^2.0.0" - "@csstools/css-tokenizer" "^2.0.0" - postcss-value-parser "^4.2.0" - -postcss-custom-selectors@^7.1.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.2.tgz#e100e9dd628d969a651d7d310cdfd25b27b58d4b" - integrity sha512-jX7VlE3jrgfBIOfxiGNRFq81xUoHSZhvxhQurzE7ZFRv+bUmMwB7/XnA0nNlts2CwNtbXm4Ozy0ZAYKHlCRmBQ== - dependencies: - "@csstools/cascade-layer-name-parser" "^1.0.0" - "@csstools/css-parser-algorithms" "^2.0.0" - "@csstools/css-tokenizer" "^2.0.0" - postcss-selector-parser "^6.0.4" - -postcss-dir-pseudo-class@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-7.0.2.tgz#71618b7eb4abe067845d11b3c8f322760c9b3e88" - integrity sha512-cMnslilYxBf9k3qejnovrUONZx1rXeUZJw06fgIUBzABJe3D2LiLL5WAER7Imt3nrkaIgG05XZBztueLEf5P8w== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-discard-comments@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" - integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ== - -postcss-discard-duplicates@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" - integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== - -postcss-discard-empty@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" - integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== - -postcss-discard-overridden@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" - integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== - -postcss-double-position-gradients@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-4.0.2.tgz#855a23201f26be447210504e9b668429cbf4640c" - integrity sha512-GXL1RmFREDK4Q9aYvI2RhVrA6a6qqSMQQ5ke8gSH1xgV6exsqbcJpIumC7AOgooH6/WIG3/K/T8xxAiVHy/tJg== - dependencies: - "@csstools/postcss-progressive-custom-properties" "^2.0.0" - postcss-value-parser "^4.2.0" - -postcss-focus-visible@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-8.0.2.tgz#a7ac26ffe3e9c2bd17d7200d75e2d79ee8110891" - integrity sha512-f/Vd+EC/GaKElknU59esVcRYr/Y3t1ZAQyL4u2xSOgkDy4bMCmG7VP5cGvj3+BTLNE9ETfEuz2nnt4qkZwTTeA== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-focus-within@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-7.0.2.tgz#5d2c866030e66ed22b204c9506de640943310b1c" - integrity sha512-AHAJ89UQBcqBvFgQJE9XasGuwMNkKsGj4D/f9Uk60jFmEBHpAL14DrnSk3Rj+SwZTr/WUG+mh+Rvf8fid/346w== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-font-variant@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66" - integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA== - -postcss-gap-properties@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-4.0.1.tgz#0347d6a84a46bfbe88bedc542cc4b354e04a8338" - integrity sha512-V5OuQGw4lBumPlwHWk/PRfMKjaq/LTGR4WDTemIMCaMevArVfCCA9wBJiL1VjDAd+rzuCIlkRoRvDsSiAaZ4Fg== - -postcss-image-set-function@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-5.0.2.tgz#088e0f535f43e74d6ea8033ff7b0482e2735ea6e" - integrity sha512-Sszjwo0ubETX0Fi5MvpYzsONwrsjeabjMoc5YqHvURFItXgIu3HdCjcVuVKGMPGzKRhgaknmdM5uVWInWPJmeg== - dependencies: - postcss-value-parser "^4.2.0" - postcss-import@15.1.0: version "15.1.0" resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70" @@ -14854,20 +14103,6 @@ postcss-import@15.1.0: read-cache "^1.0.0" resolve "^1.1.7" -postcss-initial@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42" - integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ== - -postcss-lab-function@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-5.1.0.tgz#ed3822feb0f7ff229e6d185929583b16861f7753" - integrity sha512-iZApRTNcpc71uTn7PkzjHtj5cmuZpvu6okX4jHnM5OFi2fG97sodjxkq6SpL65xhW0NviQrAMSX97ntyGVRV0w== - dependencies: - "@csstools/color-helpers" "^1.0.0" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" - postcss-value-parser "^4.2.0" - postcss-lightningcss@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/postcss-lightningcss/-/postcss-lightningcss-1.0.0.tgz#a755fd04d5a20f2673afb15afe317a6563ddb8c1" @@ -14876,77 +14111,6 @@ postcss-lightningcss@^1.0.0: browserslist "^4.19.1" lightningcss "^1.22.0" -postcss-loader@7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.2.tgz#b53ff44a26fba3688eee92a048c7f2d4802e23bb" - integrity sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg== - dependencies: - cosmiconfig "^7.0.0" - klona "^2.0.5" - semver "^7.3.8" - -postcss-logical@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-6.1.0.tgz#c33ae75d3edaea7eb821e76dc4e6d0ecedc3200d" - integrity sha512-qb1+LpClhYjxac8SfOcWotnY3unKZesDqIOm+jnGt8rTl7xaIWpE2bPGZHxflOip1E/4ETo79qlJyRL3yrHn1g== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-media-minmax@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5" - integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ== - -postcss-merge-longhand@^5.1.7: - version "5.1.7" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16" - integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ== - dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^5.1.1" - -postcss-merge-rules@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c" - integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - cssnano-utils "^3.1.0" - postcss-selector-parser "^6.0.5" - -postcss-minify-font-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" - integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-minify-gradients@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" - integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== - dependencies: - colord "^2.9.1" - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-minify-params@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352" - integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw== - dependencies: - browserslist "^4.21.4" - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-minify-selectors@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" - integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg== - dependencies: - postcss-selector-parser "^6.0.5" - postcss-modules-extract-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" @@ -14983,203 +14147,7 @@ postcss-nesting@^10.1.7: "@csstools/selector-specificity" "1.0.0" postcss-selector-parser "^6.0.10" -postcss-nesting@^11.0.0: - version "11.2.1" - resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-11.2.1.tgz#260806f20971c82700d327468b49d1c1b44f1790" - integrity sha512-E6Jq74Jo/PbRAtZioON54NPhUNJYxVWhwxbweYl1vAoBYuGlDIts5yhtKiZFLvkvwT73e/9nFrW3oMqAtgG+GQ== - dependencies: - "@csstools/selector-specificity" "^2.0.0" - postcss-selector-parser "^6.0.10" - -postcss-normalize-charset@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" - integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== - -postcss-normalize-display-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" - integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-positions@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92" - integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-repeat-style@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2" - integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-string@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" - integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-timing-functions@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" - integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-unicode@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030" - integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA== - dependencies: - browserslist "^4.21.4" - postcss-value-parser "^4.2.0" - -postcss-normalize-url@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" - integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== - dependencies: - normalize-url "^6.0.1" - postcss-value-parser "^4.2.0" - -postcss-normalize-whitespace@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" - integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-opacity-percentage@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz#5b89b35551a556e20c5d23eb5260fbfcf5245da6" - integrity sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A== - -postcss-ordered-values@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38" - integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ== - dependencies: - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-overflow-shorthand@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-4.0.1.tgz#cb61ca24d8c4e1dbf14d85181b017cfa6953aa34" - integrity sha512-HQZ0qi/9iSYHW4w3ogNqVNr2J49DHJAl7r8O2p0Meip38jsdnRPgiDW7r/LlLrrMBMe3KHkvNtAV2UmRVxzLIg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-page-break@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f" - integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ== - -postcss-place@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-8.0.1.tgz#408d7a27e99192df51c95fe62a3a34def62aa66a" - integrity sha512-Ow2LedN8sL4pq8ubukO77phSVt4QyCm35ZGCYXKvRFayAwcpgB0sjNJglDoTuRdUL32q/ZC1VkPBo0AOEr4Uiw== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-preset-env@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-8.0.1.tgz#d249c137febc037dd5dbb97e18f94dba4dd0cda8" - integrity sha512-IUbymw0JlUbyVG+I85963PNWgPp3KhnFa1sxU7M/2dGthxV8e297P0VV5W9XcyypoH4hirH2fp1c6fmqh6YnSg== - dependencies: - "@csstools/postcss-cascade-layers" "^3.0.0" - "@csstools/postcss-color-function" "^2.0.0" - "@csstools/postcss-font-format-keywords" "^2.0.0" - "@csstools/postcss-hwb-function" "^2.0.0" - "@csstools/postcss-ic-unit" "^2.0.0" - "@csstools/postcss-is-pseudo-class" "^3.0.0" - "@csstools/postcss-logical-float-and-clear" "^1.0.0" - "@csstools/postcss-logical-resize" "^1.0.0" - "@csstools/postcss-logical-viewport-units" "^1.0.0" - "@csstools/postcss-media-queries-aspect-ratio-number-values" "^1.0.0" - "@csstools/postcss-nested-calc" "^2.0.0" - "@csstools/postcss-normalize-display-values" "^2.0.0" - "@csstools/postcss-oklab-function" "^2.0.0" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" - "@csstools/postcss-scope-pseudo-class" "^2.0.0" - "@csstools/postcss-stepped-value-functions" "^2.0.0" - "@csstools/postcss-text-decoration-shorthand" "^2.0.0" - "@csstools/postcss-trigonometric-functions" "^2.0.0" - "@csstools/postcss-unset-value" "^2.0.0" - autoprefixer "^10.4.13" - browserslist "^4.21.4" - css-blank-pseudo "^5.0.0" - css-has-pseudo "^5.0.0" - css-prefers-color-scheme "^8.0.0" - cssdb "^7.4.0" - postcss-attribute-case-insensitive "^6.0.0" - postcss-clamp "^4.1.0" - postcss-color-functional-notation "^5.0.0" - postcss-color-hex-alpha "^9.0.0" - postcss-color-rebeccapurple "^8.0.0" - postcss-custom-media "^9.1.0" - postcss-custom-properties "^13.1.0" - postcss-custom-selectors "^7.1.0" - postcss-dir-pseudo-class "^7.0.0" - postcss-double-position-gradients "^4.0.0" - postcss-focus-visible "^8.0.0" - postcss-focus-within "^7.0.0" - postcss-font-variant "^5.0.0" - postcss-gap-properties "^4.0.0" - postcss-image-set-function "^5.0.0" - postcss-initial "^4.0.1" - postcss-lab-function "^5.0.0" - postcss-logical "^6.0.0" - postcss-media-minmax "^5.0.0" - postcss-nesting "^11.0.0" - postcss-opacity-percentage "^1.1.3" - postcss-overflow-shorthand "^4.0.0" - postcss-page-break "^3.0.4" - postcss-place "^8.0.0" - postcss-pseudo-class-any-link "^8.0.0" - postcss-replace-overflow-wrap "^4.0.0" - postcss-selector-not "^7.0.0" - postcss-value-parser "^4.2.0" - -postcss-pseudo-class-any-link@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-8.0.2.tgz#f5738503f2045de0c4dc216eca99bd835f74e42e" - integrity sha512-FYTIuRE07jZ2CW8POvctRgArQJ43yxhr5vLmImdKUvjFCkR09kh8pIdlCwdx/jbFm7MiW4QP58L4oOUv3grQYA== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-reduce-initial@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6" - integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - -postcss-reduce-transforms@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" - integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-replace-overflow-wrap@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319" - integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw== - -postcss-selector-not@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-7.0.1.tgz#8142e90c8eb6c8c5faecb3e9d96d4353d02e94fb" - integrity sha512-1zT5C27b/zeJhchN7fP0kBr16Cc61mu7Si9uWWLoA3Px/D9tIJPKchJCkUH3tPO5D0pCFmGeApAv8XpXBQJ8SQ== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: +postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: version "6.0.11" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== @@ -15187,21 +14155,6 @@ postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selecto cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" - integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== - dependencies: - postcss-value-parser "^4.2.0" - svgo "^2.7.0" - -postcss-unique-selectors@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" - integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== - dependencies: - postcss-selector-parser "^6.0.5" - postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" @@ -15368,16 +14321,7 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - -prop-types@^15.6.1, prop-types@^15.8.1: +prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -15501,11 +14445,6 @@ randombytes@^2.1.0: dependencies: safe-buffer "^5.1.0" -range-parser@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= - range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" @@ -15521,7 +14460,7 @@ raw-body@2.5.2: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: +rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -15539,26 +14478,7 @@ react-dom@^18.2.0: loose-envify "^1.1.0" scheduler "^0.23.0" -react-hot-loader@^4.12.20: - version "4.12.21" - resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.21.tgz#332e830801fb33024b5a147d6b13417f491eb975" - integrity sha512-Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA== - dependencies: - fast-levenshtein "^2.0.6" - global "^4.3.0" - hoist-non-react-statics "^3.3.0" - loader-utils "^1.1.0" - prop-types "^15.6.1" - react-lifecycles-compat "^3.0.4" - shallowequal "^1.1.0" - source-map "^0.7.3" - -"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== - -react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.13.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -15568,10 +14488,10 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react-lifecycles-compat@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" - integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== +react-is@^18.0.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== react-refresh@^0.14.2: version "0.14.2" @@ -15597,14 +14517,6 @@ react-remove-scroll@2.5.5: use-callback-ref "^1.3.0" use-sidecar "^1.1.2" -react-shallow-renderer@^16.15.0: - version "16.15.0" - resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" - integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== - dependencies: - object-assign "^4.1.1" - react-is "^16.12.0 || ^17.0.0 || ^18.0.0" - react-style-singleton@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4" @@ -15614,15 +14526,6 @@ react-style-singleton@^2.2.1: invariant "^2.2.4" tslib "^2.0.0" -react-test-renderer@^18.2.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.2.0.tgz#1dd912bd908ff26da5b9fca4fd1c489b9523d37e" - integrity sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA== - dependencies: - react-is "^18.2.0" - react-shallow-renderer "^16.15.0" - scheduler "^0.23.0" - react@^18.2.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" @@ -15838,14 +14741,6 @@ regexpu-core@^5.3.1: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.1.0" -registry-auth-token@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" - integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ== - dependencies: - rc "^1.1.6" - safe-buffer "^5.0.1" - registry-auth-token@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" @@ -15853,13 +14748,6 @@ registry-auth-token@^4.0.0: dependencies: rc "^1.2.8" -registry-url@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI= - dependencies: - rc "^1.0.1" - registry-url@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" @@ -15951,13 +14839,6 @@ request-progress@^3.0.0: dependencies: throttleit "^1.0.0" -require-context.macro@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/require-context.macro/-/require-context.macro-1.2.2.tgz#84bc90f6b9c6dec3a840c84cfd6b2dd92884e34d" - integrity sha512-qibgUj+t0YeBAIsQSqgY3iwFrwQoAV7mmZmvdEpGwe1eAS7iunLpINsRYX/lyuHtJDeJdF7U92jXNzbuDeM2RA== - dependencies: - "@types/webpack-env" "^1.14.0" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -16424,20 +15305,6 @@ serialize-javascript@^6.0.0: dependencies: randombytes "^2.1.0" -serve-handler@6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" - integrity sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w== - dependencies: - bytes "3.0.0" - content-disposition "0.5.2" - fast-url-parser "1.1.3" - mime-types "2.1.18" - minimatch "3.0.4" - path-is-inside "1.0.2" - path-to-regexp "2.2.1" - range-parser "1.2.0" - serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" @@ -16461,21 +15328,6 @@ serve-static@1.15.0, serve-static@^1.14.1: parseurl "~1.3.3" send "0.18.0" -serve@^11.3.0: - version "11.3.2" - resolved "https://registry.yarnpkg.com/serve/-/serve-11.3.2.tgz#b905e980616feecd170e51c8f979a7b2374098f5" - integrity sha512-yKWQfI3xbj/f7X1lTBg91fXBP0FqjJ4TEi+ilES5yzH0iKJpN5LjNb1YzIfQg9Rqn4ECUS2SOf2+Kmepogoa5w== - dependencies: - "@zeit/schemas" "2.6.0" - ajv "6.5.3" - arg "2.0.0" - boxen "1.3.0" - chalk "2.4.1" - clipboardy "1.2.3" - compression "1.7.3" - serve-handler "6.1.3" - update-check "1.5.2" - set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -16540,11 +15392,6 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" -shallowequal@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" - integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -16851,11 +15698,6 @@ stable-hash@^0.0.4: resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.4.tgz#55ae7dadc13e4b3faed13601587cec41859b42f7" integrity sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g== -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - stack-utils@^2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" @@ -16954,7 +15796,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -17210,14 +16052,6 @@ styled-jsx@5.1.1: dependencies: client-only "0.0.1" -stylehacks@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9" - integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw== - dependencies: - browserslist "^4.21.4" - postcss-selector-parser "^6.0.4" - subscriptions-transport-ws@0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz#baf88f050cba51d52afe781de5e81b3c31f89883" @@ -17318,19 +16152,6 @@ svg-parser@^2.0.4: resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== -svgo@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== - dependencies: - "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - picocolors "^1.0.0" - stable "^0.1.8" - symbol-observable@^1.0.4, symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -17357,7 +16178,7 @@ synckit@^0.9.0: "@pkgr/core" "^0.1.0" tslib "^2.6.2" -tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: +tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== @@ -17398,13 +16219,6 @@ tempy@^0.6.0: type-fest "^0.16.0" unique-string "^2.0.0" -term-size@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" - integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk= - dependencies: - execa "^0.7.0" - term-size@^2.1.0: version "2.2.1" resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" @@ -17620,11 +16434,6 @@ trough@^2.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876" integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g== -tryer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" - integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== - ts-api-utils@^1.0.1, ts-api-utils@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" @@ -18101,14 +16910,6 @@ update-browserslist-db@^1.1.0: escalade "^3.1.2" picocolors "^1.0.1" -update-check@1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/update-check/-/update-check-1.5.2.tgz#2fe09f725c543440b3d7dabe8971f2d5caaedc28" - integrity sha512-1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ== - dependencies: - registry-auth-token "3.3.2" - registry-url "3.1.0" - upper-case-first@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324" @@ -18610,25 +17411,6 @@ webidl-conversions@^6.1.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== -webpack-bundle-analyzer@^3.6.1: - version "3.8.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz#ce6b3f908daf069fd1f7266f692cbb3bded9ba16" - integrity sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw== - dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" - bfj "^6.1.1" - chalk "^2.4.1" - commander "^2.18.0" - ejs "^2.6.1" - express "^4.16.3" - filesize "^3.6.1" - gzip-size "^5.0.0" - lodash "^4.17.15" - mkdirp "^0.5.1" - opener "^1.5.1" - ws "^6.0.0" - webpack-cli@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a" @@ -18925,13 +17707,6 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" -widest-line@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" - integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA== - dependencies: - string-width "^2.1.1" - wildcard@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" @@ -19225,13 +18000,6 @@ ws@8.17.1, ws@>=8.7.0, ws@^8.12.0, ws@^8.4.2: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== - dependencies: - async-limiter "~1.0.0" - wsrun@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/wsrun/-/wsrun-5.2.4.tgz#6eb6c3ccd3327721a8df073a5e3578fb0dea494e" @@ -19313,7 +18081,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: +yaml@^1.10.0, yaml@^1.7.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== From 8efb873458489ce3497d917bcafd4ad8dfcbe6c8 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 16:40:39 +0200 Subject: [PATCH 05/48] [4] update graphql to `16.9.0` and use vite `define` configuration to remove development code from cdn bundle (#3683) * vite more more more * fix demo * fix cspell * fix dev * update cypress to v13 * upd cache key * remove webpack deps * fix `yarn jest --coverage` * upd graphql * aa * yarn.lock * fix tests --- .changeset/metal-glasses-bow.md | 5 +++++ examples/cm6-graphql-legacy-parcel/package.json | 2 +- examples/cm6-graphql-parcel/package.json | 2 +- examples/graphiql-create-react-app/package.json | 2 +- examples/graphiql-parcel/package.json | 2 +- examples/graphiql-webpack/package.json | 2 +- examples/monaco-graphql-nextjs/package.json | 2 +- examples/monaco-graphql-react-vite/package.json | 2 +- examples/monaco-graphql-webpack/package.json | 2 +- packages/cm6-graphql/package.json | 2 +- packages/codemirror-graphql/package.json | 2 +- packages/graphiql-plugin-code-exporter/package.json | 2 +- packages/graphiql-plugin-explorer/package.json | 2 +- packages/graphiql-react/package.json | 2 +- packages/graphiql-toolkit/package.json | 2 +- packages/graphiql/package.json | 2 +- packages/graphiql/vite.config.mts | 4 +++- packages/graphql-language-service-cli/package.json | 2 +- packages/graphql-language-service-server/package.json | 2 +- packages/graphql-language-service/package.json | 2 +- packages/monaco-graphql/package.json | 2 +- packages/monaco-graphql/test/monaco-editor.test.ts | 2 +- packages/vscode-graphql-execution/package.json | 2 +- packages/vscode-graphql/package.json | 2 +- yarn.lock | 8 ++++---- 25 files changed, 34 insertions(+), 27 deletions(-) create mode 100644 .changeset/metal-glasses-bow.md diff --git a/.changeset/metal-glasses-bow.md b/.changeset/metal-glasses-bow.md new file mode 100644 index 00000000000..48c99bbf5c7 --- /dev/null +++ b/.changeset/metal-glasses-bow.md @@ -0,0 +1,5 @@ +--- +'graphiql': patch +--- + +update graphql to `16.9.0` and use vite `define` configuration to remove development code from cdn bundle diff --git a/examples/cm6-graphql-legacy-parcel/package.json b/examples/cm6-graphql-legacy-parcel/package.json index 320173bbe95..8a5077a186d 100644 --- a/examples/cm6-graphql-legacy-parcel/package.json +++ b/examples/cm6-graphql-legacy-parcel/package.json @@ -25,7 +25,7 @@ "@codemirror/basic-setup": "^0.20.0", "@codemirror/language": "^0.20.0", "codemirror-graphql": "^2.0.2", - "graphql": "^16.8.1" + "graphql": "^16.9.0" }, "devDependencies": { "parcel-bundler": "^1.12.4", diff --git a/examples/cm6-graphql-parcel/package.json b/examples/cm6-graphql-parcel/package.json index 890d04885d1..2b3770de34c 100644 --- a/examples/cm6-graphql-parcel/package.json +++ b/examples/cm6-graphql-parcel/package.json @@ -29,7 +29,7 @@ "@codemirror/theme-one-dark": "6.0.0", "@codemirror/view": "6.1.2", "cm6-graphql": "0.0.1", - "graphql": "^16.8.1" + "graphql": "^16.9.0" }, "devDependencies": { "parcel": "^2.6.2", diff --git a/examples/graphiql-create-react-app/package.json b/examples/graphiql-create-react-app/package.json index beac9385e65..1625bf662b2 100644 --- a/examples/graphiql-create-react-app/package.json +++ b/examples/graphiql-create-react-app/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "graphiql": "^2.2.0", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-scripts": "5.0.1" diff --git a/examples/graphiql-parcel/package.json b/examples/graphiql-parcel/package.json index 53b1c11d246..293bd6c9ba6 100644 --- a/examples/graphiql-parcel/package.json +++ b/examples/graphiql-parcel/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "graphiql": "^2.2.0", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index f276c54542c..ecbc1338459 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -14,7 +14,7 @@ "@graphiql/toolkit": "^0.9.2", "@graphiql/react": "^0.23.0", "graphiql": "^3.4.0", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-ws": "^5.5.5", "react": "^18.2.0", "regenerator-runtime": "^0.13.9" diff --git a/examples/monaco-graphql-nextjs/package.json b/examples/monaco-graphql-nextjs/package.json index 3d7c4dc95f3..6a952a96861 100644 --- a/examples/monaco-graphql-nextjs/package.json +++ b/examples/monaco-graphql-nextjs/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@graphiql/toolkit": "^0.9.2", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-ws": "^5.5.5", "jsonc-parser": "^3.2.0", "marked": "^4.2.12", diff --git a/examples/monaco-graphql-react-vite/package.json b/examples/monaco-graphql-react-vite/package.json index fd4f8ce923a..465eed4cf8c 100644 --- a/examples/monaco-graphql-react-vite/package.json +++ b/examples/monaco-graphql-react-vite/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "dependencies": { "@graphiql/toolkit": "^0.9.2", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-language-service": "^5.2.2", "jsonc-parser": "^3.2.0", "monaco-editor": "^0.39.0", diff --git a/examples/monaco-graphql-webpack/package.json b/examples/monaco-graphql-webpack/package.json index 093c7f662fe..44963c020ba 100644 --- a/examples/monaco-graphql-webpack/package.json +++ b/examples/monaco-graphql-webpack/package.json @@ -9,7 +9,7 @@ "start": "cross-env NODE_ENV=development webpack-cli serve" }, "dependencies": { - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-language-service": "^5.2.2", "json-schema": "^0.4.0", "jsonc-parser": "^3.2.0", diff --git a/packages/cm6-graphql/package.json b/packages/cm6-graphql/package.json index 74a3fb5832c..5a33799ce55 100644 --- a/packages/cm6-graphql/package.json +++ b/packages/cm6-graphql/package.json @@ -30,7 +30,7 @@ "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.1.0", "esbuild": "0.18.10", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "rollup": "^2.60.2", "rollup-plugin-dts": "^4.0.1", "rollup-plugin-esbuild": "^4.9.1", diff --git a/packages/codemirror-graphql/package.json b/packages/codemirror-graphql/package.json index 23b29225446..9fcfa64eacb 100644 --- a/packages/codemirror-graphql/package.json +++ b/packages/codemirror-graphql/package.json @@ -51,7 +51,7 @@ "@codemirror/language": "^6.0.0", "codemirror": "^5.65.3", "cross-env": "^7.0.2", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "rimraf": "^3.0.2", "sane": "2.0.0" } diff --git a/packages/graphiql-plugin-code-exporter/package.json b/packages/graphiql-plugin-code-exporter/package.json index 66ca389d957..bbac380204f 100644 --- a/packages/graphiql-plugin-code-exporter/package.json +++ b/packages/graphiql-plugin-code-exporter/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@graphiql/react": "^0.23.0", "@vitejs/plugin-react": "^4.3.1", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "postcss-nesting": "^10.1.7", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index ed4213f1c44..e6bf56bbcfc 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@graphiql/react": "^0.23.0", "@vitejs/plugin-react": "^4.3.1", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "react": "^18.2.0", "react-dom": "^18.2.0", "typescript": "^4.6.3", diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index 77b14bb8b4f..8b210faa4c3 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -70,7 +70,7 @@ "@testing-library/react": "14.0.0", "@types/set-value": "^4.0.1", "@vitejs/plugin-react": "^4.3.1", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "postcss-nesting": "^10.1.7", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/graphiql-toolkit/package.json b/packages/graphiql-toolkit/package.json index 20face9b64a..de12f431f79 100644 --- a/packages/graphiql-toolkit/package.json +++ b/packages/graphiql-toolkit/package.json @@ -24,7 +24,7 @@ "meros": "^1.1.4" }, "devDependencies": { - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-ws": "^5.5.5", "isomorphic-fetch": "^3.0.0", "subscriptions-transport-ws": "0.11.0" diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index 23d505ad8a5..765cbdd9a57 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -55,7 +55,7 @@ "cross-env": "^7.0.2", "cypress": "^13.13.2", "express": "^4.19.2", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-http": "^1.19.0", "graphql-subscriptions": "^2.0.0", "postcss": "8.4.31", diff --git a/packages/graphiql/vite.config.mts b/packages/graphiql/vite.config.mts index 23959e9a1d9..e5709514b9a 100644 --- a/packages/graphiql/vite.config.mts +++ b/packages/graphiql/vite.config.mts @@ -5,7 +5,9 @@ import commonjs from 'vite-plugin-commonjs'; const umdConfig = defineConfig({ define: { - 'process.env.NODE_ENV': `"${process.env.NODE_ENV}"`, + // https://github.com/graphql/graphql-js/blob/16.x.x/website/docs/tutorials/going-to-production.md#vite + 'globalThis.process': 'true', + 'process.env.NODE_ENV': '"production"', }, // To bundle `const { createClient } = require('graphql-ws')` in `createWebsocketsFetcherFromUrl` function plugins: [commonjs()], diff --git a/packages/graphql-language-service-cli/package.json b/packages/graphql-language-service-cli/package.json index 5aa65f3e105..5bb897de2ac 100644 --- a/packages/graphql-language-service-cli/package.json +++ b/packages/graphql-language-service-cli/package.json @@ -42,6 +42,6 @@ "yargs": "^16.2.0" }, "devDependencies": { - "graphql": "^16.8.1" + "graphql": "^16.9.0" } } diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json index 98d39128804..4eba4248937 100644 --- a/packages/graphql-language-service-server/package.json +++ b/packages/graphql-language-service-server/package.json @@ -68,7 +68,7 @@ "@types/mock-fs": "^4.13.4", "cross-env": "^7.0.2", "debounce-promise": "^3.1.2", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "mock-fs": "^5.2.0" } } diff --git a/packages/graphql-language-service/package.json b/packages/graphql-language-service/package.json index ac6b50ff1d3..193d4ea226b 100644 --- a/packages/graphql-language-service/package.json +++ b/packages/graphql-language-service/package.json @@ -45,7 +45,7 @@ "@types/json-schema": "7.0.9", "@types/picomatch": "^2.3.0", "benchmark": "^2.1.4", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-config": "5.0.3", "lodash": "^4.17.15", "platform": "^1.3.5", diff --git a/packages/monaco-graphql/package.json b/packages/monaco-graphql/package.json index 7a08cd9ee81..15b7e2bcc8b 100644 --- a/packages/monaco-graphql/package.json +++ b/packages/monaco-graphql/package.json @@ -71,7 +71,7 @@ }, "devDependencies": { "execa": "^7.1.1", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "monaco-editor": "^0.39.0", "prettier": "3.3.2", "vscode-languageserver-types": "^3.17.1" diff --git a/packages/monaco-graphql/test/monaco-editor.test.ts b/packages/monaco-graphql/test/monaco-editor.test.ts index 018c5c05a52..d1a566717a9 100644 --- a/packages/monaco-graphql/test/monaco-editor.test.ts +++ b/packages/monaco-graphql/test/monaco-editor.test.ts @@ -13,7 +13,7 @@ describe('monaco-editor', () => { // expect(lines[0]).toBe('$ vite build'); // expect(lines[1]).toMatch(' building for production...'); // expect(lines[2]).toBe('transforming...'); - expect(lines[3]).toMatch('✓ 843 modules transformed.'); + expect(lines[3]).toMatch('✓ 844 modules transformed.'); // expect(lines[4]).toBe('rendering chunks...'); // expect(lines[5]).toBe('computing gzip size...'); // expect(lines[6]).toMatch('dist/index.html'); diff --git a/packages/vscode-graphql-execution/package.json b/packages/vscode-graphql-execution/package.json index 655e6dcd5f1..c7af7629bba 100644 --- a/packages/vscode-graphql-execution/package.json +++ b/packages/vscode-graphql-execution/package.json @@ -109,7 +109,7 @@ "cosmiconfig": "8.2.0", "cosmiconfig-toml-loader": "^1.0.0", "dotenv": "10.0.0", - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-config": "5.0.3", "graphql-tag": "2.12.6", "graphql-ws": "5.10.0", diff --git a/packages/vscode-graphql/package.json b/packages/vscode-graphql/package.json index 775e8ca17c9..6aa26d92c70 100644 --- a/packages/vscode-graphql/package.json +++ b/packages/vscode-graphql/package.json @@ -179,7 +179,7 @@ "ovsx": "0.8.3" }, "dependencies": { - "graphql": "^16.8.1", + "graphql": "^16.9.0", "graphql-language-service-server": "^2.13.2", "vscode-languageclient": "8.0.2", "typescript": "^5.3.3" diff --git a/yarn.lock b/yarn.lock index 475b56b132e..60998acc168 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9871,10 +9871,10 @@ graphql-ws@5.14.0, graphql-ws@^5.5.5: resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.14.0.tgz#766f249f3974fc2c48fae0d1fb20c2c4c79cd591" integrity sha512-itrUTQZP/TgswR4GSSYuwWUzrE/w5GhbwM2GX3ic2U7aw33jgEsayfIlvaj7/GcIvZgNMzsPTrE5hqPuFUiE5g== -graphql@^16.8.1: - version "16.8.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07" - integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw== +graphql@^16.9.0: + version "16.9.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.9.0.tgz#1c310e63f16a49ce1fbb230bd0a000e99f6f115f" + integrity sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw== handle-thing@^2.0.0: version "2.0.1" From 0fdd9b9f32513d96281f577a5d9bd2fefb5f05d4 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 16:56:32 +0200 Subject: [PATCH 06/48] remove `data-testid="graphiql-container"` (#3688) --- .changeset/hungry-spiders-cheat.md | 5 +++++ packages/graphiql/src/components/GraphiQL.tsx | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .changeset/hungry-spiders-cheat.md diff --git a/.changeset/hungry-spiders-cheat.md b/.changeset/hungry-spiders-cheat.md new file mode 100644 index 00000000000..2f22a97f550 --- /dev/null +++ b/.changeset/hungry-spiders-cheat.md @@ -0,0 +1,5 @@ +--- +'graphiql': major +--- + +remove `data-testid="graphiql-container"` diff --git a/packages/graphiql/src/components/GraphiQL.tsx b/packages/graphiql/src/components/GraphiQL.tsx index a2757cca3b4..ad8bed5c6f9 100644 --- a/packages/graphiql/src/components/GraphiQL.tsx +++ b/packages/graphiql/src/components/GraphiQL.tsx @@ -462,10 +462,7 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) { return ( -
+
{pluginContext?.plugins.map((plugin, index) => { From c5b3aa260ff54b8187d2215bb0b509cd77af6bef Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 17:00:33 +0200 Subject: [PATCH 07/48] commit `pre.json` until `graphiql-v4` will be added to list of authorized branches to deploy --- .changeset/{pre.json => pre.json.bak} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changeset/{pre.json => pre.json.bak} (100%) diff --git a/.changeset/pre.json b/.changeset/pre.json.bak similarity index 100% rename from .changeset/pre.json rename to .changeset/pre.json.bak From 61fc27a8e8729d817718bebad472d2fea60b87f5 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 17:02:09 +0200 Subject: [PATCH 08/48] remove `graphiql-v4` from release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df89b238eb8..bf57ceb65c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: - branches: [main, graphiql-v4] + branches: [main] permissions: {} jobs: release: From 09e700403beb6c7290d165df33a2455ac2196971 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 17:07:03 +0200 Subject: [PATCH 09/48] [v4] remove `disableTabs` option (#3687) * remove `disableTabs` option * format --- .changeset/green-pugs-worry.md | 5 + packages/graphiql/src/components/GraphiQL.tsx | 94 +++++++++---------- 2 files changed, 49 insertions(+), 50 deletions(-) create mode 100644 .changeset/green-pugs-worry.md diff --git a/.changeset/green-pugs-worry.md b/.changeset/green-pugs-worry.md new file mode 100644 index 00000000000..4342a6bc271 --- /dev/null +++ b/.changeset/green-pugs-worry.md @@ -0,0 +1,5 @@ +--- +'graphiql': major +--- + +remove `disableTabs` option diff --git a/packages/graphiql/src/components/GraphiQL.tsx b/packages/graphiql/src/components/GraphiQL.tsx index ad8bed5c6f9..c80c261e180 100644 --- a/packages/graphiql/src/components/GraphiQL.tsx +++ b/packages/graphiql/src/components/GraphiQL.tsx @@ -169,7 +169,6 @@ export function GraphiQL({ > @@ -218,7 +217,6 @@ export type GraphiQLInterfaceProps = WriteableEditorProps & * settings modal. */ showPersistHeadersSettings?: boolean; - disableTabs?: boolean; /** * forcedTheme allows enforcement of a specific theme for GraphiQL. * This is useful when you want to make sure that GraphiQL is always @@ -541,55 +539,51 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) { )}
- {!props.disableTabs && ( - <> - {hasMultipleTabs && ( - - {editorContext.tabs.map((tab, index) => ( - - - { - executionContext.stop(); - editorContext.changeTab(index); - }} - > - {tab.title} - - { - if (editorContext.activeTabIndex === index) { - executionContext.stop(); - } - editorContext.closeTab(index); - }} - /> - - - ))} - - )} - - - - - + {hasMultipleTabs && ( + + {editorContext.tabs.map((tab, index) => ( + + + { + executionContext.stop(); + editorContext.changeTab(index); + }} + > + {tab.title} + + { + if (editorContext.activeTabIndex === index) { + executionContext.stop(); + } + editorContext.closeTab(index); + }} + /> + + + ))} + )} + + + + {logo}
Date: Wed, 7 Aug 2024 18:05:25 +0200 Subject: [PATCH 10/48] commit `pre.json` --- .changeset/{pre.json.bak => pre.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changeset/{pre.json.bak => pre.json} (100%) diff --git a/.changeset/pre.json.bak b/.changeset/pre.json similarity index 100% rename from .changeset/pre.json.bak rename to .changeset/pre.json From 445bf02eff2dbb50d34294818641d83df364d17c Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 7 Aug 2024 19:12:13 +0200 Subject: [PATCH 11/48] add `graphiql-v4` in release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf57ceb65c6..df89b238eb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: - branches: [main] + branches: [main, graphiql-v4] permissions: {} jobs: release: From 82bc961a33c4e9da29dffb4a603035a4909f49ad Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Thu, 8 Aug 2024 00:58:47 +0200 Subject: [PATCH 12/48] [v4] prefer `location` over `window.location` and prefer `navigator` over `window.navigator` (#3692) --- .changeset/spotty-bulldogs-confess.md | 7 +++++ .eslintrc.js | 10 +++++++ package.json | 2 +- packages/graphiql-react/src/editor/common.ts | 12 ++++---- .../src/editor/components/image-preview.tsx | 5 +--- packages/graphiql/resources/renderExample.js | 30 +++++++++---------- packages/graphiql/src/components/GraphiQL.tsx | 4 +-- packages/graphiql/test/images/logo.svg | 22 ++++---------- 8 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 .changeset/spotty-bulldogs-confess.md diff --git a/.changeset/spotty-bulldogs-confess.md b/.changeset/spotty-bulldogs-confess.md new file mode 100644 index 00000000000..eed64fbd7f1 --- /dev/null +++ b/.changeset/spotty-bulldogs-confess.md @@ -0,0 +1,7 @@ +--- +'@graphiql/react': patch +'graphiql': patch +--- + +- prefer `location` over `window.location` +- prefer `navigator` over `window.navigator` diff --git a/.eslintrc.js b/.eslintrc.js index 0a9cdf1f0ec..c901e02b64b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -129,6 +129,16 @@ module.exports = { property: 'localStorage', message: 'Use `localStorage` instead', }, + { + object: 'window', + property: 'location', + message: 'Use `location` instead', + }, + { + object: 'window', + property: 'navigator', + message: 'Use `navigator` instead', + }, ], 'no-return-assign': 'error', 'no-return-await': 'error', diff --git a/package.json b/package.json index 6798fa16fc3..68fa2ec4bb4 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "yarn build-clean && yarn tsc && yarn build:nontsc", "build-bundles": "yarn prebuild-bundles && yarn wsrun:noexamples --stages build-bundles", - "build-bundles-clean": "rimraf '{packages,examples,plugins}/**/{bundle,cdn,webpack}'", + "build-bundles-clean": "rimraf '{packages,examples}/**/{bundle,cdn,webpack}'", "build-clean": "yarn tsc --clean", "build-docs": "rimraf packages/graphiql/typedoc && typedoc packages", "build:nontsc": "yarn wsrun:noexamples --exclude-missing --serial build", diff --git a/packages/graphiql-react/src/editor/common.ts b/packages/graphiql-react/src/editor/common.ts index 720f427b101..8db64d0f5b4 100644 --- a/packages/graphiql-react/src/editor/common.ts +++ b/packages/graphiql-react/src/editor/common.ts @@ -3,11 +3,9 @@ import { KeyMap } from './types'; export const DEFAULT_EDITOR_THEME = 'graphiql'; export const DEFAULT_KEY_MAP: KeyMap = 'sublime'; -let isMacOs = false; - -if (typeof window === 'object') { - isMacOs = window.navigator.platform.toLowerCase().indexOf('mac') === 0; -} +const isMacOs = + typeof navigator !== 'undefined' && + navigator.platform.toLowerCase().indexOf('mac') === 0; export const commonKeys = { // Persistent search box in Query Editor @@ -30,10 +28,10 @@ export async function importCodeMirror( addons: Promise[], options?: { useCommonAddons?: boolean }, ) { - const CodeMirror = await import('codemirror').then(c => + const CodeMirror = await import('codemirror').then(mod => // Depending on bundler and settings the dynamic import either returns a // function (e.g. parcel) or an object containing a `default` property - typeof c === 'function' ? c : c.default, + typeof mod === 'function' ? mod : mod.default, ); await Promise.all( options?.useCommonAddons === false diff --git a/packages/graphiql-react/src/editor/components/image-preview.tsx b/packages/graphiql-react/src/editor/components/image-preview.tsx index b330f7bb01a..12eeff732fa 100644 --- a/packages/graphiql-react/src/editor/components/image-preview.tsx +++ b/packages/graphiql-react/src/editor/components/image-preview.tsx @@ -76,11 +76,8 @@ function tokenToURL(token: Token) { const value = token.string.slice(1).slice(0, -1).trim(); try { - const { location } = window; return new URL(value, location.protocol + '//' + location.host); - } catch { - return; - } + } catch {} } function isImageURL(url: URL) { diff --git a/packages/graphiql/resources/renderExample.js b/packages/graphiql/resources/renderExample.js index a6ef4aa8a06..b73a1631638 100644 --- a/packages/graphiql/resources/renderExample.js +++ b/packages/graphiql/resources/renderExample.js @@ -14,7 +14,7 @@ // Parse the search string to get url parameters. const parameters = {}; -for (const entry of window.location.search.slice(1).split('&')) { +for (const entry of location.search.slice(1).split('&')) { const eq = entry.indexOf('='); if (eq >= 0) { parameters[decodeURIComponent(entry.slice(0, eq))] = decodeURIComponent( @@ -60,22 +60,22 @@ function updateURL() { } function getSchemaUrl() { - const isDev = window.location.hostname.match(/localhost$/); + const isDev = /localhost$/.test(location.hostname); - if (isDev) { - // This supports an e2e test which ensures that invalid schemas do not load. - if (parameters.bad === 'true') { - return '/bad/graphql'; - } - if (parameters['http-error'] === 'true') { - return '/http-error/graphql'; - } - if (parameters['graphql-error'] === 'true') { - return '/graphql-error/graphql'; - } - return '/graphql'; + if (!isDev) { + return '/.netlify/functions/graphql'; } - return '/.netlify/functions/graphql'; + // This supports an e2e test which ensures that invalid schemas do not load. + if (parameters.bad === 'true') { + return '/bad/graphql'; + } + if (parameters['http-error'] === 'true') { + return '/http-error/graphql'; + } + if (parameters['graphql-error'] === 'true') { + return '/graphql-error/graphql'; + } + return '/graphql'; } // Render into the body. diff --git a/packages/graphiql/src/components/GraphiQL.tsx b/packages/graphiql/src/components/GraphiQL.tsx index c80c261e180..19320b8c3ea 100644 --- a/packages/graphiql/src/components/GraphiQL.tsx +++ b/packages/graphiql/src/components/GraphiQL.tsx @@ -865,8 +865,8 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) { } const modifier = - typeof window !== 'undefined' && - window.navigator.platform.toLowerCase().indexOf('mac') === 0 + typeof navigator !== 'undefined' && + navigator.platform.toLowerCase().indexOf('mac') === 0 ? 'Cmd' : 'Ctrl'; diff --git a/packages/graphiql/test/images/logo.svg b/packages/graphiql/test/images/logo.svg index 43e513e06ca..8b265562b12 100644 --- a/packages/graphiql/test/images/logo.svg +++ b/packages/graphiql/test/images/logo.svg @@ -1,27 +1,15 @@ - + + + - - + - + - From 93453fcba639bcb500ec0abe69ed75218eb43f43 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Thu, 8 Aug 2024 01:06:26 +0200 Subject: [PATCH 13/48] [v4] remove `build.sh` and `checkgit.sh` (#3694) --- packages/graphiql/resources/build.sh | 20 ------------------ packages/graphiql/resources/checkgit.sh | 27 ------------------------- 2 files changed, 47 deletions(-) delete mode 100644 packages/graphiql/resources/build.sh delete mode 100644 packages/graphiql/resources/checkgit.sh diff --git a/packages/graphiql/resources/build.sh b/packages/graphiql/resources/build.sh deleted file mode 100644 index e112482842c..00000000000 --- a/packages/graphiql/resources/build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -if [ ! -d "node_modules/.bin" ]; then - echo "Be sure to run \`yarn install\` before building GraphiQL." - exit 1 -fi - -babel src --ignore __tests__ --out-dir dist/ -ESM=true babel src --ignore __tests__ --out-dir esm/ -echo "Bundling graphiql.js..." -browserify -g browserify-shim -s GraphiQL dist/index.js > graphiql.js -echo "Bundling graphiql.min.js..." -browserify -g browserify-shim -t uglifyify -s GraphiQL graphiql.js | uglifyjs -c > graphiql.min.js -echo "Bundling graphiql.css..." -postcss --no-map --use autoprefixer -d dist/ css/*.css -cat dist/*.css > graphiql.css -echo "Done" diff --git a/packages/graphiql/resources/checkgit.sh b/packages/graphiql/resources/checkgit.sh deleted file mode 100644 index f6798e23d40..00000000000 --- a/packages/graphiql/resources/checkgit.sh +++ /dev/null @@ -1,27 +0,0 @@ -# -# This script determines if current git state is the up to date master. If so -# it exits normally. If not it prompts for an explicit continue. This script -# intends to protect from versioning for NPM without first pushing changes -# and including any changes on master. -# - -# First fetch to ensure git is up to date. Fail-fast if this fails. -git fetch; -if [[ $? -ne 0 ]]; then exit 1; fi; - -# Extract useful information. -GITBRANCH=$(git branch -v 2> /dev/null | sed '/^[^*]/d'); -GITBRANCHNAME=$(echo "$GITBRANCH" | sed 's/* \([A-Za-z0-9_\-]*\).*/\1/'); -GITBRANCHSYNC=$(echo "$GITBRANCH" | sed 's/* [^[]*.\([^]]*\).*/\1/'); - -# Check if master is checked out -if [ "$GITBRANCHNAME" != "master" ]; then - read -p "Git not on master but $GITBRANCHNAME. Continue? (y|N) " yn; - if [ "$yn" != "y" ]; then exit 1; fi; -fi; - -# Check if branch is synced with remote -if [ "$GITBRANCHSYNC" != "" ]; then - read -p "Git not up to date but $GITBRANCHSYNC. Continue? (y|N) " yn; - if [ "$yn" != "y" ]; then exit 1; fi; -fi; From 200587120df536959be360a7286a205a21b9d86b Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Thu, 8 Aug 2024 01:07:36 +0200 Subject: [PATCH 14/48] [v4] test umd build only on ci, locally test cdn.ts (#3693) * test umd build only on ci, locally test cdn.ts * Update custom-words.txt --- packages/graphiql/cypress.config.ts | 4 ++- packages/graphiql/index.html | 18 ++++++------ packages/graphiql/package.json | 2 +- packages/graphiql/resources/dev.html | 42 ---------------------------- packages/graphiql/test/e2e-server.js | 39 ++++++++++++++++++++++---- resources/custom-words.txt | 1 + 6 files changed, 46 insertions(+), 60 deletions(-) delete mode 100644 packages/graphiql/resources/dev.html diff --git a/packages/graphiql/cypress.config.ts b/packages/graphiql/cypress.config.ts index a2b7771ac3a..5a837a00d60 100644 --- a/packages/graphiql/cypress.config.ts +++ b/packages/graphiql/cypress.config.ts @@ -1,8 +1,10 @@ import { defineConfig } from 'cypress'; +const PORT = process.env.CI === 'true' ? 8080 : 5173; + export default defineConfig({ e2e: { - baseUrl: 'http://localhost:8080', + baseUrl: `http://localhost:${PORT}`, }, video: false, viewportWidth: 1920, diff --git a/packages/graphiql/index.html b/packages/graphiql/index.html index 2dd5643bdac..c9ad2853508 100644 --- a/packages/graphiql/index.html +++ b/packages/graphiql/index.html @@ -22,22 +22,20 @@ font-size: 4rem; } - - -
-
Loading…
-
+ + + + +
+
Loading…
+
diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index 9dde30e5a9d..5f2a0c9bc5c 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -32,7 +32,7 @@ } }, "scripts": { - "cypress-open": "yarn e2e-server 'cypress open'", + "cypress-open": "yarn dev 'cypress open'", "build": "vite build && UMD=true vite build", "dev": "concurrently 'cross-env PORT=8080 node test/e2e-server' vite", "e2e": "yarn e2e-server 'cypress run'", diff --git a/packages/graphiql/resources/dev.html b/packages/graphiql/resources/dev.html deleted file mode 100644 index e045c495c4b..00000000000 --- a/packages/graphiql/resources/dev.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - GraphiQL - - - - - - - -
-
Loading…
-
- - - diff --git a/packages/graphiql/test/e2e-server.js b/packages/graphiql/test/e2e-server.js index 8dcedb36d85..44247223b3c 100644 --- a/packages/graphiql/test/e2e-server.js +++ b/packages/graphiql/test/e2e-server.js @@ -7,8 +7,9 @@ /* eslint-disable no-console */ const { createServer } = require('node:http'); -const express = require('express'); +const fs = require('node:fs'); const path = require('node:path'); +const express = require('express'); const { createHandler } = require('graphql-http/lib/use/express'); const { GraphQLError } = require('graphql'); const schema = require('./schema'); @@ -35,17 +36,43 @@ app.post('/graphql-error/graphql', (_req, res, next) => { next(); }); -const IS_DEV = process.env.npm_lifecycle_script.endsWith(' vite'); +// On CI we test the UMD build +if (process.env.CI === 'true') { + const indexHtml = fs.readFileSync( + path.join(__dirname, '..', 'index.html'), + 'utf8', + ); + const start = ''; + const end = ''; + const contentToReplace = indexHtml.slice( + indexHtml.indexOf(start), + indexHtml.indexOf(end) + end.length, + ); + + const indexHtmlWithUmd = indexHtml.replace( + contentToReplace, + /* HTML */ ` + + + + + `, + ); -if (IS_DEV) { app.get('/', (req, res) => { - res.redirect('http://localhost:5173'); + res.send(indexHtmlWithUmd); }); + app.use(express.static(path.join(__dirname, '..'))); } else { app.get('/', (req, res) => { - res.sendFile(path.resolve(__dirname, '../resources/dev.html')); + res.redirect('http://localhost:5173'); }); - app.use(express.static(path.resolve(__dirname, '../'))); } // messy but it allows close diff --git a/resources/custom-words.txt b/resources/custom-words.txt index 5d561bbcc04..803cb770303 100644 --- a/resources/custom-words.txt +++ b/resources/custom-words.txt @@ -52,6 +52,7 @@ codicon colmena combobox cshaver +crossorigin dedenting delivr devx From bf3ea52d296f05a27edc29bf0eb7177c06013f5f Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Thu, 8 Aug 2024 14:04:52 +0200 Subject: [PATCH 15/48] [v4] convert graphiql e2e server to ESM (#3697) * aa * fix netlify * fix * fix fails on ci --- functions/graphql.ts | 2 +- packages/graphiql/test/afterDevServer.js | 14 ------- packages/graphiql/test/bad-schema.js | 2 +- packages/graphiql/test/beforeDevServer.js | 30 --------------- packages/graphiql/test/e2e-server.js | 37 +++++++++++++------ packages/graphiql/test/package.json | 3 ++ packages/graphiql/test/schema.js | 9 ++--- .../src/__tests__/MessageProcessor.spec.ts | 6 +-- 8 files changed, 37 insertions(+), 66 deletions(-) delete mode 100644 packages/graphiql/test/afterDevServer.js delete mode 100644 packages/graphiql/test/beforeDevServer.js create mode 100644 packages/graphiql/test/package.json diff --git a/functions/graphql.ts b/functions/graphql.ts index c4ae5bd53b3..c7b4a8e237d 100644 --- a/functions/graphql.ts +++ b/functions/graphql.ts @@ -10,7 +10,7 @@ import type { HandlerContext as NetlifyHandlerContext, } from '@netlify/functions'; -import schema from '../packages/graphiql/test/schema'; +import { schema } from '../packages/graphiql/test/schema.js'; /** * Handler options when using the netlify adapter diff --git a/packages/graphiql/test/afterDevServer.js b/packages/graphiql/test/afterDevServer.js deleted file mode 100644 index 6d54fa923fa..00000000000 --- a/packages/graphiql/test/afterDevServer.js +++ /dev/null @@ -1,14 +0,0 @@ -// eslint-disable-next-line import-x/no-extraneous-dependencies -const { useServer } = require('graphql-ws/lib/use/ws'); -const { Server: WebSocketServer } = require('ws'); -const schema = require('./schema'); - -module.exports = function afterDevServer(_app, _server, _compiler) { - const wsServer = new WebSocketServer({ - path: '/subscriptions', - port: 8081, - }); - // eslint-disable-next-line react-hooks/rules-of-hooks - useServer({ schema }, wsServer); - return wsServer; -}; diff --git a/packages/graphiql/test/bad-schema.js b/packages/graphiql/test/bad-schema.js index 2ec51e0625c..a101f008652 100644 --- a/packages/graphiql/test/bad-schema.js +++ b/packages/graphiql/test/bad-schema.js @@ -1,4 +1,4 @@ -module.exports.schema = { +export const badSchema = { __schema: { queryType: { name: 'Query', diff --git a/packages/graphiql/test/beforeDevServer.js b/packages/graphiql/test/beforeDevServer.js deleted file mode 100644 index d386ae47922..00000000000 --- a/packages/graphiql/test/beforeDevServer.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (c) 2021 GraphQL Contributors. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -const express = require('express'); -const path = require('node:path'); -const { createHandler } = require('graphql-http/lib/use/express'); -const schema = require('./schema'); -const { schema: badSchema } = require('./bad-schema'); - -module.exports = function beforeDevServer(app, _server, _compiler) { - // GraphQL Server - app.post('/graphql', createHandler({ schema })); - app.get('/graphql', createHandler({ schema })); - - app.post('/bad/graphql', (_req, res, next) => { - res.json({ data: badSchema }); - next(); - }); - - app.use('/images', express.static(path.join(__dirname, 'images'))); - - app.use( - '/resources/renderExample.js', - express.static(path.join(__dirname, '../resources/renderExample.js')), - ); -}; diff --git a/packages/graphiql/test/e2e-server.js b/packages/graphiql/test/e2e-server.js index 44247223b3c..6a4924b00bd 100644 --- a/packages/graphiql/test/e2e-server.js +++ b/packages/graphiql/test/e2e-server.js @@ -5,17 +5,21 @@ * LICENSE file in the root directory of this source tree. */ -/* eslint-disable no-console */ -const { createServer } = require('node:http'); -const fs = require('node:fs'); -const path = require('node:path'); -const express = require('express'); -const { createHandler } = require('graphql-http/lib/use/express'); -const { GraphQLError } = require('graphql'); -const schema = require('./schema'); +/* eslint-disable no-console, import-x/no-extraneous-dependencies */ +import { createServer } from 'node:http'; +import fs from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; +import express from 'express'; +import { GraphQLError } from 'graphql'; +import { createHandler } from 'graphql-http/lib/use/express'; +import { useServer } from 'graphql-ws/lib/use/ws'; +import { WebSocketServer } from 'ws'; + +import { schema } from './schema.js'; +import { badSchema } from './bad-schema.js'; + const app = express(); -const { schema: badSchema } = require('./bad-schema'); -const WebSocketsServer = require('./afterDevServer'); // Server app.post('/graphql', createHandler({ schema })); @@ -38,6 +42,9 @@ app.post('/graphql-error/graphql', (_req, res, next) => { // On CI we test the UMD build if (process.env.CI === 'true') { + const __dirname = path.dirname(fileURLToPath(import.meta.url)); + // const __dirname = import.meta.dirname; // can be converted to, after Node.js upgrade to v20 + const indexHtml = fs.readFileSync( path.join(__dirname, '..', 'index.html'), 'utf8', @@ -81,7 +88,7 @@ const server = createServer(app); server.listen(process.env.PORT || 3100, function () { const { port } = this.address(); - console.log(`Started on http://localhost:${port}/`); + console.log(`Started on http://localhost:${port}`); console.log('PID', process.pid); process.once('SIGINT', () => { @@ -92,4 +99,10 @@ server.listen(process.env.PORT || 3100, function () { }); }); -WebSocketsServer(); +const wsServer = new WebSocketServer({ + path: '/subscriptions', + port: 8081, +}); + +// eslint-disable-next-line react-hooks/rules-of-hooks +useServer({ schema }, wsServer); diff --git a/packages/graphiql/test/package.json b/packages/graphiql/test/package.json new file mode 100644 index 00000000000..3dbc1ca591c --- /dev/null +++ b/packages/graphiql/test/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} diff --git a/packages/graphiql/test/schema.js b/packages/graphiql/test/schema.js index fcd648096f1..ec8d99ff122 100644 --- a/packages/graphiql/test/schema.js +++ b/packages/graphiql/test/schema.js @@ -6,7 +6,8 @@ * LICENSE file in the root directory of this source tree. */ -const { +// eslint-disable-next-line import-x/no-extraneous-dependencies +import { GraphQLSchema, GraphQLObjectType, GraphQLUnionType, @@ -19,7 +20,7 @@ const { GraphQLString, GraphQLID, GraphQLList, -} = require('graphql'); +} from 'graphql'; // Test Schema const TestEnum = new GraphQLEnumType({ @@ -381,11 +382,9 @@ const TestSubscriptionType = new GraphQLObjectType({ }, }); -const myTestSchema = new GraphQLSchema({ +export const schema = new GraphQLSchema({ query: TestType, mutation: TestMutationType, subscription: TestSubscriptionType, description: 'This is a test schema for GraphiQL', }); - -module.exports = myTestSchema; diff --git a/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts b/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts index 97923c6e999..fe50b3c071c 100644 --- a/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts +++ b/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts @@ -1,7 +1,6 @@ import mockfs from 'mock-fs'; import { join } from 'node:path'; import { MockFile, MockProject } from './__utils__/MockProject'; -// import { readFileSync } from 'node:fs'; import { FileChangeType } from 'vscode-languageserver'; import { serializeRange } from './__utils__/utils'; import { readFile } from 'node:fs/promises'; @@ -14,6 +13,7 @@ import { parse, } from 'graphql'; import fetchMock from 'fetch-mock'; +import { schema as graphiqlSchema } from '../../../graphiql/test/schema'; const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms)); @@ -361,7 +361,7 @@ describe('MessageProcessor with config', () => { }); it('caches files and schema with a URL config', async () => { - mockSchema(require('../../../graphiql/test/schema')); + mockSchema(graphiqlSchema); const project = new MockProject({ files: [ @@ -495,7 +495,7 @@ describe('MessageProcessor with config', () => { }); it('caches multiple projects with files and schema with a URL config and a local schema', async () => { - mockSchema(require('../../../graphiql/test/schema')); + mockSchema(graphiqlSchema); const project = new MockProject({ files: [ From 5e43d2b5e25c534efafe64efa56fbf3fb7b7d9af Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Thu, 8 Aug 2024 15:08:33 +0200 Subject: [PATCH 16/48] [v4] update changeset for changed exports (#3700) --- .changeset/rich-jobs-kick.md | 18 ++++++++++++++++++ examples/graphiql-cdn/index.html | 8 ++++---- examples/graphiql-create-react-app/src/App.tsx | 2 +- examples/graphiql-parcel/src/index.html | 2 +- .../monaco-graphql-webpack/webpack.config.js | 2 +- .../graphiql-plugin-code-exporter/README.md | 2 +- .../examples/index.html | 7 +++---- packages/graphiql-plugin-explorer/README.md | 2 +- .../examples/index.html | 7 +++---- packages/graphiql/README.md | 6 +++--- packages/graphiql/cypress/e2e/errors.cy.ts | 2 +- 11 files changed, 37 insertions(+), 21 deletions(-) diff --git a/.changeset/rich-jobs-kick.md b/.changeset/rich-jobs-kick.md index f4fd0dd3cdb..9ac63586559 100644 --- a/.changeset/rich-jobs-kick.md +++ b/.changeset/rich-jobs-kick.md @@ -3,3 +3,21 @@ --- migrate from `webpack` to `vite` + +changed exports + +```diff +-graphiql/graphiql.css ++graphiql/style.css +``` + +changed cdn paths, `dist/index.umd.js` and `dist/style.css` are minified + +```diff +-https://unpkg.com/graphiql/graphiql.js +-https://unpkg.com/graphiql/graphiql.min.js ++https://unpkg.com/graphiql/dist/index.umd.js +-https://unpkg.com/graphiql/graphiql.css +-https://unpkg.com/graphiql/graphiql.min.css ++https://unpkg.com/graphiql/dist/style.css +``` diff --git a/examples/graphiql-cdn/index.html b/examples/graphiql-cdn/index.html index 501d7127736..37b934c2064 100644 --- a/examples/graphiql-cdn/index.html +++ b/examples/graphiql-cdn/index.html @@ -42,11 +42,11 @@ favored resource bundler. --> - - + + ``` (see: Usage UMD Bundle below for more required script tags) @@ -107,7 +107,7 @@ import { createGraphiQLFetcher } from '@graphiql/toolkit'; import { GraphiQL } from 'graphiql'; import React from 'react'; import { createRoot } from 'react-dom/client'; -import 'graphiql/graphiql.css'; +import 'graphiql/style.css'; const fetcher = createGraphiQLFetcher({ url: 'https://my.backend/graphql' }); diff --git a/packages/graphiql/cypress/e2e/errors.cy.ts b/packages/graphiql/cypress/e2e/errors.cy.ts index 0509e320bee..dc9dd25c33f 100644 --- a/packages/graphiql/cypress/e2e/errors.cy.ts +++ b/packages/graphiql/cypress/e2e/errors.cy.ts @@ -31,7 +31,7 @@ describe('Errors', () => { cy.visit('/?bad=true'); /** * We can't use `cy.assertQueryResult` here because the stack contains line - * and column numbers of the `graphiql.min.js` bundle which are not stable. + * and column numbers of the `index.umd.js` bundle which are not stable. */ cy.get('section.result-window').should(element => { expect(element.get(0).innerText).to.contain( From 00415d2940c4d76a4a9e683e9fa0504ba97dd627 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 9 Aug 2024 13:50:08 +0200 Subject: [PATCH 17/48] [v4] generate types with `vite-plugin-dts` (#3702) * generate types with `vite-plugin-dts` * add types:check in prebuild * more * more * more * update vite * upd * use terser --- .changeset/flat-lies-heal.md | 7 + .../monaco-graphql-react-vite/package.json | 2 +- .../package.json | 16 +- .../resources/copy-types.mjs | 11 - .../tsconfig.json | 4 +- .../tsconfig.node.json | 9 - .../vite.config.mts | 7 +- .../graphiql-plugin-explorer/package.json | 16 +- .../resources/copy-types.mjs | 11 - .../graphiql-plugin-explorer/tsconfig.json | 4 +- .../tsconfig.node.json | 9 - .../graphiql-plugin-explorer/vite.config.mts | 6 +- packages/graphiql-react/package.json | 18 +- packages/graphiql-react/tsconfig.cjs.json | 11 - packages/graphiql-react/tsconfig.json | 7 +- packages/graphiql-react/tsconfig.node.json | 8 - packages/graphiql-react/vite.config.mts | 7 +- packages/graphiql/package.json | 6 +- packages/graphiql/tsconfig.esm.json | 31 -- packages/graphiql/vite.config.mts | 1 + yarn.lock | 405 ++++++++++-------- 21 files changed, 293 insertions(+), 303 deletions(-) create mode 100644 .changeset/flat-lies-heal.md delete mode 100644 packages/graphiql-plugin-code-exporter/resources/copy-types.mjs delete mode 100644 packages/graphiql-plugin-code-exporter/tsconfig.node.json delete mode 100644 packages/graphiql-plugin-explorer/resources/copy-types.mjs delete mode 100644 packages/graphiql-plugin-explorer/tsconfig.node.json delete mode 100644 packages/graphiql-react/tsconfig.cjs.json delete mode 100644 packages/graphiql-react/tsconfig.node.json delete mode 100644 packages/graphiql/tsconfig.esm.json diff --git a/.changeset/flat-lies-heal.md b/.changeset/flat-lies-heal.md new file mode 100644 index 00000000000..dfe39818386 --- /dev/null +++ b/.changeset/flat-lies-heal.md @@ -0,0 +1,7 @@ +--- +'@graphiql/react': minor +'@graphiql/plugin-explorer': minor +'@graphiql/plugin-code-exporter': minor +--- + +generate types with `vite-plugin-dts` diff --git a/examples/monaco-graphql-react-vite/package.json b/examples/monaco-graphql-react-vite/package.json index 465eed4cf8c..3f38875515e 100644 --- a/examples/monaco-graphql-react-vite/package.json +++ b/examples/monaco-graphql-react-vite/package.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@vitejs/plugin-react": "^4.3.1", - "vite": "^5.3.5", + "vite": "^5.4.0", "vite-plugin-monaco-editor": "^1.1.0" }, "scripts": { diff --git a/packages/graphiql-plugin-code-exporter/package.json b/packages/graphiql-plugin-code-exporter/package.json index bbac380204f..54f4df58631 100644 --- a/packages/graphiql-plugin-code-exporter/package.json +++ b/packages/graphiql-plugin-code-exporter/package.json @@ -9,7 +9,7 @@ "author": "LekoArts", "main": "dist/index.js", "module": "dist/index.mjs", - "types": "types/index.d.ts", + "types": "dist/index.d.ts", "license": "MIT", "keywords": [ "react", @@ -19,15 +19,14 @@ "explorer" ], "files": [ - "dist", - "src", - "types" + "dist" ], "scripts": { - "prebuild": "rimraf dist types", "dev": "vite", - "build": "tsc --emitDeclarationOnly && node resources/copy-types.mjs && vite build && UMD=true vite build", - "preview": "vite preview" + "build": "vite build && UMD=true vite build", + "prebuild": "yarn types:check", + "postbuild": "cp src/graphiql-code-exporter.d.ts dist/graphiql-code-exporter.d.ts", + "types:check": "tsc --noEmit" }, "dependencies": { "graphiql-code-exporter": "^3.0.3" @@ -46,6 +45,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "typescript": "^4.6.3", - "vite": "^5.3.5" + "vite": "^5.4.0", + "vite-plugin-dts": "^4.0.1" } } diff --git a/packages/graphiql-plugin-code-exporter/resources/copy-types.mjs b/packages/graphiql-plugin-code-exporter/resources/copy-types.mjs deleted file mode 100644 index 45e621b507b..00000000000 --- a/packages/graphiql-plugin-code-exporter/resources/copy-types.mjs +++ /dev/null @@ -1,11 +0,0 @@ -import fs from 'fs'; -import path from 'path'; -import { fileURLToPath } from 'url'; - -const __filename = fileURLToPath(import.meta.url); -const base = path.resolve(path.dirname(__filename), '..'); - -fs.copyFileSync( - path.resolve(base, 'src', 'graphiql-code-exporter.d.ts'), - path.resolve(base, 'types', 'graphiql-code-exporter.d.ts'), -); diff --git a/packages/graphiql-plugin-code-exporter/tsconfig.json b/packages/graphiql-plugin-code-exporter/tsconfig.json index 8ad4d4a311c..4b1db24ef65 100644 --- a/packages/graphiql-plugin-code-exporter/tsconfig.json +++ b/packages/graphiql-plugin-code-exporter/tsconfig.json @@ -14,9 +14,7 @@ "resolveJsonModule": true, "isolatedModules": true, "declaration": true, - "declarationDir": "types", "jsx": "react" }, - "include": ["src"], - "references": [{ "path": "./tsconfig.node.json" }] + "include": ["src"] } diff --git a/packages/graphiql-plugin-code-exporter/tsconfig.node.json b/packages/graphiql-plugin-code-exporter/tsconfig.node.json deleted file mode 100644 index 9d31e2aed93..00000000000 --- a/packages/graphiql-plugin-code-exporter/tsconfig.node.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "compilerOptions": { - "composite": true, - "module": "ESNext", - "moduleResolution": "Node", - "allowSyntheticDefaultImports": true - }, - "include": ["vite.config.ts"] -} diff --git a/packages/graphiql-plugin-code-exporter/vite.config.mts b/packages/graphiql-plugin-code-exporter/vite.config.mts index b963a34933f..b0f4cebfe5b 100644 --- a/packages/graphiql-plugin-code-exporter/vite.config.mts +++ b/packages/graphiql-plugin-code-exporter/vite.config.mts @@ -1,13 +1,16 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; import packageJSON from './package.json'; +import dts from 'vite-plugin-dts'; const IS_UMD = process.env.UMD === 'true'; export default defineConfig({ - plugins: [react({ jsxRuntime: 'classic' })], + plugins: [react({ jsxRuntime: 'classic' }), dts()], build: { - minify: IS_UMD ? 'esbuild' : false, + minify: IS_UMD + ? 'terser' // produce better bundle size than esbuild + : false, // avoid clean cjs/es builds emptyOutDir: !IS_UMD, lib: { diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index e6bf56bbcfc..073353f0dc5 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -8,7 +8,7 @@ }, "main": "dist/index.js", "module": "dist/index.mjs", - "types": "types/index.d.ts", + "types": "dist/index.d.ts", "license": "MIT", "keywords": [ "react", @@ -18,15 +18,14 @@ "explorer" ], "files": [ - "dist", - "src", - "types" + "dist" ], "scripts": { - "prebuild": "rimraf dist types", "dev": "vite", - "build": "tsc --emitDeclarationOnly && node resources/copy-types.mjs && vite build && UMD=true vite build", - "preview": "vite preview" + "build": "vite build && UMD=true vite build", + "postbuild": "cp src/graphiql-explorer.d.ts dist/graphiql-explorer.d.ts", + "prebuild": "yarn types:check", + "types:check": "tsc --noEmit" }, "dependencies": { "graphiql-explorer": "^0.9.0" @@ -44,7 +43,8 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "typescript": "^4.6.3", - "vite": "^5.3.5", + "vite": "^5.4.0", + "vite-plugin-dts": "^4.0.1", "vite-plugin-svgr": "^4.2.0" } } diff --git a/packages/graphiql-plugin-explorer/resources/copy-types.mjs b/packages/graphiql-plugin-explorer/resources/copy-types.mjs deleted file mode 100644 index 8f6175f68c7..00000000000 --- a/packages/graphiql-plugin-explorer/resources/copy-types.mjs +++ /dev/null @@ -1,11 +0,0 @@ -import fs from 'fs'; -import path from 'path'; -import { fileURLToPath } from 'url'; - -const __filename = fileURLToPath(import.meta.url); -const base = path.resolve(path.dirname(__filename), '..'); - -fs.copyFileSync( - path.resolve(base, 'src', 'graphiql-explorer.d.ts'), - path.resolve(base, 'types', 'graphiql-explorer.d.ts'), -); diff --git a/packages/graphiql-plugin-explorer/tsconfig.json b/packages/graphiql-plugin-explorer/tsconfig.json index 8ad4d4a311c..4b1db24ef65 100644 --- a/packages/graphiql-plugin-explorer/tsconfig.json +++ b/packages/graphiql-plugin-explorer/tsconfig.json @@ -14,9 +14,7 @@ "resolveJsonModule": true, "isolatedModules": true, "declaration": true, - "declarationDir": "types", "jsx": "react" }, - "include": ["src"], - "references": [{ "path": "./tsconfig.node.json" }] + "include": ["src"] } diff --git a/packages/graphiql-plugin-explorer/tsconfig.node.json b/packages/graphiql-plugin-explorer/tsconfig.node.json deleted file mode 100644 index 9d31e2aed93..00000000000 --- a/packages/graphiql-plugin-explorer/tsconfig.node.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "compilerOptions": { - "composite": true, - "module": "ESNext", - "moduleResolution": "Node", - "allowSyntheticDefaultImports": true - }, - "include": ["vite.config.ts"] -} diff --git a/packages/graphiql-plugin-explorer/vite.config.mts b/packages/graphiql-plugin-explorer/vite.config.mts index e47ea748b70..e12c0cf76a4 100644 --- a/packages/graphiql-plugin-explorer/vite.config.mts +++ b/packages/graphiql-plugin-explorer/vite.config.mts @@ -2,6 +2,7 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; import svgr from 'vite-plugin-svgr'; import packageJSON from './package.json'; +import dts from 'vite-plugin-dts'; const IS_UMD = process.env.UMD === 'true'; @@ -14,9 +15,12 @@ export default defineConfig({ titleProp: true, }, }), + dts(), ], build: { - minify: IS_UMD ? 'esbuild' : false, + minify: IS_UMD + ? 'terser' // produce better bundle size than esbuild + : false, // avoid clean cjs/es builds emptyOutDir: !IS_UMD, lib: { diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index 362a87973c2..5878a8ac46a 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -18,13 +18,13 @@ ".": { "import": "./dist/index.mjs", "require": "./dist/index.js", - "types": "./types/index.d.ts" + "types": "./dist/types/index.d.ts" }, "./font/roboto.css": "./font/roboto.css", "./font/fira-code.css": "./font/fira-code.css", "./dist/style.css": "./dist/style.css" }, - "types": "types/index.d.ts", + "types": "dist/types/index.d.ts", "keywords": [ "react", "graphql", @@ -33,14 +33,13 @@ ], "files": [ "dist", - "font", - "src", - "types" + "font" ], "scripts": { - "prebuild": "rimraf dist types", - "dev": "concurrently 'tsc --emitDeclarationOnly --watch' 'vite build --watch'", - "build": "tsc --emitDeclarationOnly && vite build" + "dev": "vite", + "build": "vite build", + "prebuild": "yarn types:check", + "types:check": "tsc --noEmit" }, "peerDependencies": { "graphql": "^15.5.0 || ^16.0.0", @@ -75,7 +74,8 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "typescript": "^4.6.3", - "vite": "^5.3.5", + "vite": "^5.4.0", + "vite-plugin-dts": "^4.0.1", "vite-plugin-svgr": "^4.2.0" } } diff --git a/packages/graphiql-react/tsconfig.cjs.json b/packages/graphiql-react/tsconfig.cjs.json deleted file mode 100644 index 01792adbce1..00000000000 --- a/packages/graphiql-react/tsconfig.cjs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "composite": true, - "module": "commonjs", - "target": "es6", - "outDir": "cjs" - }, - "include": ["src"], - "exclude": ["**/__tests__/**"] -} diff --git a/packages/graphiql-react/tsconfig.json b/packages/graphiql-react/tsconfig.json index 95480738c1d..d0698784ddd 100644 --- a/packages/graphiql-react/tsconfig.json +++ b/packages/graphiql-react/tsconfig.json @@ -14,10 +14,7 @@ "resolveJsonModule": true, "isolatedModules": true, "jsx": "react-jsx", - "declaration": true, - "declarationDir": "types", - "outDir": "tsc" + "declaration": true }, - "include": ["src"], - "references": [{ "path": "./tsconfig.node.json" }] + "include": ["src"] } diff --git a/packages/graphiql-react/tsconfig.node.json b/packages/graphiql-react/tsconfig.node.json deleted file mode 100644 index e993792cb12..00000000000 --- a/packages/graphiql-react/tsconfig.node.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "compilerOptions": { - "composite": true, - "module": "esnext", - "moduleResolution": "node" - }, - "include": ["vite.config.ts"] -} diff --git a/packages/graphiql-react/vite.config.mts b/packages/graphiql-react/vite.config.mts index fb552395aaf..1abcf2859ed 100644 --- a/packages/graphiql-react/vite.config.mts +++ b/packages/graphiql-react/vite.config.mts @@ -3,6 +3,7 @@ import react from '@vitejs/plugin-react'; import svgr from 'vite-plugin-svgr'; import postCssNestingPlugin from 'postcss-nesting'; import packageJSON from './package.json'; +import dts from 'vite-plugin-dts'; export default defineConfig({ plugins: [ @@ -13,6 +14,10 @@ export default defineConfig({ titleProp: true, }, }), + dts({ + outDir: ['dist/types'], + exclude: ['**/*.spec.{ts,tsx}', '**/__tests__/'], + }), ], css: { postcss: { @@ -37,7 +42,7 @@ export default defineConfig({ ), ], output: { - chunkFileNames: '[name].[format].js', + chunkFileNames: '[format]/[name].js', }, }, }, diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index d41a35d1415..955ac944514 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -35,6 +35,8 @@ "cypress-open": "yarn dev 'cypress open'", "build": "vite build && UMD=true vite build", "dev": "concurrently 'cross-env PORT=8080 node test/e2e-server' vite", + "prebuild": "yarn types:check", + "types:check": "tsc --noEmit", "e2e": "yarn e2e-server 'cypress run'", "e2e-server": "start-server-and-test 'cross-env PORT=8080 node test/e2e-server' 'http-get://localhost:8080/graphql?query={test { id }}'" }, @@ -65,9 +67,9 @@ "start-server-and-test": "^1.10.11", "subscriptions-transport-ws": "0.11.0", "typescript": "^4.6.3", - "vite": "^5.3.5", + "vite": "^5.4.0", "vite-plugin-commonjs": "^0.10.1", - "vite-plugin-dts": "^3.9.1", + "vite-plugin-dts": "^4.0.1", "ws": "8.17.1" } } diff --git a/packages/graphiql/tsconfig.esm.json b/packages/graphiql/tsconfig.esm.json deleted file mode 100644 index 4c9526db8ef..00000000000 --- a/packages/graphiql/tsconfig.esm.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "extends": "../../resources/tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "./src", - "outDir": "./esm", - "composite": false, - "jsx": "react", - "baseUrl": ".", - "target": "es5" - }, - "include": ["src"], - "exclude": [ - "**/__tests__/**", - "**/dist/**.*", - "**/*.spec.ts", - "**/*.spec.js", - "**/*-test.ts", - "**/*-test.js" - ], - "references": [ - { - "path": "../codemirror-graphql" - }, - { - "path": "../graphiql-toolkit" - }, - { - "path": "../graphql-language-service" - } - ] -} diff --git a/packages/graphiql/vite.config.mts b/packages/graphiql/vite.config.mts index e5709514b9a..60dcf8dd77f 100644 --- a/packages/graphiql/vite.config.mts +++ b/packages/graphiql/vite.config.mts @@ -12,6 +12,7 @@ const umdConfig = defineConfig({ // To bundle `const { createClient } = require('graphql-ws')` in `createWebsocketsFetcherFromUrl` function plugins: [commonjs()], build: { + minify: 'terser', // produce less bundle size sourcemap: true, emptyOutDir: false, lib: { diff --git a/yarn.lock b/yarn.lock index 9075241d5f1..1ffd2b84f3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2974,27 +2974,27 @@ resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-4.2.1.tgz#1fead437f3957ceebe2e8c3f46beccdb9bc575b8" integrity sha512-EWUguj2kd7ldmrF9F+vI5hUOralPd+sdsUnYbRy33vZTuZkduC1shE9TtEMEjAQwyfyMb4ole5KtjF8MsnQOlA== -"@microsoft/api-extractor-model@7.28.13": - version "7.28.13" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.28.13.tgz#96fbc52155e0d07e0eabbd9699065b77702fe33a" - integrity sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw== - dependencies: - "@microsoft/tsdoc" "0.14.2" - "@microsoft/tsdoc-config" "~0.16.1" - "@rushstack/node-core-library" "4.0.2" - -"@microsoft/api-extractor@7.43.0": - version "7.43.0" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.43.0.tgz#41c42677bc71cd8e0f23c63c56802d85044e65cd" - integrity sha512-GFhTcJpB+MI6FhvXEI9b2K0snulNLWHqC/BbcJtyNYcKUiw7l3Lgis5ApsYncJ0leALX7/of4XfmXk+maT111w== - dependencies: - "@microsoft/api-extractor-model" "7.28.13" - "@microsoft/tsdoc" "0.14.2" - "@microsoft/tsdoc-config" "~0.16.1" - "@rushstack/node-core-library" "4.0.2" - "@rushstack/rig-package" "0.5.2" - "@rushstack/terminal" "0.10.0" - "@rushstack/ts-command-line" "4.19.1" +"@microsoft/api-extractor-model@7.29.4": + version "7.29.4" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.29.4.tgz#098f94f304db98f3cea8618fd1107946e212eaf5" + integrity sha512-LHOMxmT8/tU1IiiiHOdHFF83Qsi+V8d0kLfscG4EvQE9cafiR8blOYr8SfkQKWB1wgEilQgXJX3MIA4vetDLZw== + dependencies: + "@microsoft/tsdoc" "~0.15.0" + "@microsoft/tsdoc-config" "~0.17.0" + "@rushstack/node-core-library" "5.5.1" + +"@microsoft/api-extractor@7.47.4": + version "7.47.4" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.47.4.tgz#1a66dc9d6f316fe86eef336e7f8004ab9222499b" + integrity sha512-HKm+P4VNzWwvq1Ey+Jfhhj/3MjsD+ka2hbt8L5AcRM95lu1MFOYnz3XlU7Gr79Q/ZhOb7W/imAKeYrOI0bFydg== + dependencies: + "@microsoft/api-extractor-model" "7.29.4" + "@microsoft/tsdoc" "~0.15.0" + "@microsoft/tsdoc-config" "~0.17.0" + "@rushstack/node-core-library" "5.5.1" + "@rushstack/rig-package" "0.5.3" + "@rushstack/terminal" "0.13.3" + "@rushstack/ts-command-line" "4.22.3" lodash "~4.17.15" minimatch "~3.0.3" resolve "~1.22.1" @@ -3002,20 +3002,20 @@ source-map "~0.6.1" typescript "5.4.2" -"@microsoft/tsdoc-config@~0.16.1": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz#b786bb4ead00d54f53839a458ce626c8548d3adf" - integrity sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw== +"@microsoft/tsdoc-config@~0.17.0": + version "0.17.0" + resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.17.0.tgz#82605152b3c1d3f5cd4a11697bc298437484d55d" + integrity sha512-v/EYRXnCAIHxOHW+Plb6OWuUoMotxTN0GLatnpOb1xq0KuTNw/WI3pamJx/UbsoJP5k9MCw1QxvvhPcF9pH3Zg== dependencies: - "@microsoft/tsdoc" "0.14.2" - ajv "~6.12.6" + "@microsoft/tsdoc" "0.15.0" + ajv "~8.12.0" jju "~1.4.0" - resolve "~1.19.0" + resolve "~1.22.2" -"@microsoft/tsdoc@0.14.2": - version "0.14.2" - resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb" - integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug== +"@microsoft/tsdoc@0.15.0", "@microsoft/tsdoc@~0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.15.0.tgz#f29a55df17cb6e87cfbabce33ff6a14a9f85076d" + integrity sha512-HZpPoABogPvjeJOdzCOSJsXeL/SMCBgBZMVC3X3d7YYp2gf31MfxhUoYUNwf1ERPJOnQc0wkFn9trqI6ZEdZuA== "@n1ru4l/push-pull-async-iterable-iterator@^3.1.0": version "3.1.0" @@ -3600,40 +3600,42 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.0.tgz#baf9b65023ea2ecc5e6ec68f787a0fecfd8ee84c" integrity sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag== -"@rushstack/node-core-library@4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-4.0.2.tgz#e26854a3314b279d57e8abdb4acce7797d02f554" - integrity sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg== +"@rushstack/node-core-library@5.5.1": + version "5.5.1" + resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-5.5.1.tgz#890db37eafaab582c79eb6bf421447b82b3a964b" + integrity sha512-ZutW56qIzH8xIOlfyaLQJFx+8IBqdbVCZdnj+XT1MorQ1JqqxHse8vbCpEM+2MjsrqcbxcgDIbfggB1ZSQ2A3g== dependencies: + ajv "~8.13.0" + ajv-draft-04 "~1.0.0" + ajv-formats "~3.0.1" fs-extra "~7.0.1" import-lazy "~4.0.0" jju "~1.4.0" resolve "~1.22.1" semver "~7.5.4" - z-schema "~5.0.2" -"@rushstack/rig-package@0.5.2": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.5.2.tgz#0e23a115904678717a74049661931c0b37dd5495" - integrity sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA== +"@rushstack/rig-package@0.5.3": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.5.3.tgz#ea4d8a3458540b1295500149c04e645f23134e5d" + integrity sha512-olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow== dependencies: resolve "~1.22.1" strip-json-comments "~3.1.1" -"@rushstack/terminal@0.10.0": - version "0.10.0" - resolved "https://registry.yarnpkg.com/@rushstack/terminal/-/terminal-0.10.0.tgz#e81909fa0e5c8016b6df4739f0f381f44358269f" - integrity sha512-UbELbXnUdc7EKwfH2sb8ChqNgapUOdqcCIdQP4NGxBpTZV2sQyeekuK3zmfQSa/MN+/7b4kBogl2wq0vpkpYGw== +"@rushstack/terminal@0.13.3": + version "0.13.3" + resolved "https://registry.yarnpkg.com/@rushstack/terminal/-/terminal-0.13.3.tgz#9a05b8cf759f14161a49d3ccb09d556e4161caca" + integrity sha512-fc3zjXOw8E0pXS5t9vTiIPx9gHA0fIdTXsu9mT4WbH+P3mYvnrX0iAQ5a6NvyK1+CqYWBTw/wVNx7SDJkI+WYQ== dependencies: - "@rushstack/node-core-library" "4.0.2" + "@rushstack/node-core-library" "5.5.1" supports-color "~8.1.1" -"@rushstack/ts-command-line@4.19.1": - version "4.19.1" - resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.19.1.tgz#288ee54dd607e558a8be07705869c16c31b5c3ef" - integrity sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg== +"@rushstack/ts-command-line@4.22.3": + version "4.22.3" + resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.22.3.tgz#dcc75bd25b21031b32b2758ee3f2f4973b112572" + integrity sha512-edMpWB3QhFFZ4KtSzS8WNjBgR4PXPPOVrOHMbb7kNpmQ1UFS9HdVtjCXg1H5fG+xYAbeE+TMPcVPUyX2p84STA== dependencies: - "@rushstack/terminal" "0.10.0" + "@rushstack/terminal" "0.13.3" "@types/argparse" "1.0.38" argparse "~1.0.9" string-argv "~0.3.1" @@ -4814,27 +4816,47 @@ loupe "^3.1.1" tinyrainbow "^1.2.0" -"@volar/language-core@1.11.1", "@volar/language-core@~1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.11.1.tgz#ecdf12ea8dc35fb8549e517991abcbf449a5ad4f" - integrity sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw== +"@volar/language-core@2.3.4": + version "2.3.4" + resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.3.4.tgz#51de0263039a567a12a1eea90e02e59cdbf5de3b" + integrity sha512-wXBhY11qG6pCDAqDnbBRFIDSIwbqkWI7no+lj5+L7IlA7HRIjRP7YQLGzT0LF4lS6eHkMSsclXqy9DwYJasZTQ== dependencies: - "@volar/source-map" "1.11.1" + "@volar/source-map" "2.3.4" -"@volar/source-map@1.11.1", "@volar/source-map@~1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.11.1.tgz#535b0328d9e2b7a91dff846cab4058e191f4452f" - integrity sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg== +"@volar/language-core@2.4.0-alpha.18", "@volar/language-core@~2.4.0-alpha.18": + version "2.4.0-alpha.18" + resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz#dafffd68ac07c26d69de16741187fd4c06bfa345" + integrity sha512-JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg== dependencies: - muggle-string "^0.3.1" + "@volar/source-map" "2.4.0-alpha.18" -"@volar/typescript@~1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.11.1.tgz#ba86c6f326d88e249c7f5cfe4b765be3946fd627" - integrity sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ== +"@volar/source-map@2.3.4": + version "2.3.4" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.3.4.tgz#1d285610134fe565ca59a54e5a99c12befc70c93" + integrity sha512-C+t63nwcblqLIVTYXaVi/+gC8NukDaDIQI72J3R7aXGvtgaVB16c+J8Iz7/VfOy7kjYv7lf5GhBny6ACw9fTGQ== + +"@volar/source-map@2.4.0-alpha.18": + version "2.4.0-alpha.18" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz#a2413932ff6b1821ae8efcbd9249d4da3f99f223" + integrity sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g== + +"@volar/typescript@^2.3.4": + version "2.3.4" + resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.3.4.tgz#bfa2834c79bd0b9a38cdfdf220fea0afa8ed64b0" + integrity sha512-acCvt7dZECyKcvO5geNybmrqOsu9u8n5XP1rfiYsOLYGPxvHRav9BVmEdRyZ3vvY6mNyQ1wLL5Hday4IShe17w== dependencies: - "@volar/language-core" "1.11.1" + "@volar/language-core" "2.3.4" path-browserify "^1.0.1" + vscode-uri "^3.0.8" + +"@volar/typescript@~2.4.0-alpha.18": + version "2.4.0-alpha.18" + resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.0-alpha.18.tgz#806aca9ce1bd7c48dc5fcd0fcf7f33bdd04e5b35" + integrity sha512-sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ== + dependencies: + "@volar/language-core" "2.4.0-alpha.18" + path-browserify "^1.0.1" + vscode-uri "^3.0.8" "@vscode/vsce-sign-alpine-arm64@2.0.2": version "2.0.2" @@ -4968,13 +4990,13 @@ estree-walker "^2.0.2" source-map-js "^1.2.0" -"@vue/compiler-core@3.4.36": - version "3.4.36" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.36.tgz#4e28dfcbaa8a85e135f7a94c44372b6d52329e42" - integrity sha512-qBkndgpwFKdupmOPoiS10i7oFdN7a+4UNDlezD0GlQ1kuA1pNrscg9g12HnB5E8hrWSuEftRsbJhL1HI2zpJhg== +"@vue/compiler-core@3.4.37": + version "3.4.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.37.tgz#55db3900e09424c65c39111a05a3c6e698f371e3" + integrity sha512-ZDDT/KiLKuCRXyzWecNzC5vTcubGz4LECAtfGPENpo0nrmqJHwuWtRLxk/Sb9RAKtR9iFflFycbkjkY+W/PZUQ== dependencies: "@babel/parser" "^7.24.7" - "@vue/shared" "3.4.36" + "@vue/shared" "3.4.37" entities "^5.0.0" estree-walker "^2.0.2" source-map-js "^1.2.0" @@ -4987,13 +5009,13 @@ "@vue/compiler-core" "3.4.35" "@vue/shared" "3.4.35" -"@vue/compiler-dom@^3.3.0": - version "3.4.36" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.36.tgz#32f5f65d1fb242211df2ddc65a336779cd8b974c" - integrity sha512-eEIjy4GwwZTFon/Y+WO8tRRNGqylaRlA79T1RLhUpkOzJ7EtZkkb8MurNfkqY6x6Qiu0R7ESspEF7GkPR/4yYg== +"@vue/compiler-dom@^3.4.0": + version "3.4.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.37.tgz#a1fcf79e287cb828545082ff1afa8630480a3044" + integrity sha512-rIiSmL3YrntvgYV84rekAtU/xfogMUJIclUMeIKEtVBFngOL3IeZHhsH3UaFEgB5iFGpj6IW+8YuM/2Up+vVag== dependencies: - "@vue/compiler-core" "3.4.36" - "@vue/shared" "3.4.36" + "@vue/compiler-core" "3.4.37" + "@vue/shared" "3.4.37" "@vue/compiler-sfc@3.4.35": version "3.4.35" @@ -5018,20 +5040,27 @@ "@vue/compiler-dom" "3.4.35" "@vue/shared" "3.4.35" -"@vue/language-core@1.8.27", "@vue/language-core@^1.8.27": - version "1.8.27" - resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-1.8.27.tgz#2ca6892cb524e024a44e554e4c55d7a23e72263f" - integrity sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA== +"@vue/compiler-vue2@^2.7.16": + version "2.7.16" + resolved "https://registry.yarnpkg.com/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz#2ba837cbd3f1b33c2bc865fbe1a3b53fb611e249" + integrity sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A== + dependencies: + de-indent "^1.0.2" + he "^1.2.0" + +"@vue/language-core@2.0.29": + version "2.0.29" + resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.0.29.tgz#19462d786cd7a1c21dbe575b46970a57094e0357" + integrity sha512-o2qz9JPjhdoVj8D2+9bDXbaI4q2uZTHQA/dbyZT4Bj1FR9viZxDJnLcKVHfxdn6wsOzRgpqIzJEEmSSvgMvDTQ== dependencies: - "@volar/language-core" "~1.11.1" - "@volar/source-map" "~1.11.1" - "@vue/compiler-dom" "^3.3.0" - "@vue/shared" "^3.3.0" + "@volar/language-core" "~2.4.0-alpha.18" + "@vue/compiler-dom" "^3.4.0" + "@vue/compiler-vue2" "^2.7.16" + "@vue/shared" "^3.4.0" computeds "^0.0.1" minimatch "^9.0.3" - muggle-string "^0.3.1" + muggle-string "^0.4.1" path-browserify "^1.0.1" - vue-template-compiler "^2.7.14" "@vue/reactivity@3.4.35": version "3.4.35" @@ -5071,10 +5100,10 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.35.tgz#5432f4b1c79e763fcf78cc830faf59ff01248968" integrity sha512-hvuhBYYDe+b1G8KHxsQ0diDqDMA8D9laxWZhNAjE83VZb5UDaXl9Xnz7cGdDSyiHM90qqI/CyGMcpBpiDy6VVQ== -"@vue/shared@3.4.36", "@vue/shared@^3.3.0": - version "3.4.36" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.36.tgz#7551f41684966acb6a307152b49a8308e7f69203" - integrity sha512-fdPLStwl1sDfYuUftBaUVn2pIrVFDASYerZSrlBvVBfylObPA1gtcWJHy5Ox8jLEJ524zBibss488Q3SZtU1uA== +"@vue/shared@3.4.37", "@vue/shared@^3.4.0": + version "3.4.37" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.37.tgz#4f4c08a2e73da512a77b47165cf59ffbc1b5ade8" + integrity sha512-nIh8P2fc3DflG8+5Uw8PT/1i17ccFn0xxN/5oE9RfV5SVnd7G0XEFRwakrnNFE/jlS95fpGXDVG5zDETS26nmg== "@webassemblyjs/ast@1.11.1": version "1.11.1" @@ -5356,6 +5385,11 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" +ajv-draft-04@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz#3b64761b268ba0b9e668f0b41ba53fce0ad77fc8" + integrity sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw== + ajv-formats@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" @@ -5363,6 +5397,13 @@ ajv-formats@^2.1.1: dependencies: ajv "^8.0.0" +ajv-formats@~3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578" + integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ== + dependencies: + ajv "^8.0.0" + ajv-keywords@^3.1.0, ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -5375,7 +5416,7 @@ ajv-keywords@^5.0.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6: +ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -5385,7 +5426,7 @@ ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0: +ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0, ajv@~8.12.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -5395,6 +5436,16 @@ ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0: require-from-string "^2.0.2" uri-js "^4.2.2" +ajv@~8.13.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.13.0.tgz#a3939eaec9fb80d217ddf0c3376948c023f28c91" + integrity sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA== + dependencies: + fast-deep-equal "^3.1.3" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.4.1" + ansi-colors@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -6774,11 +6825,6 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^10.0.0: - version "10.0.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" - integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== - commander@^2.20.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -6830,6 +6876,11 @@ compare-versions@^3.6.0: resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== +compare-versions@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.1.tgz#7af3cc1099ba37d244b3145a9af5201b629148a9" + integrity sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg== + compatfactory@^0.0.13: version "0.0.13" resolved "https://registry.yarnpkg.com/compatfactory/-/compatfactory-0.0.13.tgz#3862c967623c8976eb1a11208f5cf84520c03346" @@ -6891,6 +6942,11 @@ concurrently@^7.0.0: tree-kill "^1.2.2" yargs "^16.2.0" +confbox@^0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579" + integrity sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA== + configstore@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" @@ -7431,6 +7487,13 @@ debug@^3.1.0, debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4.3.6: + version "4.3.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" + integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== + dependencies: + ms "2.1.2" + decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" @@ -10487,13 +10550,6 @@ is-ci@^3.0.1: dependencies: ci-info "^3.2.0" -is-core-module@^2.1.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" - integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA== - dependencies: - hasown "^2.0.2" - is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1: version "2.14.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.14.0.tgz#43b8ef9f46a6a08888db67b1ffd4ec9e3dfd59d1" @@ -12136,6 +12192,14 @@ loader-utils@^2.0.0, loader-utils@^2.0.2: emojis-list "^3.0.0" json5 "^2.1.2" +local-pkg@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.5.0.tgz#093d25a346bae59a99f80e75f6e9d36d7e8c925c" + integrity sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg== + dependencies: + mlly "^1.4.2" + pkg-types "^1.0.3" + locate-character@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-3.0.0.tgz#0305c5b8744f61028ef5d01f444009e00779f974" @@ -12168,11 +12232,6 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.get@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== - lodash.includes@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" @@ -12183,11 +12242,6 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg== -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== - lodash.isinteger@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" @@ -12376,7 +12430,7 @@ magic-string@^0.30.0: dependencies: "@jridgewell/sourcemap-codec" "^1.4.15" -magic-string@^0.30.1, magic-string@^0.30.10, magic-string@^0.30.8: +magic-string@^0.30.1, magic-string@^0.30.10, magic-string@^0.30.11: version "0.30.11" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.11.tgz#301a6f93b3e8c2cb13ac1a7a673492c0dfd12954" integrity sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A== @@ -13119,6 +13173,16 @@ mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +mlly@^1.4.2, mlly@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.1.tgz#e0336429bb0731b6a8e887b438cbdae522c8f32f" + integrity sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA== + dependencies: + acorn "^8.11.3" + pathe "^1.1.2" + pkg-types "^1.1.1" + ufo "^1.5.3" + mocha@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9" @@ -13184,10 +13248,10 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -muggle-string@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.3.1.tgz#e524312eb1728c63dd0b2ac49e3282e6ed85963a" - integrity sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg== +muggle-string@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.4.1.tgz#3b366bd43b32f809dc20659534dd30e7c8a0d328" + integrity sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ== multicast-dns@^7.2.5: version "7.2.5" @@ -13948,7 +14012,7 @@ path-key@^4.0.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== -path-parse@^1.0.6, path-parse@^1.0.7: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -14063,6 +14127,15 @@ pkg-dir@^5.0.0: dependencies: find-up "^5.0.0" +pkg-types@^1.0.3, pkg-types@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.1.3.tgz#161bb1242b21daf7795036803f28e30222e476e3" + integrity sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA== + dependencies: + confbox "^0.1.7" + mlly "^1.7.1" + pathe "^1.1.2" + platform@^1.3.3, platform@^1.3.5: version "1.3.6" resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7" @@ -14897,7 +14970,7 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999" integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ== -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.4, resolve@~1.22.1: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.4, resolve@~1.22.1, resolve@~1.22.2: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -14915,14 +14988,6 @@ resolve@^2.0.0-next.5: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@~1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" - integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== - dependencies: - is-core-module "^2.1.0" - path-parse "^1.0.6" - responselike@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" @@ -16673,6 +16738,11 @@ uc.micro@^2.0.0, uc.micro@^2.1.0: resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee" integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A== +ufo@^1.5.3: + version "1.5.4" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754" + integrity sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ== + uglify-js@^3.1.4: version "3.8.1" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.1.tgz#43bb15ce6f545eaa0a64c49fd29375ea09fa0f93" @@ -16915,7 +16985,7 @@ upper-case@^2.0.2: dependencies: tslib "^2.0.3" -uri-js@^4.2.2: +uri-js@^4.2.2, uri-js@^4.4.1: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== @@ -17009,11 +17079,6 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -validator@^13.7.0: - version "13.12.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-13.12.0.tgz#7d78e76ba85504da3fee4fd1922b385914d4b35f" - integrity sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg== - value-or-promise@^1.0.11, value-or-promise@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" @@ -17110,18 +17175,21 @@ vite-plugin-commonjs@^0.10.1: magic-string "^0.30.1" vite-plugin-dynamic-import "^1.5.0" -vite-plugin-dts@^3.9.1: - version "3.9.1" - resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-3.9.1.tgz#625ad388ec3956708ccec7960550a7b0a8e8909e" - integrity sha512-rVp2KM9Ue22NGWB8dNtWEr+KekN3rIgz1tWD050QnRGlriUCmaDwa7qA5zDEjbXg5lAXhYMSBJtx3q3hQIJZSg== +vite-plugin-dts@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-4.0.1.tgz#4a4dedc373292930a737879a8a35cb83f73af071" + integrity sha512-JFbAKMjJdJbeXJVwQNoi8M26lP+5Ene4/ryv9w0Z7Ca5N0DdxYEak9V3C0tqwHO7WZ9JLbwMsuUZOqYIyBRwSQ== dependencies: - "@microsoft/api-extractor" "7.43.0" + "@microsoft/api-extractor" "7.47.4" "@rollup/pluginutils" "^5.1.0" - "@vue/language-core" "^1.8.27" - debug "^4.3.4" + "@volar/typescript" "^2.3.4" + "@vue/language-core" "2.0.29" + compare-versions "^6.1.1" + debug "^4.3.6" kolorist "^1.8.0" - magic-string "^0.30.8" - vue-tsc "^1.8.27" + local-pkg "^0.5.0" + magic-string "^0.30.11" + vue-tsc "2.0.29" vite-plugin-dynamic-import@^1.5.0: version "1.5.0" @@ -17147,7 +17215,7 @@ vite-plugin-svgr@^4.2.0: "@svgr/core" "^8.1.0" "@svgr/plugin-jsx" "^8.1.0" -vite@^5.0.0, vite@^5.3.5: +vite@^5.0.0: version "5.3.5" resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.5.tgz#b847f846fb2b6cb6f6f4ed50a830186138cb83d8" integrity sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA== @@ -17158,6 +17226,17 @@ vite@^5.0.0, vite@^5.3.5: optionalDependencies: fsevents "~2.3.3" +vite@^5.4.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.0.tgz#11dca8a961369ba8b5cae42d068c7ad684d5370f" + integrity sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg== + dependencies: + esbuild "^0.21.3" + postcss "^8.4.40" + rollup "^4.13.0" + optionalDependencies: + fsevents "~2.3.3" + vitest@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/vitest/-/vitest-2.0.4.tgz#ac6bfbaee53e502cee864b07a5b2edf1fcba793e" @@ -17271,21 +17350,18 @@ vscode-uri@^3.0.2, vscode-uri@^3.0.3: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== -vue-template-compiler@^2.7.14: - version "2.7.16" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b" - integrity sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ== - dependencies: - de-indent "^1.0.2" - he "^1.2.0" +vscode-uri@^3.0.8: + version "3.0.8" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f" + integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw== -vue-tsc@^1.8.27: - version "1.8.27" - resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.27.tgz#feb2bb1eef9be28017bb9e95e2bbd1ebdd48481c" - integrity sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg== +vue-tsc@2.0.29: + version "2.0.29" + resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.0.29.tgz#bf7e9605af9fadec7fd6037d242217f5c6ad2c3b" + integrity sha512-MHhsfyxO3mYShZCGYNziSbc63x7cQ5g9kvijV7dRe1TTXBRLxXyL0FnXWpUF1xII2mJ86mwYpYsUmMwkmerq7Q== dependencies: - "@volar/typescript" "~1.11.1" - "@vue/language-core" "1.8.27" + "@volar/typescript" "~2.4.0-alpha.18" + "@vue/language-core" "2.0.29" semver "^7.5.4" vue@^3.2.0: @@ -18182,17 +18258,6 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -z-schema@~5.0.2: - version "5.0.6" - resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.6.tgz#46d6a687b15e4a4369e18d6cb1c7b8618fc256c5" - integrity sha512-+XR1GhnWklYdfr8YaZv/iu+vY+ux7V5DS5zH1DQf6bO5ufrt/5cgNhVO5qyhsjFXvsqQb/f08DWE9b6uPscyAg== - dependencies: - lodash.get "^4.4.2" - lodash.isequal "^4.5.0" - validator "^13.7.0" - optionalDependencies: - commander "^10.0.0" - zod@3.21.4: version "3.21.4" resolved "https://registry.yarnpkg.com/zod/-/zod-3.21.4.tgz#10882231d992519f0a10b5dd58a38c9dabbb64db" From 8ff87d7b6b3d5d12b539612a39ca3abf7e631106 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 9 Aug 2024 14:11:36 +0200 Subject: [PATCH 18/48] [v4] use `vite build --watch` instead of `vite` for `dev` script because we don't need development server for them (#3705) --- .changeset/orange-rivers-draw.md | 9 +++ .../package.json | 2 +- .../vite.config.mts | 5 +- .../graphiql-plugin-explorer/package.json | 2 +- .../graphiql-plugin-explorer/vite.config.mts | 2 +- packages/graphiql-react/package.json | 2 +- packages/graphiql-react/src/editor/hooks.ts | 2 - packages/graphiql/src/cdn.ts | 55 +++++++------------ packages/graphiql/src/index.ts | 5 +- 9 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 .changeset/orange-rivers-draw.md diff --git a/.changeset/orange-rivers-draw.md b/.changeset/orange-rivers-draw.md new file mode 100644 index 00000000000..f87e0f7e852 --- /dev/null +++ b/.changeset/orange-rivers-draw.md @@ -0,0 +1,9 @@ +--- +'@graphiql/plugin-code-exporter': patch +'@graphiql/plugin-explorer': patch +'@graphiql/react': patch +--- + +use `vite build --watch` instead of `vite` for `dev` script because we don't need development server for them + +do not use `vite-plugin-dts` when generating umd build diff --git a/packages/graphiql-plugin-code-exporter/package.json b/packages/graphiql-plugin-code-exporter/package.json index 54f4df58631..24f00f62ab5 100644 --- a/packages/graphiql-plugin-code-exporter/package.json +++ b/packages/graphiql-plugin-code-exporter/package.json @@ -22,7 +22,7 @@ "dist" ], "scripts": { - "dev": "vite", + "dev": "vite build --watch", "build": "vite build && UMD=true vite build", "prebuild": "yarn types:check", "postbuild": "cp src/graphiql-code-exporter.d.ts dist/graphiql-code-exporter.d.ts", diff --git a/packages/graphiql-plugin-code-exporter/vite.config.mts b/packages/graphiql-plugin-code-exporter/vite.config.mts index b0f4cebfe5b..d1aa02f024e 100644 --- a/packages/graphiql-plugin-code-exporter/vite.config.mts +++ b/packages/graphiql-plugin-code-exporter/vite.config.mts @@ -6,7 +6,10 @@ import dts from 'vite-plugin-dts'; const IS_UMD = process.env.UMD === 'true'; export default defineConfig({ - plugins: [react({ jsxRuntime: 'classic' }), dts()], + plugins: [ + react({ jsxRuntime: 'classic' }), + !IS_UMD && dts({ rollupTypes: true }), + ], build: { minify: IS_UMD ? 'terser' // produce better bundle size than esbuild diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index 073353f0dc5..044f6d5c3fd 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -21,7 +21,7 @@ "dist" ], "scripts": { - "dev": "vite", + "dev": "vite build --watch", "build": "vite build && UMD=true vite build", "postbuild": "cp src/graphiql-explorer.d.ts dist/graphiql-explorer.d.ts", "prebuild": "yarn types:check", diff --git a/packages/graphiql-plugin-explorer/vite.config.mts b/packages/graphiql-plugin-explorer/vite.config.mts index e12c0cf76a4..637fee10fb0 100644 --- a/packages/graphiql-plugin-explorer/vite.config.mts +++ b/packages/graphiql-plugin-explorer/vite.config.mts @@ -15,7 +15,7 @@ export default defineConfig({ titleProp: true, }, }), - dts(), + !IS_UMD && dts({ rollupTypes: true }), ], build: { minify: IS_UMD diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index 5878a8ac46a..e27d53d4994 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -36,7 +36,7 @@ "font" ], "scripts": { - "dev": "vite", + "dev": "vite build --watch", "build": "vite build", "prebuild": "yarn types:check", "types:check": "tsc --noEmit" diff --git a/packages/graphiql-react/src/editor/hooks.ts b/packages/graphiql-react/src/editor/hooks.ts index e946c59926b..b96ec5eaaec 100644 --- a/packages/graphiql-react/src/editor/hooks.ts +++ b/packages/graphiql-react/src/editor/hooks.ts @@ -333,8 +333,6 @@ export function useAutoCompleteLeafs({ }, [getDefaultFieldNames, queryEditor, schema]); } -export type InitialState = string | (() => string); - // https://react.dev/learn/you-might-not-need-an-effect export const useEditorState = (editor: 'query' | 'variable' | 'header') => { diff --git a/packages/graphiql/src/cdn.ts b/packages/graphiql/src/cdn.ts index d7a5914f9dc..6ad0bceabc1 100644 --- a/packages/graphiql/src/cdn.ts +++ b/packages/graphiql/src/cdn.ts @@ -9,41 +9,28 @@ import { createGraphiQLFetcher, createLocalStorage } from '@graphiql/toolkit'; import * as GraphQL from 'graphql'; import { GraphiQL } from './components/GraphiQL'; -import '@graphiql/react/font/roboto.css'; -import '@graphiql/react/font/fira-code.css'; -import '@graphiql/react/dist/style.css'; -import './style.css'; - /** * For the CDN bundle we add some static properties to the component function * so that they can be accessed in the inline-script in the HTML file. */ - -/** - * This function is needed in order to easily create a fetcher function. - */ -// @ts-expect-error -GraphiQL.createFetcher = createGraphiQLFetcher; - -/** - * This function is needed in order to easily generate a custom storage namespace - */ -// @ts-expect-error -GraphiQL.createLocalStorage = createLocalStorage; - -/** - * We also add the complete `graphiql-js` exports so that this instance of - * `graphiql-js` can be reused from plugin CDN bundles. - */ -// @ts-expect-error -GraphiQL.GraphQL = GraphQL; - -/** - * We also add the complete `@graphiql/react` exports. These will be included - * in the bundle anyway since they make up the `GraphiQL` component, so by - * doing this we can reuse them from plugin CDN bundles. - */ -// @ts-expect-error -GraphiQL.React = GraphiQLReact; - -export default GraphiQL; +export default Object.assign(GraphiQL, { + /** + * This function is needed in order to easily create a fetcher function. + */ + createFetcher: createGraphiQLFetcher, + /** + * This function is needed in order to easily generate a custom storage namespace + */ + createLocalStorage, + /** + * We also add the complete `graphiql-js` exports so that this instance of + * `graphiql-js` can be reused from plugin CDN bundles. + */ + GraphQL, + /** + * We also add the complete `@graphiql/react` exports. These will be included + * in the bundle anyway since they make up the `GraphiQL` component, so by + * doing this we can reuse them from plugin CDN bundles. + */ + React: GraphiQLReact, +}); diff --git a/packages/graphiql/src/index.ts b/packages/graphiql/src/index.ts index b4ea740e2e5..7e0743bbcbc 100644 --- a/packages/graphiql/src/index.ts +++ b/packages/graphiql/src/index.ts @@ -4,11 +4,14 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ +import '@graphiql/react/font/roboto.css'; +import '@graphiql/react/font/fira-code.css'; +import '@graphiql/react/dist/style.css'; +import './style.css'; /** * GraphiQL */ - export { GraphiQLProvider } from '@graphiql/react'; /** From 343dd599ee10b0670cd7ab4dfaa65344f0d48c84 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 9 Aug 2024 14:23:57 +0200 Subject: [PATCH 19/48] [v4] remove graphiql default export (#3706) * aa * aa * polish --- .changeset/gentle-bugs-mix.md | 19 +++++++++++++++++++ packages/graphiql/src/index.ts | 6 +----- 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 .changeset/gentle-bugs-mix.md diff --git a/.changeset/gentle-bugs-mix.md b/.changeset/gentle-bugs-mix.md new file mode 100644 index 00000000000..9bb1ae56ab2 --- /dev/null +++ b/.changeset/gentle-bugs-mix.md @@ -0,0 +1,19 @@ +--- +'graphiql': major +--- + +remove default export + +## Migration + +### Before + +```jsx +import GraphiQL from 'graphiql' +``` + +### After + +```jsx +import { GraphiQL } from 'graphiql' +``` diff --git a/packages/graphiql/src/index.ts b/packages/graphiql/src/index.ts index 7e0743bbcbc..2d465df577e 100644 --- a/packages/graphiql/src/index.ts +++ b/packages/graphiql/src/index.ts @@ -23,8 +23,4 @@ export type { } from './components/GraphiQL'; export type { GraphiQLProviderProps } from '@graphiql/react'; -export { - GraphiQLInterface, - GraphiQL, - GraphiQL as default, -} from './components/GraphiQL'; +export { GraphiQLInterface, GraphiQL } from './components/GraphiQL'; From db181b2fbc98ab307c682e5bef1e87a399f62670 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 9 Aug 2024 15:42:26 +0200 Subject: [PATCH 20/48] [v4] fix netlify deploy (#3708) * fix netlify deploy * fix cypress --- examples/graphiql-webpack/package.json | 1 + examples/graphiql-webpack/public/logo.svg | 22 ++------- functions/graphql.ts | 5 +- packages/graphiql/index.html | 21 +++++---- packages/graphiql/src/index.ts | 3 -- packages/graphiql/src/style.css | 4 ++ packages/graphiql/test/e2e-server.js | 32 ------------- packages/graphiql/vite.config.mts | 34 +++++++++++++- yarn.lock | 57 +++++++++++++++++++++-- 9 files changed, 110 insertions(+), 69 deletions(-) diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index e46a751c12b..6afb63c126c 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -20,6 +20,7 @@ "regenerator-runtime": "^0.13.9" }, "devDependencies": { + "react-hot-loader": "^4.13.1", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/preset-env": "^7.20.2", diff --git a/examples/graphiql-webpack/public/logo.svg b/examples/graphiql-webpack/public/logo.svg index 43e513e06ca..8b265562b12 100644 --- a/examples/graphiql-webpack/public/logo.svg +++ b/examples/graphiql-webpack/public/logo.svg @@ -1,27 +1,15 @@ - + + + - - + - + - diff --git a/functions/graphql.ts b/functions/graphql.ts index c7b4a8e237d..915604b17d0 100644 --- a/functions/graphql.ts +++ b/functions/graphql.ts @@ -45,11 +45,10 @@ export function createHandler( statusCode: init.status, }; } catch (err) { - // The handler should'nt throw errors. + // The handler shouldn't throw errors. // If you wish to handle them differently, consider implementing your own request handler. console.error( - 'Internal error occurred during request handling. ' + - 'Please check your implementation.', + 'Internal error occurred during request handling. Please check your implementation.', err, ); return { statusCode: 500 }; diff --git a/packages/graphiql/index.html b/packages/graphiql/index.html index c9ad2853508..d5365d780f9 100644 --- a/packages/graphiql/index.html +++ b/packages/graphiql/index.html @@ -22,15 +22,18 @@ font-size: 4rem; } - - - + + + + + +
diff --git a/packages/graphiql/src/index.ts b/packages/graphiql/src/index.ts index 2d465df577e..dd68af03422 100644 --- a/packages/graphiql/src/index.ts +++ b/packages/graphiql/src/index.ts @@ -4,9 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -import '@graphiql/react/font/roboto.css'; -import '@graphiql/react/font/fira-code.css'; -import '@graphiql/react/dist/style.css'; import './style.css'; /** diff --git a/packages/graphiql/src/style.css b/packages/graphiql/src/style.css index 87df7f87c2f..6c031fef448 100644 --- a/packages/graphiql/src/style.css +++ b/packages/graphiql/src/style.css @@ -1,3 +1,7 @@ +@import '@graphiql/react/font/roboto.css'; +@import '@graphiql/react/font/fira-code.css'; +@import '@graphiql/react/dist/style.css'; + /* Everything */ .graphiql-container { background-color: hsl(var(--color-base)); diff --git a/packages/graphiql/test/e2e-server.js b/packages/graphiql/test/e2e-server.js index 6a4924b00bd..003b5ebd013 100644 --- a/packages/graphiql/test/e2e-server.js +++ b/packages/graphiql/test/e2e-server.js @@ -7,7 +7,6 @@ /* eslint-disable no-console, import-x/no-extraneous-dependencies */ import { createServer } from 'node:http'; -import fs from 'node:fs'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; import express from 'express'; @@ -44,37 +43,6 @@ app.post('/graphql-error/graphql', (_req, res, next) => { if (process.env.CI === 'true') { const __dirname = path.dirname(fileURLToPath(import.meta.url)); // const __dirname = import.meta.dirname; // can be converted to, after Node.js upgrade to v20 - - const indexHtml = fs.readFileSync( - path.join(__dirname, '..', 'index.html'), - 'utf8', - ); - const start = ''; - const end = ''; - const contentToReplace = indexHtml.slice( - indexHtml.indexOf(start), - indexHtml.indexOf(end) + end.length, - ); - - const indexHtmlWithUmd = indexHtml.replace( - contentToReplace, - /* HTML */ ` - - - - - `, - ); - - app.get('/', (req, res) => { - res.send(indexHtmlWithUmd); - }); app.use(express.static(path.join(__dirname, '..'))); } else { app.get('/', (req, res) => { diff --git a/packages/graphiql/vite.config.mts b/packages/graphiql/vite.config.mts index 60dcf8dd77f..402570f6e10 100644 --- a/packages/graphiql/vite.config.mts +++ b/packages/graphiql/vite.config.mts @@ -1,4 +1,4 @@ -import { defineConfig } from 'vite'; +import { defineConfig, PluginOption } from 'vite'; import packageJSON from './package.json'; import dts from 'vite-plugin-dts'; import commonjs from 'vite-plugin-commonjs'; @@ -65,7 +65,37 @@ const esmConfig = defineConfig({ }, }, }, - plugins: [dts({ rollupTypes: true })], + plugins: [htmlPlugin(), dts({ rollupTypes: true })], }); +function htmlPlugin(): PluginOption { + return { + name: 'html-replace-umd-with-src', + transformIndexHtml: { + order: 'pre', + handler(html) { + const start = ''; + const end = ''; + const contentToReplace = html.slice( + html.indexOf(start), + html.indexOf(end) + end.length, + ); + return html.replace( + contentToReplace, + /* HTML */ ` + + + `, + ); + }, + }, + }; +} + export default process.env.UMD === 'true' ? umdConfig : esmConfig; diff --git a/yarn.lock b/yarn.lock index 1ffd2b84f3e..68bc66ccbb3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7770,6 +7770,11 @@ dom-serializer@^1.0.1, dom-serializer@^1.3.2: domhandler "^4.2.0" entities "^2.0.0" +dom-walk@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" + integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== + domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" @@ -9780,6 +9785,14 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" +global@^4.3.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" + integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== + dependencies: + min-document "^2.19.0" + process "^0.11.10" + globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -10055,6 +10068,13 @@ highlight.js@^9.15.6: resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c" integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg== +hoist-non-react-statics@^3.3.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + homedir-polyfill@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -12183,7 +12203,7 @@ loader-utils@^1.0.0: emojis-list "^3.0.0" json5 "^1.0.1" -loader-utils@^2.0.0, loader-utils@^2.0.2: +loader-utils@^2.0.0, loader-utils@^2.0.2, loader-utils@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== @@ -13073,6 +13093,13 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== +min-document@^2.19.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" + integrity sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ== + dependencies: + dom-walk "^0.1.0" + min-indent@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" @@ -14385,7 +14412,7 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15.8.1: +prop-types@^15.6.1, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -14542,7 +14569,21 @@ react-dom@^18.2.0: loose-envify "^1.1.0" scheduler "^0.23.0" -react-is@^16.13.1: +react-hot-loader@^4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.13.1.tgz#979fd7598e27338b3faffae6ed01c65374dace5e" + integrity sha512-ZlqCfVRqDJmMXTulUGic4lN7Ic1SXgHAFw7y/Jb7t25GBgTR0fYAJ8uY4mrpxjRyWGWmqw77qJQGnYbzCvBU7g== + dependencies: + fast-levenshtein "^2.0.6" + global "^4.3.0" + hoist-non-react-statics "^3.3.0" + loader-utils "^2.0.3" + prop-types "^15.6.1" + react-lifecycles-compat "^3.0.4" + shallowequal "^1.1.0" + source-map "^0.7.3" + +react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -14557,6 +14598,11 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== +react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + react-refresh@^0.14.2: version "0.14.2" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9" @@ -15448,6 +15494,11 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" +shallowequal@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" From 9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 9 Aug 2024 15:58:31 +0200 Subject: [PATCH 21/48] change `style.css` imports (#3709) --- .changeset/breezy-chicken-crash.md | 12 ++++++++++++ .changeset/good-vans-refuse.md | 12 ++++++++++++ .changeset/poor-ghosts-jump.md | 13 +++++++++++++ examples/graphiql-webpack/src/index.jsx | 4 ++-- packages/graphiql-plugin-code-exporter/README.md | 2 +- packages/graphiql-plugin-code-exporter/package.json | 9 +++++++++ packages/graphiql-plugin-explorer/README.md | 2 +- packages/graphiql-plugin-explorer/package.json | 9 +++++++++ packages/graphiql-react/README.md | 2 +- packages/graphiql-react/package.json | 7 +++---- packages/graphiql/src/style.css | 2 +- 11 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 .changeset/breezy-chicken-crash.md create mode 100644 .changeset/good-vans-refuse.md create mode 100644 .changeset/poor-ghosts-jump.md diff --git a/.changeset/breezy-chicken-crash.md b/.changeset/breezy-chicken-crash.md new file mode 100644 index 00000000000..1a3bff1737e --- /dev/null +++ b/.changeset/breezy-chicken-crash.md @@ -0,0 +1,12 @@ +--- +'@graphiql/plugin-code-exporter': major +--- + +`style.css` import was changed + +## Migration + +```diff +-import '@graphiql/plugin-code-exporter/dist/style.css'; ++import '@graphiql/plugin-code-exporter/style.css'; +``` diff --git a/.changeset/good-vans-refuse.md b/.changeset/good-vans-refuse.md new file mode 100644 index 00000000000..ef8a4038150 --- /dev/null +++ b/.changeset/good-vans-refuse.md @@ -0,0 +1,12 @@ +--- +'@graphiql/react': major +--- + +`style.css` import was changed + +## Migration + +```diff +-import '@graphiql/react/dist/style.css'; ++import '@graphiql/react/style.css'; +``` diff --git a/.changeset/poor-ghosts-jump.md b/.changeset/poor-ghosts-jump.md new file mode 100644 index 00000000000..4494b47715e --- /dev/null +++ b/.changeset/poor-ghosts-jump.md @@ -0,0 +1,13 @@ +--- +'@graphiql/plugin-code-exporter': major +--- + +`style.css` import was changed + +## Migration + +```diff +-import '@graphiql/plugin-code-exporter/dist/style.css'; ++import '@graphiql/plugin-code-exporter/style.css'; +``` + diff --git a/examples/graphiql-webpack/src/index.jsx b/examples/graphiql-webpack/src/index.jsx index 06f6b88da5b..7b6f678fa04 100644 --- a/examples/graphiql-webpack/src/index.jsx +++ b/examples/graphiql-webpack/src/index.jsx @@ -6,8 +6,8 @@ import { explorerPlugin } from '@graphiql/plugin-explorer'; import { getSnippets } from './snippets'; import { codeExporterPlugin } from '@graphiql/plugin-code-exporter'; import 'graphiql/style.css'; -import '@graphiql/plugin-explorer/dist/style.css'; -import '@graphiql/plugin-code-exporter/dist/style.css'; +import '@graphiql/plugin-explorer/style.css'; +import '@graphiql/plugin-code-exporter/style.css'; import { createGraphiQLFetcher } from '@graphiql/toolkit'; import { useStorageContext } from '@graphiql/react'; diff --git a/packages/graphiql-plugin-code-exporter/README.md b/packages/graphiql-plugin-code-exporter/README.md index 716cb11f6ac..fc57b061c84 100644 --- a/packages/graphiql-plugin-code-exporter/README.md +++ b/packages/graphiql-plugin-code-exporter/README.md @@ -32,7 +32,7 @@ import { GraphiQL } from 'graphiql'; import { createGraphiQLFetcher } from '@graphiql/toolkit'; import { codeExporterPlugin } from '@graphiql/plugin-code-exporter'; import 'graphiql/style.css'; -import '@graphiql/plugin-code-exporter/dist/style.css'; +import '@graphiql/plugin-code-exporter/style.css'; const fetcher = createGraphiQLFetcher({ url: 'https://swapi-graphql.netlify.app/.netlify/functions/index', diff --git a/packages/graphiql-plugin-code-exporter/package.json b/packages/graphiql-plugin-code-exporter/package.json index 24f00f62ab5..20d3c15679f 100644 --- a/packages/graphiql-plugin-code-exporter/package.json +++ b/packages/graphiql-plugin-code-exporter/package.json @@ -21,6 +21,15 @@ "files": [ "dist" ], + "exports": { + "./package.json": "./package.json", + "./style.css": "./dist/style.css", + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/types/index.d.ts" + } + }, "scripts": { "dev": "vite build --watch", "build": "vite build && UMD=true vite build", diff --git a/packages/graphiql-plugin-explorer/README.md b/packages/graphiql-plugin-explorer/README.md index 5b6f82e4f56..57fb71e940c 100644 --- a/packages/graphiql-plugin-explorer/README.md +++ b/packages/graphiql-plugin-explorer/README.md @@ -26,7 +26,7 @@ import { GraphiQL } from 'graphiql'; import { createGraphiQLFetcher } from '@graphiql/toolkit'; import { explorerPlugin } from '@graphiql/plugin-explorer'; import 'graphiql/style.css'; -import '@graphiql/plugin-explorer/dist/style.css'; +import '@graphiql/plugin-explorer/style.css'; const fetcher = createGraphiQLFetcher({ url: 'https://swapi-graphql.netlify.app/.netlify/functions/index', diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index 044f6d5c3fd..0db3fdc1bd8 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -20,6 +20,15 @@ "files": [ "dist" ], + "exports": { + "./package.json": "./package.json", + "./style.css": "./dist/style.css", + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/types/index.d.ts" + } + }, "scripts": { "dev": "vite build --watch", "build": "vite build && UMD=true vite build", diff --git a/packages/graphiql-react/README.md b/packages/graphiql-react/README.md index 54ac1e2615e..77b90db13c2 100644 --- a/packages/graphiql-react/README.md +++ b/packages/graphiql-react/README.md @@ -61,7 +61,7 @@ function MyGraphQLIDE() { ``` The package also ships the necessary CSS that all its UI components need. You -can import them from `@graphiql/react/dist/style.css`. +can import them from `@graphiql/react/style.css`. > **Note**: In order for these styles to apply, the UI components need to be > rendered inside an element that has a class name `graphiql-container`. diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index e27d53d4994..11b9b68932c 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -15,14 +15,13 @@ "module": "dist/index.mjs", "exports": { "./package.json": "./package.json", + "./style.css": "./dist/style.css", + "./font/*": "./font/*", ".": { "import": "./dist/index.mjs", "require": "./dist/index.js", "types": "./dist/types/index.d.ts" - }, - "./font/roboto.css": "./font/roboto.css", - "./font/fira-code.css": "./font/fira-code.css", - "./dist/style.css": "./dist/style.css" + } }, "types": "dist/types/index.d.ts", "keywords": [ diff --git a/packages/graphiql/src/style.css b/packages/graphiql/src/style.css index 6c031fef448..59215688daa 100644 --- a/packages/graphiql/src/style.css +++ b/packages/graphiql/src/style.css @@ -1,6 +1,6 @@ @import '@graphiql/react/font/roboto.css'; @import '@graphiql/react/font/fira-code.css'; -@import '@graphiql/react/dist/style.css'; +@import '@graphiql/react/style.css'; /* Everything */ .graphiql-container { From 7afb4befcdc3cc07cc5f70d4b2ec790875094c84 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 9 Aug 2024 16:07:26 +0200 Subject: [PATCH 22/48] Update poor-ghosts-jump.md --- .changeset/poor-ghosts-jump.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.changeset/poor-ghosts-jump.md b/.changeset/poor-ghosts-jump.md index 4494b47715e..79d454d52a5 100644 --- a/.changeset/poor-ghosts-jump.md +++ b/.changeset/poor-ghosts-jump.md @@ -1,5 +1,5 @@ --- -'@graphiql/plugin-code-exporter': major +'@graphiql/plugin-explorer': major --- `style.css` import was changed @@ -7,7 +7,7 @@ ## Migration ```diff --import '@graphiql/plugin-code-exporter/dist/style.css'; -+import '@graphiql/plugin-code-exporter/style.css'; +-import '@graphiql/plugin-explorer/dist/style.css'; ++import '@graphiql/plugin-explorer/style.css'; ``` From 1a6d63d6b542cc4b4b335daa5b715488b49dfd8b Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Sun, 11 Aug 2024 20:02:19 +0200 Subject: [PATCH 23/48] Version Packages (alpha) (#3689) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 21 ++++++- examples/graphiql-webpack/package.json | 8 +-- .../CHANGELOG.md | 26 +++++++++ .../package.json | 6 +- .../graphiql-plugin-explorer/CHANGELOG.md | 26 +++++++++ .../graphiql-plugin-explorer/package.json | 6 +- packages/graphiql-react/CHANGELOG.md | 30 ++++++++++ packages/graphiql-react/package.json | 2 +- packages/graphiql/CHANGELOG.md | 57 +++++++++++++++++++ packages/graphiql/package.json | 4 +- 10 files changed, 171 insertions(+), 15 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 2d3dbfe45e7..dac7dd49cab 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -15,7 +15,24 @@ "monaco-graphql": "1.5.3", "vscode-graphql": "0.11.2", "vscode-graphql-execution": "0.2.6", - "vscode-graphql-syntax": "1.3.6" + "vscode-graphql-syntax": "1.3.6", + "example-graphiql-webpack": "0.0.0", + "example-monaco-graphql-nextjs": "0.0.0", + "example-monaco-graphql-react-vite": "0.0.0", + "example-monaco-graphql-webpack": "0.0.0" }, - "changesets": [] + "changesets": [ + "breezy-chicken-crash", + "flat-lies-heal", + "gentle-bugs-mix", + "good-vans-refuse", + "green-pugs-worry", + "hungry-spiders-cheat", + "metal-glasses-bow", + "orange-rivers-draw", + "poor-ghosts-jump", + "rich-jobs-kick", + "spotty-bulldogs-confess", + "thirty-spoons-call" + ] } diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index 6afb63c126c..19693eec98e 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -9,11 +9,11 @@ "start": "NODE_ENV=development webpack-cli serve" }, "dependencies": { - "@graphiql/plugin-code-exporter": "^3.0.5", - "@graphiql/plugin-explorer": "^3.1.1", + "@graphiql/plugin-code-exporter": "^4.0.0-alpha.0", + "@graphiql/plugin-explorer": "^4.0.0-alpha.0", "@graphiql/toolkit": "^0.9.2", - "@graphiql/react": "^0.23.1", - "graphiql": "^3.4.1", + "@graphiql/react": "^1.0.0-alpha.0", + "graphiql": "^4.0.0-alpha.0", "graphql": "^16.9.0", "graphql-ws": "^5.5.5", "react": "^18.2.0", diff --git a/packages/graphiql-plugin-code-exporter/CHANGELOG.md b/packages/graphiql-plugin-code-exporter/CHANGELOG.md index 0cf41978427..4be547f592b 100644 --- a/packages/graphiql-plugin-code-exporter/CHANGELOG.md +++ b/packages/graphiql-plugin-code-exporter/CHANGELOG.md @@ -1,5 +1,31 @@ # @graphiql/plugin-code-exporter +## 4.0.0-alpha.0 + +### Major Changes + +- [#3709](https://github.com/graphql/graphiql/pull/3709) [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb) Thanks [@dimaMachina](https://github.com/dimaMachina)! - `style.css` import was changed + + ## Migration + + ```diff + -import '@graphiql/plugin-code-exporter/dist/style.css'; + +import '@graphiql/plugin-code-exporter/style.css'; + ``` + +### Minor Changes + +- [#3702](https://github.com/graphql/graphiql/pull/3702) [`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627) Thanks [@dimaMachina](https://github.com/dimaMachina)! - generate types with `vite-plugin-dts` + +### Patch Changes + +- [#3705](https://github.com/graphql/graphiql/pull/3705) [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106) Thanks [@dimaMachina](https://github.com/dimaMachina)! - use `vite build --watch` instead of `vite` for `dev` script because we don't need development server for them + + do not use `vite-plugin-dts` when generating umd build + +- Updated dependencies [[`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627), [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb), [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106), [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad), [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673)]: + - @graphiql/react@1.0.0-alpha.0 + ## 3.0.5 ### Patch Changes diff --git a/packages/graphiql-plugin-code-exporter/package.json b/packages/graphiql-plugin-code-exporter/package.json index 20d3c15679f..0b2c9783ab4 100644 --- a/packages/graphiql-plugin-code-exporter/package.json +++ b/packages/graphiql-plugin-code-exporter/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/plugin-code-exporter", - "version": "3.0.5", + "version": "4.0.0-alpha.0", "repository": { "type": "git", "url": "https://github.com/graphql/graphiql", @@ -41,13 +41,13 @@ "graphiql-code-exporter": "^3.0.3" }, "peerDependencies": { - "@graphiql/react": "^0.23.0", + "@graphiql/react": "^1.0.0-alpha.0", "graphql": "^15.5.0 || ^16.0.0", "react": "^16.8.0 || ^17 || ^18", "react-dom": "^16.8.0 || ^17 || ^18" }, "devDependencies": { - "@graphiql/react": "^0.23.0", + "@graphiql/react": "^1.0.0-alpha.0", "@vitejs/plugin-react": "^4.3.1", "graphql": "^16.9.0", "postcss-nesting": "^10.1.7", diff --git a/packages/graphiql-plugin-explorer/CHANGELOG.md b/packages/graphiql-plugin-explorer/CHANGELOG.md index d5dec204346..99eb768ccc1 100644 --- a/packages/graphiql-plugin-explorer/CHANGELOG.md +++ b/packages/graphiql-plugin-explorer/CHANGELOG.md @@ -1,5 +1,31 @@ # @graphiql/plugin-explorer +## 4.0.0-alpha.0 + +### Major Changes + +- [#3709](https://github.com/graphql/graphiql/pull/3709) [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb) Thanks [@dimaMachina](https://github.com/dimaMachina)! - `style.css` import was changed + + ## Migration + + ```diff + -import '@graphiql/plugin-explorer/dist/style.css'; + +import '@graphiql/plugin-explorer/style.css'; + ``` + +### Minor Changes + +- [#3702](https://github.com/graphql/graphiql/pull/3702) [`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627) Thanks [@dimaMachina](https://github.com/dimaMachina)! - generate types with `vite-plugin-dts` + +### Patch Changes + +- [#3705](https://github.com/graphql/graphiql/pull/3705) [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106) Thanks [@dimaMachina](https://github.com/dimaMachina)! - use `vite build --watch` instead of `vite` for `dev` script because we don't need development server for them + + do not use `vite-plugin-dts` when generating umd build + +- Updated dependencies [[`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627), [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb), [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106), [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad), [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673)]: + - @graphiql/react@1.0.0-alpha.0 + ## 3.1.1 ### Patch Changes diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index 0db3fdc1bd8..96536c0ed40 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/plugin-explorer", - "version": "3.1.1", + "version": "4.0.0-alpha.0", "repository": { "type": "git", "url": "https://github.com/graphql/graphiql", @@ -40,13 +40,13 @@ "graphiql-explorer": "^0.9.0" }, "peerDependencies": { - "@graphiql/react": "^0.23.0", + "@graphiql/react": "^1.0.0-alpha.0", "graphql": "^15.5.0 || ^16.0.0", "react": "^16.8.0 || ^17 || ^18", "react-dom": "^16.8.0 || ^17 || ^18" }, "devDependencies": { - "@graphiql/react": "^0.23.0", + "@graphiql/react": "^1.0.0-alpha.0", "@vitejs/plugin-react": "^4.3.1", "graphql": "^16.9.0", "react": "^18.2.0", diff --git a/packages/graphiql-react/CHANGELOG.md b/packages/graphiql-react/CHANGELOG.md index 6be3894a67e..d03c8686635 100644 --- a/packages/graphiql-react/CHANGELOG.md +++ b/packages/graphiql-react/CHANGELOG.md @@ -1,5 +1,35 @@ # @graphiql/react +## 1.0.0-alpha.0 + +### Major Changes + +- [#3709](https://github.com/graphql/graphiql/pull/3709) [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb) Thanks [@dimaMachina](https://github.com/dimaMachina)! - `style.css` import was changed + + ## Migration + + ```diff + -import '@graphiql/react/dist/style.css'; + +import '@graphiql/react/style.css'; + ``` + +### Minor Changes + +- [#3702](https://github.com/graphql/graphiql/pull/3702) [`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627) Thanks [@dimaMachina](https://github.com/dimaMachina)! - generate types with `vite-plugin-dts` + +- [#3644](https://github.com/graphql/graphiql/pull/3644) [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673) Thanks [@dimaMachina](https://github.com/dimaMachina)! - - new looks of tabs + + - fix `disableTabs` when `Add tab` button is still shown + +### Patch Changes + +- [#3705](https://github.com/graphql/graphiql/pull/3705) [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106) Thanks [@dimaMachina](https://github.com/dimaMachina)! - use `vite build --watch` instead of `vite` for `dev` script because we don't need development server for them + + do not use `vite-plugin-dts` when generating umd build + +- [#3692](https://github.com/graphql/graphiql/pull/3692) [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad) Thanks [@dimaMachina](https://github.com/dimaMachina)! - - prefer `location` over `window.location` + - prefer `navigator` over `window.navigator` + ## 0.23.1 ### Patch Changes diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index 11b9b68932c..33a6c07e165 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/react", - "version": "0.23.1", + "version": "1.0.0-alpha.0", "repository": { "type": "git", "url": "https://github.com/graphql/graphiql", diff --git a/packages/graphiql/CHANGELOG.md b/packages/graphiql/CHANGELOG.md index 76ad07c273c..aa6f16eacfe 100644 --- a/packages/graphiql/CHANGELOG.md +++ b/packages/graphiql/CHANGELOG.md @@ -1,5 +1,62 @@ # Change Log +## 4.0.0-alpha.0 + +### Major Changes + +- [#3706](https://github.com/graphql/graphiql/pull/3706) [`343dd59`](https://github.com/graphql/graphiql/commit/343dd599ee10b0670cd7ab4dfaa65344f0d48c84) Thanks [@dimaMachina](https://github.com/dimaMachina)! - remove default export + + ## Migration + + ### Before + + ```jsx + import GraphiQL from 'graphiql'; + ``` + + ### After + + ```jsx + import { GraphiQL } from 'graphiql'; + ``` + +- [#3687](https://github.com/graphql/graphiql/pull/3687) [`09e7004`](https://github.com/graphql/graphiql/commit/09e700403beb6c7290d165df33a2455ac2196971) Thanks [@dimaMachina](https://github.com/dimaMachina)! - remove `disableTabs` option + +- [#3688](https://github.com/graphql/graphiql/pull/3688) [`0fdd9b9`](https://github.com/graphql/graphiql/commit/0fdd9b9f32513d96281f577a5d9bd2fefb5f05d4) Thanks [@dimaMachina](https://github.com/dimaMachina)! - remove `data-testid="graphiql-container"` + +- [#3679](https://github.com/graphql/graphiql/pull/3679) [`5d90e0e`](https://github.com/graphql/graphiql/commit/5d90e0eed58214c5926e6e0edb196971b15b1121) Thanks [@dimaMachina](https://github.com/dimaMachina)! - migrate from `webpack` to `vite` + + changed exports + + ```diff + -graphiql/graphiql.css + +graphiql/style.css + ``` + + changed cdn paths, `dist/index.umd.js` and `dist/style.css` are minified + + ```diff + -https://unpkg.com/graphiql/graphiql.js + -https://unpkg.com/graphiql/graphiql.min.js + +https://unpkg.com/graphiql/dist/index.umd.js + -https://unpkg.com/graphiql/graphiql.css + -https://unpkg.com/graphiql/graphiql.min.css + +https://unpkg.com/graphiql/dist/style.css + ``` + +- [#3644](https://github.com/graphql/graphiql/pull/3644) [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673) Thanks [@dimaMachina](https://github.com/dimaMachina)! - - new looks of tabs + + - fix `disableTabs` when `Add tab` button is still shown + +### Patch Changes + +- [#3683](https://github.com/graphql/graphiql/pull/3683) [`8efb873`](https://github.com/graphql/graphiql/commit/8efb873458489ce3497d917bcafd4ad8dfcbe6c8) Thanks [@dimaMachina](https://github.com/dimaMachina)! - update graphql to `16.9.0` and use vite `define` configuration to remove development code from cdn bundle + +- [#3692](https://github.com/graphql/graphiql/pull/3692) [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad) Thanks [@dimaMachina](https://github.com/dimaMachina)! - - prefer `location` over `window.location` + - prefer `navigator` over `window.navigator` +- Updated dependencies [[`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627), [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb), [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106), [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad), [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673)]: + - @graphiql/react@1.0.0-alpha.0 + ## 3.4.1 ### Patch Changes diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index 955ac944514..8f87073b4e1 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -1,6 +1,6 @@ { "name": "graphiql", - "version": "3.4.1", + "version": "4.0.0-alpha.0", "description": "An graphical interactive in-browser GraphQL IDE.", "contributors": [ "Hyohyeon Jeong ", @@ -41,7 +41,7 @@ "e2e-server": "start-server-and-test 'cross-env PORT=8080 node test/e2e-server' 'http-get://localhost:8080/graphql?query={test { id }}'" }, "dependencies": { - "@graphiql/react": "^0.23.1" + "@graphiql/react": "^1.0.0-alpha.0" }, "peerDependencies": { "graphql": "^15.5.0 || ^16.0.0", From 27bbc51a69504ffa9c6efbb17f112668f38fe52d Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Tue, 13 Aug 2024 18:12:45 +0200 Subject: [PATCH 24/48] [v4] show tabs even there is only 1 tab (#3713) * aa * aa * fix unit tests * fix cypress --- .changeset/few-steaks-clap.md | 5 + packages/graphiql-react/src/style/root.css | 1 - packages/graphiql/cypress/e2e/tabs.cy.ts | 4 +- packages/graphiql/src/components/GraphiQL.tsx | 187 ++++++++---------- .../components/__tests__/GraphiQL.spec.tsx | 6 +- packages/graphiql/src/style.css | 30 +-- 6 files changed, 106 insertions(+), 127 deletions(-) create mode 100644 .changeset/few-steaks-clap.md diff --git a/.changeset/few-steaks-clap.md b/.changeset/few-steaks-clap.md new file mode 100644 index 00000000000..7eff915641d --- /dev/null +++ b/.changeset/few-steaks-clap.md @@ -0,0 +1,5 @@ +--- +'graphiql': major +--- + +show tabs even there is only 1 tab diff --git a/packages/graphiql-react/src/style/root.css b/packages/graphiql-react/src/style/root.css index 8c8dbcfa09f..cebe1da2732 100644 --- a/packages/graphiql-react/src/style/root.css +++ b/packages/graphiql-react/src/style/root.css @@ -68,7 +68,6 @@ /* Layout */ --sidebar-width: 60px; --toolbar-width: 40px; - --session-header-height: 38.5px; } @media (prefers-color-scheme: dark) { diff --git a/packages/graphiql/cypress/e2e/tabs.cy.ts b/packages/graphiql/cypress/e2e/tabs.cy.ts index 4ad14f76d14..eb85755f9ca 100644 --- a/packages/graphiql/cypress/e2e/tabs.cy.ts +++ b/packages/graphiql/cypress/e2e/tabs.cy.ts @@ -67,8 +67,8 @@ describe('Tabs', () => { // Close tab cy.get('#graphiql-session-tab-1 + .graphiql-tab-close').click(); - // Assert that no tab visible when there's only one session - cy.get('#graphiql-session-tab-0').should('not.exist'); + // Assert that tab close button not visible when there is only 1 tab + cy.get('#graphiql-session-tab-0 + .graphiql-tab-close').should('not.exist'); // Assert editor values cy.assertHasValues({ diff --git a/packages/graphiql/src/components/GraphiQL.tsx b/packages/graphiql/src/components/GraphiQL.tsx index 19320b8c3ea..90bc9d860a2 100644 --- a/packages/graphiql/src/components/GraphiQL.tsx +++ b/packages/graphiql/src/components/GraphiQL.tsx @@ -454,69 +454,63 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) { } }, []); - const hasMultipleTabs = editorContext.tabs.length > 1; - const className = props.className ? ` ${props.className}` : ''; return (
-
- {pluginContext?.plugins.map((plugin, index) => { - const isVisible = plugin === pluginContext.visiblePlugin; - const label = `${isVisible ? 'Hide' : 'Show'} ${plugin.title}`; - const Icon = plugin.icon; - return ( - - - - - ); - })} -
-
- - - - - - - - - - - - -
+ {pluginContext?.plugins.map((plugin, index) => { + const isVisible = plugin === pluginContext.visiblePlugin; + const label = `${isVisible ? 'Hide' : 'Show'} ${plugin.title}`; + return ( + + + + + ); + })} + + + + + + + + + + + +
- {hasMultipleTabs && ( - - {editorContext.tabs.map((tab, index) => ( - - + {editorContext.tabs.map((tab, index, tabs) => ( + + + { + executionContext.stop(); + editorContext.changeTab(index); + }} > - { - executionContext.stop(); - editorContext.changeTab(index); - }} - > - {tab.title} - - { - if (editorContext.activeTabIndex === index) { - executionContext.stop(); - } - editorContext.closeTab(index); - }} - /> - + {tab.title} + - ))} - - )} + {tabs.length > 1 && ( + { + if (editorContext.activeTabIndex === index) { + executionContext.stop(); + } + editorContext.closeTab(index); + }} + /> + )} + + ))} +
-
+
{ }); describe('Tabs', () => { - it('show tabs if there are more than one', async () => { + it('show tabs', async () => { const { container } = render(); await waitFor(() => { expect( container.querySelectorAll('.graphiql-tabs .graphiql-tab'), - ).toHaveLength(0); + ).toHaveLength(1); }); act(() => { @@ -492,7 +492,7 @@ describe('GraphiQL', () => { await waitFor(() => { expect( container.querySelectorAll('.graphiql-tabs .graphiql-tab'), - ).toHaveLength(0); + ).toHaveLength(1); expect( container.querySelectorAll('.graphiql-tab .graphiql-tab-close'), ).toHaveLength(0); diff --git a/packages/graphiql/src/style.css b/packages/graphiql/src/style.css index 59215688daa..13c8b311ebf 100644 --- a/packages/graphiql/src/style.css +++ b/packages/graphiql/src/style.css @@ -16,34 +16,26 @@ .graphiql-container .graphiql-sidebar { display: flex; flex-direction: column; - justify-content: space-between; padding: var(--px-8); width: var(--sidebar-width); -} - -.graphiql-container .graphiql-sidebar .graphiql-sidebar-section { - display: flex; - flex-direction: column; gap: var(--px-8); + overflow-y: scroll; } -.graphiql-container .graphiql-sidebar button { +.graphiql-container .graphiql-sidebar > button { display: flex; align-items: center; justify-content: center; color: hsla(var(--color-neutral), var(--alpha-secondary)); height: calc(var(--sidebar-width) - (2 * var(--px-8))); width: calc(var(--sidebar-width) - (2 * var(--px-8))); + flex-shrink: 0; } .graphiql-container .graphiql-sidebar button.active { color: hsl(var(--color-neutral)); } -.graphiql-container .graphiql-sidebar button:not(:first-child) { - margin-top: var(--px-4); -} - .graphiql-container .graphiql-sidebar button > svg { height: var(--px-20); width: var(--px-20); @@ -74,14 +66,8 @@ .graphiql-container .graphiql-session-header { align-items: center; display: flex; - justify-content: flex-end; - height: var(--session-header-height); padding: var(--px-8) var(--px-8) 0; gap: var(--px-8); - - .graphiql-tabs + .graphiql-tab-add { - margin-right: auto; - } } /* The button to add a new tab */ @@ -97,6 +83,7 @@ button.graphiql-tab-add { /* The GraphiQL logo */ .graphiql-container .graphiql-logo { + margin-left: auto; color: hsla(var(--color-neutral), var(--alpha-secondary)); font-size: var(--font-size-h4); font-weight: var(--font-weight-medium); @@ -121,7 +108,7 @@ button.graphiql-tab-add { /* All editors (query, variable, headers) */ .graphiql-container .graphiql-editors { background-color: hsl(var(--color-base)); - border-radius: var(--border-radius-12); + border-radius: 0 0 var(--border-radius-12) var(--border-radius-12); box-shadow: var(--popover-box-shadow); display: flex; flex: 1; @@ -141,10 +128,13 @@ button.graphiql-tab-add { /* The vertical toolbar next to the query editor */ .graphiql-container .graphiql-toolbar { width: var(--toolbar-width); + display: flex; + flex-direction: column; + gap: var(--px-8); } -.graphiql-container .graphiql-toolbar > * + * { - margin-top: var(--px-8); +.graphiql-container .graphiql-toolbar > button { + flex-shrink: 0; } /* The toolbar icons */ From 3c901c104123750f45bcd64ade5b0ab9706d3146 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Tue, 13 Aug 2024 18:15:05 +0200 Subject: [PATCH 25/48] [v4] Remove `toolbar.additionalContent` and `toolbar.additionalComponent` props in favor of `GraphiQL.Toolbar` render props. (#3707) --- .changeset/weak-dancers-jog.md | 79 +++++++ packages/graphiql/src/components/GraphiQL.tsx | 216 ++++++++++-------- .../components/__tests__/GraphiQL.spec.tsx | 80 +------ 3 files changed, 202 insertions(+), 173 deletions(-) create mode 100644 .changeset/weak-dancers-jog.md diff --git a/.changeset/weak-dancers-jog.md b/.changeset/weak-dancers-jog.md new file mode 100644 index 00000000000..a95c2bc5590 --- /dev/null +++ b/.changeset/weak-dancers-jog.md @@ -0,0 +1,79 @@ +--- +'graphiql': major +--- + +Remove `toolbar.additionalContent` and `toolbar.additionalComponent` props in favor of `GraphiQL.Toolbar` render props. + +## Migration from `toolbar.additionalContent` + +#### Before + +```jsx +My button }} /> +``` + +#### After + +```jsx + + + {({ merge, prettify, copy }) => ( + <> + {prettify} + {merge} + {copy} + + + )} + + +``` + +### Migration from `toolbar.additionalComponent` + +#### Before + +```jsx +My button; + }, + }} +/> +``` + +#### After + +```jsx + + + {({ merge, prettify, copy }) => ( + <> + {prettify} + {merge} + {copy} + + + )} + + +``` + +--- + +Additionally, you can sort default toolbar buttons in different order or remove unneeded buttons for you: + +```jsx + + + {({ prettify, copy }) => ( + <> + {copy /* Copy button will be first instead of default last */} + {/* Merge button is removed from toolbar */} + {prettify} + + )} + + +``` diff --git a/packages/graphiql/src/components/GraphiQL.tsx b/packages/graphiql/src/components/GraphiQL.tsx index 90bc9d860a2..a17c6b46c9b 100644 --- a/packages/graphiql/src/components/GraphiQL.tsx +++ b/packages/graphiql/src/components/GraphiQL.tsx @@ -6,7 +6,6 @@ */ import React, { - ComponentType, Fragment, MouseEventHandler, PropsWithChildren, @@ -16,6 +15,10 @@ import React, { useState, useEffect, useMemo, + version, + Children, + JSX, + cloneElement, } from 'react'; import { @@ -61,7 +64,7 @@ import { WriteableEditorProps, } from '@graphiql/react'; -const majorVersion = parseInt(React.version.slice(0, 2), 10); +const majorVersion = parseInt(version.slice(0, 2), 10); if (majorVersion < 16) { throw new Error( @@ -73,20 +76,6 @@ if (majorVersion < 16) { ); } -export type GraphiQLToolbarConfig = { - /** - * This content will be rendered after the built-in buttons of the toolbar. - * Note that this will not apply if you provide a completely custom toolbar - * (by passing `GraphiQL.Toolbar` as child to the `GraphiQL` component). - */ - additionalContent?: React.ReactNode; - - /** - * same as above, except a component with access to context - */ - additionalComponent?: React.JSXElementConstructor; -}; - /** * API docs for this live here: * @@ -101,7 +90,6 @@ export type GraphiQLProps = Omit & * * @see https://github.com/graphql/graphiql#usage */ - export function GraphiQL({ dangerouslyAssumeSchemaIsValid, defaultQuery, @@ -137,7 +125,18 @@ export function GraphiQL({ 'The `GraphiQL` component requires a `fetcher` function to be passed as prop.', ); } - + // @ts-expect-error -- Prop is removed + if (props.toolbar?.additionalContent) { + throw new TypeError( + '`toolbar.additionalContent` was removed. Use render props on `GraphiQL.Toolbar` component instead.', + ); + } + // @ts-expect-error -- Prop is removed + if (props.toolbar?.additionalComponent) { + throw new TypeError( + '`toolbar.additionalComponent` was removed. Use render props on `GraphiQL.Toolbar` component instead.', + ); + } return ( { @@ -323,37 +312,35 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) { 'success' | 'error' | null >(null); - const children = React.Children.toArray(props.children); - - const logo = children.find(child => - isChildComponentType(child, GraphiQL.Logo), - ) || ; - - const toolbar = children.find(child => - isChildComponentType(child, GraphiQL.Toolbar), - ) || ( - <> - - - - - - - {props.toolbar?.additionalContent} - {props.toolbar?.additionalComponent && ( - - )} - - ); - - const footer = children.find(child => - isChildComponentType(child, GraphiQL.Footer), + const { + logo = , + // @ts-expect-error -- Prop exists but hidden for users + toolbar = , + footer, + } = useMemo( + () => + Children.toArray(props.children).reduce<{ + logo?: ReactNode; + toolbar?: ReactNode; + footer?: ReactNode; + }>((acc, curr) => { + switch (getChildComponentType(curr)) { + case GraphiQL.Logo: + acc.logo = curr; + break; + case GraphiQL.Toolbar: + // @ts-expect-error -- fix type error + acc.toolbar = cloneElement(curr, { + onCopyQuery: props.onCopyQuery, + }); + break; + case GraphiQL.Footer: + acc.footer = curr; + break; + } + return acc; + }, {}), + [props.children, props.onCopyQuery], ); const onClickReference = useCallback(() => { @@ -912,53 +899,94 @@ function ShortKeys({ keyMap }: { keyMap: string }): ReactElement { } // Configure the UI by providing this Component as a child of GraphiQL. -function GraphiQLLogo(props: PropsWithChildren) { - return ( -
- {props.children || ( - - Graph - i - QL - - )} -
- ); +function GraphiQLLogo({ + children = ( + + Graph + i + QL + + ), +}: PropsWithChildren) { + return
{children}
; } -GraphiQLLogo.displayName = 'GraphiQLLogo'; +type ToolbarRenderProps = (props: { + prettify: ReactNode; + copy: ReactNode; + merge: ReactNode; +}) => JSX.Element; + +const DefaultToolbarRenderProps: ToolbarRenderProps = ({ + prettify, + copy, + merge, +}) => ( + <> + {prettify} + {merge} + {copy} + +); // Configure the UI by providing this Component as a child of GraphiQL. -function GraphiQLToolbar(props: PropsWithChildren) { - // eslint-disable-next-line react/jsx-no-useless-fragment - return <>{props.children}; -} +function GraphiQLToolbar({ + children = DefaultToolbarRenderProps, + // @ts-expect-error -- Hide this prop for user, we use cloneElement to pass onCopyQuery + onCopyQuery, +}: { + children?: ToolbarRenderProps; +}) { + if (typeof children !== 'function') { + throw new TypeError( + 'The `GraphiQL.Toolbar` component requires a render prop function as its child.', + ); + } + const onCopy = useCopyQuery({ onCopyQuery }); + const onMerge = useMergeQuery(); + const onPrettify = usePrettifyEditors(); + + const prettify = ( + + + ); -GraphiQLToolbar.displayName = 'GraphiQLToolbar'; + const merge = ( + + + ); + + const copy = ( + + + ); + + return children({ prettify, copy, merge }); +} // Configure the UI by providing this Component as a child of GraphiQL. function GraphiQLFooter(props: PropsWithChildren) { return
{props.children}
; } -GraphiQLFooter.displayName = 'GraphiQLFooter'; - -// Determines if the React child is of the same type of the provided React component -function isChildComponentType( - child: any, - component: T, -): child is T { +function getChildComponentType(child: ReactNode) { if ( - child?.type?.displayName && - child.type.displayName === component.displayName + child && + typeof child === 'object' && + 'type' in child && + typeof child.type === 'function' ) { - return true; + return child.type; } - - return child.type === component; } diff --git a/packages/graphiql/src/components/__tests__/GraphiQL.spec.tsx b/packages/graphiql/src/components/__tests__/GraphiQL.spec.tsx index e91e1f65162..2bf102d0f0c 100644 --- a/packages/graphiql/src/components/__tests__/GraphiQL.spec.tsx +++ b/packages/graphiql/src/components/__tests__/GraphiQL.spec.tsx @@ -599,28 +599,6 @@ describe('GraphiQL', () => { expect(getByText('My Exported Type Logo')).toBeInTheDocument(); }); }); - - it('can be overridden using a named component', async () => { - const WrappedLogo = () => { - return ( -
- My Named Component Logo -
- ); - }; - WrappedLogo.displayName = 'GraphiQLLogo'; - - const { container, getByText } = render( - - - , - ); - - await waitFor(() => { - expect(container.querySelector('.test-wrapper')).toBeInTheDocument(); - expect(getByText('My Named Component Logo')).toBeInTheDocument(); - }); - }); }); describe('GraphiQL.Toolbar', () => { @@ -628,7 +606,7 @@ describe('GraphiQL', () => { const { container } = render( - + {() => } , ); @@ -641,35 +619,6 @@ describe('GraphiQL', () => { ).toHaveLength(1); }); }); - - it('can be overridden using a named component', async () => { - const WrappedToolbar = () => { - return ( -
- - - - , -
- ); - }; - WrappedToolbar.displayName = 'GraphiQLToolbar'; - - const { container } = render( - - - , - ); - - await waitFor(() => { - expect(container.querySelector('.test-wrapper')).toBeInTheDocument(); - expect( - container.querySelectorAll( - '[role="toolbar"] .graphiql-toolbar-button', - ), - ).toHaveLength(1); - }); - }); }); describe('GraphiQL.Footer', () => { @@ -688,33 +637,6 @@ describe('GraphiQL', () => { ).toHaveLength(1); }); }); - - it('can be overridden using a named component', async () => { - const WrappedFooter = () => { - return ( -
- - - - , -
- ); - }; - WrappedFooter.displayName = 'GraphiQLFooter'; - - const { container } = render( - - - , - ); - - await waitFor(() => { - expect(container.querySelector('.test-wrapper')).toBeInTheDocument(); - expect( - container.querySelectorAll('.graphiql-footer button'), - ).toHaveLength(1); - }); - }); }); }); }); From cb4553db1f1e39128cf82a39ed4f8f4f9dd57b14 Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Tue, 13 Aug 2024 20:01:33 +0200 Subject: [PATCH 26/48] Version Packages (alpha) (#3714) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 4 +- examples/graphiql-webpack/package.json | 2 +- packages/graphiql/CHANGELOG.md | 82 ++++++++++++++++++++++++++ packages/graphiql/package.json | 2 +- 4 files changed, 87 insertions(+), 3 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index dac7dd49cab..39947939197 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -23,6 +23,7 @@ }, "changesets": [ "breezy-chicken-crash", + "few-steaks-clap", "flat-lies-heal", "gentle-bugs-mix", "good-vans-refuse", @@ -33,6 +34,7 @@ "poor-ghosts-jump", "rich-jobs-kick", "spotty-bulldogs-confess", - "thirty-spoons-call" + "thirty-spoons-call", + "weak-dancers-jog" ] } diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index 19693eec98e..60be22a4b25 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -13,7 +13,7 @@ "@graphiql/plugin-explorer": "^4.0.0-alpha.0", "@graphiql/toolkit": "^0.9.2", "@graphiql/react": "^1.0.0-alpha.0", - "graphiql": "^4.0.0-alpha.0", + "graphiql": "^4.0.0-alpha.1", "graphql": "^16.9.0", "graphql-ws": "^5.5.5", "react": "^18.2.0", diff --git a/packages/graphiql/CHANGELOG.md b/packages/graphiql/CHANGELOG.md index aa6f16eacfe..24689761f0f 100644 --- a/packages/graphiql/CHANGELOG.md +++ b/packages/graphiql/CHANGELOG.md @@ -1,5 +1,87 @@ # Change Log +## 4.0.0-alpha.1 + +### Major Changes + +- [#3713](https://github.com/graphql/graphiql/pull/3713) [`27bbc51`](https://github.com/graphql/graphiql/commit/27bbc51a69504ffa9c6efbb17f112668f38fe52d) Thanks [@dimaMachina](https://github.com/dimaMachina)! - show tabs even there is only 1 tab + +- [#3707](https://github.com/graphql/graphiql/pull/3707) [`3c901c1`](https://github.com/graphql/graphiql/commit/3c901c104123750f45bcd64ade5b0ab9706d3146) Thanks [@dimaMachina](https://github.com/dimaMachina)! - Remove `toolbar.additionalContent` and `toolbar.additionalComponent` props in favor of `GraphiQL.Toolbar` render props. + + ## Migration from `toolbar.additionalContent` + + #### Before + + ```jsx + My button }} /> + ``` + + #### After + + ```jsx + + + {({ merge, prettify, copy }) => ( + <> + {prettify} + {merge} + {copy} + + + )} + + + ``` + + ### Migration from `toolbar.additionalComponent` + + #### Before + + ```jsx + My button; + }, + }} + /> + ``` + + #### After + + ```jsx + + + {({ merge, prettify, copy }) => ( + <> + {prettify} + {merge} + {copy} + + + )} + + + ``` + + *** + + Additionally, you can sort default toolbar buttons in different order or remove unneeded buttons for you: + + ```jsx + + + {({ prettify, copy }) => ( + <> + {copy /* Copy button will be first instead of default last */} + {/* Merge button is removed from toolbar */} + {prettify} + + )} + + + ``` + ## 4.0.0-alpha.0 ### Major Changes diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index 8f87073b4e1..c8e1a469e09 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -1,6 +1,6 @@ { "name": "graphiql", - "version": "4.0.0-alpha.0", + "version": "4.0.0-alpha.1", "description": "An graphical interactive in-browser GraphQL IDE.", "contributors": [ "Hyohyeon Jeong ", From cc2808f9b0d9ac0f98603299ec67e2a659cbfcd7 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Tue, 13 Aug 2024 23:21:07 +0200 Subject: [PATCH 27/48] [v4] use `position: absolute` for `.graphiql-logo` class (#3716) --- .changeset/pink-moose-shake.md | 5 +++++ packages/graphiql/src/style.css | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .changeset/pink-moose-shake.md diff --git a/.changeset/pink-moose-shake.md b/.changeset/pink-moose-shake.md new file mode 100644 index 00000000000..59273f6196b --- /dev/null +++ b/.changeset/pink-moose-shake.md @@ -0,0 +1,5 @@ +--- +'graphiql': patch +--- + +use `position: absolute` for `.graphiql-logo` class diff --git a/packages/graphiql/src/style.css b/packages/graphiql/src/style.css index 13c8b311ebf..ba20a575c45 100644 --- a/packages/graphiql/src/style.css +++ b/packages/graphiql/src/style.css @@ -64,6 +64,7 @@ /* The session header containing tabs and the logo */ .graphiql-container .graphiql-session-header { + position: relative; align-items: center; display: flex; padding: var(--px-8) var(--px-8) 0; @@ -73,6 +74,7 @@ /* The button to add a new tab */ button.graphiql-tab-add { padding: var(--px-4); + & > svg { color: hsla(var(--color-neutral), var(--alpha-secondary)); display: block; @@ -83,7 +85,8 @@ button.graphiql-tab-add { /* The GraphiQL logo */ .graphiql-container .graphiql-logo { - margin-left: auto; + position: absolute; + right: 0; color: hsla(var(--color-neutral), var(--alpha-secondary)); font-size: var(--font-size-h4); font-weight: var(--font-weight-medium); @@ -93,6 +96,7 @@ button.graphiql-tab-add { .graphiql-container .graphiql-logo .graphiql-logo-link { color: hsla(var(--color-neutral), var(--alpha-secondary)); text-decoration: none; + &:focus { outline: hsla(var(--color-neutral), var(--alpha-background-heavy)) auto 1px; } From bf0c4e7236f4a68448063aa0c6a4ed439e869a9f Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Tue, 13 Aug 2024 23:26:38 +0200 Subject: [PATCH 28/48] [v4] remove `createComponentGroup` utility in favour `Object.assign` (#3717) --- .changeset/thick-adults-leave.md | 5 +++++ .changeset/weak-dancers-jog.md | 10 +++++----- packages/graphiql-react/src/toolbar/menu.tsx | 3 +-- packages/graphiql-react/src/ui/dialog.tsx | 3 +-- packages/graphiql-react/src/ui/dropdown.tsx | 3 +-- packages/graphiql-react/src/ui/tooltip.tsx | 3 +-- .../graphiql-react/src/utility/component-group.ts | 13 ------------- 7 files changed, 14 insertions(+), 26 deletions(-) create mode 100644 .changeset/thick-adults-leave.md delete mode 100644 packages/graphiql-react/src/utility/component-group.ts diff --git a/.changeset/thick-adults-leave.md b/.changeset/thick-adults-leave.md new file mode 100644 index 00000000000..f18738c9905 --- /dev/null +++ b/.changeset/thick-adults-leave.md @@ -0,0 +1,5 @@ +--- +'@graphiql/react': minor +--- + +remove `createComponentGroup` utility in favour `Object.assign` diff --git a/.changeset/weak-dancers-jog.md b/.changeset/weak-dancers-jog.md index a95c2bc5590..8b78fe25302 100644 --- a/.changeset/weak-dancers-jog.md +++ b/.changeset/weak-dancers-jog.md @@ -6,13 +6,13 @@ Remove `toolbar.additionalContent` and `toolbar.additionalComponent` props in fa ## Migration from `toolbar.additionalContent` -#### Before +### Before ```jsx My button }} /> ``` -#### After +### After ```jsx @@ -29,9 +29,9 @@ Remove `toolbar.additionalContent` and `toolbar.additionalComponent` props in fa ``` -### Migration from `toolbar.additionalComponent` +## Migration from `toolbar.additionalComponent` -#### Before +### Before ```jsx ``` -#### After +### After ```jsx diff --git a/packages/graphiql-react/src/toolbar/menu.tsx b/packages/graphiql-react/src/toolbar/menu.tsx index fd5ab6f5075..1f3ab4f638e 100644 --- a/packages/graphiql-react/src/toolbar/menu.tsx +++ b/packages/graphiql-react/src/toolbar/menu.tsx @@ -1,7 +1,6 @@ import { ReactNode } from 'react'; import { clsx } from 'clsx'; import { DropdownMenu, Tooltip } from '../ui'; -import { createComponentGroup } from '../utility/component-group'; import './menu.css'; import { DropdownMenuProps } from '@radix-ui/react-dropdown-menu'; @@ -36,6 +35,6 @@ const ToolbarMenuRoot = ({ ); -export const ToolbarMenu = createComponentGroup(ToolbarMenuRoot, { +export const ToolbarMenu = Object.assign(ToolbarMenuRoot, { Item: DropdownMenu.Item, }); diff --git a/packages/graphiql-react/src/ui/dialog.tsx b/packages/graphiql-react/src/ui/dialog.tsx index 4b9d3091645..6a5f9881fea 100644 --- a/packages/graphiql-react/src/ui/dialog.tsx +++ b/packages/graphiql-react/src/ui/dialog.tsx @@ -1,7 +1,6 @@ import { clsx } from 'clsx'; import { forwardRef, ReactElement } from 'react'; import { CloseIcon } from '../icons'; -import { createComponentGroup } from '../utility/component-group'; import { UnStyledButton } from './button'; import * as D from '@radix-ui/react-dialog'; import { Root as VisuallyHidden } from '@radix-ui/react-visually-hidden'; @@ -40,7 +39,7 @@ export function DialogRoot({ ); } -export const Dialog = createComponentGroup(DialogRoot, { +export const Dialog = Object.assign(DialogRoot, { Close: DialogClose, Title: D.Title, Trigger: D.Trigger, diff --git a/packages/graphiql-react/src/ui/dropdown.tsx b/packages/graphiql-react/src/ui/dropdown.tsx index 5009c102da4..4d39e706fbc 100644 --- a/packages/graphiql-react/src/ui/dropdown.tsx +++ b/packages/graphiql-react/src/ui/dropdown.tsx @@ -1,6 +1,5 @@ import { ComponentProps, forwardRef, ReactElement } from 'react'; import { clsx } from 'clsx'; -import { createComponentGroup } from '../utility/component-group'; import { Trigger, Portal, @@ -53,7 +52,7 @@ const Item = ({ className, children, ...props }: DropdownMenuItemProps) => ( ); -export const DropdownMenu = createComponentGroup(Root, { +export const DropdownMenu = Object.assign(Root, { Button, Item, Content, diff --git a/packages/graphiql-react/src/ui/tooltip.tsx b/packages/graphiql-react/src/ui/tooltip.tsx index af141a9364c..8c9cea4523c 100644 --- a/packages/graphiql-react/src/ui/tooltip.tsx +++ b/packages/graphiql-react/src/ui/tooltip.tsx @@ -1,6 +1,5 @@ import { ReactElement, ReactNode } from 'react'; import * as T from '@radix-ui/react-tooltip'; -import { createComponentGroup } from '../utility/component-group'; import './tooltip.css'; export function TooltipRoot({ @@ -27,6 +26,6 @@ export function TooltipRoot({ ); } -export const Tooltip = createComponentGroup(TooltipRoot, { +export const Tooltip = Object.assign(TooltipRoot, { Provider: T.Provider, }); diff --git a/packages/graphiql-react/src/utility/component-group.ts b/packages/graphiql-react/src/utility/component-group.ts deleted file mode 100644 index d8cae861a00..00000000000 --- a/packages/graphiql-react/src/utility/component-group.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { JSXElementConstructor } from 'react'; - -export const createComponentGroup = < - Root extends JSXElementConstructor, - Children extends { [key: string]: JSXElementConstructor }, ->( - root: Root, - children: Children, -): Root & Children => - Object.entries(children).reduce((r, [key, value]) => { - r[key] = value; - return r; - }, root); From 15fff266713bed7520d34efe7abe154aa5c1d427 Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Tue, 13 Aug 2024 23:30:37 +0200 Subject: [PATCH 29/48] Version Packages (alpha) (#3718) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 2 ++ examples/graphiql-webpack/package.json | 4 ++-- packages/graphiql-react/CHANGELOG.md | 6 ++++++ packages/graphiql-react/package.json | 2 +- packages/graphiql/CHANGELOG.md | 9 +++++++++ packages/graphiql/package.json | 4 ++-- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 39947939197..62a9e0b5809 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -31,9 +31,11 @@ "hungry-spiders-cheat", "metal-glasses-bow", "orange-rivers-draw", + "pink-moose-shake", "poor-ghosts-jump", "rich-jobs-kick", "spotty-bulldogs-confess", + "thick-adults-leave", "thirty-spoons-call", "weak-dancers-jog" ] diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index 60be22a4b25..57cb742cfed 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -12,8 +12,8 @@ "@graphiql/plugin-code-exporter": "^4.0.0-alpha.0", "@graphiql/plugin-explorer": "^4.0.0-alpha.0", "@graphiql/toolkit": "^0.9.2", - "@graphiql/react": "^1.0.0-alpha.0", - "graphiql": "^4.0.0-alpha.1", + "@graphiql/react": "^1.0.0-alpha.1", + "graphiql": "^4.0.0-alpha.2", "graphql": "^16.9.0", "graphql-ws": "^5.5.5", "react": "^18.2.0", diff --git a/packages/graphiql-react/CHANGELOG.md b/packages/graphiql-react/CHANGELOG.md index d03c8686635..344d87a5401 100644 --- a/packages/graphiql-react/CHANGELOG.md +++ b/packages/graphiql-react/CHANGELOG.md @@ -1,5 +1,11 @@ # @graphiql/react +## 1.0.0-alpha.1 + +### Minor Changes + +- [#3717](https://github.com/graphql/graphiql/pull/3717) [`bf0c4e7`](https://github.com/graphql/graphiql/commit/bf0c4e7236f4a68448063aa0c6a4ed439e869a9f) Thanks [@dimaMachina](https://github.com/dimaMachina)! - remove `createComponentGroup` utility in favour `Object.assign` + ## 1.0.0-alpha.0 ### Major Changes diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index 33a6c07e165..e1117217b96 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/react", - "version": "1.0.0-alpha.0", + "version": "1.0.0-alpha.1", "repository": { "type": "git", "url": "https://github.com/graphql/graphiql", diff --git a/packages/graphiql/CHANGELOG.md b/packages/graphiql/CHANGELOG.md index 24689761f0f..f6e426e9584 100644 --- a/packages/graphiql/CHANGELOG.md +++ b/packages/graphiql/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## 4.0.0-alpha.2 + +### Patch Changes + +- [#3716](https://github.com/graphql/graphiql/pull/3716) [`cc2808f`](https://github.com/graphql/graphiql/commit/cc2808f9b0d9ac0f98603299ec67e2a659cbfcd7) Thanks [@dimaMachina](https://github.com/dimaMachina)! - use `position: absolute` for `.graphiql-logo` class + +- Updated dependencies [[`bf0c4e7`](https://github.com/graphql/graphiql/commit/bf0c4e7236f4a68448063aa0c6a4ed439e869a9f)]: + - @graphiql/react@1.0.0-alpha.1 + ## 4.0.0-alpha.1 ### Major Changes diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index c8e1a469e09..ca032b0fb6a 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -1,6 +1,6 @@ { "name": "graphiql", - "version": "4.0.0-alpha.1", + "version": "4.0.0-alpha.2", "description": "An graphical interactive in-browser GraphQL IDE.", "contributors": [ "Hyohyeon Jeong ", @@ -41,7 +41,7 @@ "e2e-server": "start-server-and-test 'cross-env PORT=8080 node test/e2e-server' 'http-get://localhost:8080/graphql?query={test { id }}'" }, "dependencies": { - "@graphiql/react": "^1.0.0-alpha.0" + "@graphiql/react": "^1.0.0-alpha.1" }, "peerDependencies": { "graphql": "^15.5.0 || ^16.0.0", From d3fc4707d10d66aced9d1db1c53f24db92fa813c Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 14 Aug 2024 01:46:20 +0200 Subject: [PATCH 30/48] [v4] fix merge conflicts with `main` (#3719) * upgrade to graphql v17 including support for new incremental delivery format (#3682) * add support for new incremental delivery format * fix vitest * add patch for graphql-js bug submittes upstream with test at https://github.com/graphql/graphql-js/pull/4160 * apply feedback * move patches! * some fixes * fix netlify/cypress * remove export * update changeset --------- Co-authored-by: Dimitri POSTOLOV * Version Packages (#3715) Co-authored-by: github-actions[bot] * prettier * fix e2e * update pr-graphql-compat-check.yml * prettier --------- Co-authored-by: Yaacov Rydzinski Co-authored-by: Rikki Schulte Co-authored-by: github-actions[bot] --- .github/workflows/pr-graphql-compat-check.yml | 6 +- examples/graphiql-webpack/package.json | 2 +- examples/monaco-graphql-nextjs/package.json | 4 +- .../monaco-graphql-react-vite/package.json | 6 +- examples/monaco-graphql-webpack/package.json | 4 +- package.json | 4 +- packages/cm6-graphql/CHANGELOG.md | 13 +++ packages/cm6-graphql/package.json | 8 +- packages/codemirror-graphql/CHANGELOG.md | 13 +++ packages/codemirror-graphql/package.json | 8 +- .../src/__tests__/lint-test.ts | 10 +- .../CHANGELOG.md | 13 +++ .../package.json | 4 +- .../graphiql-plugin-explorer/CHANGELOG.md | 13 +++ .../graphiql-plugin-explorer/package.json | 4 +- packages/graphiql-react/CHANGELOG.md | 15 +++ packages/graphiql-react/package.json | 14 +-- packages/graphiql-react/src/execution.tsx | 89 ++++++++++++++--- packages/graphiql-toolkit/CHANGELOG.md | 8 ++ packages/graphiql-toolkit/package.json | 6 +- packages/graphiql/CHANGELOG.md | 13 +++ packages/graphiql/cypress/e2e/errors.cy.ts | 22 +++-- .../cypress/e2e/incremental-delivery.cy.ts | 10 +- packages/graphiql/cypress/e2e/init.cy.ts | 3 +- .../graphiql/cypress/fixtures/bad-schema.json | 99 +++++++++++++++++++ packages/graphiql/package.json | 8 +- packages/graphiql/resources/renderExample.js | 16 +-- packages/graphiql/test/bad-schema.js | 97 ------------------ packages/graphiql/test/e2e-server.js | 69 +++++++++---- packages/graphiql/test/schema.js | 10 ++ packages/graphiql/vite.config.mts | 30 +++--- .../graphql-language-service-cli/CHANGELOG.md | 14 +++ .../graphql-language-service-cli/package.json | 10 +- .../CHANGELOG.md | 13 +++ .../package.json | 8 +- .../src/__tests__/MessageProcessor.spec.ts | 12 ++- .../graphql-language-service/CHANGELOG.md | 8 ++ .../graphql-language-service/package.json | 6 +- .../__tests__/getDiagnostics-test.ts | 17 +++- .../__tests__/validateWithCustomRules-test.ts | 4 +- packages/monaco-graphql/CHANGELOG.md | 13 +++ packages/monaco-graphql/package.json | 8 +- .../monaco-graphql/test/monaco-editor.test.ts | 5 +- .../vscode-graphql-execution/CHANGELOG.md | 8 ++ .../vscode-graphql-execution/package.json | 4 +- packages/vscode-graphql/CHANGELOG.md | 13 +++ packages/vscode-graphql/package.json | 6 +- .../patches/graphql+17.0.0-alpha.5.patch | 26 +++++ yarn.lock | 59 +++++++---- 49 files changed, 595 insertions(+), 260 deletions(-) create mode 100644 packages/graphiql/cypress/fixtures/bad-schema.json delete mode 100644 packages/graphiql/test/bad-schema.js create mode 100644 resources/patches/graphql+17.0.0-alpha.5.patch diff --git a/.github/workflows/pr-graphql-compat-check.yml b/.github/workflows/pr-graphql-compat-check.yml index c945e490d30..cd77d4741f5 100644 --- a/.github/workflows/pr-graphql-compat-check.yml +++ b/.github/workflows/pr-graphql-compat-check.yml @@ -4,8 +4,7 @@ on: # only on merge to main. # it's rare that this workflow would # show us an error, but when it does it's important! - branches: - - main + branches: [main, graphiql-v4] # don't run this regression suite if we don't need to paths-ignore: - '**.md' @@ -23,7 +22,8 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - release: ['15.5.3', '^15.8.0', '16.1.0', '16.2.0', '16.3.0'] + release: + ['15.5.3', '^15.8.0', '16.1.0', '16.2.0', '16.3.0', '17.0.0-alpha.5'] steps: - name: Checkout Code uses: actions/checkout@v4 diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index 57cb742cfed..bb3767363cc 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -11,7 +11,7 @@ "dependencies": { "@graphiql/plugin-code-exporter": "^4.0.0-alpha.0", "@graphiql/plugin-explorer": "^4.0.0-alpha.0", - "@graphiql/toolkit": "^0.9.2", + "@graphiql/toolkit": "^0.10.0", "@graphiql/react": "^1.0.0-alpha.1", "graphiql": "^4.0.0-alpha.2", "graphql": "^16.9.0", diff --git a/examples/monaco-graphql-nextjs/package.json b/examples/monaco-graphql-nextjs/package.json index 6a952a96861..2a8fb7ddea6 100644 --- a/examples/monaco-graphql-nextjs/package.json +++ b/examples/monaco-graphql-nextjs/package.json @@ -9,14 +9,14 @@ "start": "next start" }, "dependencies": { - "@graphiql/toolkit": "^0.9.2", + "@graphiql/toolkit": "^0.10.0", "graphql": "^16.9.0", "graphql-ws": "^5.5.5", "jsonc-parser": "^3.2.0", "marked": "^4.2.12", "monaco-editor": "^0.39.0", "monaco-editor-webpack-plugin": "^7.0.1", - "monaco-graphql": "^1.5.3", + "monaco-graphql": "^1.6.0", "next": "13.4.7", "prettier": "3.3.2", "react": "^18.2.0", diff --git a/examples/monaco-graphql-react-vite/package.json b/examples/monaco-graphql-react-vite/package.json index 3f38875515e..16c5fc627c8 100644 --- a/examples/monaco-graphql-react-vite/package.json +++ b/examples/monaco-graphql-react-vite/package.json @@ -3,12 +3,12 @@ "private": true, "version": "0.0.0", "dependencies": { - "@graphiql/toolkit": "^0.9.2", + "@graphiql/toolkit": "^0.10.0", "graphql": "^16.9.0", - "graphql-language-service": "^5.2.2", + "graphql-language-service": "^5.3.0", "jsonc-parser": "^3.2.0", "monaco-editor": "^0.39.0", - "monaco-graphql": "^1.5.3", + "monaco-graphql": "^1.6.0", "prettier": "3.3.2", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/examples/monaco-graphql-webpack/package.json b/examples/monaco-graphql-webpack/package.json index e73f258bb7e..ba412189401 100644 --- a/examples/monaco-graphql-webpack/package.json +++ b/examples/monaco-graphql-webpack/package.json @@ -10,11 +10,11 @@ }, "dependencies": { "graphql": "^16.9.0", - "graphql-language-service": "^5.2.2", + "graphql-language-service": "^5.3.0", "json-schema": "^0.4.0", "jsonc-parser": "^3.2.0", "monaco-editor": "^0.39.0", - "monaco-graphql": "^1.5.3", + "monaco-graphql": "^1.6.0", "prettier": "3.3.2" }, "devDependencies": { diff --git a/package.json b/package.json index 68fa2ec4bb4..356758b4cbf 100644 --- a/package.json +++ b/package.json @@ -79,6 +79,7 @@ "dependencies": { "identity-obj-proxy": "^3.0.0", "babel-plugin-macros": "^3.1.0", + "graphql-http": "^1.22.1", "@babel/cli": "^7.21.0", "@babel/core": "^7.21.0", "@babel/plugin-proposal-class-properties": "^7.18.6", @@ -144,6 +145,7 @@ "resolutions": { "@babel/traverse": "^7.23.2", "vscode-languageserver-types": "3.17.3", - "markdown-it": "14.1.0" + "markdown-it": "14.1.0", + "graphql": "17.0.0-alpha.5" } } diff --git a/packages/cm6-graphql/CHANGELOG.md b/packages/cm6-graphql/CHANGELOG.md index 840ee2a0c4d..3a6cd89d9e7 100644 --- a/packages/cm6-graphql/CHANGELOG.md +++ b/packages/cm6-graphql/CHANGELOG.md @@ -1,5 +1,18 @@ # cm6-graphql +## 0.1.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - graphql-language-service@5.3.0 + ## 0.0.15 ### Patch Changes diff --git a/packages/cm6-graphql/package.json b/packages/cm6-graphql/package.json index 5a33799ce55..52a45677e52 100644 --- a/packages/cm6-graphql/package.json +++ b/packages/cm6-graphql/package.json @@ -1,6 +1,6 @@ { "name": "cm6-graphql", - "version": "0.0.15", + "version": "0.1.0", "description": "GraphQL language support for CodeMirror 6", "scripts": { "build": "cm-buildhelper src/index.ts", @@ -16,7 +16,7 @@ "types": "dist/index.d.ts", "sideEffects": false, "dependencies": { - "graphql-language-service": "^5.2.1" + "graphql-language-service": "^5.3.0" }, "devDependencies": { "@codemirror/autocomplete": "6.2.0", @@ -30,7 +30,7 @@ "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.1.0", "esbuild": "0.18.10", - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "rollup": "^2.60.2", "rollup-plugin-dts": "^4.0.1", "rollup-plugin-esbuild": "^4.9.1", @@ -44,7 +44,7 @@ "@codemirror/state": "6.2.0", "@codemirror/view": "6.2.1", "@lezer/highlight": "^1.0.0", - "graphql": "^16.5.0" + "graphql": "^16.5.0 || ^17.0.0-alpha.2" }, "license": "MIT" } diff --git a/packages/codemirror-graphql/CHANGELOG.md b/packages/codemirror-graphql/CHANGELOG.md index cc6ddfc8019..3fa9165b6b8 100644 --- a/packages/codemirror-graphql/CHANGELOG.md +++ b/packages/codemirror-graphql/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 2.1.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - graphql-language-service@5.3.0 + ## 2.0.13 ### Patch Changes diff --git a/packages/codemirror-graphql/package.json b/packages/codemirror-graphql/package.json index 9fcfa64eacb..47c317563d4 100644 --- a/packages/codemirror-graphql/package.json +++ b/packages/codemirror-graphql/package.json @@ -1,6 +1,6 @@ { "name": "codemirror-graphql", - "version": "2.0.13", + "version": "2.1.0", "description": "GraphQL mode and helpers for CodeMirror.", "contributors": [ "Hyohyeon Jeong ", @@ -40,18 +40,18 @@ "peerDependencies": { "@codemirror/language": "6.0.0", "codemirror": "^5.65.3", - "graphql": "^15.5.0 || ^16.0.0" + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2" }, "// TEMPORARILY PINNED until we fix graphql 15 support": "", "dependencies": { "@types/codemirror": "^0.0.90", - "graphql-language-service": "5.2.2" + "graphql-language-service": "5.3.0" }, "devDependencies": { "@codemirror/language": "^6.0.0", "codemirror": "^5.65.3", "cross-env": "^7.0.2", - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "rimraf": "^3.0.2", "sane": "2.0.0" } diff --git a/packages/codemirror-graphql/src/__tests__/lint-test.ts b/packages/codemirror-graphql/src/__tests__/lint-test.ts index 0df6a8a3c9e..e603873dd9b 100644 --- a/packages/codemirror-graphql/src/__tests__/lint-test.ts +++ b/packages/codemirror-graphql/src/__tests__/lint-test.ts @@ -11,7 +11,7 @@ import CodeMirror from 'codemirror'; import 'codemirror/addon/lint/lint'; import { readFileSync } from 'node:fs'; import { join } from 'node:path'; -import { GraphQLError, OperationDefinitionNode } from 'graphql'; +import { GraphQLError, OperationDefinitionNode, version } from 'graphql'; import '../lint'; import '../mode'; import { TestSchema } from './testSchema'; @@ -61,7 +61,13 @@ describe('graphql-lint', () => { const noMutationOperationRule = (context: any) => ({ OperationDefinition(node: OperationDefinitionNode) { if (node.operation === 'mutation') { - context.reportError(new GraphQLError('I like turtles.', node)); + context.reportError( + new GraphQLError( + 'I like turtles.', + // @ts-expect-error + parseInt(version, 10) > 16 ? { nodes: node } : node, + ), + ); } return false; }, diff --git a/packages/graphiql-plugin-code-exporter/CHANGELOG.md b/packages/graphiql-plugin-code-exporter/CHANGELOG.md index 4be547f592b..23581470018 100644 --- a/packages/graphiql-plugin-code-exporter/CHANGELOG.md +++ b/packages/graphiql-plugin-code-exporter/CHANGELOG.md @@ -26,6 +26,19 @@ - Updated dependencies [[`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627), [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb), [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106), [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad), [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673)]: - @graphiql/react@1.0.0-alpha.0 +## 3.1.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - @graphiql/react@0.24.0 + ## 3.0.5 ### Patch Changes diff --git a/packages/graphiql-plugin-code-exporter/package.json b/packages/graphiql-plugin-code-exporter/package.json index 0b2c9783ab4..ff97b3ee4eb 100644 --- a/packages/graphiql-plugin-code-exporter/package.json +++ b/packages/graphiql-plugin-code-exporter/package.json @@ -42,14 +42,14 @@ }, "peerDependencies": { "@graphiql/react": "^1.0.0-alpha.0", - "graphql": "^15.5.0 || ^16.0.0", + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2", "react": "^16.8.0 || ^17 || ^18", "react-dom": "^16.8.0 || ^17 || ^18" }, "devDependencies": { "@graphiql/react": "^1.0.0-alpha.0", "@vitejs/plugin-react": "^4.3.1", - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "postcss-nesting": "^10.1.7", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/graphiql-plugin-explorer/CHANGELOG.md b/packages/graphiql-plugin-explorer/CHANGELOG.md index 99eb768ccc1..a2c13528535 100644 --- a/packages/graphiql-plugin-explorer/CHANGELOG.md +++ b/packages/graphiql-plugin-explorer/CHANGELOG.md @@ -26,6 +26,19 @@ - Updated dependencies [[`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627), [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb), [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106), [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad), [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673)]: - @graphiql/react@1.0.0-alpha.0 +## 3.2.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - @graphiql/react@0.24.0 + ## 3.1.1 ### Patch Changes diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index 96536c0ed40..49890111acf 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -41,14 +41,14 @@ }, "peerDependencies": { "@graphiql/react": "^1.0.0-alpha.0", - "graphql": "^15.5.0 || ^16.0.0", + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2", "react": "^16.8.0 || ^17 || ^18", "react-dom": "^16.8.0 || ^17 || ^18" }, "devDependencies": { "@graphiql/react": "^1.0.0-alpha.0", "@vitejs/plugin-react": "^4.3.1", - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "react": "^18.2.0", "react-dom": "^18.2.0", "typescript": "^4.6.3", diff --git a/packages/graphiql-react/CHANGELOG.md b/packages/graphiql-react/CHANGELOG.md index 344d87a5401..280ce16fba6 100644 --- a/packages/graphiql-react/CHANGELOG.md +++ b/packages/graphiql-react/CHANGELOG.md @@ -36,6 +36,21 @@ - [#3692](https://github.com/graphql/graphiql/pull/3692) [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad) Thanks [@dimaMachina](https://github.com/dimaMachina)! - - prefer `location` over `window.location` - prefer `navigator` over `window.navigator` +## 0.24.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - graphql-language-service@5.3.0 + - codemirror-graphql@2.1.0 + - @graphiql/toolkit@0.10.0 + ## 0.23.1 ### Patch Changes diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index e1117217b96..1733f83f0df 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -41,12 +41,12 @@ "types:check": "tsc --noEmit" }, "peerDependencies": { - "graphql": "^15.5.0 || ^16.0.0", + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2", "react": "^16.8.0 || ^17 || ^18", "react-dom": "^16.8.0 || ^17 || ^18" }, "dependencies": { - "@graphiql/toolkit": "^0.9.2", + "@graphiql/toolkit": "^0.10.0", "@headlessui/react": "^1.7.15", "@radix-ui/react-dialog": "^1.0.4", "@radix-ui/react-dropdown-menu": "^2.0.5", @@ -55,20 +55,22 @@ "@types/codemirror": "^5.60.8", "clsx": "^1.2.1", "codemirror": "^5.65.3", - "codemirror-graphql": "^2.0.13", + "codemirror-graphql": "^2.1.0", "copy-to-clipboard": "^3.2.0", "framer-motion": "^10.0.0", - "graphql-language-service": "^5.2.2", + "get-value": "^3.0.1", + "graphql-language-service": "^5.3.0", "markdown-it": "^14.1.0", "set-value": "^4.1.0" }, "devDependencies": { - "@types/markdown-it": "^14.1.2", "@babel/helper-string-parser": "^7.19.4", "@testing-library/react": "14.0.0", + "@types/markdown-it": "^14.1.2", + "@types/get-value": "^3.0.5", "@types/set-value": "^4.0.1", "@vitejs/plugin-react": "^4.3.1", - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "postcss-nesting": "^10.1.7", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/graphiql-react/src/execution.tsx b/packages/graphiql-react/src/execution.tsx index be1b8bcaced..5df69e39bbf 100644 --- a/packages/graphiql-react/src/execution.tsx +++ b/packages/graphiql-react/src/execution.tsx @@ -15,6 +15,7 @@ import { import { getFragmentDependenciesForAST } from 'graphql-language-service'; import { ReactNode, useCallback, useMemo, useRef, useState } from 'react'; import setValue from 'set-value'; +import getValue from 'get-value'; import { useAutoCompleteLeafs, useEditorContext } from './editor'; import { UseAutoCompleteLeafsArgs } from './editor/hooks'; @@ -343,8 +344,20 @@ type IncrementalResult = { incremental?: ReadonlyArray; label?: string; items?: ReadonlyArray> | null; + pending?: ReadonlyArray<{ id: string; path: ReadonlyArray }>; + completed?: ReadonlyArray<{ + id: string; + errors?: ReadonlyArray; + }>; + id?: string; + subPath?: ReadonlyArray; }; +const pathsMap = new WeakMap< + ExecutionResult, + Map> +>(); + /** * @param executionResult The complete execution result object which will be * mutated by merging the contents of the incremental result. @@ -352,22 +365,64 @@ type IncrementalResult = { * complete execution result. */ function mergeIncrementalResult( - executionResult: ExecutionResult, + executionResult: IncrementalResult, incrementalResult: IncrementalResult, ): void { - const path = ['data', ...(incrementalResult.path ?? [])]; - - if (incrementalResult.items) { - for (const item of incrementalResult.items) { - setValue(executionResult, path.join('.'), item); - // Increment the last path segment (the array index) to merge the next item at the next index - // eslint-disable-next-line unicorn/prefer-at -- cannot mutate the array using Array.at() - (path[path.length - 1] as number)++; + let path: ReadonlyArray | undefined = [ + 'data', + ...(incrementalResult.path ?? []), + ]; + + for (const result of [executionResult, incrementalResult]) { + if (result.pending) { + let paths = pathsMap.get(executionResult); + if (paths === undefined) { + paths = new Map(); + pathsMap.set(executionResult, paths); + } + + for (const { id, path: pendingPath } of result.pending) { + paths.set(id, ['data', ...pendingPath]); + } } } - if (incrementalResult.data) { - setValue(executionResult, path.join('.'), incrementalResult.data, { + const { items } = incrementalResult; + if (items) { + const { id } = incrementalResult; + if (id) { + path = pathsMap.get(executionResult)?.get(id); + if (path === undefined) { + throw new Error('Invalid incremental delivery format.'); + } + + const list = getValue(executionResult, path.join('.')); + list.push(...items); + } else { + path = ['data', ...(incrementalResult.path ?? [])]; + for (const item of items) { + setValue(executionResult, path.join('.'), item); + // Increment the last path segment (the array index) to merge the next item at the next index + // eslint-disable-next-line unicorn/prefer-at -- cannot mutate the array using Array.at() + (path[path.length - 1] as number)++; + } + } + } + + const { data } = incrementalResult; + if (data) { + const { id } = incrementalResult; + if (id) { + path = pathsMap.get(executionResult)?.get(id); + if (path === undefined) { + throw new Error('Invalid incremental delivery format.'); + } + const { subPath } = incrementalResult; + if (subPath !== undefined) { + path = [...path, ...subPath]; + } + } + setValue(executionResult, path.join('.'), data, { merge: true, }); } @@ -390,4 +445,16 @@ function mergeIncrementalResult( mergeIncrementalResult(executionResult, incrementalSubResult); } } + + if (incrementalResult.completed) { + // Remove tracking and add additional errors + for (const { id, errors } of incrementalResult.completed) { + pathsMap.get(executionResult)?.delete(id); + + if (errors) { + executionResult.errors ||= []; + (executionResult.errors as GraphQLError[]).push(...errors); + } + } + } } diff --git a/packages/graphiql-toolkit/CHANGELOG.md b/packages/graphiql-toolkit/CHANGELOG.md index b77a7a225cb..778d099fe80 100644 --- a/packages/graphiql-toolkit/CHANGELOG.md +++ b/packages/graphiql-toolkit/CHANGELOG.md @@ -1,5 +1,13 @@ # @graphiql/toolkit +## 0.10.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + ## 0.9.2 ### Patch Changes diff --git a/packages/graphiql-toolkit/package.json b/packages/graphiql-toolkit/package.json index de12f431f79..7e11d002671 100644 --- a/packages/graphiql-toolkit/package.json +++ b/packages/graphiql-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/toolkit", - "version": "0.9.2", + "version": "0.10.0", "description": "Utility to build a fetcher for GraphiQL", "contributors": [ "Rikki Schulte (https://rikki.dev)" @@ -24,13 +24,13 @@ "meros": "^1.1.4" }, "devDependencies": { - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "graphql-ws": "^5.5.5", "isomorphic-fetch": "^3.0.0", "subscriptions-transport-ws": "0.11.0" }, "peerDependencies": { - "graphql": "^15.5.0 || ^16.0.0", + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2", "graphql-ws": ">= 4.5.0" }, "peerDependenciesMeta": { diff --git a/packages/graphiql/CHANGELOG.md b/packages/graphiql/CHANGELOG.md index f6e426e9584..1a6d8cfe524 100644 --- a/packages/graphiql/CHANGELOG.md +++ b/packages/graphiql/CHANGELOG.md @@ -148,6 +148,19 @@ - Updated dependencies [[`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627), [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb), [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106), [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad), [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673)]: - @graphiql/react@1.0.0-alpha.0 +## 3.5.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - @graphiql/react@0.24.0 + ## 3.4.1 ### Patch Changes diff --git a/packages/graphiql/cypress/e2e/errors.cy.ts b/packages/graphiql/cypress/e2e/errors.cy.ts index dc9dd25c33f..b46511b3a8d 100644 --- a/packages/graphiql/cypress/e2e/errors.cy.ts +++ b/packages/graphiql/cypress/e2e/errors.cy.ts @@ -1,8 +1,12 @@ -import { version } from 'graphql'; +import { GraphQLError, version } from 'graphql'; describe('Errors', () => { it('Should show an error when the HTTP request fails', () => { - cy.visit('/?http-error=true'); + cy.intercept('/graphql', { + statusCode: 502, + body: 'Bad Gateway', + }); + cy.visit('/'); cy.assertQueryResult({ errors: [ { @@ -21,23 +25,27 @@ describe('Errors', () => { }); it('Should show an error when introspection fails', () => { - cy.visit('/?graphql-error=true'); + cy.intercept('/graphql', { + body: { errors: [new GraphQLError('Something unexpected happened...')] }, + }); + cy.visit('/'); cy.assertQueryResult({ errors: [{ message: 'Something unexpected happened...' }], }); }); it('Should show an error when the schema is invalid', () => { - cy.visit('/?bad=true'); + cy.intercept('/graphql', { fixture: 'bad-schema.json' }); + cy.visit('/'); /** * We can't use `cy.assertQueryResult` here because the stack contains line * and column numbers of the `index.umd.js` bundle which are not stable. */ cy.get('section.result-window').should(element => { expect(element.get(0).innerText).to.contain( - version.startsWith('16.') - ? 'Names must only contain [_a-zA-Z0-9] but \\"\\" does not.' - : 'Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but \\"\\" does not.', + version.startsWith('15') + ? 'Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but \\"\\" does not.' + : 'Names must only contain [_a-zA-Z0-9] but \\"\\" does not.', ); }); }); diff --git a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts index 0ab5710b5ea..1ea0c0ed822 100644 --- a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts +++ b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts @@ -1,10 +1,9 @@ import { version } from 'graphql'; -let describeOrSkip = describe.skip; +let describeOrSkip: Mocha.SuiteFunction | Mocha.PendingSuiteFunction = describe; -// TODO: disable when defer/stream is merged to graphql -if (version.includes('stream')) { - describeOrSkip = describe; +if (parseInt(version, 10) < 17) { + describeOrSkip = describe.skip; } describeOrSkip('IncrementalDelivery support via fetcher', () => { @@ -52,7 +51,6 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => { }, ], }, - hasNext: false, }; it('Expects slower streams to resolve in several increments, and the payloads to patch properly', () => { @@ -99,7 +97,6 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => { 'Oops, this took 1 seconds longer than I thought it would!', }, }, - hasNext: false, }); }); @@ -164,7 +161,6 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => { age: 1000, }, }, - hasNext: false, }); }); }); diff --git a/packages/graphiql/cypress/e2e/init.cy.ts b/packages/graphiql/cypress/e2e/init.cy.ts index 960faecd627..15f2b84e39d 100644 --- a/packages/graphiql/cypress/e2e/init.cy.ts +++ b/packages/graphiql/cypress/e2e/init.cy.ts @@ -49,7 +49,8 @@ describe('GraphiQL On Initialization', () => { cy.assertQueryResult(mockSuccess); }); it('Shows the expected error when the schema is invalid', () => { - cy.visit('/?bad=true'); + cy.intercept('/graphql', { fixture: 'bad-schema.json' }); + cy.visit('/'); cy.get('section.result-window').should(element => { expect(element.get(0).innerText).to.contain('Names must'); }); diff --git a/packages/graphiql/cypress/fixtures/bad-schema.json b/packages/graphiql/cypress/fixtures/bad-schema.json new file mode 100644 index 00000000000..b05417a54bf --- /dev/null +++ b/packages/graphiql/cypress/fixtures/bad-schema.json @@ -0,0 +1,99 @@ +{ + "data": { + "__schema": { + "queryType": { + "name": "Query" + }, + "mutationType": null, + "subscriptionType": null, + "types": [ + { + "kind": "OBJECT", + "name": "Query", + "description": null, + "fields": [ + { + "name": "user", + "description": null, + "args": [ + { + "name": "id", + "description": null, + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + }, + "defaultValue": null + } + ], + "type": { + "kind": "OBJECT", + "name": "", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "ID", + "description": "", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "", + "description": null, + "fields": [ + { + "name": "name", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "String", + "description": "", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + } + ], + "directives": [] + } + } +} diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index ca032b0fb6a..ecee724261f 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -44,20 +44,20 @@ "@graphiql/react": "^1.0.0-alpha.1" }, "peerDependencies": { - "graphql": "^15.5.0 || ^16.0.0", + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2", "react": "^16.8.0 || ^17 || ^18", "react-dom": "^16.8.0 || ^17 || ^18" }, "devDependencies": { - "@graphiql/toolkit": "^0.9.2", + "@graphiql/toolkit": "^0.10.0", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "14.0.0", "@types/testing-library__jest-dom": "5.14.5", "cross-env": "^7.0.2", "cypress": "^13.13.2", "express": "^4.19.2", - "graphql": "^16.9.0", - "graphql-http": "^1.19.0", + "graphql": "^17.0.0-alpha.5", + "graphql-helix": "^1.13.0", "graphql-subscriptions": "^2.0.0", "postcss": "8.4.31", "postcss-import": "15.1.0", diff --git a/packages/graphiql/resources/renderExample.js b/packages/graphiql/resources/renderExample.js index b73a1631638..b61ea304b86 100644 --- a/packages/graphiql/resources/renderExample.js +++ b/packages/graphiql/resources/renderExample.js @@ -62,20 +62,10 @@ function updateURL() { function getSchemaUrl() { const isDev = /localhost$/.test(location.hostname); - if (!isDev) { - return '/.netlify/functions/graphql'; + if (isDev) { + return '/graphql'; } - // This supports an e2e test which ensures that invalid schemas do not load. - if (parameters.bad === 'true') { - return '/bad/graphql'; - } - if (parameters['http-error'] === 'true') { - return '/http-error/graphql'; - } - if (parameters['graphql-error'] === 'true') { - return '/graphql-error/graphql'; - } - return '/graphql'; + return '/.netlify/functions/graphql'; } // Render into the body. diff --git a/packages/graphiql/test/bad-schema.js b/packages/graphiql/test/bad-schema.js deleted file mode 100644 index a101f008652..00000000000 --- a/packages/graphiql/test/bad-schema.js +++ /dev/null @@ -1,97 +0,0 @@ -export const badSchema = { - __schema: { - queryType: { - name: 'Query', - }, - mutationType: null, - subscriptionType: null, - types: [ - { - kind: 'OBJECT', - name: 'Query', - description: null, - fields: [ - { - name: 'user', - description: null, - args: [ - { - name: 'id', - description: null, - type: { - kind: 'NON_NULL', - name: null, - ofType: { - kind: 'SCALAR', - name: 'ID', - ofType: null, - }, - }, - defaultValue: null, - }, - ], - type: { - kind: 'OBJECT', - name: '', - ofType: null, - }, - isDeprecated: false, - deprecationReason: null, - }, - ], - inputFields: null, - interfaces: [], - enumValues: null, - possibleTypes: null, - }, - { - kind: 'SCALAR', - name: 'ID', - description: '', - fields: null, - inputFields: null, - interfaces: null, - enumValues: null, - possibleTypes: null, - }, - { - kind: 'OBJECT', - name: '', - description: null, - fields: [ - { - name: 'name', - description: null, - args: [], - type: { - kind: 'NON_NULL', - name: null, - ofType: { - kind: 'SCALAR', - name: 'String', - ofType: null, - }, - }, - isDeprecated: false, - deprecationReason: null, - }, - ], - inputFields: null, - interfaces: [], - enumValues: null, - possibleTypes: null, - }, - { - kind: 'SCALAR', - name: 'String', - description: '', - fields: null, - inputFields: null, - interfaces: null, - enumValues: null, - possibleTypes: null, - }, - ], - directives: [], - }, -}; diff --git a/packages/graphiql/test/e2e-server.js b/packages/graphiql/test/e2e-server.js index 003b5ebd013..4357c2da799 100644 --- a/packages/graphiql/test/e2e-server.js +++ b/packages/graphiql/test/e2e-server.js @@ -10,34 +10,67 @@ import { createServer } from 'node:http'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; import express from 'express'; -import { GraphQLError } from 'graphql'; -import { createHandler } from 'graphql-http/lib/use/express'; import { useServer } from 'graphql-ws/lib/use/ws'; import { WebSocketServer } from 'ws'; +import { execute, experimentalExecuteIncrementally, version } from 'graphql'; +import { + getGraphQLParameters, + processRequest, + sendResult, +} from 'graphql-helix'; // update when `graphql-http` is upgraded to support multipart requests for incremental delivery https://github.com/graphql/graphiql/pull/3682#discussion_r1715545279 import { schema } from './schema.js'; -import { badSchema } from './bad-schema.js'; const app = express(); -// Server -app.post('/graphql', createHandler({ schema })); -app.get('/graphql', createHandler({ schema })); +const customExecute = + parseInt(version, 10) > 16 + ? async (...args) => { + const result = await experimentalExecuteIncrementally(...args); -app.post('/bad/graphql', (_req, res, next) => { - res.json({ data: badSchema }); - next(); -}); + if (!('subsequentResults' in result)) { + return result; + } -app.post('/http-error/graphql', (_req, res, next) => { - res.status(502).send('Bad Gateway'); - next(); -}); + const { initialResult, subsequentResults } = result; + if (typeof subsequentResults[Symbol.asyncIterator] !== 'function') { + return result; + } -app.post('/graphql-error/graphql', (_req, res, next) => { - res.json({ errors: [new GraphQLError('Something unexpected happened...')] }); - next(); -}); + return (async function* () { + yield initialResult; + yield* subsequentResults; + })(); + } + : execute; + +async function handler(req, res) { + const request = { + body: req.body, + headers: req.headers, + method: req.method, + query: req.query, + }; + + const { operationName, query, variables } = getGraphQLParameters(request); + + const result = await processRequest({ + operationName, + query, + variables, + request, + schema, + execute: customExecute, + }); + + sendResult(result, res); +} + +// Server +app.use(express.json()); + +app.post('/graphql', handler); +app.get('/graphql', handler); // On CI we test the UMD build if (process.env.CI === 'true') { diff --git a/packages/graphiql/test/schema.js b/packages/graphiql/test/schema.js index ec8d99ff122..5d9173a4563 100644 --- a/packages/graphiql/test/schema.js +++ b/packages/graphiql/test/schema.js @@ -20,8 +20,17 @@ import { GraphQLString, GraphQLID, GraphQLList, + GraphQLDeferDirective, + GraphQLStreamDirective, + specifiedDirectives, + version, } from 'graphql'; +const directives = + parseInt(version, 10) > 16 + ? [...specifiedDirectives, GraphQLDeferDirective, GraphQLStreamDirective] + : specifiedDirectives; + // Test Schema const TestEnum = new GraphQLEnumType({ name: 'TestEnum', @@ -387,4 +396,5 @@ export const schema = new GraphQLSchema({ mutation: TestMutationType, subscription: TestSubscriptionType, description: 'This is a test schema for GraphiQL', + directives, }); diff --git a/packages/graphiql/vite.config.mts b/packages/graphiql/vite.config.mts index 402570f6e10..f6f830074f4 100644 --- a/packages/graphiql/vite.config.mts +++ b/packages/graphiql/vite.config.mts @@ -5,6 +5,8 @@ import commonjs from 'vite-plugin-commonjs'; const umdConfig = defineConfig({ define: { + // graphql v17 + 'globalThis.process.env.NODE_ENV': 'true', // https://github.com/graphql/graphql-js/blob/16.x.x/website/docs/tutorials/going-to-production.md#vite 'globalThis.process': 'true', 'process.env.NODE_ENV': '"production"', @@ -56,9 +58,6 @@ const esmConfig = defineConfig({ open: false, proxy: { '/graphql': 'http://localhost:8080', - '/bad/graphql': 'http://localhost:8080', - '/http-error/graphql': 'http://localhost:8080', - '/graphql-error/graphql': 'http://localhost:8080', '/subscriptions': { target: 'ws://localhost:8081', ws: true, @@ -69,6 +68,17 @@ const esmConfig = defineConfig({ }); function htmlPlugin(): PluginOption { + const htmlForVite = /* HTML */ ` + + + `; + return { name: 'html-replace-umd-with-src', transformIndexHtml: { @@ -80,19 +90,7 @@ function htmlPlugin(): PluginOption { html.indexOf(start), html.indexOf(end) + end.length, ); - return html.replace( - contentToReplace, - /* HTML */ ` - - - `, - ); + return html.replace(contentToReplace, htmlForVite); }, }, }; diff --git a/packages/graphql-language-service-cli/CHANGELOG.md b/packages/graphql-language-service-cli/CHANGELOG.md index 3ab48753318..0a2e4bf41b5 100644 --- a/packages/graphql-language-service-cli/CHANGELOG.md +++ b/packages/graphql-language-service-cli/CHANGELOG.md @@ -1,5 +1,19 @@ # graphql-language-service-cli +## 3.5.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - graphql-language-service-server@2.14.0 + - graphql-language-service@5.3.0 + ## 3.4.2 ### Patch Changes diff --git a/packages/graphql-language-service-cli/package.json b/packages/graphql-language-service-cli/package.json index 5bb897de2ac..a7e321c08a1 100644 --- a/packages/graphql-language-service-cli/package.json +++ b/packages/graphql-language-service-cli/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service-cli", - "version": "3.4.2", + "version": "3.5.0", "description": "An interface for building GraphQL language services for IDEs", "contributors": [ "Hyohyeon Jeong ", @@ -32,16 +32,16 @@ "LSP" ], "peerDependencies": { - "graphql": "^15.5.0 || ^16.0.0" + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2" }, "dependencies": { "@babel/polyfill": "^7.12.1", "@types/yargs": "16.0.5", - "graphql-language-service": "^5.2.2", - "graphql-language-service-server": "^2.13.2", + "graphql-language-service": "^5.3.0", + "graphql-language-service-server": "^2.14.0", "yargs": "^16.2.0" }, "devDependencies": { - "graphql": "^16.9.0" + "graphql": "^17.0.0-alpha.5" } } diff --git a/packages/graphql-language-service-server/CHANGELOG.md b/packages/graphql-language-service-server/CHANGELOG.md index 91a4ddaeba0..39db56e2790 100644 --- a/packages/graphql-language-service-server/CHANGELOG.md +++ b/packages/graphql-language-service-server/CHANGELOG.md @@ -1,5 +1,18 @@ # graphql-language-service-server +## 2.14.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - graphql-language-service@5.3.0 + ## 2.13.3 ### Patch Changes diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json index a87186adf62..868dd3240be 100644 --- a/packages/graphql-language-service-server/package.json +++ b/packages/graphql-language-service-server/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service-server", - "version": "2.13.3", + "version": "2.14.0", "description": "Server process backing the GraphQL Language Service", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", @@ -34,7 +34,7 @@ "module": "esm/index.js", "typings": "esm/index.d.ts", "peerDependencies": { - "graphql": "^15.5.0 || ^16.0.0" + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2" }, "COMMENT": "please do not remove dependencies without thorough testing. many dependencies are not imported directly, as they are peer dependencies", "dependencies": { @@ -47,7 +47,7 @@ "fast-glob": "^3.2.7", "glob": "^7.2.0", "graphql-config": "5.0.3", - "graphql-language-service": "^5.2.2", + "graphql-language-service": "^5.3.0", "lru-cache": "^10.2.0", "mkdirp": "^1.0.4", "node-abort-controller": "^3.0.1", @@ -68,7 +68,7 @@ "@types/mock-fs": "^4.13.4", "cross-env": "^7.0.2", "debounce-promise": "^3.1.2", - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "mock-fs": "^5.2.0" } } diff --git a/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts b/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts index fe50b3c071c..7e6695b1aac 100644 --- a/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts +++ b/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts @@ -11,6 +11,7 @@ import { buildASTSchema, introspectionFromSchema, parse, + version, } from 'graphql'; import fetchMock from 'fetch-mock'; import { schema as graphiqlSchema } from '../../../graphiql/test/schema'; @@ -361,6 +362,7 @@ describe('MessageProcessor with config', () => { }); it('caches files and schema with a URL config', async () => { + const offset = parseInt(version, 10) > 16 ? 25 : 0; mockSchema(graphiqlSchema); const project = new MockProject({ @@ -428,29 +430,29 @@ describe('MessageProcessor with config', () => { expect(serializeRange(typeDefinitions[0].range)).toEqual({ start: { - line: 11, + line: 11 + offset, character: 0, }, end: { - line: 102, + line: 102 + offset, character: 1, }, }); const schemaDefs = await project.lsp.handleDefinitionRequest({ textDocument: { uri: URI.parse(genSchemaPath).toString() }, - position: { character: 20, line: 18 }, + position: { character: 20, line: 18 + offset }, }); expect(schemaDefs[0].uri).toEqual(URI.parse(genSchemaPath).toString()); // note: if the graphiql test schema changes, // this might break, please adjust if you see a failure here expect(serializeRange(schemaDefs[0].range)).toEqual({ start: { - line: 104, + line: 104 + offset, character: 0, }, end: { - line: 112, + line: 112 + offset, character: 1, }, }); diff --git a/packages/graphql-language-service/CHANGELOG.md b/packages/graphql-language-service/CHANGELOG.md index 8bb6d733cfd..cb388248f1a 100644 --- a/packages/graphql-language-service/CHANGELOG.md +++ b/packages/graphql-language-service/CHANGELOG.md @@ -1,5 +1,13 @@ # graphql-language-service +## 5.3.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + ## 5.2.2 ### Patch Changes diff --git a/packages/graphql-language-service/package.json b/packages/graphql-language-service/package.json index 193d4ea226b..5a3335c708f 100644 --- a/packages/graphql-language-service/package.json +++ b/packages/graphql-language-service/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service", - "version": "5.2.2", + "version": "5.3.0", "description": "The official, runtime independent Language Service for GraphQL", "contributors": [ "GraphQL Contributors" @@ -32,7 +32,7 @@ "graphql": "./dist/temp-bin.js" }, "peerDependencies": { - "graphql": "^15.5.0 || ^16.0.0" + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2" }, "dependencies": { "debounce-promise": "^3.1.2", @@ -45,7 +45,7 @@ "@types/json-schema": "7.0.9", "@types/picomatch": "^2.3.0", "benchmark": "^2.1.4", - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "graphql-config": "5.0.3", "lodash": "^4.17.15", "platform": "^1.3.5", diff --git a/packages/graphql-language-service/src/interface/__tests__/getDiagnostics-test.ts b/packages/graphql-language-service/src/interface/__tests__/getDiagnostics-test.ts index 85ce2fe7171..ccb2bc71311 100644 --- a/packages/graphql-language-service/src/interface/__tests__/getDiagnostics-test.ts +++ b/packages/graphql-language-service/src/interface/__tests__/getDiagnostics-test.ts @@ -17,6 +17,7 @@ import { ValidationContext, ASTVisitor, FragmentDefinitionNode, + version, } from 'graphql'; import path from 'node:path'; @@ -87,7 +88,13 @@ describe('getDiagnostics', () => { for (const definition of node.definitions) { // add a custom error to every definition validationContext.reportError( - new GraphQLError('This is a custom error.', definition), + new GraphQLError( + 'This is a custom error.', + // @ts-expect-error + parseInt(version, 10) > 16 + ? { nodes: definition } + : definition, + ), ); } return false; @@ -158,7 +165,13 @@ describe('getDiagnostics', () => { const noQueryRule = (context: ValidationContext): ASTVisitor => ({ OperationDefinition(node) { if (node.operation === 'query') { - context.reportError(new GraphQLError('No query allowed.', node.name)); + context.reportError( + new GraphQLError( + 'No query allowed.', + // @ts-expect-error + parseInt(version, 10) > 16 ? { nodes: node } : node, + ), + ); } }, }); diff --git a/packages/graphql-language-service/src/utils/__tests__/validateWithCustomRules-test.ts b/packages/graphql-language-service/src/utils/__tests__/validateWithCustomRules-test.ts index 6ba7de8002b..b65c35c1eab 100644 --- a/packages/graphql-language-service/src/utils/__tests__/validateWithCustomRules-test.ts +++ b/packages/graphql-language-service/src/utils/__tests__/validateWithCustomRules-test.ts @@ -14,6 +14,7 @@ import { GraphQLSchema, ValidationContext, ArgumentNode, + version, } from 'graphql'; import { join } from 'node:path'; @@ -37,7 +38,8 @@ describe('validateWithCustomRules', () => { context.reportError( new GraphQLError( 'Argument ID must be a number written in string type.', - [node], + // @ts-expect-error + parseInt(version, 10) > 16 ? { nodes: node } : node, ), ); } diff --git a/packages/monaco-graphql/CHANGELOG.md b/packages/monaco-graphql/CHANGELOG.md index 3598596e396..b054831a995 100644 --- a/packages/monaco-graphql/CHANGELOG.md +++ b/packages/monaco-graphql/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 1.6.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - graphql-language-service@5.3.0 + ## 1.5.3 ### Patch Changes diff --git a/packages/monaco-graphql/package.json b/packages/monaco-graphql/package.json index 15b7e2bcc8b..14dc88a1a2e 100644 --- a/packages/monaco-graphql/package.json +++ b/packages/monaco-graphql/package.json @@ -1,7 +1,7 @@ { "name": "monaco-graphql", "description": "full service, official monaco mode for GraphQL", - "version": "1.5.3", + "version": "1.6.0", "license": "MIT", "main": "dist/monaco.contribution.js", "module": "esm/monaco.contribution.js", @@ -66,18 +66,18 @@ "test": "vitest run" }, "dependencies": { - "graphql-language-service": "^5.2.2", + "graphql-language-service": "^5.3.0", "picomatch-browser": "^2.2.6" }, "devDependencies": { "execa": "^7.1.1", - "graphql": "^16.9.0", + "graphql": "^17.0.0-alpha.5", "monaco-editor": "^0.39.0", "prettier": "3.3.2", "vscode-languageserver-types": "^3.17.1" }, "peerDependencies": { - "graphql": "^15.5.0 || ^16.0.0", + "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2", "monaco-editor": ">= 0.20.0 < 1", "prettier": "^2.8.0 || ^3.0.0" } diff --git a/packages/monaco-graphql/test/monaco-editor.test.ts b/packages/monaco-graphql/test/monaco-editor.test.ts index d1a566717a9..fee02855f48 100644 --- a/packages/monaco-graphql/test/monaco-editor.test.ts +++ b/packages/monaco-graphql/test/monaco-editor.test.ts @@ -1,4 +1,5 @@ import { $ } from 'execa'; +import { version } from 'graphql'; // eslint-disable-next-line no-control-regex const ANSI_COLOR_REGEX = /\u001b\[\d+m/g; @@ -13,7 +14,9 @@ describe('monaco-editor', () => { // expect(lines[0]).toBe('$ vite build'); // expect(lines[1]).toMatch(' building for production...'); // expect(lines[2]).toBe('transforming...'); - expect(lines[3]).toMatch('✓ 844 modules transformed.'); + expect(lines[3]).toMatch( + `✓ ${parseInt(version, 10) > 16 ? 856 : 843} modules transformed.`, + ); // expect(lines[4]).toBe('rendering chunks...'); // expect(lines[5]).toBe('computing gzip size...'); // expect(lines[6]).toMatch('dist/index.html'); diff --git a/packages/vscode-graphql-execution/CHANGELOG.md b/packages/vscode-graphql-execution/CHANGELOG.md index f8e72dbc41d..73dfa6119e3 100644 --- a/packages/vscode-graphql-execution/CHANGELOG.md +++ b/packages/vscode-graphql-execution/CHANGELOG.md @@ -1,5 +1,13 @@ # vscode-graphql-execution +## 0.3.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + ## 0.2.6 ### Patch Changes diff --git a/packages/vscode-graphql-execution/package.json b/packages/vscode-graphql-execution/package.json index c7af7629bba..6cb04f08616 100644 --- a/packages/vscode-graphql-execution/package.json +++ b/packages/vscode-graphql-execution/package.json @@ -1,6 +1,6 @@ { "name": "vscode-graphql-execution", - "version": "0.2.6", + "version": "0.3.0", "displayName": "GraphQL: Inline Operation Execution", "description": "Execute graphql operations from your code (revived!)", "publisher": "GraphQL", @@ -109,7 +109,7 @@ "cosmiconfig": "8.2.0", "cosmiconfig-toml-loader": "^1.0.0", "dotenv": "10.0.0", - "graphql": "^16.9.0", + "graphql": "^16.9.0 || ^17.0.0-alpha.2", "graphql-config": "5.0.3", "graphql-tag": "2.12.6", "graphql-ws": "5.10.0", diff --git a/packages/vscode-graphql/CHANGELOG.md b/packages/vscode-graphql/CHANGELOG.md index 7f5b8366d54..8466274207a 100644 --- a/packages/vscode-graphql/CHANGELOG.md +++ b/packages/vscode-graphql/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 0.12.0 + +### Minor Changes + +- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward. + + Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69. + +### Patch Changes + +- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]: + - graphql-language-service-server@2.14.0 + ## 0.11.3 ### Patch Changes diff --git a/packages/vscode-graphql/package.json b/packages/vscode-graphql/package.json index 35b17d5cb97..50d0f059553 100644 --- a/packages/vscode-graphql/package.json +++ b/packages/vscode-graphql/package.json @@ -1,6 +1,6 @@ { "name": "vscode-graphql", - "version": "0.11.3", + "version": "0.12.0", "private": true, "license": "MIT", "displayName": "GraphQL: Language Feature Support", @@ -179,8 +179,8 @@ "ovsx": "0.8.3" }, "dependencies": { - "graphql": "^16.9.0", - "graphql-language-service-server": "^2.13.3", + "graphql": "^16.9.0 || ^17.0.0-alpha.2", + "graphql-language-service-server": "^2.14.0", "vscode-languageclient": "8.0.2", "typescript": "^5.3.3" } diff --git a/resources/patches/graphql+17.0.0-alpha.5.patch b/resources/patches/graphql+17.0.0-alpha.5.patch new file mode 100644 index 00000000000..82e4f39cf16 --- /dev/null +++ b/resources/patches/graphql+17.0.0-alpha.5.patch @@ -0,0 +1,26 @@ +diff --git a/node_modules/graphql/execution/execute.js b/node_modules/graphql/execution/execute.js +index eb56e4b..5a4a398 100644 +--- a/node_modules/graphql/execution/execute.js ++++ b/node_modules/graphql/execution/execute.js +@@ -2055,7 +2055,7 @@ async function getNextAsyncStreamItemResult( + getNextAsyncStreamItemResult( + streamItemQueue, + streamPath, +- index, ++ index + 1, + asyncIterator, + exeContext, + fieldGroup, +diff --git a/node_modules/graphql/execution/execute.mjs b/node_modules/graphql/execution/execute.mjs +index 641c067..c7641d4 100644 +--- a/node_modules/graphql/execution/execute.mjs ++++ b/node_modules/graphql/execution/execute.mjs +@@ -1984,7 +1984,7 @@ async function getNextAsyncStreamItemResult( + getNextAsyncStreamItemResult( + streamItemQueue, + streamPath, +- index, ++ index + 1, + asyncIterator, + exeContext, + fieldGroup, diff --git a/yarn.lock b/yarn.lock index 68bc66ccbb3..bc64ce8c792 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4092,6 +4092,11 @@ resolved "https://registry.yarnpkg.com/@types/fetch-mock/-/fetch-mock-7.3.2.tgz#58805ba36a9357be92cc8c008dbfda937e9f7d8f" integrity sha512-NCEfv49jmDsBAixjMjEHKVgmVQlJ+uK56FOc+2roYPExnXCZDpi6mJOHQ3v23BiO84hBDStND9R2itJr7PNoow== +"@types/get-value@^3.0.5": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/get-value/-/get-value-3.0.5.tgz#4ea0e0b0a31c256636b3e7e0026c2ad38baea6f6" + integrity sha512-+o8nw0TId5cDwtdVrhlc8rvzaxbCU+JksFeu8ZunY9vUaODxngXiNceTFj2gkSwGWNRpe3PtaSWt1y0VB71PvA== + "@types/glob@^8.1.0": version "8.1.0" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" @@ -6405,9 +6410,9 @@ caniuse-lite@^1.0.30001640: integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg== caniuse-lite@^1.0.30001646: - version "1.0.30001650" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001650.tgz#dd1eba0938e39536d184c3c99b2569a13788bc16" - integrity sha512-fgEc7hP/LB7iicdXHUI9VsBsMZmUmlVJeQP2qqQW+3lkqVhbmjEU8zp+h5stWeilX+G7uXuIUIIlWlDw9jdt8g== + version "1.0.30001651" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz#52de59529e8b02b1aedcaaf5c05d9e23c0c28138" + integrity sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg== capital-case@^1.0.4: version "1.0.4" @@ -7886,9 +7891,9 @@ electron-to-chromium@^1.4.820: integrity sha512-FKbOCOQ5QRB3VlIbl1LZQefWIYwszlBloaXcY2rbfpu9ioJnNh3TK03YtIDKDo3WKBi8u+YV4+Fn2CkEozgf4w== electron-to-chromium@^1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.5.tgz#03bfdf422bdd2c05ee2657efedde21264a1a566b" - integrity sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA== + version "1.5.6" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.6.tgz#c81d9938b5a877314ad370feb73b4e5409b36abd" + integrity sha512-jwXWsM5RPf6j9dPYzaorcBSUg6AiqocPEyMpkchkvntaH9HGfOOMZwxMJjDY/XEs3T5dM7uyH1VhRMkqUU9qVw== elegant-spinner@^1.0.1: version "1.0.1" @@ -9664,6 +9669,13 @@ get-tsconfig@^4.7.3: dependencies: resolve-pkg-maps "^1.0.0" +get-value@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" + integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== + dependencies: + isobject "^3.0.1" + getos@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" @@ -9909,10 +9921,15 @@ graphql-config@5.0.3: string-env-interpolation "^1.0.1" tslib "^2.4.0" -graphql-http@^1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/graphql-http/-/graphql-http-1.19.0.tgz#6f0fff0dbd9a8e797c99b5ac0ca160566e7927da" - integrity sha512-fOD3hfp/G+Lhx2FWW5HsfmtJSsw6CikcpOboG7/mFo/pPUzn3yOwKdTFRnJ8MVY4ru69MT1nSPr/1gI/iuGNlw== +graphql-helix@^1.13.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/graphql-helix/-/graphql-helix-1.13.0.tgz#e64dad5ef5f622ef38c97fa033f56f3d953c0104" + integrity sha512-cqDKMoRywKjnL0ZWCTB0GOiBgsH6d3nU4JGDF6RuzAyd35tmalzKpSxkx3NNp4H5RvnKWnrukWzR51wUq277ng== + +graphql-http@^1.22.1: + version "1.22.1" + resolved "https://registry.yarnpkg.com/graphql-http/-/graphql-http-1.22.1.tgz#3857ac75366e55db189cfe09ade9cc4c4f2cfd09" + integrity sha512-4Jor+LRbA7SfSaw7dfDUs2UBzvWg3cKrykfHRgKsOIvQaLuf+QOcG2t3Mx5N9GzSNJcuqMqJWz0ta5+BryEmXg== graphql-subscriptions@^2.0.0: version "2.0.0" @@ -9938,10 +9955,10 @@ graphql-ws@5.14.0, graphql-ws@^5.5.5: resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.14.0.tgz#766f249f3974fc2c48fae0d1fb20c2c4c79cd591" integrity sha512-itrUTQZP/TgswR4GSSYuwWUzrE/w5GhbwM2GX3ic2U7aw33jgEsayfIlvaj7/GcIvZgNMzsPTrE5hqPuFUiE5g== -graphql@^16.9.0: - version "16.9.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.9.0.tgz#1c310e63f16a49ce1fbb230bd0a000e99f6f115f" - integrity sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw== +graphql@17.0.0-alpha.5, graphql@^16.9.0, "graphql@^16.9.0 || ^17.0.0-alpha.2", graphql@^17.0.0-alpha.5: + version "17.0.0-alpha.5" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-17.0.0-alpha.5.tgz#d094b76c14abbbfc7eabde0501a74709103d3c6b" + integrity sha512-gUBugdZH5nIl8G7cfz4WOKRtjcyuwpPTfFqWWMkcxpQCiO6wPRe7OfrjHe7p8mHEFG1a+ySzC7eB8idGZ27AGQ== handle-thing@^2.0.0: version "2.0.1" @@ -13096,7 +13113,7 @@ mimic-response@^3.1.0: min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - integrity sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ== + integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= dependencies: dom-walk "^0.1.0" @@ -14195,9 +14212,9 @@ postcss-import@15.1.0: resolve "^1.1.7" postcss-lightningcss@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postcss-lightningcss/-/postcss-lightningcss-1.0.0.tgz#a755fd04d5a20f2673afb15afe317a6563ddb8c1" - integrity sha512-sLNRVh+DINZHf5b31KUZnv3w4sf/CEdmvYP5JWzyyB8++E6WdaE7yxsrhfXiUFqISNBXcSrKfAF/MtTZrYAlbg== + version "1.0.1" + resolved "https://registry.yarnpkg.com/postcss-lightningcss/-/postcss-lightningcss-1.0.1.tgz#4a28c451e5205e0da6ec9110ad881f8d6b1b222f" + integrity sha512-9IrtZVt2HQ92iZJTkO43Qipx7E3PM+lLzZM8aGwMmMjNQHcir5jNC42U33p3Gh2lj1nES/ireYWEbMrJNiRBoQ== dependencies: browserslist "^4.19.1" lightningcss "^1.22.0" @@ -17227,9 +17244,9 @@ vite-plugin-commonjs@^0.10.1: vite-plugin-dynamic-import "^1.5.0" vite-plugin-dts@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-4.0.1.tgz#4a4dedc373292930a737879a8a35cb83f73af071" - integrity sha512-JFbAKMjJdJbeXJVwQNoi8M26lP+5Ene4/ryv9w0Z7Ca5N0DdxYEak9V3C0tqwHO7WZ9JLbwMsuUZOqYIyBRwSQ== + version "4.0.2" + resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-4.0.2.tgz#efe6367decbb2eb851e12ec0707d2459f6d5d0b8" + integrity sha512-Ni3EPG8yeLc5ivEzT4szreJ0rXpEQgvdYq3PaZ7OMoHc8uET4/HRUfzVPejJaUAojbxsKgaZbp6Zgm41sxb86Q== dependencies: "@microsoft/api-extractor" "7.47.4" "@rollup/pluginutils" "^5.1.0" From 79f3abf9b697c448442e32eb5a21b7ff720bc242 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 14 Aug 2024 16:34:21 +0200 Subject: [PATCH 31/48] [v4] fix scrollbar appearing in sidebar (#3720) * replace `overflow-y: scroll` with `overflow-y: auto` * fix netlify graphql function --- .changeset/red-papayas-fly.md | 6 +++++ .changeset/wicked-seas-laugh.md | 5 ++++ packages/graphiql-react/src/ui/dropdown.css | 2 +- packages/graphiql/src/components/GraphiQL.tsx | 23 +++++++++---------- packages/graphiql/src/style.css | 2 +- 5 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 .changeset/red-papayas-fly.md create mode 100644 .changeset/wicked-seas-laugh.md diff --git a/.changeset/red-papayas-fly.md b/.changeset/red-papayas-fly.md new file mode 100644 index 00000000000..2d02218e3b5 --- /dev/null +++ b/.changeset/red-papayas-fly.md @@ -0,0 +1,6 @@ +--- +'@graphiql/react': patch +'graphiql': patch +--- + +replace `overflow-y: scroll` with `overflow-y: auto` diff --git a/.changeset/wicked-seas-laugh.md b/.changeset/wicked-seas-laugh.md new file mode 100644 index 00000000000..3162059dcaf --- /dev/null +++ b/.changeset/wicked-seas-laugh.md @@ -0,0 +1,5 @@ +--- +'graphiql': patch +--- + +replace `Tooltip`s in tabs with html `title="..."` attribute diff --git a/packages/graphiql-react/src/ui/dropdown.css b/packages/graphiql-react/src/ui/dropdown.css index 5f7b9186ee2..09f4c57524e 100644 --- a/packages/graphiql-react/src/ui/dropdown.css +++ b/packages/graphiql-react/src/ui/dropdown.css @@ -12,7 +12,7 @@ calc(var(--radix-dropdown-menu-content-available-height) - 10px), 400px ); - overflow-y: scroll; + overflow-y: auto; } .graphiql-dropdown-item { diff --git a/packages/graphiql/src/components/GraphiQL.tsx b/packages/graphiql/src/components/GraphiQL.tsx index a17c6b46c9b..b387259a741 100644 --- a/packages/graphiql/src/components/GraphiQL.tsx +++ b/packages/graphiql/src/components/GraphiQL.tsx @@ -531,18 +531,17 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) { value={tab} isActive={index === editorContext.activeTabIndex} > - - { - executionContext.stop(); - editorContext.changeTab(index); - }} - > - {tab.title} - - + { + executionContext.stop(); + editorContext.changeTab(index); + }} + > + {tab.title} + {tabs.length > 1 && ( { diff --git a/packages/graphiql/src/style.css b/packages/graphiql/src/style.css index ba20a575c45..4fd72deff91 100644 --- a/packages/graphiql/src/style.css +++ b/packages/graphiql/src/style.css @@ -19,7 +19,7 @@ padding: var(--px-8); width: var(--sidebar-width); gap: var(--px-8); - overflow-y: scroll; + overflow-y: auto; } .graphiql-container .graphiql-sidebar > button { From 9d28035b51cddfffe89ab793cb9a073062bcdd6a Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Wed, 14 Aug 2024 16:46:30 +0200 Subject: [PATCH 32/48] Version Packages (alpha) (#3723) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 4 +++- examples/graphiql-webpack/package.json | 4 ++-- packages/graphiql-react/CHANGELOG.md | 6 ++++++ packages/graphiql-react/package.json | 2 +- packages/graphiql/CHANGELOG.md | 11 +++++++++++ packages/graphiql/package.json | 4 ++-- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 62a9e0b5809..19072259ca1 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -33,10 +33,12 @@ "orange-rivers-draw", "pink-moose-shake", "poor-ghosts-jump", + "red-papayas-fly", "rich-jobs-kick", "spotty-bulldogs-confess", "thick-adults-leave", "thirty-spoons-call", - "weak-dancers-jog" + "weak-dancers-jog", + "wicked-seas-laugh" ] } diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index bb3767363cc..e05a2e5d0f6 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -12,8 +12,8 @@ "@graphiql/plugin-code-exporter": "^4.0.0-alpha.0", "@graphiql/plugin-explorer": "^4.0.0-alpha.0", "@graphiql/toolkit": "^0.10.0", - "@graphiql/react": "^1.0.0-alpha.1", - "graphiql": "^4.0.0-alpha.2", + "@graphiql/react": "^1.0.0-alpha.2", + "graphiql": "^4.0.0-alpha.3", "graphql": "^16.9.0", "graphql-ws": "^5.5.5", "react": "^18.2.0", diff --git a/packages/graphiql-react/CHANGELOG.md b/packages/graphiql-react/CHANGELOG.md index 280ce16fba6..a472abfed13 100644 --- a/packages/graphiql-react/CHANGELOG.md +++ b/packages/graphiql-react/CHANGELOG.md @@ -1,5 +1,11 @@ # @graphiql/react +## 1.0.0-alpha.2 + +### Patch Changes + +- [#3720](https://github.com/graphql/graphiql/pull/3720) [`79f3abf`](https://github.com/graphql/graphiql/commit/79f3abf9b697c448442e32eb5a21b7ff720bc242) Thanks [@dimaMachina](https://github.com/dimaMachina)! - replace `overflow-y: scroll` with `overflow-y: auto` + ## 1.0.0-alpha.1 ### Minor Changes diff --git a/packages/graphiql-react/package.json b/packages/graphiql-react/package.json index 1733f83f0df..9cc2c3764b7 100644 --- a/packages/graphiql-react/package.json +++ b/packages/graphiql-react/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/react", - "version": "1.0.0-alpha.1", + "version": "1.0.0-alpha.2", "repository": { "type": "git", "url": "https://github.com/graphql/graphiql", diff --git a/packages/graphiql/CHANGELOG.md b/packages/graphiql/CHANGELOG.md index 1a6d8cfe524..0722f100363 100644 --- a/packages/graphiql/CHANGELOG.md +++ b/packages/graphiql/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## 4.0.0-alpha.3 + +### Patch Changes + +- [#3720](https://github.com/graphql/graphiql/pull/3720) [`79f3abf`](https://github.com/graphql/graphiql/commit/79f3abf9b697c448442e32eb5a21b7ff720bc242) Thanks [@dimaMachina](https://github.com/dimaMachina)! - replace `overflow-y: scroll` with `overflow-y: auto` + +- [#3720](https://github.com/graphql/graphiql/pull/3720) [`79f3abf`](https://github.com/graphql/graphiql/commit/79f3abf9b697c448442e32eb5a21b7ff720bc242) Thanks [@dimaMachina](https://github.com/dimaMachina)! - replace `Tooltip`s in tabs with html `title="..."` attribute + +- Updated dependencies [[`79f3abf`](https://github.com/graphql/graphiql/commit/79f3abf9b697c448442e32eb5a21b7ff720bc242)]: + - @graphiql/react@1.0.0-alpha.2 + ## 4.0.0-alpha.2 ### Patch Changes diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index ecee724261f..a38ed80f8c6 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -1,6 +1,6 @@ { "name": "graphiql", - "version": "4.0.0-alpha.2", + "version": "4.0.0-alpha.3", "description": "An graphical interactive in-browser GraphQL IDE.", "contributors": [ "Hyohyeon Jeong ", @@ -41,7 +41,7 @@ "e2e-server": "start-server-and-test 'cross-env PORT=8080 node test/e2e-server' 'http-get://localhost:8080/graphql?query={test { id }}'" }, "dependencies": { - "@graphiql/react": "^1.0.0-alpha.1" + "@graphiql/react": "^1.0.0-alpha.2" }, "peerDependencies": { "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2", From f8b719f215a79038d1b2a54ddfef461fd849a912 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 14 Aug 2024 20:07:19 +0200 Subject: [PATCH 33/48] style: Don't convert single \n to
(#3414) * Update development instructions * Don't convert single \n to
* Add changeset * Update .changeset/olive-mice-hide.md --------- Co-authored-by: Dimitri POSTOLOV --- .changeset/olive-mice-hide.md | 6 ++++++ packages/graphiql-react/src/markdown.ts | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .changeset/olive-mice-hide.md diff --git a/.changeset/olive-mice-hide.md b/.changeset/olive-mice-hide.md new file mode 100644 index 00000000000..2606c7cae1c --- /dev/null +++ b/.changeset/olive-mice-hide.md @@ -0,0 +1,6 @@ +--- +'graphiql': patch +'@graphiql/react': patch +--- + +Respect Markdown format: ignore single newline diff --git a/packages/graphiql-react/src/markdown.ts b/packages/graphiql-react/src/markdown.ts index 9386e370973..1e26795a8c1 100644 --- a/packages/graphiql-react/src/markdown.ts +++ b/packages/graphiql-react/src/markdown.ts @@ -1,6 +1,8 @@ import MarkdownIt from 'markdown-it'; export const markdown = new MarkdownIt({ - breaks: true, + // we don't want to convert \n to
because in markdown a single newline is not a line break + // https://github.com/graphql/graphiql/issues/3155 + breaks: false, linkify: true, }); From 196e9a081ffc0df16a5537c8ec0fb622fc3ba0b0 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 14 Aug 2024 22:24:11 +0200 Subject: [PATCH 34/48] [v4] some refactoring (#3726) * some refactoring * use `right: var(--px-16)` instead of `right: 0` for `.graphiql-logo` * more * try to fix * fix join is not defined * Update packages/graphiql/cypress/e2e/incremental-delivery.cy.ts Co-authored-by: Ted Thibodeau Jr --------- Co-authored-by: Ted Thibodeau Jr --- .changeset/strong-ears-bake.md | 5 ++++ .../cypress/e2e/incremental-delivery.cy.ts | 2 +- packages/graphiql/cypress/e2e/init.cy.ts | 2 +- packages/graphiql/cypress/e2e/tabs.cy.ts | 2 +- packages/graphiql/index.html | 7 ++--- .../{test/images => resources}/logo.svg | 2 +- packages/graphiql/src/style.css | 2 +- packages/graphiql/test/schema.js | 27 +++++++++---------- .../src/__tests__/MessageProcessor.spec.ts | 20 ++++++-------- 9 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 .changeset/strong-ears-bake.md rename packages/graphiql/{test/images => resources}/logo.svg (98%) diff --git a/.changeset/strong-ears-bake.md b/.changeset/strong-ears-bake.md new file mode 100644 index 00000000000..45ac76e3ebd --- /dev/null +++ b/.changeset/strong-ears-bake.md @@ -0,0 +1,5 @@ +--- +'graphiql': patch +--- + +use `right: var(--px-16)` instead of `right: 0` for `.graphiql-logo` diff --git a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts index 1ea0c0ed822..8dcee9bc941 100644 --- a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts +++ b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts @@ -105,7 +105,7 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => { This tests that; 1. user ({name}) => { name } 2. user ({age}) => { name, age } - 3. user.friends.0 ({name}) => { name, age, friends: [{name}] } <- can sometimes happen before 4, due the the promise race + 3. user.friends.0 ({name}) => { name, age, friends: [{name}] } <- can sometimes happen before 4, due to the promise race 4. user.friends.0 ({age}) => { name, age, friends: [{name, age}] } This shows us that we can deep merge defers, deep merge streams, and also deep merge defers inside streams diff --git a/packages/graphiql/cypress/e2e/init.cy.ts b/packages/graphiql/cypress/e2e/init.cy.ts index 15f2b84e39d..d10ee2810b5 100644 --- a/packages/graphiql/cypress/e2e/init.cy.ts +++ b/packages/graphiql/cypress/e2e/init.cy.ts @@ -15,7 +15,7 @@ const mockSuccess = { data: { longDescriptionType: { id: 'abc123', - image: '/images/logo.svg', + image: '/resources/logo.svg', hasArgs: '{"defaultValue":"test default value"}', test: { id: 'abc123', diff --git a/packages/graphiql/cypress/e2e/tabs.cy.ts b/packages/graphiql/cypress/e2e/tabs.cy.ts index eb85755f9ca..f438b9ecd68 100644 --- a/packages/graphiql/cypress/e2e/tabs.cy.ts +++ b/packages/graphiql/cypress/e2e/tabs.cy.ts @@ -61,7 +61,7 @@ describe('Tabs', () => { query: 'query Foo {image}', variablesString: '{"someVar":42}', headersString: '{"someHeader":"someValue"}', - response: { data: { image: '/images/logo.svg' } }, + response: { data: { image: '/resources/logo.svg' } }, }); // Close tab diff --git a/packages/graphiql/index.html b/packages/graphiql/index.html index d5365d780f9..04073bb4c0e 100644 --- a/packages/graphiql/index.html +++ b/packages/graphiql/index.html @@ -2,12 +2,13 @@ - + GraphiQL - - - - - -
Loading...
+ .loading { + height: 100%; + display: flex; + align-items: center; + justify-content: center; + font-size: 4rem; + } + + + + + + + +
+
Loading…
+
diff --git a/packages/graphiql-plugin-explorer/src/icons/folder-plus.svg b/packages/graphiql-plugin-explorer/src/icons/folder-plus.svg index d6714651b81..0e5550c87d8 100644 --- a/packages/graphiql-plugin-explorer/src/icons/folder-plus.svg +++ b/packages/graphiql-plugin-explorer/src/icons/folder-plus.svg @@ -13,8 +13,6 @@ /> div { + overflow: auto !important; /* override overflow: scroll */ +} + .graphiql-explorer-root input { background: unset; } @@ -44,16 +48,23 @@ padding: var(--px-4) var(--px-6); } -.graphiql-operation-title-bar .toolbar-button { - line-height: 0; - margin-left: var(--px-8); - color: hsla(var(--color-neutral), var(--alpha-secondary, 0.6)); - font-size: var(--font-size-h3); - vertical-align: middle; +.toolbar-button { + all: unset; + cursor: pointer; + line-height: 0 !important; + margin-left: var(--px-6); + color: hsl(var(--color-primary)); + font-size: var(--font-size-h3) !important; +} + +.graphiql-explorer-slug .toolbar-button, +.graphiql-explorer-graphql-arguments .toolbar-button { + font-size: inherit !important; } .graphiql-explorer-graphql-arguments input { line-height: 0; + min-width: 5rem; } .graphiql-explorer-actions { From dfb302a587197f7a9dc21074258ec5119f367b61 Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Mon, 19 Aug 2024 18:24:50 +0200 Subject: [PATCH 42/48] Version Packages (alpha) (#3739) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 1 + examples/graphiql-webpack/package.json | 2 +- packages/graphiql-plugin-explorer/CHANGELOG.md | 6 ++++++ packages/graphiql-plugin-explorer/package.json | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index c75e90da251..350985d8c62 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -29,6 +29,7 @@ "gentle-bugs-mix", "good-vans-refuse", "green-pugs-worry", + "healthy-onions-bake", "hungry-spiders-cheat", "metal-glasses-bow", "old-zebras-knock", diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index e48d8a8076b..249615b221e 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@graphiql/plugin-code-exporter": "^4.0.0-alpha.0", - "@graphiql/plugin-explorer": "^4.0.0-alpha.0", + "@graphiql/plugin-explorer": "^4.0.0-alpha.1", "@graphiql/toolkit": "^0.10.0", "@graphiql/react": "^1.0.0-alpha.4", "graphiql": "^4.0.0-alpha.5", diff --git a/packages/graphiql-plugin-explorer/CHANGELOG.md b/packages/graphiql-plugin-explorer/CHANGELOG.md index 948aa056a6d..3d1eb6c2a1e 100644 --- a/packages/graphiql-plugin-explorer/CHANGELOG.md +++ b/packages/graphiql-plugin-explorer/CHANGELOG.md @@ -1,5 +1,11 @@ # @graphiql/plugin-explorer +## 4.0.0-alpha.1 + +### Patch Changes + +- [#3738](https://github.com/graphql/graphiql/pull/3738) [`eaa415c`](https://github.com/graphql/graphiql/commit/eaa415cce5c3baecea76068c02953884eec5ba2e) Thanks [@dimaMachina](https://github.com/dimaMachina)! - improve explorer styles + ## 4.0.0-alpha.0 ### Major Changes diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index 921d86bf324..3d5e853b0b3 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/plugin-explorer", - "version": "4.0.0-alpha.0", + "version": "4.0.0-alpha.1", "repository": { "type": "git", "url": "https://github.com/graphql/graphiql", From 3c12ce01eb3b2ec9a317a2fea2bb92602b748a8b Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Tue, 20 Aug 2024 14:50:26 +0200 Subject: [PATCH 43/48] fix types incorrect types entry (#3740) --- .changeset/nine-meals-happen.md | 6 +++++ .../package.json | 2 +- packages/graphiql-plugin-explorer/README.md | 2 +- .../{examples/index.html => example.html} | 23 +++++++++++-------- .../graphiql-plugin-explorer/package.json | 2 +- .../graphiql-plugin-explorer/src/index.css | 2 +- 6 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 .changeset/nine-meals-happen.md rename packages/graphiql-plugin-explorer/{examples/index.html => example.html} (85%) diff --git a/.changeset/nine-meals-happen.md b/.changeset/nine-meals-happen.md new file mode 100644 index 00000000000..34b1551d197 --- /dev/null +++ b/.changeset/nine-meals-happen.md @@ -0,0 +1,6 @@ +--- +'@graphiql/plugin-code-exporter': patch +'@graphiql/plugin-explorer': patch +--- + +fix types incorrect types entry diff --git a/packages/graphiql-plugin-code-exporter/package.json b/packages/graphiql-plugin-code-exporter/package.json index 1a9e64a1010..6766d5fd598 100644 --- a/packages/graphiql-plugin-code-exporter/package.json +++ b/packages/graphiql-plugin-code-exporter/package.json @@ -27,7 +27,7 @@ ".": { "import": "./dist/index.mjs", "require": "./dist/index.js", - "types": "./dist/types/index.d.ts" + "types": "./dist/index.d.ts" } }, "scripts": { diff --git a/packages/graphiql-plugin-explorer/README.md b/packages/graphiql-plugin-explorer/README.md index 57fb71e940c..7ea41b8c2df 100644 --- a/packages/graphiql-plugin-explorer/README.md +++ b/packages/graphiql-plugin-explorer/README.md @@ -44,4 +44,4 @@ function GraphiQLWithExplorer() { You can also use this plugin with `unpkg`, `jsdelivr`, and other CDNs. -See the [example HTML file](examples/index.html) for this plugin +See the [example HTML file](./example.html) for this plugin diff --git a/packages/graphiql-plugin-explorer/examples/index.html b/packages/graphiql-plugin-explorer/example.html similarity index 85% rename from packages/graphiql-plugin-explorer/examples/index.html rename to packages/graphiql-plugin-explorer/example.html index 67109fa9b8d..7d07347f1ad 100644 --- a/packages/graphiql-plugin-explorer/examples/index.html +++ b/packages/graphiql-plugin-explorer/example.html @@ -68,15 +68,20 @@ const explorerPlugin = GraphiQLPluginExplorer.explorerPlugin(); const root = ReactDOM.createRoot(document.getElementById('graphiql')); - root.render( - React.createElement(GraphiQL, { - fetcher: fetcher, - defaultEditorToolsVisibility: true, - plugins: [explorerPlugin], - defaultQuery: - 'query AllFilms {\n allFilms {\n films {\n title\n }\n }\n}', - }), - ); + const app = React.createElement(GraphiQL, { + fetcher, + defaultEditorToolsVisibility: true, + plugins: [explorerPlugin], + defaultQuery: `query AllFilms { + allFilms { + films { + title + } + } +}`, + }); + + root.render(app); diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index 3d5e853b0b3..ec88413e4ff 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -26,7 +26,7 @@ ".": { "import": "./dist/index.mjs", "require": "./dist/index.js", - "types": "./dist/types/index.d.ts" + "types": "./dist/index.d.ts" } }, "scripts": { diff --git a/packages/graphiql-plugin-explorer/src/index.css b/packages/graphiql-plugin-explorer/src/index.css index eb05824538f..36c1f2b95dd 100644 --- a/packages/graphiql-plugin-explorer/src/index.css +++ b/packages/graphiql-plugin-explorer/src/index.css @@ -64,7 +64,7 @@ .graphiql-explorer-graphql-arguments input { line-height: 0; - min-width: 5rem; + min-width: 2rem; } .graphiql-explorer-actions { From e432fb502831383061a0b780b304bd36ac51e16d Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Tue, 20 Aug 2024 15:00:51 +0200 Subject: [PATCH 44/48] Version Packages (alpha) (#3741) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 1 + examples/graphiql-webpack/package.json | 4 ++-- packages/graphiql-plugin-code-exporter/CHANGELOG.md | 6 ++++++ packages/graphiql-plugin-code-exporter/package.json | 2 +- packages/graphiql-plugin-explorer/CHANGELOG.md | 6 ++++++ packages/graphiql-plugin-explorer/package.json | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 350985d8c62..4220dda8dcc 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -32,6 +32,7 @@ "healthy-onions-bake", "hungry-spiders-cheat", "metal-glasses-bow", + "nine-meals-happen", "old-zebras-knock", "olive-mice-hide", "orange-rivers-draw", diff --git a/examples/graphiql-webpack/package.json b/examples/graphiql-webpack/package.json index 249615b221e..67fa410c474 100644 --- a/examples/graphiql-webpack/package.json +++ b/examples/graphiql-webpack/package.json @@ -9,8 +9,8 @@ "start": "NODE_ENV=development webpack-cli serve" }, "dependencies": { - "@graphiql/plugin-code-exporter": "^4.0.0-alpha.0", - "@graphiql/plugin-explorer": "^4.0.0-alpha.1", + "@graphiql/plugin-code-exporter": "^4.0.0-alpha.1", + "@graphiql/plugin-explorer": "^4.0.0-alpha.2", "@graphiql/toolkit": "^0.10.0", "@graphiql/react": "^1.0.0-alpha.4", "graphiql": "^4.0.0-alpha.5", diff --git a/packages/graphiql-plugin-code-exporter/CHANGELOG.md b/packages/graphiql-plugin-code-exporter/CHANGELOG.md index a5eaf6b2f10..b4fb31d1d94 100644 --- a/packages/graphiql-plugin-code-exporter/CHANGELOG.md +++ b/packages/graphiql-plugin-code-exporter/CHANGELOG.md @@ -1,5 +1,11 @@ # @graphiql/plugin-code-exporter +## 4.0.0-alpha.1 + +### Patch Changes + +- [#3740](https://github.com/graphql/graphiql/pull/3740) [`3c12ce0`](https://github.com/graphql/graphiql/commit/3c12ce01eb3b2ec9a317a2fea2bb92602b748a8b) Thanks [@dimaMachina](https://github.com/dimaMachina)! - fix types incorrect types entry + ## 4.0.0-alpha.0 ### Major Changes diff --git a/packages/graphiql-plugin-code-exporter/package.json b/packages/graphiql-plugin-code-exporter/package.json index 6766d5fd598..3e055b0386b 100644 --- a/packages/graphiql-plugin-code-exporter/package.json +++ b/packages/graphiql-plugin-code-exporter/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/plugin-code-exporter", - "version": "4.0.0-alpha.0", + "version": "4.0.0-alpha.1", "repository": { "type": "git", "url": "https://github.com/graphql/graphiql", diff --git a/packages/graphiql-plugin-explorer/CHANGELOG.md b/packages/graphiql-plugin-explorer/CHANGELOG.md index 3d1eb6c2a1e..df9962da8f9 100644 --- a/packages/graphiql-plugin-explorer/CHANGELOG.md +++ b/packages/graphiql-plugin-explorer/CHANGELOG.md @@ -1,5 +1,11 @@ # @graphiql/plugin-explorer +## 4.0.0-alpha.2 + +### Patch Changes + +- [#3740](https://github.com/graphql/graphiql/pull/3740) [`3c12ce0`](https://github.com/graphql/graphiql/commit/3c12ce01eb3b2ec9a317a2fea2bb92602b748a8b) Thanks [@dimaMachina](https://github.com/dimaMachina)! - fix types incorrect types entry + ## 4.0.0-alpha.1 ### Patch Changes diff --git a/packages/graphiql-plugin-explorer/package.json b/packages/graphiql-plugin-explorer/package.json index ec88413e4ff..c0b88ec2bab 100644 --- a/packages/graphiql-plugin-explorer/package.json +++ b/packages/graphiql-plugin-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@graphiql/plugin-explorer", - "version": "4.0.0-alpha.1", + "version": "4.0.0-alpha.2", "repository": { "type": "git", "url": "https://github.com/graphql/graphiql", From ffaf5c9e9d6b36800bdf37f977ac373a628dd394 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Tue, 20 Aug 2024 15:40:04 +0200 Subject: [PATCH 45/48] add vite replace html plugin for graphiql plugin explorer (#3742) * add vite replace html plugin for graphiql plugin explorer * fix build --- .../graphiql-plugin-explorer/example.html | 15 +++---- .../graphiql-plugin-explorer/vite.config.mts | 41 +++++++++++++++++-- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/packages/graphiql-plugin-explorer/example.html b/packages/graphiql-plugin-explorer/example.html index 7d07347f1ad..3e5d223eeeb 100644 --- a/packages/graphiql-plugin-explorer/example.html +++ b/packages/graphiql-plugin-explorer/example.html @@ -38,30 +38,27 @@ > - +
-
Loading…
+
Loading...
- `; + + return { + name: 'html-replace-umd-with-src', + transformIndexHtml: { + order: 'pre', + handler(html) { + const start = ''; + const end = ''; + const contentToReplace = html.slice( + html.indexOf(start) + start.length, + html.indexOf(end), + ); + return html.replace(contentToReplace, htmlForVite); + }, + }, + }; +} From befbd04e8a5d8990e41c58d4f1a22ea6b4a19da2 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 23 Aug 2024 18:41:13 +0200 Subject: [PATCH 46/48] temp --- .../cypress/e2e/incremental-delivery.cy.ts | 60 ++++---------- packages/graphiql/cypress/support/commands.ts | 1 + packages/graphiql/index.html | 4 + packages/graphiql/package.json | 2 + packages/graphiql/resources/renderExample.js | 81 +++++++++++++++---- packages/graphiql/test/e2e-server.js | 29 ++++++- packages/graphiql/test/schema.js | 26 ++++++ packages/graphiql/vite.config.mts | 12 +-- 8 files changed, 149 insertions(+), 66 deletions(-) diff --git a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts index 8dcee9bc941..b4669a3be41 100644 --- a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts +++ b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts @@ -19,36 +19,16 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => { const mockStreamSuccess = { data: { streamable: [ - { - text: 'Hi', - }, - { - text: '你好', - }, - { - text: 'Hola', - }, - { - text: 'أهلاً', - }, - { - text: 'Bonjour', - }, - { - text: 'سلام', - }, - { - text: '안녕', - }, - { - text: 'Ciao', - }, - { - text: 'हेलो', - }, - { - text: 'Здорово', - }, + { text: 'Hi' }, + { text: '你好' }, + { text: 'Hola' }, + { text: 'أهلاً' }, + { text: 'Bonjour' }, + { text: 'سلام' }, + { text: '안녕' }, + { text: 'Ciao' }, + { text: 'हेलो' }, + { text: 'Здорово' }, ], }, }; @@ -141,22 +121,10 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => { person: { name: 'Mark', friends: [ - { - name: 'James', - age: 1000, - }, - { - name: 'Mary', - age: 1000, - }, - { - name: 'John', - age: 1000, - }, - { - name: 'Patrica', - age: 1000, - }, + { name: 'James', age: 1000 }, + { name: 'Mary', age: 1000 }, + { name: 'John', age: 1000 }, + { name: 'Patrica', age: 1000 }, ], age: 1000, }, diff --git a/packages/graphiql/cypress/support/commands.ts b/packages/graphiql/cypress/support/commands.ts index 0f2254afbf9..77ecf9813f0 100644 --- a/packages/graphiql/cypress/support/commands.ts +++ b/packages/graphiql/cypress/support/commands.ts @@ -54,6 +54,7 @@ Cypress.Commands.add('dataCy', value => { }); Cypress.Commands.add('clickExecuteQuery', () => { + cy.wait(500) return cy.get('.graphiql-execute-button').click(); }); diff --git a/packages/graphiql/index.html b/packages/graphiql/index.html index 04073bb4c0e..fa4877dcf1b 100644 --- a/packages/graphiql/index.html +++ b/packages/graphiql/index.html @@ -24,6 +24,10 @@ } + `; From 78cb5001e61b548953a92c86988b0125235e2b59 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 23 Aug 2024 20:35:05 +0200 Subject: [PATCH 47/48] migrate `@graphiql/toolkit` to `tsup` (#3746) * aa * removes unneeded `undefined` * try * fix * fix vitest --- packages/graphiql/test/beforeDevServer.js | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/graphiql/test/beforeDevServer.js diff --git a/packages/graphiql/test/beforeDevServer.js b/packages/graphiql/test/beforeDevServer.js new file mode 100644 index 00000000000..55c634caeed --- /dev/null +++ b/packages/graphiql/test/beforeDevServer.js @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2021 GraphQL Contributors. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +const express = require('express'); +const path = require('node:path'); +// eslint-disable-next-line import-x/no-extraneous-dependencies +const { createHandler } = require('graphql-http/lib/use/express'); +const schema = require('./schema'); +const badSchema = require('../cypress/fixtures/bad-schema.json'); + +module.exports = function beforeDevServer(app, _server, _compiler) { + // GraphQL Server + app.post('/graphql', createHandler({ schema })); + app.get('/graphql', createHandler({ schema })); + + app.post('/bad/graphql', (_req, res, next) => { + res.json({ data: badSchema }); + next(); + }); + + app.use('/images', express.static(path.join(__dirname, 'images'))); + + app.use( + '/resources/renderExample.js', + express.static(path.join(__dirname, '../resources/renderExample.js')), + ); +}; From 3c48be0531480119d172ea01fdf096888592ab20 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Fri, 23 Aug 2024 20:52:48 +0200 Subject: [PATCH 48/48] rollback of `temp` commit --- .../cypress/e2e/incremental-delivery.cy.ts | 60 ++++++++++---- packages/graphiql/cypress/support/commands.ts | 1 - packages/graphiql/index.html | 4 - packages/graphiql/package.json | 2 - packages/graphiql/resources/renderExample.js | 81 ++++--------------- packages/graphiql/test/beforeDevServer.js | 31 ------- packages/graphiql/test/e2e-server.js | 29 +------ packages/graphiql/test/schema.js | 26 ------ packages/graphiql/vite.config.mts | 12 ++- yarn.lock | 17 +--- 10 files changed, 68 insertions(+), 195 deletions(-) delete mode 100644 packages/graphiql/test/beforeDevServer.js diff --git a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts index b4669a3be41..8dcee9bc941 100644 --- a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts +++ b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts @@ -19,16 +19,36 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => { const mockStreamSuccess = { data: { streamable: [ - { text: 'Hi' }, - { text: '你好' }, - { text: 'Hola' }, - { text: 'أهلاً' }, - { text: 'Bonjour' }, - { text: 'سلام' }, - { text: '안녕' }, - { text: 'Ciao' }, - { text: 'हेलो' }, - { text: 'Здорово' }, + { + text: 'Hi', + }, + { + text: '你好', + }, + { + text: 'Hola', + }, + { + text: 'أهلاً', + }, + { + text: 'Bonjour', + }, + { + text: 'سلام', + }, + { + text: '안녕', + }, + { + text: 'Ciao', + }, + { + text: 'हेलो', + }, + { + text: 'Здорово', + }, ], }, }; @@ -121,10 +141,22 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => { person: { name: 'Mark', friends: [ - { name: 'James', age: 1000 }, - { name: 'Mary', age: 1000 }, - { name: 'John', age: 1000 }, - { name: 'Patrica', age: 1000 }, + { + name: 'James', + age: 1000, + }, + { + name: 'Mary', + age: 1000, + }, + { + name: 'John', + age: 1000, + }, + { + name: 'Patrica', + age: 1000, + }, ], age: 1000, }, diff --git a/packages/graphiql/cypress/support/commands.ts b/packages/graphiql/cypress/support/commands.ts index 77ecf9813f0..0f2254afbf9 100644 --- a/packages/graphiql/cypress/support/commands.ts +++ b/packages/graphiql/cypress/support/commands.ts @@ -54,7 +54,6 @@ Cypress.Commands.add('dataCy', value => { }); Cypress.Commands.add('clickExecuteQuery', () => { - cy.wait(500) return cy.get('.graphiql-execute-button').click(); }); diff --git a/packages/graphiql/index.html b/packages/graphiql/index.html index fa4877dcf1b..04073bb4c0e 100644 --- a/packages/graphiql/index.html +++ b/packages/graphiql/index.html @@ -24,10 +24,6 @@ } - `; diff --git a/yarn.lock b/yarn.lock index 35edef675b6..5dab2c7b25d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7287,14 +7287,6 @@ core-util-is@^1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cors@^2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^1" - cosmiconfig-toml-loader@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig-toml-loader/-/cosmiconfig-toml-loader-1.0.0.tgz#0681383651cceff918177debe9084c0d3769509b" @@ -10187,11 +10179,6 @@ graphql-http@^1.22.1: resolved "https://registry.yarnpkg.com/graphql-http/-/graphql-http-1.22.1.tgz#3857ac75366e55db189cfe09ade9cc4c4f2cfd09" integrity sha512-4Jor+LRbA7SfSaw7dfDUs2UBzvWg3cKrykfHRgKsOIvQaLuf+QOcG2t3Mx5N9GzSNJcuqMqJWz0ta5+BryEmXg== -graphql-sse@^2.5.3: - version "2.5.3" - resolved "https://registry.yarnpkg.com/graphql-sse/-/graphql-sse-2.5.3.tgz#c3557803f2db306d8ac87fd3bc089b6d4bac8353" - integrity sha512-5IcFW3e7fPOG7oFkK1v3X1wWtCJArQKB/H1UJeNotjy7a/9EYA5K+EiHJF1BiDSVNx7y64bd0FlDETrNBSvIHQ== - graphql-subscriptions@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-2.0.0.tgz#11ec181d475852d8aec879183e8e1eb94f2eb79a" @@ -13827,7 +13814,7 @@ nwsapi@^2.2.0: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2" integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ== -object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -17532,7 +17519,7 @@ value-or-promise@^1.0.11, value-or-promise@^1.0.12: resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q== -vary@^1, vary@~1.1.2: +vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=