diff --git a/.prettierrc b/.prettierrc index af07fd2..26d4848 100644 --- a/.prettierrc +++ b/.prettierrc @@ -7,5 +7,14 @@ "bracketSpacing": true, "bracketSameLine": false, "arrowParens": "always", - "trailingComma": "none" + "trailingComma": "none", + "importOrder": [ + "^(react/(.*)$)|^(react$)|^(next/(.*)$)|^(next$)", + "", + "^(@/lib/(.*)$)|^(@/components/(.*)$)|^(@/styles/(.*)$)", + "^[./]" + ], + "importOrderSeparation": true, + "importOrderSortSpecifiers": true, + "importOrderGroupNamespaceSpecifiers": true } diff --git a/components/ErrorPage.tsx b/components/ErrorPage.tsx index 550477b..43720d4 100644 --- a/components/ErrorPage.tsx +++ b/components/ErrorPage.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { PageHead } from './PageHead' +import { PageHead } from './PageHead' import styles from './styles.module.css' export const ErrorPage: React.FC<{ statusCode: number }> = ({ statusCode }) => { diff --git a/components/Footer.tsx b/components/Footer.tsx index 67fc2c5..29e4b1c 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -1,15 +1,16 @@ import * as React from 'react' -import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter' -import { FaZhihu } from '@react-icons/all-files/fa/FaZhihu' + +import { FaEnvelopeOpenText } from '@react-icons/all-files/fa/FaEnvelopeOpenText' import { FaGithub } from '@react-icons/all-files/fa/FaGithub' import { FaLinkedin } from '@react-icons/all-files/fa/FaLinkedin' -import { FaEnvelopeOpenText } from '@react-icons/all-files/fa/FaEnvelopeOpenText' +import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter' import { FaYoutube } from '@react-icons/all-files/fa/FaYoutube' -import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline' +import { FaZhihu } from '@react-icons/all-files/fa/FaZhihu' import { IoMoonSharp } from '@react-icons/all-files/io5/IoMoonSharp' +import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline' -import { useDarkMode } from 'lib/use-dark-mode' -import * as config from 'lib/config' +import * as config from '@/lib/config' +import { useDarkMode } from '@/lib/use-dark-mode' import styles from './styles.module.css' diff --git a/components/Loading.tsx b/components/Loading.tsx index f78825b..bdfaac7 100644 --- a/components/Loading.tsx +++ b/components/Loading.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { LoadingIcon } from './LoadingIcon' +import { LoadingIcon } from './LoadingIcon' import styles from './styles.module.css' export const Loading: React.FC = () => ( diff --git a/components/LoadingIcon.tsx b/components/LoadingIcon.tsx index d2561ed..9249fea 100644 --- a/components/LoadingIcon.tsx +++ b/components/LoadingIcon.tsx @@ -1,5 +1,7 @@ import * as React from 'react' + import cs from 'classnames' + import styles from './styles.module.css' export const LoadingIcon = (props) => { diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index dcb2c06..90b0b91 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -1,36 +1,31 @@ import * as React from 'react' -import Link from 'next/link' -import Image from 'next/image' import dynamic from 'next/dynamic' -import cs from 'classnames' +import Image from 'next/image' +import Link from 'next/link' import { useRouter } from 'next/router' -import { useSearchParam } from 'react-use' -import BodyClassName from 'react-body-classname' + +import cs from 'classnames' import { PageBlock } from 'notion-types' - -import TweetEmbed from 'react-tweet-embed' - -// core notion renderer +import { formatDate, getBlockTitle, getPageProperty } from 'notion-utils' +import BodyClassName from 'react-body-classname' import { NotionRenderer } from 'react-notion-x' +import TweetEmbed from 'react-tweet-embed' +import { useSearchParam } from 'react-use' -// utils -import { getBlockTitle, getPageProperty, formatDate } from 'notion-utils' -import { mapPageUrl, getCanonicalPageUrl } from 'lib/map-page-url' -import { mapImageUrl } from 'lib/map-image-url' -import { searchNotion } from 'lib/search-notion' -import { useDarkMode } from 'lib/use-dark-mode' -import * as types from 'lib/types' -import * as config from 'lib/config' +import * as config from '@/lib/config' +import * as types from '@/lib/types' +import { mapImageUrl } from '@/lib/map-image-url' +import { getCanonicalPageUrl, mapPageUrl } from '@/lib/map-page-url' +import { searchNotion } from '@/lib/search-notion' +import { useDarkMode } from '@/lib/use-dark-mode' -// components -import { Loading } from './Loading' -import { Page404 } from './Page404' -import { PageHead } from './PageHead' -import { PageAside } from './PageAside' import { Footer } from './Footer' -import { NotionPageHeader } from './NotionPageHeader' import { GitHubShareButton } from './GitHubShareButton' - +import { Loading } from './Loading' +import { NotionPageHeader } from './NotionPageHeader' +import { Page404 } from './Page404' +import { PageAside } from './PageAside' +import { PageHead } from './PageHead' import styles from './styles.module.css' // ----------------------------------------------------------------------------- diff --git a/components/NotionPageHeader.tsx b/components/NotionPageHeader.tsx index 6458305..7702c25 100644 --- a/components/NotionPageHeader.tsx +++ b/components/NotionPageHeader.tsx @@ -1,12 +1,13 @@ import * as React from 'react' -import cs from 'classnames' -import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline' -import { IoMoonSharp } from '@react-icons/all-files/io5/IoMoonSharp' -import { Header, Breadcrumbs, Search, useNotionContext } from 'react-notion-x' -import * as types from 'notion-types' -import { useDarkMode } from 'lib/use-dark-mode' -import { navigationStyle, navigationLinks, isSearchEnabled } from 'lib/config' +import * as types from 'notion-types' +import { IoMoonSharp } from '@react-icons/all-files/io5/IoMoonSharp' +import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline' +import cs from 'classnames' +import { Breadcrumbs, Header, Search, useNotionContext } from 'react-notion-x' + +import { isSearchEnabled, navigationLinks, navigationStyle } from '@/lib/config' +import { useDarkMode } from '@/lib/use-dark-mode' import styles from './styles.module.css' diff --git a/components/Page404.tsx b/components/Page404.tsx index 4d0f914..445cd15 100644 --- a/components/Page404.tsx +++ b/components/Page404.tsx @@ -1,7 +1,8 @@ import * as React from 'react' -import * as types from 'lib/types' -import { PageHead } from './PageHead' +import * as types from '@/lib/types' + +import { PageHead } from './PageHead' import styles from './styles.module.css' export const Page404: React.FC = ({ site, pageId, error }) => { diff --git a/components/PageActions.tsx b/components/PageActions.tsx index a2ab332..2336513 100644 --- a/components/PageActions.tsx +++ b/components/PageActions.tsx @@ -1,6 +1,7 @@ import * as React from 'react' -import { IoHeartOutline } from '@react-icons/all-files/io5/IoHeartOutline' + import { AiOutlineRetweet } from '@react-icons/all-files/ai/AiOutlineRetweet' +import { IoHeartOutline } from '@react-icons/all-files/io5/IoHeartOutline' import styles from './styles.module.css' diff --git a/components/PageAside.tsx b/components/PageAside.tsx index b1f8506..510b559 100644 --- a/components/PageAside.tsx +++ b/components/PageAside.tsx @@ -1,11 +1,12 @@ import * as React from 'react' + import { Block, ExtendedRecordMap } from 'notion-types' +import { getPageTweet } from '@/lib/get-page-tweet' + import { PageActions } from './PageActions' import { PageSocial } from './PageSocial' -import { getPageTweet } from 'lib/get-page-tweet' - export const PageAside: React.FC<{ block: Block recordMap: ExtendedRecordMap diff --git a/components/PageHead.tsx b/components/PageHead.tsx index 831f269..d379ee7 100644 --- a/components/PageHead.tsx +++ b/components/PageHead.tsx @@ -1,9 +1,9 @@ -import Head from 'next/head' import * as React from 'react' +import Head from 'next/head' -import * as types from 'lib/types' -import * as config from 'lib/config' -import { getSocialImageUrl } from 'lib/get-social-image-url' +import * as config from '@/lib/config' +import * as types from '@/lib/types' +import { getSocialImageUrl } from '@/lib/get-social-image-url' export const PageHead: React.FC< types.PageProps & { diff --git a/components/PageSocial.tsx b/components/PageSocial.tsx index b9c55d4..36ec819 100644 --- a/components/PageSocial.tsx +++ b/components/PageSocial.tsx @@ -1,7 +1,8 @@ import * as React from 'react' + import cs from 'classnames' -import * as config from 'lib/config' +import * as config from '@/lib/config' import styles from './PageSocial.module.css' diff --git a/components/index.ts b/components/index.ts deleted file mode 100644 index 94d5b04..0000000 --- a/components/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './NotionPage' -export * from './Page404' -export * from './ErrorPage' diff --git a/lib/config.ts b/lib/config.ts index 25e27bc..f82bc1d 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -4,15 +4,15 @@ * This file pulls from the root "site.config.ts" as well as environment variables * for optional depenencies. */ - import { parsePageId } from 'notion-utils' import type posthog from 'posthog-js' + import { getEnv, getSiteConfig } from './get-config-value' import { NavigationLink } from './site-config' import { + NavigationStyle, PageUrlOverridesInverseMap, PageUrlOverridesMap, - NavigationStyle, Site } from './types' diff --git a/lib/db.ts b/lib/db.ts index 2030ded..21bdeb2 100644 --- a/lib/db.ts +++ b/lib/db.ts @@ -1,7 +1,7 @@ import Keyv from '@keyvhq/core' import KeyvRedis from '@keyvhq/redis' -import { isRedisEnabled, redisUrl, redisNamespace } from './config' +import { isRedisEnabled, redisNamespace, redisUrl } from './config' let db: Keyv if (isRedisEnabled) { diff --git a/lib/get-canonical-page-id.ts b/lib/get-canonical-page-id.ts index e0c7949..efc8aff 100644 --- a/lib/get-canonical-page-id.ts +++ b/lib/get-canonical-page-id.ts @@ -1,7 +1,7 @@ import { ExtendedRecordMap } from 'notion-types' import { - parsePageId, - getCanonicalPageId as getCanonicalPageIdImpl + getCanonicalPageId as getCanonicalPageIdImpl, + parsePageId } from 'notion-utils' import { inversePageUrlOverrides } from './config' diff --git a/lib/get-page-tweet.ts b/lib/get-page-tweet.ts index 1abe6f8..3452eba 100644 --- a/lib/get-page-tweet.ts +++ b/lib/get-page-tweet.ts @@ -1,6 +1,7 @@ -import * as types from './types' import { getPageProperty } from 'notion-utils' +import * as types from './types' + export function getPageTweet( block: types.Block, recordMap: types.ExtendedRecordMap diff --git a/lib/get-site-map.ts b/lib/get-site-map.ts index 1f74fc9..7018406 100644 --- a/lib/get-site-map.ts +++ b/lib/get-site-map.ts @@ -1,11 +1,11 @@ -import pMemoize from 'p-memoize' import { getAllPagesInSpace, uuidToId } from 'notion-utils' +import pMemoize from 'p-memoize' -import { includeNotionIdInUrls } from './config' -import { notion } from './notion-api' -import { getCanonicalPageId } from './get-canonical-page-id' import * as config from './config' import * as types from './types' +import { includeNotionIdInUrls } from './config' +import { getCanonicalPageId } from './get-canonical-page-id' +import { notion } from './notion-api' const uuid = !!includeNotionIdInUrls diff --git a/lib/map-image-url.ts b/lib/map-image-url.ts index fdc15ee..6570a56 100644 --- a/lib/map-image-url.ts +++ b/lib/map-image-url.ts @@ -1,7 +1,7 @@ import { Block } from 'notion-types' import { defaultMapImageUrl } from 'react-notion-x' -import { defaultPageIcon, defaultPageCover } from './config' +import { defaultPageCover, defaultPageIcon } from './config' export const mapImageUrl = (url: string, block: Block) => { if (url === defaultPageCover || url === defaultPageIcon) { diff --git a/lib/map-page-url.ts b/lib/map-page-url.ts index 1c8973a..8239254 100644 --- a/lib/map-page-url.ts +++ b/lib/map-page-url.ts @@ -1,9 +1,9 @@ import { ExtendedRecordMap } from 'notion-types' -import { uuidToId, parsePageId } from 'notion-utils' +import { parsePageId, uuidToId } from 'notion-utils' -import { Site } from './types' import { includeNotionIdInUrls } from './config' import { getCanonicalPageId } from './get-canonical-page-id' +import { Site } from './types' // include UUIDs in page URLs during local development but not in production // (they're nice for debugging and speed up local dev) diff --git a/lib/notion.ts b/lib/notion.ts index 53eb4ba..b9be972 100644 --- a/lib/notion.ts +++ b/lib/notion.ts @@ -1,15 +1,15 @@ -import pMap from 'p-map' -import pMemoize from 'p-memoize' import { ExtendedRecordMap, SearchParams, SearchResults } from 'notion-types' import { mergeRecordMaps } from 'notion-utils' +import pMap from 'p-map' +import pMemoize from 'p-memoize' -import { notion } from './notion-api' -import { getPreviewImageMap } from './preview-images' import { isPreviewImageSupportEnabled, - navigationStyle, - navigationLinks + navigationLinks, + navigationStyle } from './config' +import { notion } from './notion-api' +import { getPreviewImageMap } from './preview-images' const getNavigationLinkPages = pMemoize( async (): Promise => { diff --git a/lib/oembed.ts b/lib/oembed.ts index 3a2bb74..de87e8e 100644 --- a/lib/oembed.ts +++ b/lib/oembed.ts @@ -1,6 +1,7 @@ -import { parsePageId, getPageTitle } from 'notion-utils' -import { getPage } from './notion' +import { getPageTitle, parsePageId } from 'notion-utils' + import * as config from './config' +import { getPage } from './notion' export const oembed = async ({ url, diff --git a/lib/preview-images.ts b/lib/preview-images.ts index a8b36aa..e361944 100644 --- a/lib/preview-images.ts +++ b/lib/preview-images.ts @@ -1,11 +1,11 @@ import got from 'got' import lqip from 'lqip-modern' -import pMap from 'p-map' -import pMemoize from 'p-memoize' import { ExtendedRecordMap, PreviewImage, PreviewImageMap } from 'notion-types' import { getPageImageUrls, normalizeUrl } from 'notion-utils' +import pMap from 'p-map' +import pMemoize from 'p-memoize' -import { defaultPageIcon, defaultPageCover } from './config' +import { defaultPageCover, defaultPageIcon } from './config' import { db } from './db' import { mapImageUrl } from './map-image-url' diff --git a/lib/resolve-notion-page.ts b/lib/resolve-notion-page.ts index b2ded3e..d533978 100644 --- a/lib/resolve-notion-page.ts +++ b/lib/resolve-notion-page.ts @@ -1,11 +1,11 @@ -import { parsePageId } from 'notion-utils' import { ExtendedRecordMap } from 'notion-types' +import { parsePageId } from 'notion-utils' import * as acl from './acl' -import { pageUrlOverrides, pageUrlAdditions, environment, site } from './config' +import { environment, pageUrlAdditions, pageUrlOverrides, site } from './config' import { db } from './db' -import { getPage } from './notion' import { getSiteMap } from './get-site-map' +import { getPage } from './notion' export async function resolveNotionPage(domain: string, rawPageId?: string) { let pageId: string diff --git a/lib/search-notion.ts b/lib/search-notion.ts index a048584..d0b3a49 100644 --- a/lib/search-notion.ts +++ b/lib/search-notion.ts @@ -1,10 +1,10 @@ // import ky from 'ky' +import ExpiryMap from 'expiry-map' import fetch from 'isomorphic-unfetch' import pMemoize from 'p-memoize' -import ExpiryMap from 'expiry-map' -import { api } from './config' import * as types from './types' +import { api } from './config' export const searchNotion = pMemoize(searchNotionImpl, { cacheKey: (args) => args[0]?.query, diff --git a/package.json b/package.json index bb5618b..7c20639 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ }, "devDependencies": { "@next/bundle-analyzer": "^12.3.1", + "@trivago/prettier-plugin-sort-imports": "^3.3.1", "@types/node": "^18.8.5", "@types/react": "^18.0.21", "@typescript-eslint/eslint-plugin": "^5.40.0", diff --git a/pages/404.tsx b/pages/404.tsx index 131f806..a1ea1da 100644 --- a/pages/404.tsx +++ b/pages/404.tsx @@ -1,3 +1,3 @@ -import { Page404 } from 'components' +import { Page404 } from '@/components/Page404' export default Page404 diff --git a/pages/[pageId].tsx b/pages/[pageId].tsx index f16fff3..0751876 100644 --- a/pages/[pageId].tsx +++ b/pages/[pageId].tsx @@ -1,10 +1,11 @@ import * as React from 'react' import { GetStaticProps } from 'next' -import { isDev, domain } from 'lib/config' -import { getSiteMap } from 'lib/get-site-map' -import { resolveNotionPage } from 'lib/resolve-notion-page' -import { PageProps, Params } from 'lib/types' -import { NotionPage } from 'components' + +import { NotionPage } from '@/components/NotionPage' +import { domain, isDev } from '@/lib/config' +import { getSiteMap } from '@/lib/get-site-map' +import { resolveNotionPage } from '@/lib/resolve-notion-page' +import { PageProps, Params } from '@/lib/types' export const getStaticProps: GetStaticProps = async ( context diff --git a/pages/_app.tsx b/pages/_app.tsx index 0b1961f..091bf17 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,38 +1,32 @@ // global styles shared across the entire site -import 'styles/global.css' - -// core styles shared by all of react-notion-x (required) -import 'react-notion-x/src/styles.css' +import * as React from 'react' +import type { AppProps } from 'next/app' +import { useRouter } from 'next/router' +import * as Fathom from 'fathom-client' // used for rendering equations (optional) import 'katex/dist/katex.min.css' - +import posthog from 'posthog-js' // used for code syntax highlighting (optional) import 'prismjs/themes/prism-coy.css' - +// core styles shared by all of react-notion-x (required) +import 'react-notion-x/src/styles.css' +import 'styles/global.css' // this might be better for dark mode // import 'prismjs/themes/prism-okaidia.css' - // global style overrides for notion import 'styles/notion.css' - // global style overrides for prism theme (optional) import 'styles/prism-theme.css' -import * as React from 'react' -import * as Fathom from 'fathom-client' -import type { AppProps } from 'next/app' -import { useRouter } from 'next/router' -import posthog from 'posthog-js' - -import { bootstrap } from 'lib/bootstrap-client' +import { bootstrap } from '@/lib/bootstrap-client' import { - isServer, - fathomId, fathomConfig, - posthogId, - posthogConfig -} from 'lib/config' + fathomId, + isServer, + posthogConfig, + posthogId +} from '@/lib/config' if (!isServer) { bootstrap() diff --git a/pages/_document.tsx b/pages/_document.tsx index a60676d..97a7b4c 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -1,5 +1,6 @@ import * as React from 'react' -import Document, { Html, Head, Main, NextScript } from 'next/document' +import Document, { Head, Html, Main, NextScript } from 'next/document' + import { IconContext } from '@react-icons/all-files' export default class MyDocument extends Document { diff --git a/pages/_error.tsx b/pages/_error.tsx index e3c35d2..26194ea 100644 --- a/pages/_error.tsx +++ b/pages/_error.tsx @@ -1,3 +1,3 @@ -import { ErrorPage } from 'components' +import { ErrorPage } from '@/components/ErrorPage' export default ErrorPage diff --git a/pages/api/notion-page-info.tsx b/pages/api/notion-page-info.tsx index b053041..21e48a4 100644 --- a/pages/api/notion-page-info.tsx +++ b/pages/api/notion-page-info.tsx @@ -1,18 +1,18 @@ import { NextApiRequest, NextApiResponse } from 'next' +import { PageBlock } from 'notion-types' import { - getBlockTitle, getBlockIcon, + getBlockTitle, getPageProperty, isUrl, parsePageId } from 'notion-utils' -import { PageBlock } from 'notion-types' -import { notion } from 'lib/notion-api' -import { mapImageUrl } from 'lib/map-image-url' -import { NotionPageInfo } from 'lib/types' -import * as libConfig from 'lib/config' +import * as libConfig from '@/lib/config' +import { mapImageUrl } from '@/lib/map-image-url' +import { notion } from '@/lib/notion-api' +import { NotionPageInfo } from '@/lib/types' export default async (req: NextApiRequest, res: NextApiResponse) => { if (req.method !== 'POST') { diff --git a/pages/api/social-image.tsx b/pages/api/social-image.tsx index f6fe068..33662c4 100644 --- a/pages/api/social-image.tsx +++ b/pages/api/social-image.tsx @@ -1,9 +1,10 @@ import * as React from 'react' -import { ImageResponse } from '@vercel/og' import { NextRequest } from 'next/server' -import { NotionPageInfo } from 'lib/types' -import { apiHost, api } from 'lib/config' +import { ImageResponse } from '@vercel/og' + +import { api, apiHost } from '@/lib/config' +import { NotionPageInfo } from '@/lib/types' const interRegularFontP = fetch( new URL('../../public/fonts/Inter-Regular.ttf', import.meta.url) diff --git a/pages/feed.tsx b/pages/feed.tsx index bff41da..fcf33cf 100644 --- a/pages/feed.tsx +++ b/pages/feed.tsx @@ -1,17 +1,18 @@ -import RSS from 'rss' import type { GetServerSideProps } from 'next' + +import { ExtendedRecordMap } from 'notion-types' import { getBlockParentPage, getBlockTitle, getPageProperty, idToUuid } from 'notion-utils' -import { ExtendedRecordMap } from 'notion-types' +import RSS from 'rss' -import * as config from 'lib/config' -import { getSiteMap } from 'lib/get-site-map' -import { getCanonicalPageUrl } from 'lib/map-page-url' -import { getSocialImageUrl } from 'lib/get-social-image-url' +import * as config from '@/lib/config' +import { getSiteMap } from '@/lib/get-site-map' +import { getSocialImageUrl } from '@/lib/get-social-image-url' +import { getCanonicalPageUrl } from '@/lib/map-page-url' export const getServerSideProps: GetServerSideProps = async ({ req, res }) => { if (req.method !== 'GET') { diff --git a/pages/index.tsx b/pages/index.tsx index 1fa7f9f..bc3d4de 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,7 +1,8 @@ import * as React from 'react' -import { domain } from 'lib/config' -import { resolveNotionPage } from 'lib/resolve-notion-page' -import { NotionPage } from 'components' + +import { NotionPage } from '@/components/NotionPage' +import { domain } from '@/lib/config' +import { resolveNotionPage } from '@/lib/resolve-notion-page' export const getStaticProps = async () => { try { diff --git a/pages/robots.txt.tsx b/pages/robots.txt.tsx index d82ef1c..6e20e3e 100644 --- a/pages/robots.txt.tsx +++ b/pages/robots.txt.tsx @@ -1,5 +1,6 @@ import type { GetServerSideProps } from 'next' -import { host } from 'lib/config' + +import { host } from '@/lib/config' export const getServerSideProps: GetServerSideProps = async ({ req, res }) => { if (req.method !== 'GET') { diff --git a/pages/sitemap.xml.tsx b/pages/sitemap.xml.tsx index 7cd792d..95741d4 100644 --- a/pages/sitemap.xml.tsx +++ b/pages/sitemap.xml.tsx @@ -1,7 +1,8 @@ import type { GetServerSideProps } from 'next' -import type { SiteMap } from 'lib/types' -import { host } from 'lib/config' -import { getSiteMap } from 'lib/get-site-map' + +import { host } from '@/lib/config' +import { getSiteMap } from '@/lib/get-site-map' +import type { SiteMap } from '@/lib/types' export const getServerSideProps: GetServerSideProps = async ({ req, res }) => { if (req.method !== 'GET') { diff --git a/tsconfig.json b/tsconfig.json index 73d6662..77ad1d4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,12 @@ "jsx": "preserve", "baseUrl": ".", "typeRoots": ["./node_modules/@types"], - "incremental": true + "incremental": true, + "paths": { + "@/components/*": ["components/*"], + "@/lib/*": ["lib/*"], + "@/styles/*": ["styles/*"] + } }, "exclude": ["node_modules"], "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "site.config.ts"] diff --git a/yarn.lock b/yarn.lock index 295f23d..51b462a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,173 @@ # yarn lockfile v1 +"@ampproject/remapping@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + dependencies: + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== + dependencies: + "@babel/highlight" "^7.18.6" + +"@babel/compat-data@^7.19.3": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz#95c86de137bf0317f3a570e1b6e996b427299747" + integrity sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw== + +"@babel/core@7.17.8": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" + integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.7" + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-module-transforms" "^7.17.7" + "@babel/helpers" "^7.17.8" + "@babel/parser" "^7.17.8" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.1.2" + semver "^6.3.0" + +"@babel/generator@7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" + integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w== + dependencies: + "@babel/types" "^7.17.0" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.19.4": + version "7.19.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.5.tgz#da3f4b301c8086717eee9cab14da91b1fa5dcca7" + integrity sha512-DxbNz9Lz4aMZ99qPpO1raTbcrI1ZeYh+9NR9qhfkQIbFtVEqotHojEBxHzmxhVONkGt6VyrqVQcgpefMy9pqcg== + dependencies: + "@babel/types" "^7.19.4" + "@jridgewell/gen-mapping" "^0.3.2" + jsesc "^2.5.1" + +"@babel/helper-compilation-targets@^7.17.7": + version "7.19.3" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz#a10a04588125675d7c7ae299af86fa1b2ee038ca" + integrity sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg== + dependencies: + "@babel/compat-data" "^7.19.3" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.21.3" + semver "^6.3.0" + +"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== + dependencies: + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" + +"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-transforms@^7.17.7": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30" + integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.18.6" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.0" + "@babel/types" "^7.19.0" + +"@babel/helper-simple-access@^7.18.6": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7" + integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg== + dependencies: + "@babel/types" "^7.19.4" + +"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== + +"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== + +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + +"@babel/helpers@^7.17.8": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz#42154945f87b8148df7203a25c31ba9a73be46c5" + integrity sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw== + dependencies: + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.4" + "@babel/types" "^7.19.4" + +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== + dependencies: + "@babel/helper-validator-identifier" "^7.18.6" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539" + integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg== + +"@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.18.10", "@babel/parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.4.tgz#03c4339d2b8971eb3beca5252bafd9b9f79db3dc" + integrity sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA== + "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0": version "7.18.9" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz" @@ -9,6 +176,64 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/template@^7.16.7", "@babel/template@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" + integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.18.10" + "@babel/types" "^7.18.10" + +"@babel/traverse@7.17.3": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" + integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.3" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.17.3" + "@babel/types" "^7.17.0" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/traverse@^7.17.3", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.4.tgz#f117820e18b1e59448a6c1fa9d0ff08f7ac459a8" + integrity sha512-w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.19.4" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.19.4" + "@babel/types" "^7.19.4" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" + integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + to-fast-properties "^2.0.0" + +"@babel/types@^7.17.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7" + integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw== + dependencies: + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + "@eslint/eslintrc@^1.3.3": version "1.3.3" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95" @@ -61,6 +286,46 @@ resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.1.1.tgz" integrity sha512-fsR4P/ROllzf/7lXYyElUJCheWdTJVJvOTps8v9IWKFATxR61ANOlnoPqhH099xYLrJGpc2ZQ28B3rMeUt5VQg== +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.14" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.17" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" + "@keyvhq/core@^1.6.9": version "1.6.9" resolved "https://registry.npmjs.org/@keyvhq/core/-/core-1.6.9.tgz" @@ -233,6 +498,19 @@ dependencies: defer-to-connect "^2.0.1" +"@trivago/prettier-plugin-sort-imports@^3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-3.3.1.tgz#9210335f3883edefdc9f28f4d5b624871771fc34" + integrity sha512-ITGspeOlFnK1dwJVjqOguGW3Ja8hakxOPFudhpP0YfsDHT0yM0u4TU+62Vl83hCatnhB4+fYhlSZyiifUv4xSg== + dependencies: + "@babel/core" "7.17.8" + "@babel/generator" "7.17.7" + "@babel/parser" "7.18.9" + "@babel/traverse" "7.17.3" + "@babel/types" "7.17.0" + javascript-natural-sort "0.7.1" + lodash "4.17.21" + "@types/cacheable-request@^6.0.1", "@types/cacheable-request@^6.0.2": version "6.0.2" resolved "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz" @@ -306,13 +584,6 @@ resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== -"@types/yauzl@^2.9.1": - version "2.9.2" - resolved "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz" - integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== - dependencies: - "@types/node" "*" - "@types/yoga-layout@1.9.2": version "1.9.2" resolved "https://registry.yarnpkg.com/@types/yoga-layout/-/yoga-layout-1.9.2.tgz#efaf9e991a7390dc081a0b679185979a83a9639a" @@ -433,13 +704,6 @@ acorn@^8.0.4, acorn@^8.8.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== -agent-base@6: - version "6.0.2" - resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz" @@ -589,12 +853,17 @@ braces@^3.0.2: dependencies: fill-range "^7.0.1" -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" - integrity "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==" +browserslist@^4.21.3: + version "4.21.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" + integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== + dependencies: + caniuse-lite "^1.0.30001400" + electron-to-chromium "^1.4.251" + node-releases "^2.0.6" + update-browserslist-db "^1.0.9" -buffer@^5.2.1, buffer@^5.5.0: +buffer@^5.5.0: version "5.7.1" resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -643,12 +912,17 @@ camelize@^1.0.0: resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3" integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== +caniuse-lite@^1.0.30001400: + version "1.0.30001420" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001420.tgz#f62f35f051e0b6d25532cf376776d41e45b47ef6" + integrity sha512-OnyeJ9ascFA9roEj72ok2Ikp7PHJTKubtEJIQ/VK3fdsS50q4KWy+Z5X0A1/GswEItKX0ctAp8n4SYDE7wTu6A== + caniuse-lite@^1.0.30001406: version "1.0.30001419" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001419.tgz#3542722d57d567c8210d5e4d0f9f17336b776457" integrity sha512-aFO1r+g6R7TW+PNQxKzjITwLOyDhVRLjW0LcwS/HCZGUUKTGNp9+IwLC4xyDSZBygVL/mxaFR3HIV6wEKQuSzw== -chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -670,13 +944,6 @@ chownr@^1.1.1: resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== -chrome-aws-lambda@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/chrome-aws-lambda/-/chrome-aws-lambda-6.0.0.tgz#e0966a5759e6b57c24584c2511fb72738b6209ff" - integrity sha512-XnFo6AaE5ZYpHYmOmMoj1yCYFeRTx6uFCpJnVuDREWzXevzZvo3gzkyQ6qSKsPW91VGWeQI7wQgnOpW50e+Dzg== - dependencies: - lambdafs "^2.0.2" - classnames@^2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz" @@ -779,6 +1046,11 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" integrity "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" +convert-source-map@^1.7.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== + copy-to-clipboard@^3.3.1: version "3.3.1" resolved "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz" @@ -868,7 +1140,7 @@ date-fns@^2.28.0: resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz" integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw== -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -934,11 +1206,6 @@ detect-libc@^1.0.3: resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz" integrity "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==" -devtools-protocol@0.0.842839: - version "0.0.842839" - resolved "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.842839.tgz" - integrity sha512-iI3v9uuGUW02vPUXTvxl4ijnCPL/RGRVR9I+U8s7+9OG9An/bvExjQ0KrXE9V0QBLra7wANhZctB00FKBSn1gw== - dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" @@ -965,6 +1232,11 @@ duplexer@^0.1.2: resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== +electron-to-chromium@^1.4.251: + version "1.4.283" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.283.tgz#d4f263f5df402fd799c0a06255d580dcf8aa9a8e" + integrity sha512-g6RQ9zCOV+U5QVHW9OpFR7rdk/V7xfopNXnyAamdpFgCHgZ1sjI8VuR1+zG2YG/TZk+tQ8mpNkug4P8FU0fuOA== + emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz" @@ -1063,6 +1335,11 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + escape-string-regexp@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz" @@ -1245,17 +1522,6 @@ expiry-map@^2.0.0: dependencies: map-age-cleaner "^0.2.0" -extract-zip@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" @@ -1304,13 +1570,6 @@ fathom-client@^3.4.1: resolved "https://registry.npmjs.org/fathom-client/-/fathom-client-3.4.1.tgz" integrity sha512-iQFKx9B9RDeGLzgNqsaXWg3Fvu7yfq1Z8GjpAG3DP8IoGoPRWOOktpM7DUKiUzoE3d37hdvDQvkqUHfNzVwimg== -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz" - integrity "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==" - dependencies: - pend "~1.2.0" - fflate@^0.4.1: version "0.4.8" resolved "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz" @@ -1343,14 +1602,6 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -1421,6 +1672,11 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" @@ -1490,6 +1746,11 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + globals@^13.15.0: version "13.17.0" resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4" @@ -1644,14 +1905,6 @@ http2-wrapper@^2.1.10: quick-lru "^5.1.1" resolve-alpn "^1.2.0" -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - hyphenate-style-name@^1.0.2: version "1.0.4" resolved "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz" @@ -1900,6 +2153,11 @@ isomorphic-unfetch@^3.1.0: node-fetch "^2.6.1" unfetch "^4.2.0" +javascript-natural-sort@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" + integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== + js-cookie@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz" @@ -1910,7 +2168,7 @@ js-sdsl@^4.1.4: resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a" integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q== -"js-tokens@^3.0.0 || ^4.0.0": +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== @@ -1922,6 +2180,11 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + json-buffer@3.0.1, json-buffer@~3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz" @@ -1970,13 +2233,6 @@ keyv@^4.0.0: compress-brotli "^1.3.6" json-buffer "3.0.1" -lambdafs@^2.0.2: - version "2.1.1" - resolved "https://registry.npmjs.org/lambdafs/-/lambdafs-2.1.1.tgz" - integrity sha512-x5k8JcoJWkWLvCVBzrl4pzvkEHSgSBqFjg3Dpsc4AcTMq7oUMym4cL/gRTZ6VM4mUMY+M0dIbQ+V1c1tsqqanQ== - dependencies: - tar-fs "^2.1.1" - levn@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz" @@ -2004,13 +2260,6 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -2033,7 +2282,7 @@ lodash.merge@^4.6.2: resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash@^4.17.20: +lodash@4.17.21, lodash@^4.17.20: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -2278,6 +2527,11 @@ node-fetch@^2.6.1: dependencies: whatwg-url "^5.0.0" +node-releases@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" + integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== + normalize-package-data@^2.3.2: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" @@ -2480,13 +2734,6 @@ p-finally@^1.0.0: resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz" integrity "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==" -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -2494,13 +2741,6 @@ p-limit@^3.0.2: dependencies: yocto-queue "^0.1.0" -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -2549,11 +2789,6 @@ p-timeout@^5.0.2: resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-5.0.2.tgz" integrity sha512-sEmji9Yaq+Tw+STwsGAE56hf7gMy9p0tQfJojIAamB7WHJYJKf1qlsg9jqBWG8q9VCxKPhZaP/AcXwEoBcYQhQ== -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" @@ -2611,11 +2846,6 @@ pdfjs-dist@2.12.313: resolved "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz" integrity sha512-1x6iXO4Qnv6Eb+YFdN5JdUzt4pAkxSp3aLAYPX93eQCyg/m7QFzXVWJHJVtoW48CI8HCXju4dSkhQZwoheL5mA== -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz" - integrity "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" - picocolors@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" @@ -2636,13 +2866,6 @@ pify@^3.0.0: resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz" integrity "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==" -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - postcss-value-parser@^4.0.2, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" @@ -2705,11 +2928,6 @@ process-nextick-args@~2.0.0: resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -progress@^2.0.1: - version "2.0.3" - resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - prop-types@^15.5.6, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" @@ -2719,11 +2937,6 @@ prop-types@^15.5.6, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" -proxy-from-env@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - pump@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz" @@ -2737,24 +2950,6 @@ punycode@^2.1.0: resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -puppeteer-core@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-6.0.0.tgz#16fea8229ee4053f208194cd17718318ea6e69a7" - integrity sha512-Mm4lVSM8CJUrHSLt2zHjlW9B2D5B3JRbkbmxzGaGTauaB9gTrM+r7gk88xfRWuaBy81pRG+nTtCBdMPzO7pjqg== - dependencies: - debug "^4.1.0" - devtools-protocol "0.0.842839" - extract-zip "^2.0.0" - https-proxy-agent "^5.0.0" - node-fetch "^2.6.1" - pkg-dir "^4.2.0" - progress "^2.0.1" - proxy-from-env "^1.0.0" - rimraf "^3.0.2" - tar-fs "^2.0.0" - unbzip2-stream "^1.3.3" - ws "^7.2.3" - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" @@ -3252,6 +3447,11 @@ source-map@0.5.6: resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" integrity "sha1-dc449SvwczxafwwRjYEzSiu19BI= sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==" +source-map@^0.5.0: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== + source-map@^0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" @@ -3489,11 +3689,6 @@ throttle-debounce@^3.0.1: resolved "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-3.0.1.tgz" integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg== -through@^2.3.8: - version "2.3.8" - resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - integrity "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" - tiny-invariant@^1.0.0: version "1.2.0" resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz" @@ -3504,6 +3699,11 @@ tiny-warning@^1.0.0: resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== + to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" @@ -3597,14 +3797,6 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -unbzip2-stream@^1.3.3: - version "1.4.3" - resolved "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz" - integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== - dependencies: - buffer "^5.2.1" - through "^2.3.8" - unfetch@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz" @@ -3615,6 +3807,14 @@ unionize@^2.1.2: resolved "https://registry.npmjs.org/unionize/-/unionize-2.2.0.tgz" integrity sha512-lHXiL6LPVuRYBGCLOdUd4GMHoAGqM0HtYHAZcA6pUEiwN1nk+LEYlh8bud7saeL0bkFntJzCPEPVVJeFm3Cqsg== +update-browserslist-db@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" @@ -3724,7 +3924,7 @@ wrappy@1: resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" integrity "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" -ws@^7.2.3, ws@^7.3.1: +ws@^7.3.1: version "7.5.7" resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== @@ -3739,14 +3939,6 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz" - integrity "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==" - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"