diff --git a/components/CodeBlock/CodeBlock.tsx b/components/CodeBlock/CodeBlock.tsx index 15325fba..4be0ca41 100644 --- a/components/CodeBlock/CodeBlock.tsx +++ b/components/CodeBlock/CodeBlock.tsx @@ -9,7 +9,7 @@ const Block = styled("div", { margin: "1em auto", color: "$codeText", - [`${Code}`]: { + [`& ${Code}`]: { display: "block", overflowX: "auto", padding: "1em", diff --git a/components/Menu/Menu.tsx b/components/Menu/Menu.tsx index 759eda1a..eb17f6d9 100644 --- a/components/Menu/Menu.tsx +++ b/components/Menu/Menu.tsx @@ -45,12 +45,16 @@ const Menu = ({ ...rest }: MenuProps) => { return ( - {menuItems.map((item, index) => ( - - {/* kinda weird/hacky way to determine if the *first part* of the current path matches this href */} - - - ))} + {menuItems.map((item, index) => { + // kinda weird/hacky way to determine if the *first part* of the current path matches this href + const isCurrent = item.href === `/${router.pathname.split("/")[1]}`; + + return ( + + + + ); + })} diff --git a/components/NoteTitle/NoteTitle.tsx b/components/NoteTitle/NoteTitle.tsx index 88dc30dc..98cbf47e 100644 --- a/components/NoteTitle/NoteTitle.tsx +++ b/components/NoteTitle/NoteTitle.tsx @@ -9,7 +9,7 @@ const Title = styled("h1", { lineHeight: 1.3, fontWeight: 700, - code: { + "& code": { margin: "0 0.075em", }, diff --git a/components/VNC/VNC.tsx b/components/VNC/VNC.tsx index 556b0e76..e972d3ad 100644 --- a/components/VNC/VNC.tsx +++ b/components/VNC/VNC.tsx @@ -12,10 +12,10 @@ const Display = styled( maxWidth: "800px", // these are injected by noVNC after connection, so we can't target them directly: - div: { + "& div": { background: "none !important", - canvas: { + "& canvas": { cursor: "inherit !important", }, }, diff --git a/components/Video/Video.tsx b/components/Video/Video.tsx index d4489a57..84316367 100644 --- a/components/Video/Video.tsx +++ b/components/Video/Video.tsx @@ -13,7 +13,7 @@ const Player = styled(ReactPlayer, { top: 0, left: 0, - video: { + "& video": { borderRadius: "$rounded", }, }); diff --git a/components/YouTubeEmbed/YouTubeEmbed.tsx b/components/YouTubeEmbed/YouTubeEmbed.tsx index 2edc317f..26980986 100644 --- a/components/YouTubeEmbed/YouTubeEmbed.tsx +++ b/components/YouTubeEmbed/YouTubeEmbed.tsx @@ -14,7 +14,7 @@ const Player = styled(ReactPlayer, { left: 0, // target both the lazy thumbnail preview *and* the actual YouTube embed - ".react-player__preview, iframe": { + "& .react-player__preview, & iframe": { borderRadius: "$rounded", }, }); diff --git a/lib/styles/stitches.config.ts b/lib/styles/stitches.config.ts index cc115086..89fa09ab 100644 --- a/lib/styles/stitches.config.ts +++ b/lib/styles/stitches.config.ts @@ -151,7 +151,7 @@ export const globalStyles = globalCss( fontVariationSettings: `"ital" 1, "slnt" -10`, // Roboto Mono doesn't have this problem, but the above fix breaks it, of course. - "code, kbd, samp, pre": { + "& code, & kbd, & samp, & pre": { fontStyle: "italic !important", fontVariationSettings: "initial !important", }, diff --git a/package.json b/package.json index 32143099..c1de7364 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "gray-matter": "^4.0.3", "hex-to-rgba": "^2.0.1", "markdown-to-jsx": "^7.1.7", - "next": "12.1.7-canary.11", + "next": "12.1.7-canary.15", "next-compose-plugins": "^2.2.1", "next-mdx-remote": "^4.0.3", "next-seo": "^5.4.0", @@ -78,29 +78,29 @@ }, "devDependencies": { "@jakejarvis/eslint-config": "*", - "@next/bundle-analyzer": "12.1.7-canary.11", + "@next/bundle-analyzer": "12.1.7-canary.15", "@svgr/webpack": "^6.2.1", "@types/comma-number": "^2.1.0", "@types/node": "*", "@types/prop-types": "^15.7.5", "@types/react": "^18.0.9", - "@types/react-dom": "^18.0.4", + "@types/react-dom": "^18.0.5", "@types/react-is": "^17.0.3", "@types/remove-markdown": "^0.3.1", "@types/sanitize-html": "^2.6.2", "@types/uglify-js": "^3.13.2", - "@typescript-eslint/eslint-plugin": "^5.25.0", - "@typescript-eslint/parser": "^5.25.0", + "@typescript-eslint/eslint-plugin": "^5.26.0", + "@typescript-eslint/parser": "^5.26.0", "cross-env": "^7.0.3", "eslint": "~8.16.0", - "eslint-config-next": "12.1.7-canary.11", + "eslint-config-next": "12.1.7-canary.15", "eslint-config-prettier": "~8.5.0", "eslint-plugin-mdx": "~1.17.0", "eslint-plugin-prettier": "~4.0.0", - "lint-staged": "^12.4.1", + "lint-staged": "^12.4.2", "prettier": "^2.6.2", "simple-git-hooks": "^2.7.0", - "typescript": "^4.6.4", + "typescript": "^4.7.2", "uglify-js": "^3.15.5" }, "simple-git-hooks": { diff --git a/pages/previously.tsx b/pages/previously.tsx index 87ebe2ed..ffe90343 100644 --- a/pages/previously.tsx +++ b/pages/previously.tsx @@ -177,12 +177,12 @@ Previously.getLayout = (page: ReactElement) => { header: { // title text - "nav > a:first-of-type span:last-of-type": { + "& > nav > a:first-of-type > span:last-of-type": { fontSize: "1.4em", fontWeight: 700, }, // menu item text - "nav ul a span": { + "& > nav > ul > li > a > span": { fontSize: "1.1em", fontWeight: 700, lineHeight: 1.1, @@ -193,29 +193,29 @@ Previously.getLayout = (page: ReactElement) => { fontSize: "1.1em", textAlign: "center", - em: { + "& em": { fontStyle: "revert !important", }, - p: { + "& p": { fontSize: "0.95em", }, - strong: { + "& strong": { fontWeight: 900, }, - code: { + "& code": { fontSize: "0.85em", fontWeight: 400, }, - hr: { + "& hr": { margin: "1em auto", }, - figcaption: { + "& figcaption": { fontSize: "0.9em", lineHeight: 1.5, color: "$medium", textAlign: "center", }, - "figure:last-of-type": { + "& figure:last-of-type": { marginBottom: 0, }, }, diff --git a/yarn.lock b/yarn.lock index 8de949a3..74b4601e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1177,89 +1177,89 @@ resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA== -"@next/bundle-analyzer@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-12.1.7-canary.11.tgz#699a1e9e213b5154536cdc66ef447eda8ad66177" - integrity sha512-f6d7UcMrV6t6vq0+IUqcyx9JkMxMT3reVdLmiBmGQfEGfWhQm7/XYR8MfBXD+2ZjX9toUUZ8IZLSS2oU87hL5A== +"@next/bundle-analyzer@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-12.1.7-canary.15.tgz#0c1afa193bf0e733ecba007b8bbc50340bf1f902" + integrity sha512-9P6LwwAr3yTM+a4xOOZwsn7w7RkO3HO3vecDnXmV2ju+dQZZuJyMEctLKAQd8Qx8E5TFe9CA5/TJKrJS5s039g== dependencies: webpack-bundle-analyzer "4.3.0" -"@next/env@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/env/-/env-12.1.7-canary.11.tgz#a0281ad26fd57fc01321763a4cd3c635fb4a49b6" - integrity sha512-sOCMPntEk/D3DPHg7vPP2vjpqdZr03AzyAEJYQ3sDcK6B4zYnszlLHcspal8h77iz4i3Ad7RfOrdHmKKBvkAZw== +"@next/env@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/env/-/env-12.1.7-canary.15.tgz#f6c630e255dfc3d1178d542febddf38e18065b8b" + integrity sha512-Ut6CM0lUyrF1rrQNkKvcKoRg0HDWop2b1VtLm81DMQnCUpFAgUKPaepZFidUIuUOgiiHXxnAXHEQGd72ui78qQ== -"@next/eslint-plugin-next@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.1.7-canary.11.tgz#6e42a9f84605b2063fe1c28991357a0bdc6679be" - integrity sha512-1C+xaJ1//NH0K2bqG7lWlsWjYADU/Idp6rYif0NEsWBeLik23WY0mblKFDMCl6ezCZtmMlhKU0o2VQWInndfxw== +"@next/eslint-plugin-next@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.1.7-canary.15.tgz#360b0f0d8870835745b3e6cb81a4171d75267d01" + integrity sha512-iHsg5hJCo3fA9p25QXSqlZDAF/+50MqhMldFvoOMZiHdXQBq+NYDWAKl+gD6qPRwUJsHtHKXm5ttD5IDgrxR/A== dependencies: glob "7.1.7" -"@next/swc-android-arm-eabi@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.1.7-canary.11.tgz#5cea5bea4ff85edb9288ec2e53258e0f44163e68" - integrity sha512-J4cA35SlQmuxQcCfUwfgy7hokFtNNh96Ggf5UU4k1AQLtkOWH+ICYiMIK5Dtce9waUe/xntjRPvhg1Y0AV3CGg== +"@next/swc-android-arm-eabi@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.1.7-canary.15.tgz#b00bb0d3eaff72c2688c702d1b1dec7b1a270d4e" + integrity sha512-yuujSDsuic7hSI1eZ6YhdkoY42Exi9rHjNZZq4kpU71K/TZrgKdRYZAp/OMsap9KVMJ4vxeqgfnS6RlBp2tTiA== -"@next/swc-android-arm64@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.1.7-canary.11.tgz#a1c9bfc97c404aa7a7c26ddfc7c5e3fa4ea67dba" - integrity sha512-3zM4F0aRSfdxNfQ37XF3RnaWdubumBMudpT6tbXmVx8n1owI92YFNzyrBAwjIiWXDS50LORzgMGKpXgrOjvjTg== +"@next/swc-android-arm64@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.1.7-canary.15.tgz#9b31b900af7c845fd921b1b990d538db86046149" + integrity sha512-yJ1FwB/n7CElP/kFiDy7SH57CzhiJriVoJ5GZMyCE0aWzvXQybS4seVzvA/UsFHws6K9saPkYW2cTKh83Dw7cQ== -"@next/swc-darwin-arm64@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.7-canary.11.tgz#88fdca64c42315c1dac42a76c6bff81634220d32" - integrity sha512-6/Su5oahAV2D7CZ6uCQe+X5fznKnWMtIpSOxMgxIA+XHW/yfgX7vFmuGJVzsrZH/X2UbomhPko2MJQwY0nUKTQ== +"@next/swc-darwin-arm64@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.7-canary.15.tgz#75b78c96f66818d034c0f65355f7f7c424bca136" + integrity sha512-ALRavRzeVwQmVmuv4pPOnSH0iVoQ7FBZMVEdu3qf8qoHDzxl1GXqSI5r4riZekNTF4FIh322a1iQOp+mQioP4Q== -"@next/swc-darwin-x64@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.7-canary.11.tgz#9e7dd8f05a4a93a4a1abc4d6a7777e27a7bf9231" - integrity sha512-7vCAogxFfh9WGTatx8IUe1Pv9s8rkBnXulHBDbzjBnIvK506mzn1nhl+Eso2cyKwwFZPQRRhv37k+SVfyUPO3w== +"@next/swc-darwin-x64@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.7-canary.15.tgz#4ddf9e972568c7c30f0b212d227e7223ba93e288" + integrity sha512-gvPguKBAfv7ZOKqa5ByQLzryJ3b8tdG9MZjGntOrwgQhPBM3T3I8rP5cjL4qqmEtSra4yVy9JVg6DGkdldq//g== -"@next/swc-freebsd-x64@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.1.7-canary.11.tgz#540ff0f44158d5ce0bb45d77cdda6cb527757c87" - integrity sha512-U9ox8nhJnzf4S6592YO5zm7iHtJQafORY0wRwBIFMUuLsFdFlSjiErRq8lyBKhuEaZHSs03DJnbSzu0pq3uxPQ== +"@next/swc-freebsd-x64@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.1.7-canary.15.tgz#7c00b5de70e1beacca0e550deaddff9aecbec475" + integrity sha512-0ADi3r9mLzxlNPIyJR53ggBhNKoqF56cBQqvnz/3Uviy5Z9Y7cSGvMdOKe+pLQN5IWoBOyz3BN+Bbm006w1Wug== -"@next/swc-linux-arm-gnueabihf@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.7-canary.11.tgz#5fbf4e584c88e8b088209e9f79585abd30dbc6b3" - integrity sha512-5wGtU31etIvnzvtdbnaGvHal75Wu0RfHkiNjsnbBh2OHvew57Kn4r9wc1/k7o21VtgDHZIpNq7vjCzaxaSIQTA== +"@next/swc-linux-arm-gnueabihf@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.7-canary.15.tgz#7f79e68231d1a60fbacea30142c961b5bed844f3" + integrity sha512-j6fPwUacCpcmKgEG5Ko7X18LNU/Mg2x9t65r/hyCbrAnQMy9PhTjgjFzMkQ8xSxZzfVkCwRuMdx38ZDB3b21Mg== -"@next/swc-linux-arm64-gnu@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.7-canary.11.tgz#38ffce775f8e085892d949b6187ded3075c2113d" - integrity sha512-ZUAY6idIRv0lz/e5jHMe40tEQMULQO6Bpse94QsKELuATAnO9MW8+u2BC0dYOJjIunZlg/qGYla0GWvquOo6KA== +"@next/swc-linux-arm64-gnu@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.7-canary.15.tgz#20ffc9c6ddf68ce4cb28c48baaf1c7ba056db1e6" + integrity sha512-osie8a8YQeSLDTEZM0BsfMvwL7yaKnye9SOL7KUGS8Jz3D2jZgxKBDnBfxVJNfMmvQ1wdlezTKIidHBGmSKJjA== -"@next/swc-linux-arm64-musl@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.7-canary.11.tgz#d3d6ef84edaaaf62f91bd105b09296503a848eaf" - integrity sha512-xeXdmVW9zYgrlOZGJ/QtUA1+K4bX/P36hgj8m+o8/OShv8XU3DPrO9tsXq9ycdsAD+Baq0f/juHa8h6mafo0Hg== +"@next/swc-linux-arm64-musl@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.7-canary.15.tgz#031ca248322e33a637a266ec641aef5a9d5d63b6" + integrity sha512-lkWW4jRbzvWWpX2tshCk6qjV6OTbWmBXXwj1YEiJyh6p1eBmz/jwQstw2ilKndiScugMxZ0f5+ULJviNFb97fQ== -"@next/swc-linux-x64-gnu@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.7-canary.11.tgz#b77197832a9d1e556ebc9168f1b2e2a6e4e90994" - integrity sha512-ip6tLXXL39ryvI65ZbEugLBcdjxxSWh8zfwcM0n/eVeacL3MssePi978XFH8Qmm3LkA5lwr47htcS7g4S+RqKg== +"@next/swc-linux-x64-gnu@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.7-canary.15.tgz#36ec43b1607f4231edadea856571881378472e2f" + integrity sha512-2OVUNtNBREdT+HymjMQOXU8uxKnKjzrY4hYaWOqI97d86GF0IcGB4755G4Wk/UEzocVz/TiKgcrVDj0aAsetUA== -"@next/swc-linux-x64-musl@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.7-canary.11.tgz#fe977822a9d5b2ca71ae2a524b96531c06fac7d7" - integrity sha512-WLZJVsNFUHM0CyUU6GW6HX432JbABK2dNRooablRQa7anT0yjCMAanDCoPvK9EPkEk5Ns6W4nHVS8wSMmgFrEw== +"@next/swc-linux-x64-musl@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.7-canary.15.tgz#d352b281feab79c3dc7f001ede403cd9e0e286fc" + integrity sha512-Yw0XKTUc1YuvXrvr/uTl7uDqqZ/uvx2d7U5yyN1Obghz9y5jozj0OgLOzVdLlLPHVMOb8luCMXAASxnxQmjd2g== -"@next/swc-win32-arm64-msvc@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.7-canary.11.tgz#87c28b399388150f03a5a5ffb5bbbbb9b1d1c5e1" - integrity sha512-E1BQGnR/H3mER5UMmUOmzjCMTp1GKUwj1KEtdiO1R1TWPOchNW1O5bkaecnuIDQF1SbBpEJ8UeWvGCwU280vTQ== +"@next/swc-win32-arm64-msvc@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.7-canary.15.tgz#4b284357660a4804439898b159794b438b36d0ba" + integrity sha512-lmnmfeloEmhCz8bd83qkKJ9aeNr9ChDKcSLf0omPBO5jcaodwvEx/JwNmrdSoRFdKzxc6R8fQrAVbAPhOyREsA== -"@next/swc-win32-ia32-msvc@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.7-canary.11.tgz#3c7ff3d7831c4ef30051969c8bde0b794980ef6b" - integrity sha512-3mWv4iLFJpR9toOeyrxG00eS5a+r2wUpZqcfAKDe5G4i1pyOtkvbUxxo21Z2uSycLeiVgVEhlwPFoM09oy+H6w== +"@next/swc-win32-ia32-msvc@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.7-canary.15.tgz#764511900c8c4b0a0c5670ab6d769b3f40923483" + integrity sha512-nkwMi520H3qYj3gIZ4l8nISLdsDkTzrckEYxJa2zWa0NoW9kZNAHWFhjSMrqxpNQgpRePmHYTrjKS6tqNKo9/Q== -"@next/swc-win32-x64-msvc@12.1.7-canary.11": - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.7-canary.11.tgz#614e6e5c13d7e3d598e87849ca091518e4b37bc6" - integrity sha512-lO6JA3hUYad3dyoABMc3/iVkkwr3vVydH6A3alwgF/2vl4dgDjA9oi5utYSq9vYDJyNwdRveKrAUm79cxGozqw== +"@next/swc-win32-x64-msvc@12.1.7-canary.15": + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.7-canary.15.tgz#784ef26ffc6644a98ff7c3c309768c9c506416a7" + integrity sha512-Tknk79Fem5SbJ1ZCP6Y77N9p+cuXGMZ2oGZ6O/mdmyaQseRTMLZiJ3gMIyfp4IUO/eUO1w/Av2ZxyhxPfhLRFw== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -1698,10 +1698,10 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/react-dom@^18.0.4": - version "18.0.4" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.4.tgz#dcbcadb277bcf6c411ceff70069424c57797d375" - integrity sha512-FgTtbqPOCI3dzZPZoC2T/sx3L34qxy99ITWn4eoSA95qPyXDMH0ALoAqUp49ITniiJFsXUVBtalh/KffMpg21Q== +"@types/react-dom@^18.0.5": + version "18.0.5" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.5.tgz#330b2d472c22f796e5531446939eacef8378444a" + integrity sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA== dependencies: "@types/react" "*" @@ -1767,14 +1767,14 @@ resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== -"@typescript-eslint/eslint-plugin@^5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.25.0.tgz#e8ce050990e4d36cc200f2de71ca0d3eb5e77a31" - integrity sha512-icYrFnUzvm+LhW0QeJNKkezBu6tJs9p/53dpPLFH8zoM9w1tfaKzVurkPotEpAqQ8Vf8uaFyL5jHd0Vs6Z0ZQg== +"@typescript-eslint/eslint-plugin@^5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.26.0.tgz#c1f98ccba9d345e38992975d3ca56ed6260643c2" + integrity sha512-oGCmo0PqnRZZndr+KwvvAUvD3kNE4AfyoGCwOZpoCncSh4MVD06JTE8XQa2u9u+NX5CsyZMBTEc2C72zx38eYA== dependencies: - "@typescript-eslint/scope-manager" "5.25.0" - "@typescript-eslint/type-utils" "5.25.0" - "@typescript-eslint/utils" "5.25.0" + "@typescript-eslint/scope-manager" "5.26.0" + "@typescript-eslint/type-utils" "5.26.0" + "@typescript-eslint/utils" "5.26.0" debug "^4.3.4" functional-red-black-tree "^1.0.1" ignore "^5.2.0" @@ -1782,69 +1782,69 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.21.0", "@typescript-eslint/parser@^5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.25.0.tgz#fb533487147b4b9efd999a4d2da0b6c263b64f7f" - integrity sha512-r3hwrOWYbNKP1nTcIw/aZoH+8bBnh/Lh1iDHoFpyG4DnCpvEdctrSl6LOo19fZbzypjQMHdajolxs6VpYoChgA== +"@typescript-eslint/parser@^5.21.0", "@typescript-eslint/parser@^5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.26.0.tgz#a61b14205fe2ab7533deb4d35e604add9a4ceee2" + integrity sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q== dependencies: - "@typescript-eslint/scope-manager" "5.25.0" - "@typescript-eslint/types" "5.25.0" - "@typescript-eslint/typescript-estree" "5.25.0" + "@typescript-eslint/scope-manager" "5.26.0" + "@typescript-eslint/types" "5.26.0" + "@typescript-eslint/typescript-estree" "5.26.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.25.0.tgz#e78f1484bca7e484c48782075219c82c6b77a09f" - integrity sha512-p4SKTFWj+2VpreUZ5xMQsBMDdQ9XdRvODKXN4EksyBjFp2YvQdLkyHqOffakYZPuWJUDNu3jVXtHALDyTv3cww== +"@typescript-eslint/scope-manager@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz#44209c7f649d1a120f0717e0e82da856e9871339" + integrity sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw== dependencies: - "@typescript-eslint/types" "5.25.0" - "@typescript-eslint/visitor-keys" "5.25.0" + "@typescript-eslint/types" "5.26.0" + "@typescript-eslint/visitor-keys" "5.26.0" -"@typescript-eslint/type-utils@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.25.0.tgz#5750d26a5db4c4d68d511611e0ada04e56f613bc" - integrity sha512-B6nb3GK3Gv1Rsb2pqalebe/RyQoyG/WDy9yhj8EE0Ikds4Xa8RR28nHz+wlt4tMZk5bnAr0f3oC8TuDAd5CPrw== +"@typescript-eslint/type-utils@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.26.0.tgz#937dee97702361744a3815c58991acf078230013" + integrity sha512-7ccbUVWGLmcRDSA1+ADkDBl5fP87EJt0fnijsMFTVHXKGduYMgienC/i3QwoVhDADUAPoytgjbZbCOMj4TY55A== dependencies: - "@typescript-eslint/utils" "5.25.0" + "@typescript-eslint/utils" "5.26.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.25.0.tgz#dee51b1855788b24a2eceeae54e4adb89b088dd8" - integrity sha512-7fWqfxr0KNHj75PFqlGX24gWjdV/FDBABXL5dyvBOWHpACGyveok8Uj4ipPX/1fGU63fBkzSIycEje4XsOxUFA== +"@typescript-eslint/types@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.26.0.tgz#cb204bb154d3c103d9cc4d225f311b08219469f3" + integrity sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA== -"@typescript-eslint/typescript-estree@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.25.0.tgz#a7ab40d32eb944e3fb5b4e3646e81b1bcdd63e00" - integrity sha512-MrPODKDych/oWs/71LCnuO7NyR681HuBly2uLnX3r5i4ME7q/yBqC4hW33kmxtuauLTM0OuBOhhkFaxCCOjEEw== +"@typescript-eslint/typescript-estree@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz#16cbceedb0011c2ed4f607255f3ee1e6e43b88c3" + integrity sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w== dependencies: - "@typescript-eslint/types" "5.25.0" - "@typescript-eslint/visitor-keys" "5.25.0" + "@typescript-eslint/types" "5.26.0" + "@typescript-eslint/visitor-keys" "5.26.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.25.0.tgz#272751fd737733294b4ab95e16c7f2d4a75c2049" - integrity sha512-qNC9bhnz/n9Kba3yI6HQgQdBLuxDoMgdjzdhSInZh6NaDnFpTUlwNGxplUFWfY260Ya0TRPvkg9dd57qxrJI9g== +"@typescript-eslint/utils@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.26.0.tgz#896b8480eb124096e99c8b240460bb4298afcfb4" + integrity sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.25.0" - "@typescript-eslint/types" "5.25.0" - "@typescript-eslint/typescript-estree" "5.25.0" + "@typescript-eslint/scope-manager" "5.26.0" + "@typescript-eslint/types" "5.26.0" + "@typescript-eslint/typescript-estree" "5.26.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.25.0.tgz#33aa5fdcc5cedb9f4c8828c6a019d58548d4474b" - integrity sha512-yd26vFgMsC4h2dgX4+LR+GeicSKIfUvZREFLf3DDjZPtqgLx5AJZr6TetMNwFP9hcKreTTeztQYBTNbNoOycwA== +"@typescript-eslint/visitor-keys@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz#7195f756e367f789c0e83035297c45b417b57f57" + integrity sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q== dependencies: - "@typescript-eslint/types" "5.25.0" + "@typescript-eslint/types" "5.26.0" eslint-visitor-keys "^3.3.0" "@xobotyi/scrollbar-width@^1.9.5": @@ -2354,22 +2354,22 @@ copy-to-clipboard@^3.3.1: toggle-selection "^1.0.6" core-js-compat@^3.21.0, core-js-compat@^3.22.1: - version "3.22.6" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.6.tgz#2e7c7a703238c168883dbf55c24bbb67503cddcb" - integrity sha512-dQ/SxlHcuiywaPIoSUCU6Fx+Mk/H5TXENqd/ZJcK85ta0ZcQkbzHwblxPeL0hF5o+NsT2uK3q9ZOG5TboiVuWw== + version "3.22.7" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.7.tgz#8359eb66ecbf726dd0cfced8e48d5e73f3224239" + integrity sha512-uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA== dependencies: browserslist "^4.20.3" semver "7.0.0" core-js-pure@^3.20.2: - version "3.22.6" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.6.tgz#463af79691fd9093e3f9548ef2e22be332814b8c" - integrity sha512-u5yG2VL6NKXz9BZHr9RAm6eWD1DTNjG7jJnJgLGR+Im0whdPcPXqwqxd+dcUrZvpvPan5KMgn/3pI+Q/aGqPOA== + version "3.22.7" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.7.tgz#f58489d9b309fa7b26486a0f70d4ec19a418084e" + integrity sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w== core-js@^3.1.3: - version "3.22.6" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.6.tgz#294dd824b4cae2c24725a36baa4a791ed00bb0de" - integrity sha512-2IGcGH00z9I4twgNWU4uGCNEsBFG1s2JudVQrgSCoVhOfwoTwQjxC8aMo9exrpTMOxvobggEpaHnGMmQY4cfBQ== + version "3.22.7" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.7.tgz#8d6c37f630f6139b8732d10f2c114c3f1d00024f" + integrity sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg== cosmiconfig@^7.0.1: version "7.0.1" @@ -2713,12 +2713,12 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-config-next@12.1.7-canary.11: - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.1.7-canary.11.tgz#728f7ddaa1dc4cb7bdc6fa58708512e467a25ff0" - integrity sha512-oezqudJp9fxww8UGCl3cq0glekM4GCZX/YQRzCJQ5ERFyaQE/0oa8G+MS9bLjLyOD8wmkbWdAkbn9FrP2ecqDQ== +eslint-config-next@12.1.7-canary.15: + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.1.7-canary.15.tgz#68180b050a4b632deb434a0bfbdcaef368fe9658" + integrity sha512-O9z015gz76HCxHVe6I/JfE9Y6k5rY8F0UgEaCrNY92mBoU+Sfbe2RFFyjTZT+eIMGZ5yTo6LO8T16O4nXTXakQ== dependencies: - "@next/eslint-plugin-next" "12.1.7-canary.11" + "@next/eslint-plugin-next" "12.1.7-canary.15" "@rushstack/eslint-patch" "^1.1.3" "@typescript-eslint/parser" "^5.21.0" eslint-import-resolver-node "^0.3.6" @@ -3897,10 +3897,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -lint-staged@^12.4.1: - version "12.4.1" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.4.1.tgz#63fa27bfc8a33515f6902f63f6670864f1fb233c" - integrity sha512-PTXgzpflrQ+pODQTG116QNB+Q6uUTDg5B5HqGvNhoQSGt8Qy+MA/6zSnR8n38+sxP5TapzeQGTvoKni0KRS8Vg== +lint-staged@^12.4.2: + version "12.4.2" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.4.2.tgz#380a5ec5a7a23caa9420972b0f98c8192afddecd" + integrity sha512-JAJGIzY/OioIUtrRePr8go6qUxij//mL+RGGoFKU3VWQRtIHgWoHizSqH0QVn2OwrbXS9Q6CICQjfj+E5qvrXg== dependencies: cli-truncate "^3.1.0" colorette "^2.0.16" @@ -4751,30 +4751,30 @@ next-transpile-modules@^9.0.0: enhanced-resolve "^5.7.0" escalade "^3.1.1" -next@12.1.7-canary.11: - version "12.1.7-canary.11" - resolved "https://registry.yarnpkg.com/next/-/next-12.1.7-canary.11.tgz#5b732cc630801db651a0a81199fe94d215e3da1c" - integrity sha512-Cv5R9a6Gx/eozBBtpYXQ6Nx7T3D9WLmMOHkTvdx4oQ9fpU2yt5mGoJzZKMwYtXzPCUc/zrY4ivdAQyTsfFg0sA== +next@12.1.7-canary.15: + version "12.1.7-canary.15" + resolved "https://registry.yarnpkg.com/next/-/next-12.1.7-canary.15.tgz#94ae85a77333c9df6fa321985e6bb1bd27ee8614" + integrity sha512-q8ndiriY3bIu06oNdI/CavdRNusvptz5gqDbXR0MvngJto4ildH0GL+uKHGgh3KJDg9o1tF7Q8x1v3pgJq4T3Q== dependencies: - "@next/env" "12.1.7-canary.11" + "@next/env" "12.1.7-canary.15" caniuse-lite "^1.0.30001332" postcss "8.4.5" styled-jsx "5.0.2" use-sync-external-store "1.1.0" optionalDependencies: - "@next/swc-android-arm-eabi" "12.1.7-canary.11" - "@next/swc-android-arm64" "12.1.7-canary.11" - "@next/swc-darwin-arm64" "12.1.7-canary.11" - "@next/swc-darwin-x64" "12.1.7-canary.11" - "@next/swc-freebsd-x64" "12.1.7-canary.11" - "@next/swc-linux-arm-gnueabihf" "12.1.7-canary.11" - "@next/swc-linux-arm64-gnu" "12.1.7-canary.11" - "@next/swc-linux-arm64-musl" "12.1.7-canary.11" - "@next/swc-linux-x64-gnu" "12.1.7-canary.11" - "@next/swc-linux-x64-musl" "12.1.7-canary.11" - "@next/swc-win32-arm64-msvc" "12.1.7-canary.11" - "@next/swc-win32-ia32-msvc" "12.1.7-canary.11" - "@next/swc-win32-x64-msvc" "12.1.7-canary.11" + "@next/swc-android-arm-eabi" "12.1.7-canary.15" + "@next/swc-android-arm64" "12.1.7-canary.15" + "@next/swc-darwin-arm64" "12.1.7-canary.15" + "@next/swc-darwin-x64" "12.1.7-canary.15" + "@next/swc-freebsd-x64" "12.1.7-canary.15" + "@next/swc-linux-arm-gnueabihf" "12.1.7-canary.15" + "@next/swc-linux-arm64-gnu" "12.1.7-canary.15" + "@next/swc-linux-arm64-musl" "12.1.7-canary.15" + "@next/swc-linux-x64-gnu" "12.1.7-canary.15" + "@next/swc-linux-x64-musl" "12.1.7-canary.15" + "@next/swc-win32-arm64-msvc" "12.1.7-canary.15" + "@next/swc-win32-ia32-msvc" "12.1.7-canary.15" + "@next/swc-win32-x64-msvc" "12.1.7-canary.15" nlcst-to-string@^2.0.0: version "2.0.4" @@ -4815,9 +4815,9 @@ node-fetch@^3.2.4: formdata-polyfill "^4.0.10" node-releases@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476" - integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ== + version "2.0.5" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666" + integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q== normalize-path@^3.0.0: version "3.0.0" @@ -6164,10 +6164,10 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -typescript@^4.6.4: - version "4.6.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" - integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== +typescript@^4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4" + integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A== uglify-js@^3.15.5: version "3.15.5"