From c1abbf99010719e91566f802d06b692678ec3fa2 Mon Sep 17 00:00:00 2001 From: timwessman Date: Wed, 4 Sep 2024 10:28:20 +0300 Subject: [PATCH 01/25] feat: support git as a gatsby documentation source --- site/gatsby-config.js | 25 ++- site/gatsby-node.js | 89 ++++++++++ site/modify-mdx-loader.js | 8 + site/package.json | 36 ++-- site/src/components/ContentLayoutWrapper.js | 6 + site/src/components/layout.js | 187 +++++++++++++++++--- 6 files changed, 305 insertions(+), 46 deletions(-) create mode 100644 site/modify-mdx-loader.js create mode 100644 site/src/components/ContentLayoutWrapper.js diff --git a/site/gatsby-config.js b/site/gatsby-config.js index 46b8716276..af2e9eafd3 100644 --- a/site/gatsby-config.js +++ b/site/gatsby-config.js @@ -1,3 +1,5 @@ +const { version } = require("../package.json"); + require("dotenv").config({ path: `.env.${process.env.NODE_ENV}`, }) @@ -147,16 +149,31 @@ module.exports = { resolve: `gatsby-source-filesystem`, options: { name: `docs`, - path: `${__dirname}/src/docs/`, + path: `${__dirname}/src/docs`, }, }, - // This config is needed when pages are somewhere else than in the pages folder. + { - resolve: 'gatsby-plugin-page-creator', + resolve: `gatsby-source-git`, options: { - path: `${__dirname}/src/docs`, + name: `docs-release-3.0.0`, + remote: `https://github.com/City-of-Helsinki/helsinki-design-system`, + branch: `release-3.0.0`, + patterns: `site/src/docs/**`, }, }, +/* + { + resolve: `gatsby-source-git`, + options: { + name: `docs-release-2.17.0`, + remote: `https://github.com/City-of-Helsinki/helsinki-design-system`, + branch: `release-2.17.0`, + patterns: `site/src/docs/**`, + }, + }, +*/ + { resolve: `gatsby-plugin-mdx`, options: { diff --git a/site/gatsby-node.js b/site/gatsby-node.js index 0f756555e3..46125c6cde 100644 --- a/site/gatsby-node.js +++ b/site/gatsby-node.js @@ -1,8 +1,23 @@ const webpack = require('webpack'); const path = require('path'); +const {makeRe} = require('micromatch'); +const { createFilePath } = require('gatsby-source-filesystem'); exports.onCreateWebpackConfig = ({ actions }) => { actions.setWebpackConfig({ + module: { + rules: [ + { + test: /\.mdx$/, + use: [ + { + loader: require.resolve('./modify-mdx-loader.js'), + }, + // other loaders like mdx-loader, babel-loader, etc. + ], + }, + ], + }, plugins: [ // We need to provide a polyfill for react-live library to make it work with the latest Gatsby: https://webpack.js.org/blog/2020-10-10-webpack-5-release/#automatic-nodejs-polyfills-removed new webpack.ProvidePlugin({ @@ -21,3 +36,77 @@ exports.onCreateWebpackConfig = ({ actions }) => { }, }); }; + + + + + +exports.createPages = async ({ actions, graphql }) => { + const { createPage } = actions; + + // GraphQL query to fetch frontmatter and rendered MDX content + const result = await graphql(` + query SiteDataQuery { + allMdx { + edges { + node { + id + frontmatter { + title + slug + navTitle + } + parent { + ... on File { + relativePath + gitRemote { + ref + } + } + } + } + } + } + } + `); + + + if (result.errors) { + console.error(result.errors); + throw new Error('Failed to fetch MDX data'); + } + + // Create pages dynamically + result.data.allMdx.edges.forEach(({ node }) => { + const gitRemote = node.parent?.gitRemote?.ref; + + try { + const pageTemplate = require.resolve("./src/components/ContentLayoutWrapper.js"); + const contentPath = "./src/docs/" + node.parent.relativePath.replace('site/src/docs/', ''); + console.log(gitRemote + ' ' + contentPath); + const pageContent = + gitRemote + ? require.resolve(`./.cache/gatsby-source-git/docs-${gitRemote}/${node.parent.relativePath}`) + : require.resolve(contentPath); + + createPage({ + component: `${pageTemplate}?__contentFilePath=${pageContent}`, + // prefix older version docs pages with their branch name + path: path.join("/", gitRemote || "", node.frontmatter.slug), + context: { + id: node.id, + frontmatter: node.frontmatter, + }, + }); + } + catch (e) { + console.log('id', node.id); + console.log('frontmatter', node.frontmatter); + console.log('gitRemote', gitRemote); + console.log('relativePath', node.parent.relativePath); + console.error(e); + } + }); +}; + + diff --git a/site/modify-mdx-loader.js b/site/modify-mdx-loader.js new file mode 100644 index 0000000000..397614f869 --- /dev/null +++ b/site/modify-mdx-loader.js @@ -0,0 +1,8 @@ +// modify-mdx-loader.js +module.exports = function (source) { + if (this.resourcePath.endsWith('tabs.mdx')) { + // Add the export statement to the content of tabs.mdx + return `${source}\n\nexport default (props) => <>{props.children};`; + } + return source; +}; diff --git a/site/package.json b/site/package.json index e9e0ad3a82..750c3021f1 100644 --- a/site/package.json +++ b/site/package.json @@ -12,24 +12,26 @@ ] }, "dependencies": { - "@mdx-js/mdx": "2.3.0", - "@mdx-js/react": "2.3.0", - "gatsby": "5.11.0", - "gatsby-plugin-image": "^3.0.0", - "gatsby-plugin-manifest": "^5.12.0", - "gatsby-plugin-matomo": "^0.13.0", - "gatsby-plugin-mdx": "5.11.0", - "gatsby-plugin-no-sourcemaps": "4.24.0", - "gatsby-plugin-offline": "^6.12.0", - "gatsby-plugin-react-helmet": "^5.17.0", - "gatsby-plugin-robots-txt": "^1.7.1", - "gatsby-plugin-sass": "^5.17.0", - "gatsby-plugin-sharp": "^5.10.0", - "gatsby-remark-autolink-headers": "^5.17.0", - "gatsby-source-filesystem": "^4.17.0", - "gatsby-transformer-remark": "6.10.0", - "gatsby-transformer-sharp": "5.11.0", + "@mdx-js/mdx": "3.0.1", + "@mdx-js/react": "3.0.1", + "gatsby": "5.13.7", + "gatsby-plugin-image": "^3.13.1", + "gatsby-plugin-manifest": "^5.13.1", + "gatsby-plugin-matomo": "^0.16.3", + "gatsby-plugin-mdx": "5.13.1", + "gatsby-plugin-no-sourcemaps": "5.13.0", + "gatsby-plugin-offline": "^6.13.3", + "gatsby-plugin-react-helmet": "^6.13.1", + "gatsby-plugin-robots-txt": "^1.8.0", + "gatsby-plugin-sass": "^6.13.1", + "gatsby-plugin-sharp": "^5.13.1", + "gatsby-remark-autolink-headers": "^6.13.1", + "gatsby-source-filesystem": "^5.13.1", + "gatsby-source-git": "^1.1.0", + "gatsby-transformer-remark": "6.13.1", + "gatsby-transformer-sharp": "5.13.1", "html-validate": "6.5.0", + "json5": "^2.2.2", "prism-react-renderer": "^1.3.1", "process-top": "^1.2.0", "prop-types": "^15.8.1", diff --git a/site/src/components/ContentLayoutWrapper.js b/site/src/components/ContentLayoutWrapper.js new file mode 100644 index 0000000000..90a18b135c --- /dev/null +++ b/site/src/components/ContentLayoutWrapper.js @@ -0,0 +1,6 @@ +import React from "react"; + +export default function ContentLayoutWrapper({ children }) { + return (
{children}
) +} + diff --git a/site/src/components/layout.js b/site/src/components/layout.js index be07617daa..a2f843779e 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -8,7 +8,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { useStaticQuery, graphql, withPrefix, Link as GatsbyLink, navigate } from 'gatsby'; -import { MDXProvider } from '@mdx-js/react'; +import { MDXProvider, mdx } from '@mdx-js/react'; import { Header, Footer, Link, SideNavigation, IconCheckCircleFill, IconCrossCircle, Logo, LogoSize, logoFi } from 'hds-react'; import Seo from './Seo'; import { PlaygroundBlock, PlaygroundPreview } from './Playground'; @@ -19,6 +19,8 @@ import ExternalLink from './ExternalLink'; import AnchorLink from './AnchorLink'; import './layout.scss'; +import { MDXRenderer } from 'gatsby-plugin-mdx'; + const classNames = (...args) => args.filter((e) => e).join(' '); const components = { @@ -67,19 +69,30 @@ const components = { ), }; -const resolveCurrentMenuItem = (menuItems, slugWithPrefix) => { - const rootPath = withPrefix('/'); +const withVersion = (version, link) => { +// console.log('withVersion', version, link, (version ? `/${version}` : '') + withPrefix(link)); + return (version ? `/${version}` : '') + withPrefix(link); +} +const withoutVersion = (version, link) => { +// console.log('withoutVersion', version, link, link.replace(`/${version}`, '')); +// console.log(version); + return link.replace(`/${version}`, ''); +} + +const resolveCurrentMenuItem = (version, menuItems, slugWithPrefix) => { + const rootPath = withVersion(version, '/'); if (slugWithPrefix === rootPath) { - return menuItems.find(({ link }) => withPrefix(link) === rootPath); + return menuItems.find(({ link }) => withVersion(version, link) === rootPath); } else { return menuItems - .filter(({ link }) => withPrefix(link) !== rootPath) - .find((menuItem) => slugWithPrefix.startsWith(withPrefix(menuItem.link))); + .filter(({ link }) => withVersion(version, link) !== rootPath) + .find((menuItem) => slugWithPrefix.startsWith(withVersion(version, menuItem.link))); } }; const generateUiIdFromPath = (path, prefix) => { + console.log('generateUiIdFromPath', path); const pathStr = !path && path === '/' ? 'home' @@ -109,9 +122,81 @@ const isMatchingParentLink = (link, slug) => { ); }; -const Layout = ({ children, pageContext }) => { - const { title: pageTitle, slug: pageSlug, customLayout } = pageContext.frontmatter; - const pageSlugWithPrefix = withPrefix(pageSlug); + +const VersionedLink = ({ to, version, ...props }) => { + const versionedTo = version ? `/${version}${withPrefix(to)}` : withPrefix(to); + return ; +}; + +const TransformLinks = ({ children, version }) => { + const transform = (child) => { + if (React.isValidElement(child)) { + console.log(child.props); + if (child.props.href) { + return ( + + {child.props.children} + + ); + } + + return React.cloneElement(child, { + children: React.Children.map(child.props.children, transform), + }); + } + return child; + }; + + return <>{React.Children.map(children, transform)}; +}; + + +const Layout = ({ location, children, pageContext }) => { +/* + const queryData = useStaticQuery(graphql` + query SiteDataQuery { + site { + siteMetadata { + title + description + siteUrl + menuLinks { + name + link + subMenuLinks { + name + link + withDivider + } + } + footerTitle + footerAriaLabel + } + } + allMdx { + edges { + node { + frontmatter { + title + slug + navTitle + } + parent { + ... on File { + gitRemote { + ref + } + } + } + } + } + } + } + `); +*/ + + const pathParts = location.pathname.split("/"); + const version = pathParts[1].startsWith('release-') ? pathParts[1] : undefined; const queryData = useStaticQuery(graphql` query SiteDataQuery { @@ -147,9 +232,51 @@ const Layout = ({ children, pageContext }) => { } `); + // Todo check available versions + + console.log(pageContext.frontmatter); + console.log('location', location); + console.log('version', version); +// console.log('children', children); +// console.log('pageContext', pageContext); + + const { title: pageTitle, slug: pageSlug, customLayout } = pageContext?.frontmatter + ? pageContext?.frontmatter + : {title: "", slug: ""}; + const pageSlugWithPrefix = withVersion(version, pageSlug); + +// console.log('children', children); + + const childrenMDX = children; + +/* + const childrenMDX = ( + + {children} + + ); +*/ + +// console.log('pageSlug', pageSlug); + + const siteData = queryData.site.siteMetadata; const mdxPageData = queryData.allMdx?.edges || []; - const allPages = mdxPageData.map(({ node }) => ({ ...node.frontmatter, ...node.fields })); +// const allPages = mdxPageData.map(({ node }) => ({ ...node.frontmatter, ...node.fields })); + +/* + const allPages = mdxPageData + .filter(({ node }) => node?.parent?.gitRemote?.ref === version) + .map(({ node }) => ({ ...node.frontmatter, ...node.fields })); +*/ + + const slugPages = Object.fromEntries(mdxPageData + .map(({ node }) => ([node.frontmatter.slug, { ...node.frontmatter, ...node.fields }]))); + const allPages = Object.values(slugPages); + + +// console.log('allPages', allPages); + const siteTitle = siteData?.title || 'Title'; const siteUrl = siteData?.siteUrl; const description = siteData?.description; @@ -160,7 +287,8 @@ const Layout = ({ children, pageContext }) => { ...menuLink, uiId: generateUiIdFromPath(menuLink.link, 'nav'), })); - const currentMenuItem = resolveCurrentMenuItem(uiMenuLinks, pageSlugWithPrefix); + const currentMenuItem = resolveCurrentMenuItem(version, uiMenuLinks, pageSlugWithPrefix); + console.log('currentMenuItem', currentMenuItem); const subMenuLinks = currentMenuItem?.subMenuLinks || []; const subMenuLinksFromPages = currentMenuItem && currentMenuItem.link @@ -173,7 +301,7 @@ const Layout = ({ children, pageContext }) => { const uiSubMenuLinks = [...subMenuLinks, ...subMenuLinksFromPages].map((subMenuLink) => ({ ...subMenuLink, - prefixedLink: withPrefix(subMenuLink.link), + prefixedLink: subMenuLink.link, uiId: generateUiIdFromPath(subMenuLink.link, 'side-nav'), subLevels: allPages .filter(isNavPage) @@ -181,7 +309,7 @@ const Layout = ({ children, pageContext }) => { .map((subLevelLink) => ({ ...subLevelLink, uiId: generateUiIdFromPath(subLevelLink.slug, 'side-nav-sub'), - prefixedLink: withPrefix(subLevelLink.slug), + prefixedLink: subLevelLink.slug, })) .sort(sortByPageTitle), })); @@ -211,14 +339,21 @@ const Layout = ({ children, pageContext }) => { logoHref={siteUrl} logoAriaLabel="City of Helsinki Logo" logo={} - /> + > + + + + + + + {uiMenuLinks.map(({ name, link, uiId }) => ( ))} @@ -248,22 +383,22 @@ const Layout = ({ children, pageContext }) => { {...(hasSubLevels ? {} : { - href: prefixedLink, + href: withVersion(version, prefixedLink), onClick: (e) => { e.preventDefault(); - navigate(link); + navigate(withVersion(version, link)); }, })} > {subLevels.map(({ navTitle, slug, prefixedLink: prefixedSubLevelLink, uiId }) => ( { e.preventDefault(); - navigate(slug); + navigate(withVersion(version, slug)); }} /> ))} @@ -274,17 +409,17 @@ const Layout = ({ children, pageContext }) => { )} {customLayout ? ( - {children} + {childrenMDX} ) : (
- {children} + {childrenMDX}
)}
{uiMenuLinks.map(({ name, link, uiId }) => ( - + ))} { backToTopLabel="Back to top" logo={} > - - + +
@@ -302,6 +437,8 @@ const Layout = ({ children, pageContext }) => { ); }; + + Layout.propTypes = { children: PropTypes.node.isRequired, }; From ff7b4c974bab3fc1c781ec0c1ac5913b52bcb493 Mon Sep 17 00:00:00 2001 From: timwessman Date: Thu, 5 Sep 2024 15:14:23 +0300 Subject: [PATCH 02/25] clean up the code --- site/gatsby-browser.js | 2 +- site/gatsby-config.js | 14 +-- site/gatsby-node.js | 57 ++++------ site/modify-mdx-loader.js | 8 -- site/src/components/layout.js | 207 ++++++++-------------------------- 5 files changed, 74 insertions(+), 214 deletions(-) delete mode 100644 site/modify-mdx-loader.js diff --git a/site/gatsby-browser.js b/site/gatsby-browser.js index dee951c159..dee4a17147 100644 --- a/site/gatsby-browser.js +++ b/site/gatsby-browser.js @@ -9,6 +9,6 @@ const Layout = require('./src/components/layout').default; // Wraps every page in a component exports.wrapPageElement = ({ element, props }) => { - if (props.location.pathname.includes("this-is-hds")) return {element} + if (props.location.pathname.includes('this-is-hds')) return {element}; return {element}; }; diff --git a/site/gatsby-config.js b/site/gatsby-config.js index af2e9eafd3..e3fe8d9392 100644 --- a/site/gatsby-config.js +++ b/site/gatsby-config.js @@ -1,5 +1,3 @@ -const { version } = require("../package.json"); - require("dotenv").config({ path: `.env.${process.env.NODE_ENV}`, }) @@ -152,28 +150,24 @@ module.exports = { path: `${__dirname}/src/docs`, }, }, - { resolve: `gatsby-source-git`, options: { - name: `docs-release-3.0.0`, + name: `docs-release-3.9.0`, remote: `https://github.com/City-of-Helsinki/helsinki-design-system`, - branch: `release-3.0.0`, + branch: `release-3.9.0`, patterns: `site/src/docs/**`, }, }, -/* { resolve: `gatsby-source-git`, options: { - name: `docs-release-2.17.0`, + name: `docs-release-3.0.0`, remote: `https://github.com/City-of-Helsinki/helsinki-design-system`, - branch: `release-2.17.0`, + branch: `release-3.0.0`, patterns: `site/src/docs/**`, }, }, -*/ - { resolve: `gatsby-plugin-mdx`, options: { diff --git a/site/gatsby-node.js b/site/gatsby-node.js index 46125c6cde..ffff9dfd44 100644 --- a/site/gatsby-node.js +++ b/site/gatsby-node.js @@ -1,23 +1,8 @@ const webpack = require('webpack'); const path = require('path'); -const {makeRe} = require('micromatch'); -const { createFilePath } = require('gatsby-source-filesystem'); exports.onCreateWebpackConfig = ({ actions }) => { actions.setWebpackConfig({ - module: { - rules: [ - { - test: /\.mdx$/, - use: [ - { - loader: require.resolve('./modify-mdx-loader.js'), - }, - // other loaders like mdx-loader, babel-loader, etc. - ], - }, - ], - }, plugins: [ // We need to provide a polyfill for react-live library to make it work with the latest Gatsby: https://webpack.js.org/blog/2020-10-10-webpack-5-release/#automatic-nodejs-polyfills-removed new webpack.ProvidePlugin({ @@ -34,13 +19,20 @@ exports.onCreateWebpackConfig = ({ actions }) => { crypto: require.resolve('crypto-browserify'), }, }, + optimization: { + splitChunks: { + chunks: 'all', + minSize: 10000000, + maxSize: 0, + cacheGroups: { + default: false, + vendors: false, + }, + }, + }, }); }; - - - - exports.createPages = async ({ actions, graphql }) => { const { createPage } = actions; @@ -70,7 +62,6 @@ exports.createPages = async ({ actions, graphql }) => { } `); - if (result.errors) { console.error(result.errors); throw new Error('Failed to fetch MDX data'); @@ -81,32 +72,26 @@ exports.createPages = async ({ actions, graphql }) => { const gitRemote = node.parent?.gitRemote?.ref; try { - const pageTemplate = require.resolve("./src/components/ContentLayoutWrapper.js"); - const contentPath = "./src/docs/" + node.parent.relativePath.replace('site/src/docs/', ''); - console.log(gitRemote + ' ' + contentPath); - const pageContent = - gitRemote + const pageTemplate = require.resolve('./src/components/ContentLayoutWrapper.js'); + const contentPath = './src/docs/' + node.parent.relativePath.replace('site/src/docs/', ''); + + console.log('createPage() ' + gitRemote + ' ' + contentPath); + + const pageContent = gitRemote ? require.resolve(`./.cache/gatsby-source-git/docs-${gitRemote}/${node.parent.relativePath}`) : require.resolve(contentPath); + const pathWithVersion = path.join('/', gitRemote || '', node.frontmatter.slug); createPage({ component: `${pageTemplate}?__contentFilePath=${pageContent}`, - // prefix older version docs pages with their branch name - path: path.join("/", gitRemote || "", node.frontmatter.slug), + path: pathWithVersion, context: { id: node.id, - frontmatter: node.frontmatter, + frontmatter: { ...node.frontmatter, slug: pathWithVersion }, }, }); - } - catch (e) { - console.log('id', node.id); - console.log('frontmatter', node.frontmatter); - console.log('gitRemote', gitRemote); - console.log('relativePath', node.parent.relativePath); + } catch (e) { console.error(e); } }); }; - - diff --git a/site/modify-mdx-loader.js b/site/modify-mdx-loader.js deleted file mode 100644 index 397614f869..0000000000 --- a/site/modify-mdx-loader.js +++ /dev/null @@ -1,8 +0,0 @@ -// modify-mdx-loader.js -module.exports = function (source) { - if (this.resourcePath.endsWith('tabs.mdx')) { - // Add the export statement to the content of tabs.mdx - return `${source}\n\nexport default (props) => <>{props.children};`; - } - return source; -}; diff --git a/site/src/components/layout.js b/site/src/components/layout.js index a2f843779e..a57c66c7f1 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -8,7 +8,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { useStaticQuery, graphql, withPrefix, Link as GatsbyLink, navigate } from 'gatsby'; -import { MDXProvider, mdx } from '@mdx-js/react'; +import { MDXProvider } from '@mdx-js/react'; import { Header, Footer, Link, SideNavigation, IconCheckCircleFill, IconCrossCircle, Logo, LogoSize, logoFi } from 'hds-react'; import Seo from './Seo'; import { PlaygroundBlock, PlaygroundPreview } from './Playground'; @@ -19,17 +19,22 @@ import ExternalLink from './ExternalLink'; import AnchorLink from './AnchorLink'; import './layout.scss'; -import { MDXRenderer } from 'gatsby-plugin-mdx'; - const classNames = (...args) => args.filter((e) => e).join(' '); -const components = { +const hrefWithVersion = (href, version) => { + return withPrefix(`${version ? `/${version}` : ''}${href}`); +}; +const hrefWithoutVersion = (href, version) => { + return href.replace(`/${version}`, ''); +}; + +const components = (version) => ({ IconCheckCircleFill, IconCrossCircle, - InternalLink, + InternalLink: (props) => , ExternalLink, AnchorLink, - Link, + Link: (props) => , Playground: PlaygroundBlock, PlaygroundPreview, pre: SyntaxHighlighter, @@ -67,32 +72,21 @@ const components = { {props.children} ), -}; - -const withVersion = (version, link) => { -// console.log('withVersion', version, link, (version ? `/${version}` : '') + withPrefix(link)); - return (version ? `/${version}` : '') + withPrefix(link); -} -const withoutVersion = (version, link) => { -// console.log('withoutVersion', version, link, link.replace(`/${version}`, '')); -// console.log(version); - return link.replace(`/${version}`, ''); -} +}); const resolveCurrentMenuItem = (version, menuItems, slugWithPrefix) => { - const rootPath = withVersion(version, '/'); + const rootPath = hrefWithVersion('/', version); if (slugWithPrefix === rootPath) { - return menuItems.find(({ link }) => withVersion(version, link) === rootPath); + return menuItems.find(({ link }) => hrefWithVersion(link, version) === rootPath); } else { return menuItems - .filter(({ link }) => withVersion(version, link) !== rootPath) - .find((menuItem) => slugWithPrefix.startsWith(withVersion(version, menuItem.link))); + .filter(({ link }) => hrefWithVersion(link, version) !== rootPath) + .find((menuItem) => slugWithPrefix.startsWith(hrefWithVersion(menuItem.link, version))); } }; const generateUiIdFromPath = (path, prefix) => { - console.log('generateUiIdFromPath', path); const pathStr = !path && path === '/' ? 'home' @@ -122,80 +116,8 @@ const isMatchingParentLink = (link, slug) => { ); }; - -const VersionedLink = ({ to, version, ...props }) => { - const versionedTo = version ? `/${version}${withPrefix(to)}` : withPrefix(to); - return ; -}; - -const TransformLinks = ({ children, version }) => { - const transform = (child) => { - if (React.isValidElement(child)) { - console.log(child.props); - if (child.props.href) { - return ( - - {child.props.children} - - ); - } - - return React.cloneElement(child, { - children: React.Children.map(child.props.children, transform), - }); - } - return child; - }; - - return <>{React.Children.map(children, transform)}; -}; - - const Layout = ({ location, children, pageContext }) => { -/* - const queryData = useStaticQuery(graphql` - query SiteDataQuery { - site { - siteMetadata { - title - description - siteUrl - menuLinks { - name - link - subMenuLinks { - name - link - withDivider - } - } - footerTitle - footerAriaLabel - } - } - allMdx { - edges { - node { - frontmatter { - title - slug - navTitle - } - parent { - ... on File { - gitRemote { - ref - } - } - } - } - } - } - } - `); -*/ - - const pathParts = location.pathname.split("/"); + const pathParts = location.pathname.split('/'); const version = pathParts[1].startsWith('release-') ? pathParts[1] : undefined; const queryData = useStaticQuery(graphql` @@ -232,50 +154,14 @@ const Layout = ({ location, children, pageContext }) => { } `); - // Todo check available versions - - console.log(pageContext.frontmatter); - console.log('location', location); - console.log('version', version); -// console.log('children', children); -// console.log('pageContext', pageContext); - - const { title: pageTitle, slug: pageSlug, customLayout } = pageContext?.frontmatter - ? pageContext?.frontmatter - : {title: "", slug: ""}; - const pageSlugWithPrefix = withVersion(version, pageSlug); - -// console.log('children', children); - - const childrenMDX = children; - -/* - const childrenMDX = ( - - {children} - - ); -*/ - -// console.log('pageSlug', pageSlug); - - + const { title: pageTitle, slug: pageSlug, customLayout } = pageContext.frontmatter; const siteData = queryData.site.siteMetadata; const mdxPageData = queryData.allMdx?.edges || []; -// const allPages = mdxPageData.map(({ node }) => ({ ...node.frontmatter, ...node.fields })); -/* - const allPages = mdxPageData - .filter(({ node }) => node?.parent?.gitRemote?.ref === version) - .map(({ node }) => ({ ...node.frontmatter, ...node.fields })); -*/ - - const slugPages = Object.fromEntries(mdxPageData - .map(({ node }) => ([node.frontmatter.slug, { ...node.frontmatter, ...node.fields }]))); - const allPages = Object.values(slugPages); - - -// console.log('allPages', allPages); + // filter out duplicate slug entries. It would be better to do this in graphql query + const allPages = Object.values( + Object.fromEntries(mdxPageData.map(({ node }) => [node.frontmatter.slug, { ...node.frontmatter, ...node.fields }])), + ); const siteTitle = siteData?.title || 'Title'; const siteUrl = siteData?.siteUrl; @@ -287,8 +173,7 @@ const Layout = ({ location, children, pageContext }) => { ...menuLink, uiId: generateUiIdFromPath(menuLink.link, 'nav'), })); - const currentMenuItem = resolveCurrentMenuItem(version, uiMenuLinks, pageSlugWithPrefix); - console.log('currentMenuItem', currentMenuItem); + const currentMenuItem = resolveCurrentMenuItem(version, uiMenuLinks, pageSlug); const subMenuLinks = currentMenuItem?.subMenuLinks || []; const subMenuLinksFromPages = currentMenuItem && currentMenuItem.link @@ -341,19 +226,24 @@ const Layout = ({ location, children, pageContext }) => { logo={} > - - - - + + + {uiMenuLinks.map(({ name, link, uiId }) => ( ))} @@ -376,29 +266,27 @@ const Layout = ({ location, children, pageContext }) => { key={uiId} id={uiId} label={name} - active={ - pageSlugWithPrefix === prefixedLink || (!hasSubLevels && isMatchingParentLink(link, pageSlug)) - } + active={pageSlug === prefixedLink || (!hasSubLevels && isMatchingParentLink(link, pageSlug))} withDivider={withDivider} {...(hasSubLevels ? {} : { - href: withVersion(version, prefixedLink), + href: hrefWithVersion(prefixedLink, version), onClick: (e) => { e.preventDefault(); - navigate(withVersion(version, link)); + navigate(hrefWithVersion(link, version)); }, })} > {subLevels.map(({ navTitle, slug, prefixedLink: prefixedSubLevelLink, uiId }) => ( { e.preventDefault(); - navigate(withVersion(version, slug)); + navigate(hrefWithVersion(slug, version)); }} /> ))} @@ -409,17 +297,17 @@ const Layout = ({ location, children, pageContext }) => { )} {customLayout ? ( - {childrenMDX} + {children} ) : (
- {childrenMDX} + {children}
)}
{uiMenuLinks.map(({ name, link, uiId }) => ( - + ))} { backToTopLabel="Back to top" logo={} > - - + +
@@ -437,8 +328,6 @@ const Layout = ({ location, children, pageContext }) => { ); }; - - Layout.propTypes = { children: PropTypes.node.isRequired, }; From 176e96825d734f339cbe6a54a8b3ccac29007707 Mon Sep 17 00:00:00 2001 From: timwessman Date: Wed, 9 Oct 2024 12:30:18 +0300 Subject: [PATCH 03/25] fix: package version bug --- site/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/package.json b/site/package.json index 750c3021f1..239c3baa87 100644 --- a/site/package.json +++ b/site/package.json @@ -12,8 +12,8 @@ ] }, "dependencies": { - "@mdx-js/mdx": "3.0.1", - "@mdx-js/react": "3.0.1", + "@mdx-js/mdx": "2.3.0", + "@mdx-js/react": "2.3.0", "gatsby": "5.13.7", "gatsby-plugin-image": "^3.13.1", "gatsby-plugin-manifest": "^5.13.1", @@ -31,7 +31,7 @@ "gatsby-transformer-remark": "6.13.1", "gatsby-transformer-sharp": "5.13.1", "html-validate": "6.5.0", - "json5": "^2.2.2", + "json5": "^2.2.3", "prism-react-renderer": "^1.3.1", "process-top": "^1.2.0", "prop-types": "^15.8.1", From 5decc1b21f890a65e6e45ca01950fe0730b36407 Mon Sep 17 00:00:00 2001 From: timwessman Date: Thu, 10 Oct 2024 11:33:00 +0300 Subject: [PATCH 04/25] fix: webpack chunking problems --- site/gatsby-node.js | 3 ++- site/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/site/gatsby-node.js b/site/gatsby-node.js index ffff9dfd44..b960da2f59 100644 --- a/site/gatsby-node.js +++ b/site/gatsby-node.js @@ -21,7 +21,8 @@ exports.onCreateWebpackConfig = ({ actions }) => { }, optimization: { splitChunks: { - chunks: 'all', + chunks: 'initial', + minChunks: 2, minSize: 10000000, maxSize: 0, cacheGroups: { diff --git a/site/package.json b/site/package.json index 239c3baa87..e90d69026c 100644 --- a/site/package.json +++ b/site/package.json @@ -27,7 +27,7 @@ "gatsby-plugin-sharp": "^5.13.1", "gatsby-remark-autolink-headers": "^6.13.1", "gatsby-source-filesystem": "^5.13.1", - "gatsby-source-git": "^1.1.0", + "gatsby-source-git": "2.2.0-beta.0", "gatsby-transformer-remark": "6.13.1", "gatsby-transformer-sharp": "5.13.1", "html-validate": "6.5.0", From 72bd6467a55b13df5cebfbff030248efa5cef600 Mon Sep 17 00:00:00 2001 From: timwessman Date: Thu, 17 Oct 2024 15:32:55 +0300 Subject: [PATCH 05/25] fix: reroute some special links on multiversion documentation --- site/src/components/layout.js | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index a57c66c7f1..659ecd660e 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -22,7 +22,12 @@ import './layout.scss'; const classNames = (...args) => args.filter((e) => e).join(' '); const hrefWithVersion = (href, version) => { - return withPrefix(`${version ? `/${version}` : ''}${href}`); + return version + && !href.startsWith(`/${version}`) + && !href.startsWith('mailto:') + && !href.startsWith('http') + ? withPrefix(`/${version}${href}`) + : withPrefix(`${href}`); }; const hrefWithoutVersion = (href, version) => { return href.replace(`/${version}`, ''); @@ -31,10 +36,10 @@ const hrefWithoutVersion = (href, version) => { const components = (version) => ({ IconCheckCircleFill, IconCrossCircle, + Link: (props) => , InternalLink: (props) => , + AnchorLink: (props) => , ExternalLink, - AnchorLink, - Link: (props) => , Playground: PlaygroundBlock, PlaygroundPreview, pre: SyntaxHighlighter, @@ -120,6 +125,24 @@ const Layout = ({ location, children, pageContext }) => { const pathParts = location.pathname.split('/'); const version = pathParts[1].startsWith('release-') ? pathParts[1] : undefined; + // Some hrefs of internal links can't be replaced with MDXProvider's replace component logic. + // this code will take care of those + React.useEffect(() => { + if (version) { + const links = document.querySelectorAll('#content a[href]'); + for (const link of links) { + const href = link.getAttribute('href'); + const hrefNew = hrefWithVersion(href, version); + if (href !== hrefNew) { + link.setAttribute('href', hrefNew); + /* eslint-disable-next-line no-self-assign */ + link.outerHTML = link.outerHTML; // this removes the click handler + } + } + } + }, [version]); + + const queryData = useStaticQuery(graphql` query SiteDataQuery { site { From abeaa438be7dcdb58bbd1fe42001a2196504b267 Mon Sep 17 00:00:00 2001 From: timwessman Date: Thu, 17 Oct 2024 16:12:36 +0300 Subject: [PATCH 06/25] fix: package and yarn.lock fix --- site/package.json | 2 +- yarn.lock | 1000 ++++++++++++++++++++++++++++++--------------- 2 files changed, 662 insertions(+), 340 deletions(-) diff --git a/site/package.json b/site/package.json index e90d69026c..8e59b5b4d5 100644 --- a/site/package.json +++ b/site/package.json @@ -27,7 +27,7 @@ "gatsby-plugin-sharp": "^5.13.1", "gatsby-remark-autolink-headers": "^6.13.1", "gatsby-source-filesystem": "^5.13.1", - "gatsby-source-git": "2.2.0-beta.0", + "gatsby-source-git": "2.0.0-beta.0", "gatsby-transformer-remark": "6.13.1", "gatsby-transformer-sharp": "5.13.1", "html-validate": "6.5.0", diff --git a/yarn.lock b/yarn.lock index 61959ad494..bb16eea72e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -279,7 +279,7 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.7": +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== @@ -1484,7 +1484,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.8", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.20.13", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.8", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.20.13", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.23.8" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650" integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw== @@ -1516,7 +1516,7 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.11.5", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.16.8", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.4", "@babel/types@^7.24.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4": +"@babel/types@^7.0.0", "@babel/types@^7.11.5", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.16.8", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.4", "@babel/types@^7.24.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2" integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q== @@ -1901,15 +1901,15 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@gatsbyjs/parcel-namer-relative-to-cwd@^2.12.1": - version "2.12.1" - resolved "https://registry.yarnpkg.com/@gatsbyjs/parcel-namer-relative-to-cwd/-/parcel-namer-relative-to-cwd-2.12.1.tgz#79d9e08fb3f8dde3ab943919b7d7f190f5dec79c" - integrity sha512-DYtRRu0yhs/T3eWtOsuJK8qG5+TPfMnbB3q20hYOxsm6BnOuIUYIHNmZNlP7VcrBTCCZJUW/6xhq81mA6GvHWA== +"@gatsbyjs/parcel-namer-relative-to-cwd@^2.13.1": + version "2.13.1" + resolved "https://registry.yarnpkg.com/@gatsbyjs/parcel-namer-relative-to-cwd/-/parcel-namer-relative-to-cwd-2.13.1.tgz#79d2692330a942394200c9bf3e820a4e55075ffb" + integrity sha512-ze0u/CAt6fKV2yQlExkBARi8oqA559lX6/GFWwdtD9S1J4h8Bje70Odl/bcIECvT/w9mWCCQEVtKLvqkraDopw== dependencies: "@babel/runtime" "^7.20.13" "@parcel/namer-default" "2.8.3" "@parcel/plugin" "2.8.3" - gatsby-core-utils "^4.12.1" + gatsby-core-utils "^4.13.1" "@gatsbyjs/reach-router@^2.0.1": version "2.0.1" @@ -2687,7 +2687,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.9": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.9": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -2700,6 +2700,18 @@ resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.2.0.tgz#5e0b448d27fe3091bae6216456512c5904d05661" integrity sha512-fsLxt0CHx2HCV9EL8lDoVkwHffsA0snUpddYjdLyXcG5E41xaamn9ZyQqOE9TUJdrRlH8/hjIf+UdOdDeKCUgg== +"@kwsites/file-exists@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99" + integrity sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw== + dependencies: + debug "^4.1.1" + +"@kwsites/promise-deferred@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919" + integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw== + "@leichtgewicht/ip-codec@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" @@ -4112,6 +4124,17 @@ "@babel/code-frame" "^7.16.0" chalk "^4.1.0" +"@sigmacomputing/babel-plugin-lodash@^3.3.5": + version "3.3.5" + resolved "https://registry.yarnpkg.com/@sigmacomputing/babel-plugin-lodash/-/babel-plugin-lodash-3.3.5.tgz#613d98b0cbb51c1836bbc12c8a12d75750ee3510" + integrity sha512-VFhaHjlNzWyBtBm3YdqOwP8GbQHK7sWzXKpSUBTLjl2Zz6/9PwCK4qXZXI5CHpDjmvbouHUDbjrZP2KU5h6VQg== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/types" "^7.0.0" + glob "^7.1.1" + lodash "^4.17.10" + require-package-name "^2.0.1" + "@sigstore/bundle@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.0.0.tgz#2f2f4867f434760f4bc6f4b4bbccbaecd4143bc3" @@ -6621,6 +6644,11 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== +"@types/estree@^1.0.5": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" + integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== + "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": version "4.17.35" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f" @@ -7160,7 +7188,7 @@ dependencies: yup "*" -"@typescript-eslint/eslint-plugin@^5.5.0", "@typescript-eslint/eslint-plugin@^5.59.8": +"@typescript-eslint/eslint-plugin@^5.5.0", "@typescript-eslint/eslint-plugin@^5.60.1": version "5.62.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db" integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== @@ -7200,7 +7228,7 @@ dependencies: "@typescript-eslint/utils" "5.62.0" -"@typescript-eslint/parser@^5.5.0", "@typescript-eslint/parser@^5.59.8": +"@typescript-eslint/parser@^5.5.0", "@typescript-eslint/parser@^5.60.1": version "5.62.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== @@ -7342,7 +7370,7 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -"@vercel/webpack-asset-relocator-loader@^1.7.3": +"@vercel/webpack-asset-relocator-loader@1.7.3": version "1.7.3" resolved "https://registry.yarnpkg.com/@vercel/webpack-asset-relocator-loader/-/webpack-asset-relocator-loader-1.7.3.tgz#e65ca1fd9feb045039788f9b4710e5acc84b01b0" integrity sha512-vizrI18v8Lcb1PmNNUBz7yxPxxXoOeuaVEjTG9MjvDrphjiSxFZrRJ5tIghk+qdLFRCXI5HBCshgobftbmrC5g== @@ -7357,6 +7385,14 @@ "@webassemblyjs/helper-numbers" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" +"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" + integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -7391,6 +7427,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== +"@webassemblyjs/helper-buffer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6" + integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw== + "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" @@ -7444,6 +7485,16 @@ "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/wasm-gen" "1.11.6" +"@webassemblyjs/helper-wasm-section@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf" + integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -7520,6 +7571,20 @@ "@webassemblyjs/wasm-parser" "1.11.6" "@webassemblyjs/wast-printer" "1.11.6" +"@webassemblyjs/wasm-edit@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" + integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-opt" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" + "@webassemblyjs/wast-printer" "1.12.1" + "@webassemblyjs/wasm-gen@1.11.6": version "1.11.6" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" @@ -7531,6 +7596,17 @@ "@webassemblyjs/leb128" "1.11.6" "@webassemblyjs/utf8" "1.11.6" +"@webassemblyjs/wasm-gen@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547" + integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -7552,6 +7628,16 @@ "@webassemblyjs/wasm-gen" "1.11.6" "@webassemblyjs/wasm-parser" "1.11.6" +"@webassemblyjs/wasm-opt@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5" + integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" + "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -7574,6 +7660,18 @@ "@webassemblyjs/leb128" "1.11.6" "@webassemblyjs/utf8" "1.11.6" +"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" + integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -7606,6 +7704,14 @@ "@webassemblyjs/ast" "1.11.6" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac" + integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -7745,6 +7851,11 @@ acorn-import-assertions@^1.9.0: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== +acorn-import-attributes@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" + integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== + acorn-jsx@^5.0.0, acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -8045,11 +8156,6 @@ aproba@^1.1.1: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -arch@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" - integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== - are-we-there-yet@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" @@ -8618,17 +8724,6 @@ babel-plugin-jest-hoist@^27.5.1: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-lodash@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196" - integrity sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg== - dependencies: - "@babel/helper-module-imports" "^7.0.0-beta.49" - "@babel/types" "^7.0.0-beta.49" - glob "^7.1.1" - lodash "^4.17.10" - require-package-name "^2.0.1" - babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" @@ -8698,14 +8793,14 @@ babel-plugin-react-docgen@^4.1.0, babel-plugin-react-docgen@^4.2.1: lodash "^4.17.15" react-docgen "^5.0.0" -babel-plugin-remove-graphql-queries@^5.11.0, babel-plugin-remove-graphql-queries@^5.12.1: - version "5.12.1" - resolved "https://registry.yarnpkg.com/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-5.12.1.tgz#49bdb72ab9e8291ca98a3eb57afa99efa4856763" - integrity sha512-R5FyZLs+YfhCpUJkpSyVwIbaw9Ya4TC4xIOBJzPK9Z3u5XVCI459aykLPyfYAWwbsI9yvjm/Ux5ft4/U4rNvMQ== +babel-plugin-remove-graphql-queries@^5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-5.13.1.tgz#bf1feb392d8a1f74046f9584c72c952663a10695" + integrity sha512-yncJ/W6Un48aBRpK/rmdpQOMcr4+EmJ3oi2Wq1zXKu8WLlw+j93KTbejf7fg2msm8GUskb/+9Nnpz7oMCqO9aA== dependencies: "@babel/runtime" "^7.20.13" "@babel/types" "^7.20.7" - gatsby-core-utils "^4.12.1" + gatsby-core-utils "^4.13.1" babel-plugin-require-context-hook@1.0.0: version "1.0.0" @@ -8791,10 +8886,10 @@ babel-preset-fbjs@^3.4.0: "@babel/plugin-transform-template-literals" "^7.0.0" babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0" -babel-preset-gatsby@^3.11.0: - version "3.12.1" - resolved "https://registry.yarnpkg.com/babel-preset-gatsby/-/babel-preset-gatsby-3.12.1.tgz#2077a10c349e6a07e3677c7b3de14a95b92e75d2" - integrity sha512-M3q7TB9YOpILjyd4ShjvWG0Agzjapu+FPQUczy9iBxlzVPcAe5hiPRlEin1v0CvXrlwj+GNydrhlczCPaf8YkA== +babel-preset-gatsby@^3.13.2: + version "3.13.2" + resolved "https://registry.yarnpkg.com/babel-preset-gatsby/-/babel-preset-gatsby-3.13.2.tgz#61f9f3a11f96577ca889c6061096c67ef287ec47" + integrity sha512-1zZ3Fpt9jD63inJXWUF2hA6U2cBAMYFDSC5hKqnSSVbNUzKlHUcY0Vbx8azBSaHg27TVp9BitR10zvq5AHP/OQ== dependencies: "@babel/plugin-proposal-class-properties" "^7.18.6" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" @@ -8809,8 +8904,8 @@ babel-preset-gatsby@^3.11.0: babel-plugin-dynamic-import-node "^2.3.3" babel-plugin-macros "^3.1.0" babel-plugin-transform-react-remove-prop-types "^0.4.24" - gatsby-core-utils "^4.12.1" - gatsby-legacy-polyfills "^3.12.0" + gatsby-core-utils "^4.13.1" + gatsby-legacy-polyfills "^3.13.1" babel-preset-jest@^26.6.2: version "26.6.2" @@ -9191,7 +9286,7 @@ browserslist@4.20.2: node-releases "^2.0.2" picocolors "^1.0.0" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.21.7, browserslist@^4.21.9, browserslist@^4.22.2, browserslist@^4.6.4, browserslist@^4.6.6: +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.21.9, browserslist@^4.22.2, browserslist@^4.6.4, browserslist@^4.6.6: version "4.23.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== @@ -9201,6 +9296,16 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4 node-releases "^2.0.14" update-browserslist-db "^1.0.13" +browserslist@^4.21.10: + version "4.24.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4" + integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A== + dependencies: + caniuse-lite "^1.0.30001663" + electron-to-chromium "^1.5.28" + node-releases "^2.0.18" + update-browserslist-db "^1.1.0" + bs-logger@0.x: version "0.2.6" resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" @@ -9555,6 +9660,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, can resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001623.tgz" integrity sha512-X/XhAVKlpIxWPpgRTnlgZssJrF0m6YtRA0QDWgsBNT12uZM6LPRydR7ip405Y3t1LamD8cP2TZFEDZFBf5ApcA== +caniuse-lite@^1.0.30001663: + version "1.0.30001669" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz#fda8f1d29a8bfdc42de0c170d7f34a9cf19ed7a3" + integrity sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w== + capital-case@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" @@ -9770,7 +9880,7 @@ cheerio-select@^2.1.0: domhandler "^5.0.3" domutils "^3.0.1" -cheerio@^1.0.0-rc.10: +cheerio@1.0.0-rc.12: version "1.0.0-rc.12" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== @@ -9985,14 +10095,14 @@ cli-width@^3.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== -clipboardy@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" - integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ== +clipboardy@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-4.0.0.tgz#e73ced93a76d19dd379ebf1f297565426dffdca1" + integrity sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w== dependencies: - arch "^2.1.1" - execa "^1.0.0" - is-wsl "^2.1.1" + execa "^8.0.1" + is-wsl "^3.1.0" + is64bit "^2.0.0" cliui@^3.0.3: version "3.2.0" @@ -10644,11 +10754,16 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.0.4, core-js@^3.14.0, core-js@^3.19.2, core-js@^3.30.2, core-js@^3.6.5, core-js@^3.8.2: +core-js@^3.0.4, core-js@^3.14.0, core-js@^3.19.2, core-js@^3.6.5, core-js@^3.8.2: version "3.33.2" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.2.tgz#312bbf6996a3a517c04c99b9909cdd27138d1ceb" integrity sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ== +core-js@^3.31.0: + version "3.38.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.1.tgz#aa375b79a286a670388a1a363363d53677c0383e" + integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw== + core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -10750,10 +10865,10 @@ create-ecdh@^4.0.0: bn.js "^4.1.0" elliptic "^6.5.3" -create-gatsby@^3.12.3: - version "3.12.3" - resolved "https://registry.yarnpkg.com/create-gatsby/-/create-gatsby-3.12.3.tgz#7952e4a5f39886e197b15fc4c0753914162eb1b7" - integrity sha512-N0K/Z/MD5LMRJcBy669WpSgrn+31zBV72Lv0RHolX0fXa77Yx58HsEiLWz83j/dtciGMQfEOEHFRetUqZhOggA== +create-gatsby@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/create-gatsby/-/create-gatsby-3.13.1.tgz#394f5ad7647409f5651057f46e93c1cee1efc47d" + integrity sha512-CCg8Vz/iQs1cgMEzyRlVGMvNs8ivE/2w+TL6yS56FVe1JjOou8nKYHzxnWxRmBUtC7rTfjxVaTESIotuYBsltQ== dependencies: "@babel/runtime" "^7.20.13" @@ -11411,6 +11526,13 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.2.6, debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4.3.5: + version "4.3.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== + dependencies: + ms "^2.1.3" + decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" @@ -12012,6 +12134,11 @@ electron-to-chromium@^1.4.668, electron-to-chromium@^1.4.84: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.740.tgz#89c82421332ee425e5b193e3db2dea019d423419" integrity sha512-Yvg5i+iyv7Xm18BRdVPVm8lc7kgxM3r6iwqCH2zB7QZy1kZRNmd0Zqm0zcD9XoFREE5/5rwIuIAOT+/mzGcnZg== +electron-to-chromium@^1.5.28: + version "1.5.40" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.40.tgz#5f6aec13751123c5c3185999ebe3e7bcaf828c2b" + integrity sha512-LYm78o6if4zTasnYclgQzxEcgMoIcybWOhkATWepN95uwVVWV0/IW10v+2sIeHE+bIYWipLneTftVyQm45UY7g== + element-resize-detector@^1.2.2: version "1.2.4" resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz#3e6c5982dd77508b5fa7e6d5c02170e26325c9b1" @@ -12104,26 +12231,26 @@ endent@^2.0.1: fast-json-parse "^1.0.3" objectorarray "^1.0.5" -engine.io-client@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.4.0.tgz#88cd3082609ca86d7d3c12f0e746d12db4f47c91" - integrity sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g== +engine.io-client@~6.5.1: + version "6.5.4" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.5.4.tgz#b8bc71ed3f25d0d51d587729262486b4b33bd0d0" + integrity sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.11.0" + engine.io-parser "~5.2.1" + ws "~8.17.1" xmlhttprequest-ssl "~2.0.0" -engine.io-parser@~5.0.3: - version "5.0.7" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.7.tgz#ed5eae76c71f398284c578ab6deafd3ba7e4e4f6" - integrity sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ== +engine.io-parser@~5.2.1: + version "5.2.3" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f" + integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q== -engine.io@~6.4.1: - version "6.4.2" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.2.tgz#ffeaf68f69b1364b0286badddf15ff633476473f" - integrity sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg== +engine.io@~6.5.0: + version "6.5.5" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.5.tgz#430b80d8840caab91a50e9e23cb551455195fc93" + integrity sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA== dependencies: "@types/cookie" "^0.4.1" "@types/cors" "^2.8.12" @@ -12133,8 +12260,8 @@ engine.io@~6.4.1: cookie "~0.4.1" cors "~2.8.5" debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.11.0" + engine.io-parser "~5.2.1" + ws "~8.17.1" enhanced-resolve@^4.5.0: version "4.5.0" @@ -12145,7 +12272,7 @@ enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" -enhanced-resolve@^5.14.1, enhanced-resolve@^5.15.0: +enhanced-resolve@^5.15.0: version "5.15.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== @@ -12153,6 +12280,14 @@ enhanced-resolve@^5.14.1, enhanced-resolve@^5.15.0: graceful-fs "^4.2.4" tapable "^2.2.0" +enhanced-resolve@^5.17.1: + version "5.17.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" + integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + enquirer@^2.3.5: version "2.4.1" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56" @@ -12426,6 +12561,11 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -13050,6 +13190,21 @@ execa@^7.1.0: signal-exit "^3.0.7" strip-final-newline "^3.0.0" +execa@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c" + integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^8.0.1" + human-signals "^5.0.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^4.1.0" + strip-final-newline "^3.0.0" + exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" @@ -13272,6 +13427,17 @@ fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0: merge2 "^1.3.0" micromatch "^4.0.4" +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== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-json-parse@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d" @@ -13297,7 +13463,7 @@ fastparse@^1.1.2: resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== -fastq@^1.13.0, fastq@^1.15.0, fastq@^1.6.0: +fastq@^1.15.0, fastq@^1.6.0: version "1.15.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== @@ -13386,7 +13552,7 @@ file-system-cache@^1.0.5: fs-extra "^10.1.0" ramda "^0.28.0" -file-type@^16.5.3, file-type@^16.5.4: +file-type@^16.5.4: version "16.5.4" resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.4.tgz#474fb4f704bee427681f98dd390058a172a6c2fd" integrity sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw== @@ -13832,10 +13998,10 @@ fuse.js@^3.6.1: resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c" integrity sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw== -gatsby-cli@^5.11.0: - version "5.12.4" - resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-5.12.4.tgz#265ae0a3c065293d181b5800ea7e965e701723e2" - integrity sha512-GD+otyd5LlgSbYK4ODrKyAise/k32G7Qy7H/k+gJ2P8DCG9sU+j//2zNwF7mY8C5dl0SpROqFTL+I0Y1DK4tmQ== +gatsby-cli@^5.13.3: + version "5.13.3" + resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-5.13.3.tgz#84c38ded7c73a35f0864b05cc27e8560e87a0ef8" + integrity sha512-JQTeivvZWuhxE1HRey2sRhwUmkCrs5478fiLR0XRFGin4X1ggCmrQx/DBkJP1TgktdPfNU8t987+slSnO2XzMA== dependencies: "@babel/code-frame" "^7.18.6" "@babel/core" "^7.20.12" @@ -13850,16 +14016,16 @@ gatsby-cli@^5.11.0: better-opn "^2.1.1" boxen "^5.1.2" chalk "^4.1.2" - clipboardy "^2.3.0" + clipboardy "^4.0.0" common-tags "^1.8.2" convert-hrtime "^3.0.0" - create-gatsby "^3.12.3" + create-gatsby "^3.13.1" envinfo "^7.10.0" execa "^5.1.1" fs-exists-cached "^1.0.0" fs-extra "^11.1.1" - gatsby-core-utils "^4.12.1" - gatsby-telemetry "^4.12.1" + gatsby-core-utils "^4.13.1" + gatsby-telemetry "^4.13.1" hosted-git-info "^3.0.8" is-valid-path "^0.1.1" joi "^17.9.2" @@ -13879,31 +14045,10 @@ gatsby-cli@^5.11.0: yoga-layout-prebuilt "^1.10.0" yurnalist "^2.1.0" -gatsby-core-utils@^3.25.0: - version "3.25.0" - resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-3.25.0.tgz#6ebfd2b8c95f3bbc3b52a9619a1ff26c68109c25" - integrity sha512-lmMDwbnKpqAi+8WWd7MvCTCx3E0u7j8sbVgydERNCYVxKVpzD/aLCH4WPb4EE9m1H1rSm76w0Z+MaentyB/c/Q== - dependencies: - "@babel/runtime" "^7.15.4" - ci-info "2.0.0" - configstore "^5.0.1" - fastq "^1.13.0" - file-type "^16.5.3" - fs-extra "^10.1.0" - got "^11.8.5" - import-from "^4.0.0" - lmdb "2.5.3" - lock "^1.1.0" - node-object-hash "^2.3.10" - proper-lockfile "^4.1.2" - resolve-from "^5.0.0" - tmp "^0.2.1" - xdg-basedir "^4.0.0" - -gatsby-core-utils@^4.10.0, gatsby-core-utils@^4.11.0, gatsby-core-utils@^4.12.1: - version "4.12.1" - resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-4.12.1.tgz#8bfa0d65033cfa4c47dd199482589e458bf4fc9d" - integrity sha512-YW7eCK2M6yGQerT5LkdOHLZTNYMsDvcgeDMRy0q66FWKj7twPZX428I6NaLCMeF5dYoj1HOOO0u96iNlW5jcKQ== +gatsby-core-utils@^4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-4.13.1.tgz#57955316486cc85ab150922f481484bc9287205e" + integrity sha512-w7G6SsQr8T2q+AJ1MxvRNGocCt+wjc22MiRLj2Zi3Ijpjszbr818JxwI4+aPt8WOSHlKT5SYCHICnEvcYPm9gg== dependencies: "@babel/runtime" "^7.20.13" ci-info "2.0.0" @@ -13922,48 +14067,48 @@ gatsby-core-utils@^4.10.0, gatsby-core-utils@^4.11.0, gatsby-core-utils@^4.12.1: tmp "^0.2.1" xdg-basedir "^4.0.0" -gatsby-graphiql-explorer@^3.11.0: - version "3.12.1" - resolved "https://registry.yarnpkg.com/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-3.12.1.tgz#7ea2196467d5982bc3fb8e0326cd57161bc1b8c6" - integrity sha512-c2iG+4nAft2cTS9zgnPUAYNBtxTWGKjI26QIfjuo25j7/klnz8rLQYdj6TA4Z2Y3yyTyBspAHr9ho6zvOHlBJg== +gatsby-graphiql-explorer@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-3.13.1.tgz#906f5b75f9c01ca5cd836de6cda60e376126e3e2" + integrity sha512-WR6jv18OhKLwK/hGZ6ZGUd82GFtM6gHz+sOpgsJJx/+uqRjZwqcrH2LSrWRSWUCk7FoZY1rJuBSD1QkOODV01A== -gatsby-legacy-polyfills@^3.11.0, gatsby-legacy-polyfills@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-3.12.0.tgz#f9333ee90457e4c1549a62ce81abb7198c433293" - integrity sha512-hj0M4w4xFvKHtBNE3StkLmbCS3LXK0oxW5g3UkubbyMAwFqylQnWzXfysBpeFicQN/tr2px1cNGaqp91Z3Nh+g== +gatsby-legacy-polyfills@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-3.13.1.tgz#6b18f6979a2dda4e9e0ffd0a453479a90a583385" + integrity sha512-NjR3B/rq6dsJuaMmeHlGExdVXJfDqVWERXi9ROfIBt7O3Fwzy5WYgoPeVikVZE06DmeZWlBzuNcGSfc8lilB5g== dependencies: "@babel/runtime" "^7.20.13" core-js-compat "3.31.0" -gatsby-link@^5.11.0: - version "5.12.1" - resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-5.12.1.tgz#e8ac516a3e36fe6ff52aa1d166808cc4b4277920" - integrity sha512-0xhQhRnpPRHWouoNzkVTu8qhbUa8GhbRrCo2QKiOyAdVzU96ZzWEMw2FUkgG6Ht5kglDXHek6LOiWyAv6jf49g== +gatsby-link@^5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-5.13.1.tgz#f37d57f1eb45f8645f0dbc9ffc8c76aca47546ad" + integrity sha512-naQxvgX/rd4Pj5ICL2DcqT30TAENk6wHttcLioxIqW9/UhwAXGkM9QsOJOyUmwbrp37UIKU3K92Ks/cMbRxwXA== dependencies: "@types/reach__router" "^1.3.10" - gatsby-page-utils "^3.12.1" + gatsby-page-utils "^3.13.1" prop-types "^15.8.1" -gatsby-page-utils@^3.11.0, gatsby-page-utils@^3.12.1: - version "3.12.1" - resolved "https://registry.yarnpkg.com/gatsby-page-utils/-/gatsby-page-utils-3.12.1.tgz#5904da323694238dc0b74e2b148c84ae68ff122e" - integrity sha512-BGtAvx4JZ143uRHYlUbWS8ZjOJ14fpj3nQfb68y9ZsNL1gdwjdWjuPXTM1gQ+w6wXDsHD/ovmYz1ZHG7qrQjJQ== +gatsby-page-utils@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/gatsby-page-utils/-/gatsby-page-utils-3.13.1.tgz#bd159e9f21ce48f170064682b9a8d087ce49abf4" + integrity sha512-+/V+ZKPn1Lv3KfeTBV/XUVljwTFQq5kg3T0esu9ygXEz3EVXjG5VjL/IX57awiDm9sLsEALqRuuYLoHpfNHg0A== dependencies: "@babel/runtime" "^7.20.13" bluebird "^3.7.2" chokidar "^3.5.3" fs-exists-cached "^1.0.0" - gatsby-core-utils "^4.12.1" + gatsby-core-utils "^4.13.1" glob "^7.2.3" lodash "^4.17.21" micromatch "^4.0.5" -gatsby-parcel-config@^1.11.0: - version "1.12.1" - resolved "https://registry.yarnpkg.com/gatsby-parcel-config/-/gatsby-parcel-config-1.12.1.tgz#248c9d685a75a867eea7f5e48f0a6a9b01144da3" - integrity sha512-hH9m/dSJTkdeksBzLGi9U+Pey0CsPeHHrRP6pugxd7owtJUQqid37noyadqnawBo2LOwcGE4o69HhqGxGNXxbw== +gatsby-parcel-config@1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/gatsby-parcel-config/-/gatsby-parcel-config-1.13.1.tgz#1d504157a2ff02227ff239bd85b0f473e41f1981" + integrity sha512-zEiDKnq1UQvDDireYQN2TmDsxDf9n2SHYXASHyUTipwsMlNMEi0nLav1vHRQAfzbjw4tabk9Z5kcknkJ6nLqOA== dependencies: - "@gatsbyjs/parcel-namer-relative-to-cwd" "^2.12.1" + "@gatsbyjs/parcel-namer-relative-to-cwd" "^2.13.1" "@parcel/bundler-default" "2.8.3" "@parcel/compressor-raw" "2.8.3" "@parcel/namer-default" "2.8.3" @@ -13976,46 +14121,46 @@ gatsby-parcel-config@^1.11.0: "@parcel/transformer-js" "2.8.3" "@parcel/transformer-json" "2.8.3" -gatsby-plugin-image@^3.0.0: - version "3.12.3" - resolved "https://registry.yarnpkg.com/gatsby-plugin-image/-/gatsby-plugin-image-3.12.3.tgz#7e1484d014afbe0005497934b4215938a69fcf56" - integrity sha512-945XpVY/14M9msfOI2fulunEUSJnw0YnwfbRq7omvqAWOH/fCnXWkyYj89NAcmNIOSM/a+KgQyaIDosnVHXdpw== +gatsby-plugin-image@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-image/-/gatsby-plugin-image-3.13.1.tgz#5c6e03b1c21bb0dbc076f589aea9911086b25bde" + integrity sha512-v5jGXxjr//iLk7LzpW6RW/9H4KNVezxee2Sgy9mxvdvekTuFQLYoQmtk2jOZINMZMP3Vm+Rl3MqWWVMfhHuWFw== dependencies: "@babel/code-frame" "^7.18.6" "@babel/parser" "^7.20.13" "@babel/runtime" "^7.20.13" "@babel/traverse" "^7.20.13" babel-jsx-utils "^1.1.0" - babel-plugin-remove-graphql-queries "^5.12.1" + babel-plugin-remove-graphql-queries "^5.13.1" camelcase "^6.3.0" chokidar "^3.5.3" common-tags "^1.8.2" fs-extra "^11.1.1" - gatsby-core-utils "^4.12.1" - gatsby-plugin-utils "^4.12.3" + gatsby-core-utils "^4.13.1" + gatsby-plugin-utils "^4.13.1" objectFitPolyfill "^2.3.5" prop-types "^15.8.1" -gatsby-plugin-manifest@^5.12.0: - version "5.12.3" - resolved "https://registry.yarnpkg.com/gatsby-plugin-manifest/-/gatsby-plugin-manifest-5.12.3.tgz#2da44659425850564f65fa69d600c6969edaae05" - integrity sha512-qpH0pSIIt7ggO7OnP127eKn6fhD1DKTzg9Aw8vaMCO8MMOQ5qfOn3ZrRCgH6DuaU1admZU18gFKlCKH+QHoGfQ== +gatsby-plugin-manifest@^5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-manifest/-/gatsby-plugin-manifest-5.13.1.tgz#4e7a87c38c5d47622016eec70ce1383f6e331f60" + integrity sha512-F8zGMYz2tRDAzQO7hLrYv+xCFyIoeySeGsEk9j1KTdWB4liVQvLtFSXzj7yljyOTinDmA7mDStCiQFStC0rHZQ== dependencies: "@babel/runtime" "^7.20.13" - gatsby-core-utils "^4.12.1" - gatsby-plugin-utils "^4.12.3" + gatsby-core-utils "^4.13.1" + gatsby-plugin-utils "^4.13.1" semver "^7.5.3" sharp "^0.32.6" -gatsby-plugin-matomo@^0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/gatsby-plugin-matomo/-/gatsby-plugin-matomo-0.13.0.tgz#abf1bd561f3ca35c57b8bbbd5d8e87579ba17886" - integrity sha512-zwmxcwOoDi3hjNQoUJehoC5XwQKgR+bArAAvArGJWHlJqv7G688tlmKgbIGqEUj3aFSdyWAzAM7QhEt68buMNw== +gatsby-plugin-matomo@^0.16.3: + version "0.16.3" + resolved "https://registry.yarnpkg.com/gatsby-plugin-matomo/-/gatsby-plugin-matomo-0.16.3.tgz#ce0df0aaabd024dbce311d6a291cb3f6fd95c4b8" + integrity sha512-xgS4gFMKRqYgD3I5rZ0mXhW+hyvCDX8i0XSkaRH4jw74GffFOoL5FRqQZP/oVRARepDInQOvdgo1sfcpQ37CCQ== -gatsby-plugin-mdx@5.11.0: - version "5.11.0" - resolved "https://registry.yarnpkg.com/gatsby-plugin-mdx/-/gatsby-plugin-mdx-5.11.0.tgz#4cff5c28ab8facd1f6a89f2a79e754f6c81670b3" - integrity sha512-7kRTVRId7VvxdSRRx1oZ9FAnd6ZcSs1yvtlpitgOsh1Tv1t9jtNTRtI6onDXCLZd1lT/6q03YfBEF0x0Z75b+g== +gatsby-plugin-mdx@5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-mdx/-/gatsby-plugin-mdx-5.13.1.tgz#9fd9d7612daefd372cb9c0f0b9ba8045f490bf3d" + integrity sha512-ZL/z1j8zBzQSqFTEoVdC+jPNpN/CXse2h87wUz78V+BMjp40ccR0DCo62KgF40HVz4iCEYVufqfjQNc0nLoSow== dependencies: "@mdx-js/mdx" "^2.3.0" acorn "^8.8.2" @@ -14024,8 +14169,8 @@ gatsby-plugin-mdx@5.11.0: deepmerge "^4.3.1" estree-util-build-jsx "^2.2.2" fs-extra "^11.1.1" - gatsby-core-utils "^4.11.0" - gatsby-plugin-utils "^4.11.0" + gatsby-core-utils "^4.13.1" + gatsby-plugin-utils "^4.13.1" gray-matter "^4.0.3" mdast-util-mdx "^2.0.1" mdast-util-to-hast "^10.2.0" @@ -14037,30 +14182,30 @@ gatsby-plugin-mdx@5.11.0: unist-util-visit "^4.1.2" vfile "^5.3.7" -gatsby-plugin-no-sourcemaps@4.24.0: - version "4.24.0" - resolved "https://registry.yarnpkg.com/gatsby-plugin-no-sourcemaps/-/gatsby-plugin-no-sourcemaps-4.24.0.tgz#b6b039fa79b53560e184263cddf66e90dacdba7a" - integrity sha512-dbh2x2NmpTykNqF8NoQ73pKWFn8Lm1EbyihjjYyLaXRFjs7guR29OU29Ar3KvvjCVfg9fsnScMlJqlEOy3l9sw== +gatsby-plugin-no-sourcemaps@5.13.0: + version "5.13.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-no-sourcemaps/-/gatsby-plugin-no-sourcemaps-5.13.0.tgz#1052a0148ecd623a1df6ac586d0c8fcf7ebae6af" + integrity sha512-C6BHpd7W82Ps6oA6IW5UuXxbDyZzvcsz96UMIBkn+n+MCNaoB6AjQDZlPcvZHaxyZ4ovqZnf7TBbvugxgzwq0g== dependencies: - "@babel/runtime" "^7.15.4" + "@babel/runtime" "^7.20.13" -gatsby-plugin-offline@^6.12.0: - version "6.12.3" - resolved "https://registry.yarnpkg.com/gatsby-plugin-offline/-/gatsby-plugin-offline-6.12.3.tgz#c17340d685e97491fe863360f2bfef0856857259" - integrity sha512-Kc2BP3PttdwtjRp17tkgsLjd6AcObK73GfL85krgOtbaC+R52u3Htagd8kgHJ+evIoIDRrnXgPk+cTuRmXTidQ== +gatsby-plugin-offline@^6.13.3: + version "6.13.3" + resolved "https://registry.yarnpkg.com/gatsby-plugin-offline/-/gatsby-plugin-offline-6.13.3.tgz#4f1d1f89299494cce4c71f9c6f71a6b31024ec17" + integrity sha512-muFxKkEtXEfa8UaoLurfR9EgvqNhmuvhB4Ri1LIzFiyjlfSmwyVZRJjkN0M0q5zjZy/u+PBzazX0k5CatLFI7A== dependencies: "@babel/runtime" "^7.20.13" - cheerio "^1.0.0-rc.10" - gatsby-core-utils "^4.12.1" + cheerio "1.0.0-rc.12" + gatsby-core-utils "^4.13.1" glob "^7.2.3" idb-keyval "^3.2.0" lodash "^4.17.21" workbox-build "^4.3.1" -gatsby-plugin-page-creator@^5.11.0: - version "5.12.3" - resolved "https://registry.yarnpkg.com/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-5.12.3.tgz#61ae00423dccf617e0daab5ec57e92ce280199fd" - integrity sha512-li9jKy70h4vXNxxRrXP2DpgEx05m5E7EDOLCjAWNsm7e9EO1szixXQ0ev6Ie1SBKT6vAHAoIonet6+oFattf9w== +gatsby-plugin-page-creator@^5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-5.13.1.tgz#41e844a16696e7a27d1909413a1102c314e86220" + integrity sha512-WBTQc0cFqaojS1Oh7MjBRSnLCOWWWl3L5t5LEsXwV+4L9OL6D5fLTz7K5xC34OVgfAIryuEKE/M2ZIEk3onVnw== dependencies: "@babel/runtime" "^7.20.13" "@babel/traverse" "^7.20.13" @@ -14068,21 +14213,21 @@ gatsby-plugin-page-creator@^5.11.0: chokidar "^3.5.3" fs-exists-cached "^1.0.0" fs-extra "^11.1.1" - gatsby-core-utils "^4.12.1" - gatsby-page-utils "^3.12.1" - gatsby-plugin-utils "^4.12.3" - gatsby-telemetry "^4.12.1" + gatsby-core-utils "^4.13.1" + gatsby-page-utils "^3.13.1" + gatsby-plugin-utils "^4.13.1" + gatsby-telemetry "^4.13.1" globby "^11.1.0" lodash "^4.17.21" -gatsby-plugin-react-helmet@^5.17.0: - version "5.25.0" - resolved "https://registry.yarnpkg.com/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-5.25.0.tgz#6849d405bfbc0846e73449d4425b45f84ec58fbb" - integrity sha512-sU/xae/sGuYFcFDpqUxwXnaOmx8xrU2Q+XSULqAapji0uTBhW6al6CJsaPFigi8IOG2bQX8ano2iWWcGF3/GHw== +gatsby-plugin-react-helmet@^6.13.1: + version "6.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-6.13.1.tgz#e0a635c00631c14412d3f5bb9d76044ab0ee8a84" + integrity sha512-Fwgf2UDOo1LQgw1vUmGmDMK5hXVrIXDR92URzu4DylQWgyfycfQ3D9FdU2JZ8jB6F3OI6Yx6YHC7zL3OAL7iOw== dependencies: - "@babel/runtime" "^7.15.4" + "@babel/runtime" "^7.20.13" -gatsby-plugin-robots-txt@^1.7.1: +gatsby-plugin-robots-txt@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/gatsby-plugin-robots-txt/-/gatsby-plugin-robots-txt-1.8.0.tgz#f237b7e9bec2d8dc276305ff629ecf3df8277c63" integrity sha512-GMUIrsCPncb10wM9cuF2ZwYNN8revEolzvvizT0RzRE4NhPxsQUT4LIRE4n5IYQhbYu6oYZtfeG7YreFXmxLMw== @@ -14090,19 +14235,19 @@ gatsby-plugin-robots-txt@^1.7.1: "@babel/runtime" "^7.17.9" generate-robotstxt "^8.0.3" -gatsby-plugin-sass@^5.17.0: - version "5.25.0" - resolved "https://registry.yarnpkg.com/gatsby-plugin-sass/-/gatsby-plugin-sass-5.25.0.tgz#8aedec8d58f50826c1c25faa52f94175e69b8017" - integrity sha512-e+47Z24DI+Uh3KcUbj/WvTyH4ZPXcC4zlwqhzspv1Ye+xMS1ipTsIelvBuTwiiEWBs6cqdcYAPhn7HoXX/errw== +gatsby-plugin-sass@^6.13.1: + version "6.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-sass/-/gatsby-plugin-sass-6.13.1.tgz#13fa6a4b95aee7c1bf3e69c017ae9c8e1a0abf49" + integrity sha512-pHS1hJhOPMEaC1eLsuXgqskLBUxbpYR1lUb7yxL4jva0PX2HOQTYTczFYtueOWz/7RD0GjrDCHIWOzUIGauRsQ== dependencies: - "@babel/runtime" "^7.15.4" - resolve-url-loader "^3.1.4" - sass-loader "^10.1.1" + "@babel/runtime" "^7.20.13" + resolve-url-loader "^3.1.5" + sass-loader "^10.4.1" -gatsby-plugin-sharp@^5.10.0: - version "5.12.3" - resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-5.12.3.tgz#b736e6f5a852090df318246c156bc2096824bc14" - integrity sha512-bEVhap/Ce6pzXXk/9U6Xug9+MmXwpZKzQZke8PxNBy1ouMZ2H4chgpcASnWpwnWkPvP+Fnehlh/whySDHmoLGw== +gatsby-plugin-sharp@^5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-5.13.1.tgz#051da57ddef3ad75a52152d3b78e3ed07589cff9" + integrity sha512-PA1LxLjZ7nKjgGykfbIxNQqrfqqfNsMN6+7wZNy5HK4Vhqjw1zDyImJEBEn6v08L2T3tlLMgR0or/OE7yo7F9A== dependencies: "@babel/runtime" "^7.20.13" async "^3.2.4" @@ -14110,17 +14255,17 @@ gatsby-plugin-sharp@^5.10.0: debug "^4.3.4" filenamify "^4.3.0" fs-extra "^11.1.1" - gatsby-core-utils "^4.12.1" - gatsby-plugin-utils "^4.12.3" + gatsby-core-utils "^4.13.1" + gatsby-plugin-utils "^4.13.1" lodash "^4.17.21" probe-image-size "^7.2.3" semver "^7.5.3" sharp "^0.32.6" -gatsby-plugin-typescript@^5.11.0: - version "5.12.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-typescript/-/gatsby-plugin-typescript-5.12.1.tgz#11f9b687bcb9f9ee1c2627921363b5886bbeabad" - integrity sha512-NIigc9TnhjLam/WAQxvVLKpRgjOXzDDgetOt2F2qtO+1KjMuUgLxHdd613Z0JoSPGpi5ug0KG8U99gh9zge7jA== +gatsby-plugin-typescript@^5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-typescript/-/gatsby-plugin-typescript-5.13.1.tgz#4544000239e7801eb0ab7636d7de27c18a90672d" + integrity sha512-FsTihoFKWTjzyIaUTndqktL39qMTAb0KyHj9kP+LxTY2FySqHIvFoYc1ycS5q52J76AoWUiGStJuuQLMNq66FQ== dependencies: "@babel/core" "^7.20.12" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" @@ -14128,74 +14273,84 @@ gatsby-plugin-typescript@^5.11.0: "@babel/plugin-proposal-optional-chaining" "^7.20.7" "@babel/preset-typescript" "^7.18.6" "@babel/runtime" "^7.20.13" - babel-plugin-remove-graphql-queries "^5.12.1" + babel-plugin-remove-graphql-queries "^5.13.1" -gatsby-plugin-utils@^4.11.0, gatsby-plugin-utils@^4.12.3: - version "4.12.3" - resolved "https://registry.yarnpkg.com/gatsby-plugin-utils/-/gatsby-plugin-utils-4.12.3.tgz#685bb26c073ac0ecf50efe6cba5fa879905c0f75" - integrity sha512-AMagRfVAIwc3w66RZzq9cGPma3pkrGe/iyhktmHWDOtu45tOt0zlbSY91juuCw2Oov17WzJp2TWKQ/i0nkuLbA== +gatsby-plugin-utils@^4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/gatsby-plugin-utils/-/gatsby-plugin-utils-4.13.1.tgz#9def57eea4559e1355244ebf706ce528231a510e" + integrity sha512-dQ8cZyUENWHqZOOSBBYWCJ8yG3zSYnHYk0mKQbgZblUS30Sp7ZFM4r0/+lsvUkEYaBOnzFBQjSSQtTa0xu9QWA== dependencies: "@babel/runtime" "^7.20.13" fastq "^1.15.0" fs-extra "^11.1.1" - gatsby-core-utils "^4.12.1" - gatsby-sharp "^1.12.1" + gatsby-core-utils "^4.13.1" + gatsby-sharp "^1.13.0" graphql-compose "^9.0.10" import-from "^4.0.0" joi "^17.9.2" mime "^3.0.0" -gatsby-react-router-scroll@^6.11.0: - version "6.12.0" - resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-6.12.0.tgz#506439ef83ca7140258703d2ba5c9a85237b3354" - integrity sha512-KZqkJE/2LPtBemFVKKzCSDN86jqZatTCfMi+D0fkfeHDteaxDhJxIILtCizxr4TfPJRvvip0Wy/Oaafv4exmiA== +gatsby-react-router-scroll@^6.13.1: + version "6.13.1" + resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-6.13.1.tgz#b20d492a1fc0ac4f31a0435452b06e22e8cb6c41" + integrity sha512-srBpg/ZHW4miwH/4OWOcspHqr8ZmKLE4DBNvckt0KO4giJerWiGoLj6qePwLFRWZPfV7txJr2kuUzACxarpL5g== dependencies: "@babel/runtime" "^7.20.13" prop-types "^15.8.1" -gatsby-remark-autolink-headers@^5.17.0: - version "5.25.0" - resolved "https://registry.yarnpkg.com/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-5.25.0.tgz#5e0b45c2c169436940315de859d02366ee106da9" - integrity sha512-umfbG6BiUhhbiC6yd6GAIZnkuPORdDasJfUueNfHbm6DNiUHAFZ8BU2PqeD7PPh6sHvjXBmUUdZKJfivVd2cNg== +gatsby-remark-autolink-headers@^6.13.1: + version "6.13.1" + resolved "https://registry.yarnpkg.com/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-6.13.1.tgz#013ba7ef0ff7e754c9e458e307a2eee6fdb552ea" + integrity sha512-nKmmA2n4xJnMV6AR+QPU7eQzjxoseLfGcNlT7k43goPRhDkRgL4DsXOMs8d06ZrAmJf8Wps5LVg+KtUUGBkjxw== dependencies: - "@babel/runtime" "^7.15.4" - github-slugger "^1.3.0" + "@babel/runtime" "^7.20.13" + github-slugger "^1.5.0" lodash "^4.17.21" mdast-util-to-string "^2.0.0" unist-util-visit "^2.0.3" -gatsby-script@^2.11.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/gatsby-script/-/gatsby-script-2.12.0.tgz#3737cddf44cd28a3d3532826db075beb4ac74067" - integrity sha512-prYN8x8q+ErQpy8G4c8VR+BalFe1H7v09/esJWF8Ufmy7xi0FsbG56a/Ee2YDrnuu942lhY+ailWR+UnDSDA8g== +gatsby-script@^2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/gatsby-script/-/gatsby-script-2.13.0.tgz#0fa7316739ebc31da217091e54db8ef86f41dbb3" + integrity sha512-TGNQGerf1NMJrgJkWxWrW6FFMAuC0L76WlyZgGXmhckPW/x7V1SxZrm0a2Q99kRHyoC59RYl2gTQWHaIwV+ZjA== -gatsby-sharp@^1.11.0, gatsby-sharp@^1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/gatsby-sharp/-/gatsby-sharp-1.12.1.tgz#e8dfe8ddfddb6176363c02f255272feb9819a82c" - integrity sha512-e7lqA74UZau7MOktc9V+sNh86a8oNZPFIsY5Atk+C0sGlzHx0IcivsJjwLHJ6OF11SIC38a9z2wE8Nl6YiG/Ig== +gatsby-sharp@^1.13.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/gatsby-sharp/-/gatsby-sharp-1.13.0.tgz#4d55d877ed3a5c9cd7ac45f27e13d07acb99993b" + integrity sha512-DviUtgm7tatSd1Hm54o/orHimOcyXBO9OJkSfzEchPFClvOza+2Qe/lqZShio0gFDxmG0Jgn0XCLzG7uH5VyJQ== dependencies: sharp "^0.32.6" -gatsby-source-filesystem@^4.17.0: - version "4.25.0" - resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-4.25.0.tgz#2748b0abd37abea0fbf70f33fb544debee3280ff" - integrity sha512-gja4++bPkYpnum4/TxFicr3zRHBArnM2HjT77EE4EuDhdl6qlJYr/heD09LIPN2jdR5gmPwMDjIZnuYZ/6j/aQ== +gatsby-source-filesystem@^5.11.0, gatsby-source-filesystem@^5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-5.13.1.tgz#1aad8f969fbfd4efe6f7cfcd8542253f54fdbd8a" + integrity sha512-nFWzOBpi84nDeVNeO7bpKL9mVYMl1tfjJmE5l868YATFShGzZnA6qMd200XCsf78PexZHAiV/P1MlsyKqjJduA== dependencies: - "@babel/runtime" "^7.15.4" + "@babel/runtime" "^7.20.13" chokidar "^3.5.3" file-type "^16.5.4" - fs-extra "^10.1.0" - gatsby-core-utils "^3.25.0" - md5-file "^5.0.0" - mime "^2.5.2" - pretty-bytes "^5.4.1" + fs-extra "^11.1.1" + gatsby-core-utils "^4.13.1" + mime "^3.0.0" + pretty-bytes "^5.6.0" valid-url "^1.0.9" - xstate "4.32.1" + xstate "^4.38.0" -gatsby-telemetry@^4.11.0, gatsby-telemetry@^4.12.1: - version "4.12.1" - resolved "https://registry.yarnpkg.com/gatsby-telemetry/-/gatsby-telemetry-4.12.1.tgz#b6878cd8659a3c4fdd7d196b70e4541891a4f877" - integrity sha512-MTHcKt5Cl68DveBpsduwfJdRjoXg48fcjITo1TspbxS2R0WnTZPRohGbA+JmQdY+O1eUSysdrONIjf6r86nhiA== +gatsby-source-git@2.0.0-beta.0: + version "2.0.0-beta.0" + resolved "https://registry.yarnpkg.com/gatsby-source-git/-/gatsby-source-git-2.0.0-beta.0.tgz#9466f3ea055e68307221ef240a903d4a91f5a3d5" + integrity sha512-8zXdmzaxGNEokX/fIFwCC2AO/klW4tIgCIxRLYR0sC8JSdJMijGATdP7RrBT2VSpuNtD0Mxg23nySu6glrDYaQ== + dependencies: + fast-glob "^3.3.1" + fs-extra "^11.1.1" + gatsby-source-filesystem "^5.11.0" + git-url-parse "^13.1.0" + simple-git "^3.16.0" + +gatsby-telemetry@^4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/gatsby-telemetry/-/gatsby-telemetry-4.13.1.tgz#f0f80b1fb71116085931b8c6b8f48efdbeb561bc" + integrity sha512-NstKs3N8LK9rwEli6SXO+ClNmewFbVzqS2yo6XZzQSXbymH6+Kkk+eqQivKhrD8PbQLLrdXkk1p47n91zc85XQ== dependencies: "@babel/code-frame" "^7.18.6" "@babel/runtime" "^7.20.13" @@ -14204,19 +14359,19 @@ gatsby-telemetry@^4.11.0, gatsby-telemetry@^4.12.1: boxen "^5.1.2" configstore "^5.0.1" fs-extra "^11.1.1" - gatsby-core-utils "^4.12.1" + gatsby-core-utils "^4.13.1" git-up "^7.0.0" is-docker "^2.2.1" lodash "^4.17.21" node-fetch "^2.6.11" -gatsby-transformer-remark@6.10.0: - version "6.10.0" - resolved "https://registry.yarnpkg.com/gatsby-transformer-remark/-/gatsby-transformer-remark-6.10.0.tgz#f51298684c86657a9cc84f036b24e15b75d6b1e6" - integrity sha512-Je8K75eNuVeGClegqb09KNbF3bSzNJSslEdzlH6AyyJYsh4A3DxFotA+5qshWCVx3J5psQ0cYoXGBXBbAltXOw== +gatsby-transformer-remark@6.13.1: + version "6.13.1" + resolved "https://registry.yarnpkg.com/gatsby-transformer-remark/-/gatsby-transformer-remark-6.13.1.tgz#690af08eb1f464e2ece2a9dbb69a812bf02ae3f4" + integrity sha512-rHHr8QK6jELzUiv8Ip/IjxavApW38ga7qVOrk1cXsl9Feo8WDEgkc3eHUbSL6doTk63LY7e/OOgi6INFlfdCAA== dependencies: "@babel/runtime" "^7.20.13" - gatsby-core-utils "^4.10.0" + gatsby-core-utils "^4.13.1" gray-matter "^4.0.3" hast-util-raw "^6.1.0" hast-util-to-html "^7.1.3" @@ -14231,41 +14386,41 @@ gatsby-transformer-remark@6.10.0: remark-retext "^4.0.0" remark-stringify "^9.0.1" retext-english "^3.0.4" - sanitize-html "^2.10.0" + sanitize-html "^2.11.0" underscore.string "^3.3.6" unified "^9.2.2" unist-util-remove-position "^3.0.0" unist-util-select "^3.0.4" unist-util-visit "^2.0.3" -gatsby-transformer-sharp@5.11.0: - version "5.11.0" - resolved "https://registry.yarnpkg.com/gatsby-transformer-sharp/-/gatsby-transformer-sharp-5.11.0.tgz#9660502f314588425d7689f7d2007a01813fd917" - integrity sha512-kIYrCtceqmgwgPRQGVbVY8JxMfJulFSqAeLigRYhrxpVYag90vskmh+HsiKHaY9j/rEARyCofnaAG/jwhSrcRg== +gatsby-transformer-sharp@5.13.1: + version "5.13.1" + resolved "https://registry.yarnpkg.com/gatsby-transformer-sharp/-/gatsby-transformer-sharp-5.13.1.tgz#9822caac4566b0d13e278bb1db9bdc9c839badd3" + integrity sha512-H5gBpnKOn86ns65fv0cP8yIpnT//+dkpnSOZSrtrtYEgmwEFqblUHSSyolu2SURgE+Af55W7IKTYk2w2d9+PCQ== dependencies: "@babel/runtime" "^7.20.13" bluebird "^3.7.2" common-tags "^1.8.2" fs-extra "^11.1.1" - gatsby-plugin-utils "^4.11.0" + gatsby-plugin-utils "^4.13.1" probe-image-size "^7.2.3" - semver "^7.5.1" - sharp "^0.32.1" + semver "^7.5.3" + sharp "^0.32.6" -gatsby-worker@^2.11.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/gatsby-worker/-/gatsby-worker-2.12.0.tgz#908544e5b38ad497a5b4caa35ce2f6eba0403fb2" - integrity sha512-wQTlAH8HdbJvCYZJ9jHCHSzF8E4SwB65suQ2hNo29wg4BhuMMpPWrLmraqPIGeAsBnWUEjzNGdedtzbCVwBJPQ== +gatsby-worker@^2.13.1: + version "2.13.1" + resolved "https://registry.yarnpkg.com/gatsby-worker/-/gatsby-worker-2.13.1.tgz#75b1881642149058d68559fa32c0ed2bc1f88f5c" + integrity sha512-CEm+5M2+3PzPcqTaJ0xjNuorQ3d1PfnKG1yqRRPfw8LFdPiycGhZAug/jqx0iTyVWXFHakEmddlykGFEbq54/Q== dependencies: "@babel/core" "^7.20.12" "@babel/runtime" "^7.20.13" fs-extra "^11.1.1" signal-exit "^3.0.7" -gatsby@5.11.0: - version "5.11.0" - resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-5.11.0.tgz#ddf6ff3d360578d69d133bb976d652fb3fb59c59" - integrity sha512-hGvMDQPzxBNr974sUSz02UbkmAX22tPdf/0gKU3MFfPPqJGcHZk/AdrerGr4klRH7RgotwSxQxsIvCv+kY44fg== +gatsby@5.13.7: + version "5.13.7" + resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-5.13.7.tgz#51b90f907ec230c1555571e54087aca4434087e4" + integrity sha512-slQ0Ky+5ev5dMV6svAgQYWRw3lztTcj6FhmnGvFPWSwrE/L+2TlQG0Izjm8DRoqzQVBp0z+hkCEiRVF7IdzLCw== dependencies: "@babel/code-frame" "^7.18.6" "@babel/core" "^7.20.12" @@ -14290,10 +14445,11 @@ gatsby@5.11.0: "@parcel/cache" "2.8.3" "@parcel/core" "2.8.3" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.10" + "@sigmacomputing/babel-plugin-lodash" "^3.3.5" "@types/http-proxy" "^1.17.11" - "@typescript-eslint/eslint-plugin" "^5.59.8" - "@typescript-eslint/parser" "^5.59.8" - "@vercel/webpack-asset-relocator-loader" "^1.7.3" + "@typescript-eslint/eslint-plugin" "^5.60.1" + "@typescript-eslint/parser" "^5.60.1" + "@vercel/webpack-asset-relocator-loader" "1.7.3" acorn-loose "^8.3.0" acorn-walk "^8.2.0" address "1.2.2" @@ -14304,19 +14460,19 @@ gatsby@5.11.0: babel-loader "^8.3.0" babel-plugin-add-module-exports "^1.0.4" babel-plugin-dynamic-import-node "^2.3.3" - babel-plugin-lodash "^3.3.4" - babel-plugin-remove-graphql-queries "^5.11.0" - babel-preset-gatsby "^3.11.0" + babel-plugin-remove-graphql-queries "^5.13.1" + babel-preset-gatsby "^3.13.2" better-opn "^2.1.1" bluebird "^3.7.2" - browserslist "^4.21.7" + body-parser "1.20.1" + browserslist "^4.21.9" cache-manager "^2.11.1" chalk "^4.1.2" chokidar "^3.5.3" common-tags "^1.8.2" compression "^1.7.4" cookie "^0.5.0" - core-js "^3.30.2" + core-js "^3.31.0" cors "^2.8.5" css-loader "^5.2.7" css-minimizer-webpack-plugin "^2.0.0" @@ -14327,7 +14483,7 @@ gatsby@5.11.0: detect-port "^1.5.1" devcert "^1.2.2" dotenv "^8.6.0" - enhanced-resolve "^5.14.1" + enhanced-resolve "^5.15.0" error-stack-parser "^2.1.4" eslint "^7.32.0" eslint-config-react-app "^6.0.0" @@ -14347,26 +14503,26 @@ gatsby@5.11.0: find-cache-dir "^3.3.2" fs-exists-cached "1.0.0" fs-extra "^11.1.1" - gatsby-cli "^5.11.0" - gatsby-core-utils "^4.11.0" - gatsby-graphiql-explorer "^3.11.0" - gatsby-legacy-polyfills "^3.11.0" - gatsby-link "^5.11.0" - gatsby-page-utils "^3.11.0" - gatsby-parcel-config "^1.11.0" - gatsby-plugin-page-creator "^5.11.0" - gatsby-plugin-typescript "^5.11.0" - gatsby-plugin-utils "^4.11.0" - gatsby-react-router-scroll "^6.11.0" - gatsby-script "^2.11.0" - gatsby-telemetry "^4.11.0" - gatsby-worker "^2.11.0" + gatsby-cli "^5.13.3" + gatsby-core-utils "^4.13.1" + gatsby-graphiql-explorer "^3.13.1" + gatsby-legacy-polyfills "^3.13.1" + gatsby-link "^5.13.1" + gatsby-page-utils "^3.13.1" + gatsby-parcel-config "1.13.1" + gatsby-plugin-page-creator "^5.13.1" + gatsby-plugin-typescript "^5.13.1" + gatsby-plugin-utils "^4.13.1" + gatsby-react-router-scroll "^6.13.1" + gatsby-script "^2.13.0" + gatsby-telemetry "^4.13.1" + gatsby-worker "^2.13.1" glob "^7.2.3" globby "^11.1.0" got "^11.8.6" - graphql "^16.6.0" + graphql "^16.7.1" graphql-compose "^9.0.10" - graphql-http "^1.18.0" + graphql-http "^1.19.0" graphql-tag "^2.12.6" hasha "^5.2.2" invariant "^2.2.4" @@ -14375,6 +14531,7 @@ gatsby@5.11.0: joi "^17.9.2" json-loader "^0.5.7" latest-version "^7.0.0" + linkfs "^2.1.0" lmdb "2.5.3" lodash "^4.17.21" meant "^1.0.3" @@ -14392,6 +14549,7 @@ gatsby@5.11.0: opentracing "^0.14.7" p-defer "^3.0.0" parseurl "^1.3.3" + path-to-regexp "0.1.7" physical-cpu-count "^2.0.0" platform "^1.3.6" postcss "^8.4.24" @@ -14407,12 +14565,12 @@ gatsby@5.11.0: redux "4.2.1" redux-thunk "^2.4.2" resolve-from "^5.0.0" - semver "^7.5.1" + semver "^7.5.3" shallow-compare "^1.2.2" signal-exit "^3.0.7" slugify "^1.6.6" - socket.io "4.6.1" - socket.io-client "4.6.1" + socket.io "4.7.1" + socket.io-client "4.7.1" stack-trace "^0.0.10" string-similarity "^1.2.2" strip-ansi "^6.0.1" @@ -14424,15 +14582,15 @@ gatsby@5.11.0: type-of "^2.0.1" url-loader "^4.1.1" uuid "^8.3.2" - webpack "^5.85.0" + webpack "^5.88.1" webpack-dev-middleware "^4.3.0" webpack-merge "^5.9.0" - webpack-stats-plugin "^1.1.1" + webpack-stats-plugin "^1.1.3" webpack-virtual-modules "^0.5.0" - xstate "^4.37.2" + xstate "^4.38.0" yaml-loader "^0.8.0" optionalDependencies: - gatsby-sharp "^1.11.0" + gatsby-sharp "^1.13.0" gauge@^3.0.0: version "3.0.2" @@ -14562,6 +14720,11 @@ get-stream@^6.0.0, get-stream@^6.0.1: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== +get-stream@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2" + integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA== + get-symbol-description@^1.0.0, get-symbol-description@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" @@ -14616,6 +14779,13 @@ git-url-parse@13.1.0: dependencies: git-up "^7.0.0" +git-url-parse@^13.1.0: + version "13.1.1" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.1.1.tgz#664bddf0857c6a75b3c1f0ae6239abb08a1486d4" + integrity sha512-PCFJyeSSdtnbfhSNRw9Wk96dDCNx+sogTe4YNXeXSJxt7xz5hvXekuRn9JX7m+Mf4OscCu8h+mtAl3+h5Fo8lQ== + dependencies: + git-up "^7.0.0" + gitconfiglocal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b" @@ -14628,7 +14798,7 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== -github-slugger@^1.0.0, github-slugger@^1.2.1, github-slugger@^1.3.0: +github-slugger@^1.0.0, github-slugger@^1.2.1, github-slugger@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.5.0.tgz#17891bbc73232051474d68bd867a34625c955f7d" integrity sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw== @@ -14880,7 +15050,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -got@^11.8.5, got@^11.8.6: +got@^11.8.6: version "11.8.6" resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== @@ -14919,7 +15089,7 @@ graceful-fs@4.2.10: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graceful-fs@4.2.11, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@4.2.11, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -14936,10 +15106,10 @@ graphql-compose@^9.0.10: dependencies: graphql-type-json "0.3.2" -graphql-http@^1.18.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/graphql-http/-/graphql-http-1.22.0.tgz#967bad279747ba5e1c9dd85b644c6b4f3dfa88f2" - integrity sha512-9RBUlGJWBFqz9LwfpmAbjJL/8j/HCNkZwPBU5+Bfmwez+1Ay43DocMNQYpIWsWqH0Ftv6PTNAh2aRnnMCBJgLw== +graphql-http@^1.19.0: + 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-tag@^2.11.0, graphql-tag@^2.12.6: version "2.12.6" @@ -14953,7 +15123,12 @@ graphql-type-json@0.3.2: resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115" integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg== -graphql@^16.6.0, graphql@^16.8.1: +graphql@^16.7.1: + version "16.9.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.9.0.tgz#1c310e63f16a49ce1fbb230bd0a000e99f6f115f" + integrity sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw== + +graphql@^16.8.1: version "16.8.1" resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07" integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw== @@ -15750,6 +15925,11 @@ human-signals@^4.3.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== +human-signals@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28" + integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ== + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -16392,6 +16572,11 @@ is-docker@^2.0.0, is-docker@^2.1.1, is-docker@^2.2.1: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== + is-dom@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.1.0.tgz#af1fced292742443bb59ca3f76ab5e80907b4e8a" @@ -16499,6 +16684,13 @@ is-hexadecimal@^2.0.0: resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027" integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg== +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + is-interactive@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" @@ -16837,6 +17029,20 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" +is-wsl@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" + integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw== + dependencies: + is-inside-container "^1.0.0" + +is64bit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is64bit/-/is64bit-2.0.0.tgz#198c627cbcb198bbec402251f88e5e1a51236c07" + integrity sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw== + dependencies: + system-architecture "^0.1.0" + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -18415,6 +18621,11 @@ lines-and-columns@~2.0.3: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b" integrity sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w== +linkfs@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/linkfs/-/linkfs-2.1.0.tgz#5cc774ad8ed6b0aae5a858bd67e3334cc300a917" + integrity sha512-kmsGcmpvjStZ0ATjuHycBujtNnXiZR28BTivEu0gAMDTT7GEyodcK6zSRtu6xsrdorrPZEIN380x7BD7xEYkew== + lmdb@2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-2.5.2.tgz#37e28a9fb43405f4dc48c44cec0e13a14c4a6ff1" @@ -18937,11 +19148,6 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -md5-file@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/md5-file/-/md5-file-5.0.0.tgz#e519f631feca9c39e7f9ea1780b63c4745012e20" - integrity sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw== - md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -19815,7 +20021,7 @@ mime@1.6.0, mime@^1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.4.4, mime@^2.5.2: +mime@^2.4.4: version "2.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== @@ -20119,7 +20325,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.0.0, ms@^2.1.1: +ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -20444,6 +20650,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== + node-status@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/node-status/-/node-status-0.1.7.tgz#03e814fa06963932eb199f0788f68f12166f911e" @@ -21591,6 +21802,11 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== + picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" @@ -23124,7 +23340,7 @@ prettier@3.2.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== -pretty-bytes@^5.1.0, pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: +pretty-bytes@^5.1.0, pretty-bytes@^5.3.0, pretty-bytes@^5.4.1, pretty-bytes@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== @@ -24659,7 +24875,7 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-url-loader@^3.1.4: +resolve-url-loader@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.5.tgz#1dce0847d4a2ef43c51f63c9fd30bf6dfbf26716" integrity sha512-mgFMCmrV/tA4738EsFmPFE5/MaqSgUMe8LK971kVEKA/RrNVb7+VqFsg/qmKyythf34eyq476qIobP/gfFBGSQ== @@ -25071,10 +25287,10 @@ sanitize-html@2.10.0: parse-srcset "^1.0.2" postcss "^8.3.11" -sanitize-html@^2.10.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.11.0.tgz#9a6434ee8fcaeddc740d8ae7cd5dd71d3981f8f6" - integrity sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA== +sanitize-html@^2.11.0: + version "2.13.1" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.1.tgz#b4639b0a09574ab62b1b353cb99b1b87af742834" + integrity sha512-ZXtKq89oue4RP7abL9wp/9URJcqQNABB5GGJ2acW1sdO8JTVl92f4ygD7Yc9Ze09VAZhnt2zegeU0tbNsdcLYg== dependencies: deepmerge "^4.2.2" escape-string-regexp "^4.0.0" @@ -25099,10 +25315,10 @@ sass-loader@10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass-loader@^10.1.1: - version "10.4.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.4.1.tgz#bea4e173ddf512c9d7f53e9ec686186146807cbf" - integrity sha512-aX/iJZTTpNUNx/OSYzo2KsjIUQHqvWsAhhUijFjAPdZTEhstjZI9zTNvkTTwsx+uNUJqUwOw5gacxQMx4hJxGQ== +sass-loader@^10.4.1: + version "10.5.2" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.5.2.tgz#1ca30534fff296417b853c7597ca3b0bbe8c37d0" + integrity sha512-vMUoSNOUKJILHpcNCCyD23X34gve1TS7Rjd9uXHeKqhvBG39x6XbswFDtpbTElj6XdMFezoWhkh5vtKudf2cgQ== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -25275,7 +25491,7 @@ semver@7.5.3: dependencies: lru-cache "^6.0.0" -semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1, semver@^7.5.3, semver@^7.5.4: +semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, 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== @@ -25447,7 +25663,7 @@ shallowequal@^1.1.0: resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== -sharp@^0.32.1, sharp@^0.32.6: +sharp@^0.32.6: version "0.32.6" resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a" integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w== @@ -25519,7 +25735,7 @@ signal-exit@3.0.7, signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, s resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -signal-exit@^4.0.1: +signal-exit@^4.0.1, signal-exit@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== @@ -25553,6 +25769,15 @@ simple-get@^4.0.0, simple-get@^4.0.1: once "^1.3.1" simple-concat "^1.0.0" +simple-git@^3.16.0: + version "3.27.0" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.27.0.tgz#f4b09e807bda56a4a3968f635c0e4888d3decbd5" + integrity sha512-ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA== + dependencies: + "@kwsites/file-exists" "^1.1.1" + "@kwsites/promise-deferred" "^1.1.1" + debug "^4.3.5" + simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -25658,17 +25883,17 @@ socket.io-adapter@~2.5.2: dependencies: ws "~8.11.0" -socket.io-client@4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.6.1.tgz#80d97d5eb0feca448a0fb6d69a7b222d3d547eab" - integrity sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ== +socket.io-client@4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.7.1.tgz#48e5f703abe4fb0402182bcf9c06b7820fb3453b" + integrity sha512-Qk3Xj8ekbnzKu3faejo4wk2MzXA029XppiXtTF/PkbTg+fcwaTw1PlDrTrrrU4mKoYC4dvlApOnSeyLCKwek2w== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.2" - engine.io-client "~6.4.0" - socket.io-parser "~4.2.1" + engine.io-client "~6.5.1" + socket.io-parser "~4.2.4" -socket.io-parser@~4.2.1: +socket.io-parser@~4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83" integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew== @@ -25676,17 +25901,18 @@ socket.io-parser@~4.2.1: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -socket.io@4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.6.1.tgz#62ec117e5fce0692fa50498da9347cfb52c3bc70" - integrity sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA== +socket.io@4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.1.tgz#9009f31bf7be25478895145e92fbc972ad1db900" + integrity sha512-W+utHys2w//dhFjy7iQQu9sGd3eokCjGbl2r59tyLqNiJJBdIebn3GAKEXBr3osqHTObJi2die/25bCx2zsaaw== dependencies: accepts "~1.3.4" base64id "~2.0.0" + cors "~2.8.5" debug "~4.3.2" - engine.io "~6.4.1" + engine.io "~6.5.0" socket.io-adapter "~2.5.2" - socket.io-parser "~4.2.1" + socket.io-parser "~4.2.4" sockjs@^0.3.24: version "0.3.24" @@ -26097,7 +26323,7 @@ string-similarity@^1.2.2: lodash.map "^4.6.0" lodash.maxby "^4.6.0" -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -26115,6 +26341,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -26250,7 +26485,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -26271,6 +26506,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -26716,6 +26958,11 @@ synckit@^0.8.6: "@pkgr/core" "^0.1.0" tslib "^2.6.2" +system-architecture@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/system-architecture/-/system-architecture-0.1.0.tgz#71012b3ac141427d97c67c56bc7921af6bff122d" + integrity sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA== + table@^6.0.9, table@^6.8.1: version "6.8.1" resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" @@ -26944,6 +27191,17 @@ terser-webpack-plugin@^5.0.3, terser-webpack-plugin@^5.2.5, terser-webpack-plugi serialize-javascript "^6.0.1" terser "^5.16.8" +terser-webpack-plugin@^5.3.10: + version "5.3.10" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" + integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + dependencies: + "@jridgewell/trace-mapping" "^0.3.20" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.1" + terser "^5.26.0" + terser@^4.1.2, terser@^4.6.3: version "4.8.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" @@ -26963,6 +27221,16 @@ terser@^5.0.0, terser@^5.10.0, terser@^5.16.8, terser@^5.2.0, terser@^5.3.4: commander "^2.20.0" source-map-support "~0.5.20" +terser@^5.26.0: + version "5.36.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.36.0.tgz#8b0dbed459ac40ff7b4c9fd5a3a2029de105180e" + integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -27923,6 +28191,14 @@ update-browserslist-db@^1.0.13: escalade "^3.1.1" picocolors "^1.0.0" +update-browserslist-db@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== + dependencies: + escalade "^3.2.0" + picocolors "^1.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" @@ -28309,6 +28585,14 @@ watchpack@^2.2.0, watchpack@^2.4.0: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" +watchpack@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" + integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" @@ -28482,7 +28766,7 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack-stats-plugin@^1.1.1: +webpack-stats-plugin@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-1.1.3.tgz#ebcc36c8b468074ad737882e2043c1ce4b55d928" integrity sha512-yUKYyy+e0iF/w31QdfioRKY+h3jDBRpthexBOWGKda99iu2l/wxYsI/XqdlP5IU58/0KB9CsJZgWNAl+/MPkRw== @@ -28533,7 +28817,7 @@ webpack@4: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack@^5.64.4, webpack@^5.85.0, webpack@^5.9.0: +webpack@^5.64.4, webpack@^5.9.0: version "5.89.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc" integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw== @@ -28563,6 +28847,35 @@ webpack@^5.64.4, webpack@^5.85.0, webpack@^5.9.0: watchpack "^2.4.0" webpack-sources "^3.2.3" +webpack@^5.88.1: + version "5.95.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0" + integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q== + dependencies: + "@types/estree" "^1.0.5" + "@webassemblyjs/ast" "^1.12.1" + "@webassemblyjs/wasm-edit" "^1.12.1" + "@webassemblyjs/wasm-parser" "^1.12.1" + acorn "^8.7.1" + acorn-import-attributes "^1.9.5" + browserslist "^4.21.10" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.17.1" + es-module-lexer "^1.2.1" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.11" + json-parse-even-better-errors "^2.3.1" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.2.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.3.10" + watchpack "^2.4.1" + webpack-sources "^3.2.3" + websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" @@ -29041,7 +29354,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -29076,6 +29389,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" @@ -29153,6 +29475,11 @@ ws@~8.11.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== +ws@~8.17.1: + version "8.17.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" + integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== + xdg-basedir@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" @@ -29186,12 +29513,7 @@ xmlhttprequest-ssl@~2.0.0: resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== -xstate@4.32.1: - version "4.32.1" - resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.32.1.tgz#1a09c808a66072938861a3b4acc5b38460244b70" - integrity sha512-QYUd+3GkXZ8i6qdixnOn28bL3EvA++LONYL/EMWwKlFSh/hiLndJ8YTnz77FDs+JUXcwU7NZJg7qoezoRHc4GQ== - -xstate@^4.37.2: +xstate@^4.38.0: version "4.38.3" resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.38.3.tgz#4e15e7ad3aa0ca1eea2010548a5379966d8f1075" integrity sha512-SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw== From 5da2d7361897a429c9100a9afbde65f008afc2d4 Mon Sep 17 00:00:00 2001 From: timwessman Date: Fri, 18 Oct 2024 10:01:57 +0300 Subject: [PATCH 07/25] fix: check links always after location change --- site/src/components/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index 659ecd660e..d041b42bb0 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -140,7 +140,7 @@ const Layout = ({ location, children, pageContext }) => { } } } - }, [version]); + }, [version, location]); const queryData = useStaticQuery(graphql` From 908e0238f27b96842eaa3fcef4eb7a12e8271ba4 Mon Sep 17 00:00:00 2001 From: timwessman Date: Fri, 18 Oct 2024 15:01:30 +0300 Subject: [PATCH 08/25] feat: documentation versions config to versions.json --- site/gatsby-config.js | 30 ++++++++++++------------------ site/src/components/layout.js | 22 ++++++++++++---------- site/src/data/versions.json | 5 +++++ 3 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 site/src/data/versions.json diff --git a/site/gatsby-config.js b/site/gatsby-config.js index e3fe8d9392..665581e398 100644 --- a/site/gatsby-config.js +++ b/site/gatsby-config.js @@ -1,6 +1,17 @@ require("dotenv").config({ path: `.env.${process.env.NODE_ENV}`, }) +const latestVersion = process.env.npm_package_version; +const versionsFromGit = require('./src/data/versions.json').filter(v => v !== latestVersion); +const gitSources = versionsFromGit.map(version => ({ + resolve: 'gatsby-source-git', + options: { + name: `docs-release-${version}`, + remote: `https://github.com/City-of-Helsinki/helsinki-design-system`, + branch: `release-${version}`, + patterns: 'site/src/docs/**', + }, +})); module.exports = { pathPrefix: process.env.PATH_PREFIX, @@ -150,24 +161,7 @@ module.exports = { path: `${__dirname}/src/docs`, }, }, - { - resolve: `gatsby-source-git`, - options: { - name: `docs-release-3.9.0`, - remote: `https://github.com/City-of-Helsinki/helsinki-design-system`, - branch: `release-3.9.0`, - patterns: `site/src/docs/**`, - }, - }, - { - resolve: `gatsby-source-git`, - options: { - name: `docs-release-3.0.0`, - remote: `https://github.com/City-of-Helsinki/helsinki-design-system`, - branch: `release-3.0.0`, - patterns: `site/src/docs/**`, - }, - }, + ...gitSources, { resolve: `gatsby-plugin-mdx`, options: { diff --git a/site/src/components/layout.js b/site/src/components/layout.js index d041b42bb0..bd05dd8735 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -18,6 +18,7 @@ import InternalLink from './InternalLink'; import ExternalLink from './ExternalLink'; import AnchorLink from './AnchorLink'; import './layout.scss'; +import versions from '../data/versions.json'; const classNames = (...args) => args.filter((e) => e).join(' '); @@ -124,6 +125,8 @@ const isMatchingParentLink = (link, slug) => { const Layout = ({ location, children, pageContext }) => { const pathParts = location.pathname.split('/'); const version = pathParts[1].startsWith('release-') ? pathParts[1] : undefined; + const locationWithoutVersion = hrefWithoutVersion(location.pathname, version); + const versionLabel = version ? `Version ${version.replace('release-', '')}` : `Version ${versions[0]}`; // Some hrefs of internal links can't be replaced with MDXProvider's replace component logic. // this code will take care of those @@ -248,16 +251,15 @@ const Layout = ({ location, children, pageContext }) => { logoAriaLabel="City of Helsinki Logo" logo={} > - - - - + + {versions.map((versionNumber, index) => ( + 0 + ? hrefWithVersion(locationWithoutVersion, `release-${versionNumber}`) + : locationWithoutVersion} + /> + ))} diff --git a/site/src/data/versions.json b/site/src/data/versions.json new file mode 100644 index 0000000000..99faa7c2cb --- /dev/null +++ b/site/src/data/versions.json @@ -0,0 +1,5 @@ +[ + "4.0.0", + "3.10.2", + "3.0.0" +] \ No newline at end of file From ed0f574ba26a872dd7a8867ed0ccc2e67f7958df Mon Sep 17 00:00:00 2001 From: timwessman Date: Tue, 22 Oct 2024 13:57:49 +0300 Subject: [PATCH 09/25] fix: dependency update --- site/package.json | 4 +++- yarn.lock | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/site/package.json b/site/package.json index 8e59b5b4d5..2f53a87e3d 100644 --- a/site/package.json +++ b/site/package.json @@ -41,7 +41,9 @@ "react-live": "2.4.1", "remark-gfm": "^1", "sanitize-html": "2.10.0", - "sass": "^1.49.9" + "sass": "^1.49.9", + "body-parser": "1.20.3", + "path-to-regexp": "0.1.10" }, "devDependencies": { "@babel/core": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index bb16eea72e..0a16e3ffa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9116,6 +9116,24 @@ body-parser@1.20.1: type-is "~1.6.18" unpipe "1.0.0" +body-parser@1.20.3: + version "1.20.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" + integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== + dependencies: + bytes "3.1.2" + content-type "~1.0.5" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.13.0" + raw-body "2.5.2" + type-is "~1.6.18" + unpipe "1.0.0" + bonjour-service@^1.0.11: version "1.1.1" resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" @@ -10569,7 +10587,7 @@ content-disposition@0.5.4: dependencies: safe-buffer "5.2.1" -content-type@~1.0.4: +content-type@~1.0.4, content-type@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== @@ -21732,6 +21750,11 @@ path-scurry@^1.11.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" +path-to-regexp@0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" + integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -23671,6 +23694,13 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" +qs@6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== + dependencies: + side-channel "^1.0.6" + qs@^6.10.0, qs@^6.11.0: version "6.11.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" @@ -23777,7 +23807,7 @@ raw-body@2.5.1: iconv-lite "0.4.24" unpipe "1.0.0" -raw-body@^2.3.0: +raw-body@2.5.2, raw-body@^2.3.0: version "2.5.2" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== From fa4a95a34d8041ea27e4f9f28e8d54526c1e3364 Mon Sep 17 00:00:00 2001 From: timwessman Date: Tue, 5 Nov 2024 14:56:40 +0200 Subject: [PATCH 10/25] debug on test server --- site/src/components/layout.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index bd05dd8735..ec57df8216 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -128,6 +128,8 @@ const Layout = ({ location, children, pageContext }) => { const locationWithoutVersion = hrefWithoutVersion(location.pathname, version); const versionLabel = version ? `Version ${version.replace('release-', '')}` : `Version ${versions[0]}`; + console.log(location, pageContext, pathParts, version); + // Some hrefs of internal links can't be replaced with MDXProvider's replace component logic. // this code will take care of those React.useEffect(() => { From 2517e0ea9ad61998dd5179f6f775cba87776cfdb Mon Sep 17 00:00:00 2001 From: timwessman Date: Tue, 5 Nov 2024 15:36:32 +0200 Subject: [PATCH 11/25] more debug on test server --- site/src/components/layout.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index ec57df8216..d31d9ffe17 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -123,12 +123,13 @@ const isMatchingParentLink = (link, slug) => { }; const Layout = ({ location, children, pageContext }) => { - const pathParts = location.pathname.split('/'); + const pathName = pageContext.frontmatter.slug; + const pathParts = pathName.split('/'); const version = pathParts[1].startsWith('release-') ? pathParts[1] : undefined; - const locationWithoutVersion = hrefWithoutVersion(location.pathname, version); + const locationWithoutVersion = hrefWithoutVersion(pathName, version); const versionLabel = version ? `Version ${version.replace('release-', '')}` : `Version ${versions[0]}`; - console.log(location, pageContext, pathParts, version); + console.log(location, pathName, pageContext, pathParts, version, locationWithoutVersion); // Some hrefs of internal links can't be replaced with MDXProvider's replace component logic. // this code will take care of those @@ -145,7 +146,7 @@ const Layout = ({ location, children, pageContext }) => { } } } - }, [version, location]); + }, [version, pathName]); const queryData = useStaticQuery(graphql` From e946ec738987d9bd93b3a126f9d6076982efeaaf Mon Sep 17 00:00:00 2001 From: timwessman Date: Wed, 6 Nov 2024 13:22:05 +0200 Subject: [PATCH 12/25] fix: new approach to versioned urls --- site/src/components/layout.js | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index d31d9ffe17..a7391a3ef9 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -23,12 +23,32 @@ import versions from '../data/versions.json'; const classNames = (...args) => args.filter((e) => e).join(' '); const hrefWithVersion = (href, version) => { - return version - && !href.startsWith(`/${version}`) - && !href.startsWith('mailto:') - && !href.startsWith('http') - ? withPrefix(`/${version}${href}`) - : withPrefix(`${href}`); + if (!version || version === '' || href.startsWith('mailto:') || href.startsWith('#') || href.startsWith('http')) + return href; + + let withVersion = ''; + let versionAdded = false; + const pathParts = href.split('/'); + + pathParts.forEach(part => { + if (part !== '') { + if (part === 'hds-demo' || part.startsWith('preview_') || versionAdded) { + withVersion += '/' + part; + } + else if (!versionAdded) { + withVersion += '/' + version + (!part.startsWith('release-') ? '/' + part : ''); + versionAdded = true; + } + } + }); + + console.log('hrefWithVersion() href:', href, + 'version:', version, + 'parts:', pathParts, + 'return:', withPrefix(`${withVersion}`) + ); + + return withPrefix(`${withVersion}`); }; const hrefWithoutVersion = (href, version) => { return href.replace(`/${version}`, ''); From f21c58437b69617068b7c241cf9bd039e4ec50bc Mon Sep 17 00:00:00 2001 From: timwessman Date: Thu, 7 Nov 2024 09:37:45 +0200 Subject: [PATCH 13/25] debug --- site/src/components/layout.js | 8 ++++++-- site/src/data/versions.json | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index a7391a3ef9..0eb2d66421 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -106,9 +106,11 @@ const resolveCurrentMenuItem = (version, menuItems, slugWithPrefix) => { if (slugWithPrefix === rootPath) { return menuItems.find(({ link }) => hrefWithVersion(link, version) === rootPath); } else { - return menuItems + const ret = menuItems .filter(({ link }) => hrefWithVersion(link, version) !== rootPath) .find((menuItem) => slugWithPrefix.startsWith(hrefWithVersion(menuItem.link, version))); + console.log('resolveCurrentMenuItem()', version, menuItems, slugWithPrefix, ret); + return ret; } }; @@ -127,7 +129,9 @@ const isNavPage = (page) => page.slug && page.navTitle; const splitPathIntoParts = (path) => path.split('/').filter((l) => !!l); const isLinkParentForPage = (parentPath, level) => (page) => { const pathParts = splitPathIntoParts(page.slug); - return pathParts.length === level && pathParts.slice(0, -1).every((pathPart) => parentPath.includes(pathPart)); + const ret = pathParts.length === level && pathParts.slice(0, -1).every((pathPart) => parentPath.includes(pathPart)); + if (ret) console.log('isLinkParentForPage()', parentPath, pathParts); + return ret; }; const sortByPageTitle = (pageA, pageB) => pageA.title.localeCompare(pageB.title); const isMatchingParentLink = (link, slug) => { diff --git a/site/src/data/versions.json b/site/src/data/versions.json index 99faa7c2cb..099ea389f7 100644 --- a/site/src/data/versions.json +++ b/site/src/data/versions.json @@ -1,5 +1,5 @@ [ "4.0.0", - "3.10.2", + "3.9.0", "3.0.0" ] \ No newline at end of file From cb276f17e977d22f3500a7a09048f5709029f689 Mon Sep 17 00:00:00 2001 From: timwessman Date: Thu, 7 Nov 2024 12:05:25 +0200 Subject: [PATCH 14/25] fix: try to avoid double prefix --- site/src/components/layout.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index 0eb2d66421..faf3d625ae 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -23,7 +23,8 @@ import versions from '../data/versions.json'; const classNames = (...args) => args.filter((e) => e).join(' '); const hrefWithVersion = (href, version) => { - if (!version || version === '' || href.startsWith('mailto:') || href.startsWith('#') || href.startsWith('http')) + if (!version || version === '' || href === '' + || href.startsWith('mailto:') || href.startsWith('#') || href.startsWith('http')) return href; let withVersion = ''; @@ -42,13 +43,15 @@ const hrefWithVersion = (href, version) => { } }); + const ret = withVersion.startsWith(withPrefix('')) ? withVersion : withPrefix(`${withVersion}`); console.log('hrefWithVersion() href:', href, 'version:', version, 'parts:', pathParts, - 'return:', withPrefix(`${withVersion}`) + 'withVersion', withVersion, + 'return:', ret, ); - return withPrefix(`${withVersion}`); + return ret; }; const hrefWithoutVersion = (href, version) => { return href.replace(`/${version}`, ''); From 18befeaf0caf05c232341731d67d965044cc87b3 Mon Sep 17 00:00:00 2001 From: timwessman Date: Mon, 11 Nov 2024 15:44:41 +0200 Subject: [PATCH 15/25] fix: navigation links --- site/src/components/layout.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index faf3d625ae..3f4119f848 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -104,14 +104,14 @@ const components = (version) => ({ }); const resolveCurrentMenuItem = (version, menuItems, slugWithPrefix) => { - const rootPath = hrefWithVersion('/', version); + const rootPath = '/'; if (slugWithPrefix === rootPath) { - return menuItems.find(({ link }) => hrefWithVersion(link, version) === rootPath); + return menuItems.find(({ link }) => link === rootPath); } else { const ret = menuItems - .filter(({ link }) => hrefWithVersion(link, version) !== rootPath) - .find((menuItem) => slugWithPrefix.startsWith(hrefWithVersion(menuItem.link, version))); + .filter(({ link }) => link !== rootPath) + .find((menuItem) => slugWithPrefix.startsWith(menuItem.link)); console.log('resolveCurrentMenuItem()', version, menuItems, slugWithPrefix, ret); return ret; } @@ -229,7 +229,7 @@ const Layout = ({ location, children, pageContext }) => { ...menuLink, uiId: generateUiIdFromPath(menuLink.link, 'nav'), })); - const currentMenuItem = resolveCurrentMenuItem(version, uiMenuLinks, pageSlug); + const currentMenuItem = resolveCurrentMenuItem(version, uiMenuLinks, locationWithoutVersion); const subMenuLinks = currentMenuItem?.subMenuLinks || []; const subMenuLinksFromPages = currentMenuItem && currentMenuItem.link @@ -287,7 +287,7 @@ const Layout = ({ location, children, pageContext }) => { label={`Version ${versionNumber}`} href={index > 0 ? hrefWithVersion(locationWithoutVersion, `release-${versionNumber}`) - : locationWithoutVersion} + : withPrefix(locationWithoutVersion)} /> ))} @@ -321,7 +321,7 @@ const Layout = ({ location, children, pageContext }) => { key={uiId} id={uiId} label={name} - active={pageSlug === prefixedLink || (!hasSubLevels && isMatchingParentLink(link, pageSlug))} + active={locationWithoutVersion === prefixedLink || (!hasSubLevels && isMatchingParentLink(link, locationWithoutVersion))} withDivider={withDivider} {...(hasSubLevels ? {} @@ -338,7 +338,7 @@ const Layout = ({ location, children, pageContext }) => { key={uiId} href={hrefWithVersion(prefixedSubLevelLink, version)} label={navTitle} - active={pageSlug === prefixedSubLevelLink || isMatchingParentLink(slug, pageSlug)} + active={locationWithoutVersion === prefixedSubLevelLink || isMatchingParentLink(slug, locationWithoutVersion)} onClick={(e) => { e.preventDefault(); navigate(hrefWithVersion(slug, version)); From bd702586a6b5fca10b1e52d58bb6f50b7805cf60 Mon Sep 17 00:00:00 2001 From: timwessman Date: Mon, 11 Nov 2024 16:19:20 +0200 Subject: [PATCH 16/25] remove console logs --- site/src/components/layout.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index 3f4119f848..b1c7f4652b 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -44,12 +44,6 @@ const hrefWithVersion = (href, version) => { }); const ret = withVersion.startsWith(withPrefix('')) ? withVersion : withPrefix(`${withVersion}`); - console.log('hrefWithVersion() href:', href, - 'version:', version, - 'parts:', pathParts, - 'withVersion', withVersion, - 'return:', ret, - ); return ret; }; @@ -112,7 +106,6 @@ const resolveCurrentMenuItem = (version, menuItems, slugWithPrefix) => { const ret = menuItems .filter(({ link }) => link !== rootPath) .find((menuItem) => slugWithPrefix.startsWith(menuItem.link)); - console.log('resolveCurrentMenuItem()', version, menuItems, slugWithPrefix, ret); return ret; } }; @@ -133,7 +126,6 @@ const splitPathIntoParts = (path) => path.split('/').filter((l) => !!l); const isLinkParentForPage = (parentPath, level) => (page) => { const pathParts = splitPathIntoParts(page.slug); const ret = pathParts.length === level && pathParts.slice(0, -1).every((pathPart) => parentPath.includes(pathPart)); - if (ret) console.log('isLinkParentForPage()', parentPath, pathParts); return ret; }; const sortByPageTitle = (pageA, pageB) => pageA.title.localeCompare(pageB.title); @@ -150,14 +142,12 @@ const isMatchingParentLink = (link, slug) => { }; const Layout = ({ location, children, pageContext }) => { - const pathName = pageContext.frontmatter.slug; + const { title: pageTitle, slug: pathName, customLayout } = pageContext.frontmatter; const pathParts = pathName.split('/'); const version = pathParts[1].startsWith('release-') ? pathParts[1] : undefined; const locationWithoutVersion = hrefWithoutVersion(pathName, version); const versionLabel = version ? `Version ${version.replace('release-', '')}` : `Version ${versions[0]}`; - console.log(location, pathName, pageContext, pathParts, version, locationWithoutVersion); - // Some hrefs of internal links can't be replaced with MDXProvider's replace component logic. // this code will take care of those React.useEffect(() => { @@ -210,7 +200,6 @@ const Layout = ({ location, children, pageContext }) => { } `); - const { title: pageTitle, slug: pageSlug, customLayout } = pageContext.frontmatter; const siteData = queryData.site.siteMetadata; const mdxPageData = queryData.allMdx?.edges || []; From 4f56d05504f0ae9e6f38f46ef7e6c95e2de5533c Mon Sep 17 00:00:00 2001 From: timwessman Date: Mon, 11 Nov 2024 16:47:55 +0200 Subject: [PATCH 17/25] test versions --- site/src/data/versions.json | 1 - 1 file changed, 1 deletion(-) diff --git a/site/src/data/versions.json b/site/src/data/versions.json index 099ea389f7..cf5cfe4522 100644 --- a/site/src/data/versions.json +++ b/site/src/data/versions.json @@ -1,5 +1,4 @@ [ "4.0.0", - "3.9.0", "3.0.0" ] \ No newline at end of file From cfec2bb46b879da59d37306c3ede19632fb6a89d Mon Sep 17 00:00:00 2001 From: timwessman Date: Tue, 12 Nov 2024 10:13:02 +0200 Subject: [PATCH 18/25] Test just latest versions --- site/src/data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/data/versions.json b/site/src/data/versions.json index cf5cfe4522..7dbf3cf5d2 100644 --- a/site/src/data/versions.json +++ b/site/src/data/versions.json @@ -1,4 +1,4 @@ [ "4.0.0", - "3.0.0" + "4.0.0-beta" ] \ No newline at end of file From 0ceb0d77d2647a8deb005e5938099e57ba109e02 Mon Sep 17 00:00:00 2001 From: timwessman Date: Wed, 13 Nov 2024 10:29:25 +0200 Subject: [PATCH 19/25] test without prefix for navigation --- site/src/components/layout.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/site/src/components/layout.js b/site/src/components/layout.js index b1c7f4652b..c2949b64ca 100644 --- a/site/src/components/layout.js +++ b/site/src/components/layout.js @@ -22,7 +22,7 @@ import versions from '../data/versions.json'; const classNames = (...args) => args.filter((e) => e).join(' '); -const hrefWithVersion = (href, version) => { +const hrefWithVersion = (href, version, withoutPrefix = false) => { if (!version || version === '' || href === '' || href.startsWith('mailto:') || href.startsWith('#') || href.startsWith('http')) return href; @@ -43,7 +43,8 @@ const hrefWithVersion = (href, version) => { } }); - const ret = withVersion.startsWith(withPrefix('')) ? withVersion : withPrefix(`${withVersion}`); + const ret = withVersion.startsWith(withPrefix('')) || withoutPrefix + ? withVersion : withPrefix(`${withVersion}`); return ret; }; @@ -287,7 +288,7 @@ const Layout = ({ location, children, pageContext }) => { active={hrefWithVersion(currentMenuItem?.link || '', version) === hrefWithVersion(link, version)} key={uiId} label={name} - to={hrefWithVersion(link, version)} + to={hrefWithVersion(link, version, true)} as={GatsbyLink} /> ))} @@ -318,7 +319,7 @@ const Layout = ({ location, children, pageContext }) => { href: hrefWithVersion(prefixedLink, version), onClick: (e) => { e.preventDefault(); - navigate(hrefWithVersion(link, version)); + navigate(hrefWithVersion(link, version, true)); }, })} > @@ -330,7 +331,7 @@ const Layout = ({ location, children, pageContext }) => { active={locationWithoutVersion === prefixedSubLevelLink || isMatchingParentLink(slug, locationWithoutVersion)} onClick={(e) => { e.preventDefault(); - navigate(hrefWithVersion(slug, version)); + navigate(hrefWithVersion(slug, version, true)); }} /> ))} @@ -351,7 +352,7 @@ const Layout = ({ location, children, pageContext }) => {