From 4e0ca9ff4d8750c476bb773bf7009c97b5ffd2e0 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Mon, 13 Jun 2022 20:07:12 -0400 Subject: [PATCH] update `cache-control` headers --- components/VNC/VNC.tsx | 2 +- lib/config/index.js | 4 +- lib/helpers/build-feed.ts | 9 +- next.config.js | 6 +- package.json | 12 +- pages/api/hits.ts | 2 +- pages/site.webmanifest.ts | 3 +- pages/sitemap.xml.ts | 2 +- yarn.lock | 300 +++++++++++++++++++------------------- 9 files changed, 170 insertions(+), 170 deletions(-) diff --git a/components/VNC/VNC.tsx b/components/VNC/VNC.tsx index 6dbe4bf3..4a67c62c 100644 --- a/components/VNC/VNC.tsx +++ b/components/VNC/VNC.tsx @@ -54,7 +54,7 @@ const VNC = ({ server }: VNCProps) => { const [message, setMessage] = useState({ message: "", anyKey: false }); // the actual connection and virtual screen (injected by noVNC when it's ready) - const rfbRef = useRef(null); + const rfbRef = useRef(); const screenRef = useRef(null); // ends the session forcefully diff --git a/lib/config/index.js b/lib/config/index.js index 9584223b..f19ec7d1 100644 --- a/lib/config/index.js +++ b/lib/config/index.js @@ -7,9 +7,9 @@ module.exports = { timeZone: "America/New_York", // https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List baseUrl: // NOTE: no trailing slashes! - process.env.NEXT_PUBLIC_VERCEL_URL && process.env.NEXT_PUBLIC_VERCEL_ENV !== "production" + process.env.NEXT_PUBLIC_VERCEL_ENV !== "production" && process.env.NEXT_PUBLIC_VERCEL_URL !== undefined ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}` - : process.env.IS_DEV_SERVER + : process.env.IS_DEV_SERVER === true ? `http://localhost:${process.env.NEXT_DEV_PORT}` : "https://jarv.is", // fallback to production URL onionDomain: "http://jarvis2i2vp4j4tbxjogsnqdemnte5xhzyi7hziiyzxwge3hzmh57zad.onion", diff --git a/lib/helpers/build-feed.ts b/lib/helpers/build-feed.ts index 12ef9aa9..d5c930c5 100644 --- a/lib/helpers/build-feed.ts +++ b/lib/helpers/build-feed.ts @@ -47,7 +47,7 @@ export const buildFeed = async ( link: note.permalink, title: note.title, description: note.description, - image: note.image ? `${config.baseUrl}${note.image}` : "", + image: note.image && `${config.baseUrl}${note.image}`, author: [ { name: config.authorName, @@ -59,7 +59,10 @@ export const buildFeed = async ( }); // cache on edge for 12 hours by default - res.setHeader("cache-control", `s-maxage=${options.edgeCacheAge ?? 43200}, stale-while-revalidate=3600`); + res.setHeader( + "cache-control", + `public, max-age=0, s-maxage=${options.edgeCacheAge ?? 86400}, stale-while-revalidate` + ); // generates RSS by default if (options.type === "rss") { @@ -74,7 +77,7 @@ export const buildFeed = async ( res.setHeader("content-type", "application/feed+json; charset=utf-8"); res.write(feed.json1()); } else { - throw new TypeError("Invalid feed type, must be 'rss', 'atom', or 'json'."); + throw new TypeError(`Invalid feed type "${options.type}", must be "rss", "atom", or "json".`); } res.end(); diff --git a/next.config.js b/next.config.js index 20b3bb78..f0e7f9a7 100644 --- a/next.config.js +++ b/next.config.js @@ -1,7 +1,3 @@ -/** - * @typedef {import("next").NextConfig} NextConfig - */ - const path = require("path"); const { PHASE_DEVELOPMENT_SERVER } = require("next/constants"); const withPlugins = require("next-compose-plugins"); @@ -19,7 +15,7 @@ module.exports = (phase, { defaultConfig }) => { ]; /** - * @type {NextConfig} + * @type {import("next").NextConfig} */ const nextConfig = { swcMinify: true, diff --git a/package.json b/package.json index 921adc6f..17bbcb94 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@fontsource/roboto-mono": "4.5.7", "@giscus/react": "^2.0.5", "@hcaptcha/react-hcaptcha": "^1.3.1", - "@novnc/novnc": "github:novnc/noVNC#cdfb33665195eb9a73fb00feb6ebaccd1068cd50", + "@novnc/novnc": "github:novnc/novnc#cdfb33665195eb9a73fb00feb6ebaccd1068cd50", "@octokit/graphql": "^4.8.0", "@primer/octicons": "^17.3.0", "@react-spring/web": "^9.4.5", @@ -42,7 +42,7 @@ "gray-matter": "^4.0.3", "hex-to-rgba": "^2.0.1", "marked": "^4.0.17", - "next": "12.1.7-canary.35", + "next": "12.1.7-canary.37", "next-compose-plugins": "^2.2.1", "next-mdx-remote": "^4.0.3", "next-seo": "^5.4.0", @@ -75,7 +75,7 @@ }, "devDependencies": { "@jakejarvis/eslint-config": "*", - "@next/bundle-analyzer": "12.1.7-canary.35", + "@next/bundle-analyzer": "12.1.7-canary.37", "@svgr/webpack": "^6.2.1", "@types/comma-number": "^2.1.0", "@types/marked": "^4.0.3", @@ -86,11 +86,11 @@ "@types/react-is": "^17.0.3", "@types/remove-markdown": "^0.3.1", "@types/uglify-js": "^3.16.0", - "@typescript-eslint/eslint-plugin": "^5.27.1", - "@typescript-eslint/parser": "^5.27.1", + "@typescript-eslint/eslint-plugin": "^5.28.0", + "@typescript-eslint/parser": "^5.28.0", "cross-env": "^7.0.3", "eslint": "~8.17.0", - "eslint-config-next": "12.1.7-canary.35", + "eslint-config-next": "12.1.7-canary.37", "eslint-config-prettier": "~8.5.0", "eslint-plugin-mdx": "~1.17.0", "eslint-plugin-prettier": "~4.0.0", diff --git a/pages/api/hits.ts b/pages/api/hits.ts index 195ca193..4856609b 100644 --- a/pages/api/hits.ts +++ b/pages/api/hits.ts @@ -53,7 +53,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { const siteStats = await getSiteStats(client); // let Vercel edge cache results for 15 mins - res.setHeader("Cache-Control", "s-maxage=900, stale-while-revalidate=60"); + res.setHeader("Cache-Control", "public, max-age=0, s-maxage=900, stale-while-revalidate"); // return in JSON format return res.status(200).json(siteStats); diff --git a/pages/site.webmanifest.ts b/pages/site.webmanifest.ts index 8a741293..28172f4c 100644 --- a/pages/site.webmanifest.ts +++ b/pages/site.webmanifest.ts @@ -42,7 +42,8 @@ export const getServerSideProps: GetServerSideProps = async (context) => { // https://developer.mozilla.org/en-US/docs/Web/Manifest#deploying_a_manifest res.setHeader("content-type", "application/manifest+json; charset=utf-8"); // cache on edge for one week - res.setHeader("cache-control", "s-maxage=604800, stale-while-revalidate=86400"); + res.setHeader("cache-control", "public, max-age=0, s-maxage=604800, stale-while-revalidate"); + res.write(JSON.stringify(manifest)); res.end(); diff --git a/pages/sitemap.xml.ts b/pages/sitemap.xml.ts index 48c82d85..7771c7b3 100644 --- a/pages/sitemap.xml.ts +++ b/pages/sitemap.xml.ts @@ -57,7 +57,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => { // cache on edge for 12 hours const { res } = context; - res.setHeader("cache-control", "s-maxage=43200, stale-while-revalidate=3600"); + res.setHeader("cache-control", "public, max-age=0, s-maxage=43200, stale-while-revalidate"); res.setHeader("content-type", "application/xml; charset=utf-8"); // finally write the resulting XML diff --git a/yarn.lock b/yarn.lock index 860743e6..74d67f04 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1175,89 +1175,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.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-12.1.7-canary.35.tgz#1e59ad526317a5bb002fc51cc4e93bcba7b973ef" - integrity sha512-URf+x6Tx2591IS6Rw6Uu6Bs5sH5gDvUWI0MxyuqVLYVEJmyZeP5zmcoMZUsSUJtgkBPLrJHZxDuBsF6UEdq6yw== +"@next/bundle-analyzer@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-12.1.7-canary.37.tgz#2669c269c11a82d3ff55d3377d8d917ab45994a8" + integrity sha512-dR+N5CBz1/C/hTBc4JbKgnUWVvn1PjTy8hra9JK/N0kXPXUdHk6Dh6Y1DMkrDQizlUqLKvvTRF40902Aa0hyrw== dependencies: webpack-bundle-analyzer "4.3.0" -"@next/env@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/env/-/env-12.1.7-canary.35.tgz#d1f9f18c9fe60f7ed401f26707be3ce25b5bdefc" - integrity sha512-VEIm6aJ1myB1poiDwGm4DxTqvM+xRIvBgZbC6PWN5oICaHw8IJ0M9u5HZTvO2U6qBbDQ2LeWtJGWxdwpF2qa3w== +"@next/env@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/env/-/env-12.1.7-canary.37.tgz#ecf58b3291a32157ee8f4b22f94758af33d948fc" + integrity sha512-qsI07oEgs0rmwimWh7oi0hLxd2ms0Iu5+a78GHGtVYV3n9U0MkeKKPzrqMgIolVzmqAXZfpLxYf2HpTNebhLMQ== -"@next/eslint-plugin-next@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.1.7-canary.35.tgz#121a452ae54edf66e7f8a31ad75fee215d8d4c16" - integrity sha512-qn2m8gBzYKNTmIC6WxTsKY+CLxW7tC+QIv4OUB1Xd7/z68omCyCcMG0N2/JcIwaMi66U0aLqzBJycduOZlnN7g== +"@next/eslint-plugin-next@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.1.7-canary.37.tgz#17fa7e1f6ac2884199c49053b8d5db52427694c5" + integrity sha512-1Z6emN2+JnHDEGk1nQT1yw8evjaLS38MjbcBzhwPgTJ7T3lONbeNbIBiHEAYNZIwsfSwO6RFk+XXdFwtxcH/7g== dependencies: glob "7.1.7" -"@next/swc-android-arm-eabi@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.1.7-canary.35.tgz#e522c73a03a05a4c5aa937fed38f8e0366802a81" - integrity sha512-G+dXNV2Mz+cQ3Rh5HdKGpZyNEIaRubwaILj0nEPtFEsgWtS1rE+aLblTuQ5tgo7+pl0wY2K+r9wMmVqPxdQo5w== +"@next/swc-android-arm-eabi@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.1.7-canary.37.tgz#410740f2013d45b4fd6017665d450450d4ec73ca" + integrity sha512-dve1j5koImZtSj+Cd3YrX8WZT4SUOW5BlJhYEFgbUfhXpDRLXZ2zFI9Qr0oXiuh+aFA0GEycKOOg1O5fKKcd4g== -"@next/swc-android-arm64@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.1.7-canary.35.tgz#91fa25005385e145b5498ec55b2655e25b750033" - integrity sha512-u9kjhUewCe7V8zA0yMY10GXF8RjxKKUskfaZfOFsh6drOCLCtoTrd96v4kNGGVnhWOUaCFVCOJwiAyAKRAPMhg== +"@next/swc-android-arm64@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.1.7-canary.37.tgz#1e9edde33ef1eb3a060e2941a470a502b3eadaa5" + integrity sha512-jJdq+gxXh7D8YsK14tQVotnlZfn2yyeNAsJLeKpVhROcikC1QATOleG91Zzlq7yHZ/I5BqC9Bt9cDVxQ/EP6+Q== -"@next/swc-darwin-arm64@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.7-canary.35.tgz#f26b5f87a41e1e9799988fb2e6f02c6cb836171f" - integrity sha512-NbhPQXEWcik91HKbwM5J2YnuWwu330NzNBRgkEZI+16qQ5wiwQwEah2pzzffFw9Mn1A/dvk5zaov77LkrJd2fA== +"@next/swc-darwin-arm64@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.7-canary.37.tgz#e492ccd16a4a8d3157e149f6965816c451222462" + integrity sha512-eBNOvpy8iigNo/Z2gfvyWrXoK2Etdpnhw1aki+qZyOsB136f8rttf/blrnXb0x+m4Lfxg7QM8vXnGVdpCnc+Ng== -"@next/swc-darwin-x64@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.7-canary.35.tgz#053c196b01ea38cd30bb3ade089847f6a857f387" - integrity sha512-0bB51FlR7BNSOM8q6RAoKcwuWGhEpgNuANs+Vg2BAN8EKCcjwC0Ur0xoTJ5759b4hamS5277wlnYkPBXutMmMg== +"@next/swc-darwin-x64@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.7-canary.37.tgz#5e22bcf766835a229229a01f9953b9a4e1a90ded" + integrity sha512-rDAaqNyKgmoM5r4FfM+6QWbKLWaQdTR9WjQC/rnUvvSHij+MxQvjs2JpxVEiiJIGJZs5eT9HntflIeJ0QQwrrA== -"@next/swc-freebsd-x64@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.1.7-canary.35.tgz#c743d75b08b56400f134ae5e048c037068126db7" - integrity sha512-flFFvttXdkob+ujuE4VaxS0LRfGojrJHwQQPCwZcsyPhJnFALkF3P+LO1Odq7CP2rJmURi5kC8/AloM3A8cI0w== +"@next/swc-freebsd-x64@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.1.7-canary.37.tgz#fdb5f745e432059c55961aca1a1f47a96cdeee2e" + integrity sha512-yMvB8GXZv/21uPrnm3OD4mEdxuWtRA0zkjRC3ewHNh85GZu5AFBq4+EZgiZO/iE9/as6E6zSLHpOMyMkurgLJw== -"@next/swc-linux-arm-gnueabihf@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.7-canary.35.tgz#9025aa46ade144531cf12579970dad1ebb61fb8c" - integrity sha512-gkiaKLLBD24oJBQGjP23vREPdly4oj5AHlkD8oy/ItjBO1sWf5uKNgZQIfkP3GNLZAqvRyTKuA9fQr/E9m9Nww== +"@next/swc-linux-arm-gnueabihf@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.7-canary.37.tgz#2e51cc32ddf5854fde008267c3a82cea7729e506" + integrity sha512-yFycoyHPP1fxuZGHwt5TbVVHZ2u3qDTKr1Jn5JhpRZlzMFT5joQFwgxCRWlRPapLn8g5fQ4Q7w0wKeU8fDa7gQ== -"@next/swc-linux-arm64-gnu@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.7-canary.35.tgz#a077d6793de30333e685e0523d7d76d89ee53bc4" - integrity sha512-q9lC4+FWI+e/km8Se9LMrOL4wOcrpbbqI41GK2wOZVOw1G/sop8XdT/xuAwhFU1pCVli5gH4qo0ngtmwgJ9jQw== +"@next/swc-linux-arm64-gnu@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.7-canary.37.tgz#7a1caa0d4732458005112e76d6d673826dab6141" + integrity sha512-VQX7Rp320kJ/ukqcz4Wmm+TtYameAoTcVhOOfu6eI0foe4Y6gfAYBGskTj2qV086EmzWo6NWaTm8mm6bJ0Qa0A== -"@next/swc-linux-arm64-musl@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.7-canary.35.tgz#667c827294d37aae0ca556534ed52d2b5725115d" - integrity sha512-TqGZ/ALFhcWFI8LR+6eLqtusgjeu00hInKLZE1i3PhJbZ4j3XyiqjAwSgz5cT+i091bTlVqH4YWSrQ4Bn9n6QA== +"@next/swc-linux-arm64-musl@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.7-canary.37.tgz#7fd506ceca3b5afd00d4a7babb331e3d7ef8fbf9" + integrity sha512-n3ky82Hn61g8qeWBJc41Zqj56gkTumca9IXeQygtwfoVkg9vx7ePvdfPpcQqruwPCDczEOVjH7qX26dbQDoOpw== -"@next/swc-linux-x64-gnu@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.7-canary.35.tgz#177b2f6118846b29969736b493d220752a0bc497" - integrity sha512-85KQWz4PBd7DFOfbXAuPpNM8LLWDSgCJotjt7GyB+DqwUgKRxNqzOcXc+9JdJTtBxUEetY7tbPKwIiQBDu0q9Q== +"@next/swc-linux-x64-gnu@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.7-canary.37.tgz#e085d3fd0b36d536a270eca1c223acb359ca41d7" + integrity sha512-00XSrx8D7uWFmrZ/5uciZ97+NcjEBh6U4Wl02AfnaqdttxbwwtFL8qpLg1kOVX6CAIU+TdMnr4Uft3gA4SBJFg== -"@next/swc-linux-x64-musl@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.7-canary.35.tgz#51f6aa7f96fc4c275404f3962a8dcea4bcc92eb7" - integrity sha512-OgYamBLjoGP70cvNNINevxcHd8phe78UkiVOEByDhW/vu4ccUIUU9UsyanQngfob+Gt1vRpiPwwDeDt6ALvLrg== +"@next/swc-linux-x64-musl@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.7-canary.37.tgz#a215cbf56fa67e9d253aae6d0b6ab0f1d1445524" + integrity sha512-zubfADMDZBNr9uMeyqMlhrwooIQXhyQd4bAbIJfa27Q2Kw6xXhaawKIs/p09iOgbWtwIy+jG8ydhrEqNYejarg== -"@next/swc-win32-arm64-msvc@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.7-canary.35.tgz#ad43acdba2ee0557b6e63732a0cd302c082181c3" - integrity sha512-hf6Jxgu+iakdMIWKVCqxrKkFNUNc54vgFxZOLK6nBNntB6ox9tQ0vcNrZB9+ZI1V0rTIioLkbvNcdfz3/H06LQ== +"@next/swc-win32-arm64-msvc@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.7-canary.37.tgz#f740528c404050e9722ad33e075152709afa83b3" + integrity sha512-aEL5eDZiGgpldf5g0OeWCpXbfPKBtHfrLSy9qMmzIHk6bLguIx/EigUiA0euASoAhdn17ACslktXaztTnZQYXA== -"@next/swc-win32-ia32-msvc@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.7-canary.35.tgz#2da599014114cd1cfb7e0f3be9ed91cb370f2040" - integrity sha512-GV6YKSeLbXLRC4DHItsvvZkBdxebNYW5pEKd9TGbA9ZRT102vrfr2DM8s34ghSiRK/uHPZMyCLLAaD2owU20+g== +"@next/swc-win32-ia32-msvc@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.7-canary.37.tgz#f64dcf0937b0800a9d5b6a457303ee75ba9240ae" + integrity sha512-0uLMbkO/tCOwnx/PC9gEswL2F8231d/pxqKL1wyM3YivcCUAjzWzxcOPOEfTo6dFzXnjNvXUw7paEGAjC3+nnw== -"@next/swc-win32-x64-msvc@12.1.7-canary.35": - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.7-canary.35.tgz#12529d4a3f7d854926e02baaa752387afdf81555" - integrity sha512-V2uCEFJMWSMw0u0Wcir+cvFloigY+52z4EpJHAoaFRb53iTMwKLbpZ6CPh3D/mobH9PsRyjxPjCxIcTDv9MT8Q== +"@next/swc-win32-x64-msvc@12.1.7-canary.37": + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.7-canary.37.tgz#230c1bc11df5e2b422aaeda9541a22ee84d40d8e" + integrity sha512-aXMPBTDC07ynA54e7qiuBtuM5XmwBYYK5i9qIzBBtqUg3GNxPBZOpYTdPxwyMoyRm8GYzqKuvBpFsDLgFOTckg== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -1280,9 +1280,9 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@novnc/novnc@github:novnc/noVNC#cdfb33665195eb9a73fb00feb6ebaccd1068cd50": +"@novnc/novnc@github:novnc/novnc#cdfb33665195eb9a73fb00feb6ebaccd1068cd50": version "1.3.0" - resolved "https://codeload.github.com/novnc/noVNC/tar.gz/cdfb33665195eb9a73fb00feb6ebaccd1068cd50" + resolved "https://codeload.github.com/novnc/novnc/tar.gz/cdfb33665195eb9a73fb00feb6ebaccd1068cd50" "@octokit/endpoint@^6.0.1": version "6.0.12" @@ -1754,14 +1754,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.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.1.tgz#fdf59c905354139046b41b3ed95d1609913d0758" - integrity sha512-6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw== +"@typescript-eslint/eslint-plugin@^5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.28.0.tgz#6204ac33bdd05ab27c7f77960f1023951115d403" + integrity sha512-DXVU6Cg29H2M6EybqSg2A+x8DgO9TCUBRp4QEXQHJceLS7ogVDP0g3Lkg/SZCqcvkAP/RruuQqK0gdlkgmhSUA== dependencies: - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/type-utils" "5.27.1" - "@typescript-eslint/utils" "5.27.1" + "@typescript-eslint/scope-manager" "5.28.0" + "@typescript-eslint/type-utils" "5.28.0" + "@typescript-eslint/utils" "5.28.0" debug "^4.3.4" functional-red-black-tree "^1.0.1" ignore "^5.2.0" @@ -1769,69 +1769,69 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.21.0", "@typescript-eslint/parser@^5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.27.1.tgz#3a4dcaa67e45e0427b6ca7bb7165122c8b569639" - integrity sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ== +"@typescript-eslint/parser@^5.21.0", "@typescript-eslint/parser@^5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.28.0.tgz#639b101cad2bfb7ae16e69710ac95c42bd4eae33" + integrity sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA== dependencies: - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/typescript-estree" "5.27.1" + "@typescript-eslint/scope-manager" "5.28.0" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/typescript-estree" "5.28.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.27.1.tgz#4d1504392d01fe5f76f4a5825991ec78b7b7894d" - integrity sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg== +"@typescript-eslint/scope-manager@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.28.0.tgz#ef9a5c68fecde72fd2ff8a84b9c120324826c1b9" + integrity sha512-LeBLTqF/he1Z+boRhSqnso6YrzcKMTQ8bO/YKEe+6+O/JGof9M0g3IJlIsqfrK/6K03MlFIlycbf1uQR1IjE+w== dependencies: - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/visitor-keys" "5.27.1" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/visitor-keys" "5.28.0" -"@typescript-eslint/type-utils@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.27.1.tgz#369f695199f74c1876e395ebea202582eb1d4166" - integrity sha512-+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw== +"@typescript-eslint/type-utils@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.28.0.tgz#53ccc78fdcf0205ef544d843b84104c0e9c7ca8e" + integrity sha512-SyKjKh4CXPglueyC6ceAFytjYWMoPHMswPQae236zqe1YbhvCVQyIawesYywGiu98L9DwrxsBN69vGIVxJ4mQQ== dependencies: - "@typescript-eslint/utils" "5.27.1" + "@typescript-eslint/utils" "5.28.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.27.1.tgz#34e3e629501349d38be6ae97841298c03a6ffbf1" - integrity sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg== +"@typescript-eslint/types@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.28.0.tgz#cffd9bcdce28db6daaa146e48a0be4387a6f4e9d" + integrity sha512-2OOm8ZTOQxqkPbf+DAo8oc16sDlVR5owgJfKheBkxBKg1vAfw2JsSofH9+16VPlN9PWtv8Wzhklkqw3k/zCVxA== -"@typescript-eslint/typescript-estree@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.1.tgz#7621ee78607331821c16fffc21fc7a452d7bc808" - integrity sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw== +"@typescript-eslint/typescript-estree@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.28.0.tgz#3487d158d091ca2772b285e67412ff6d9797d863" + integrity sha512-9GX+GfpV+F4hdTtYc6OV9ZkyYilGXPmQpm6AThInpBmKJEyRSIjORJd1G9+bknb7OTFYL+Vd4FBJAO6T78OVqA== dependencies: - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/visitor-keys" "5.27.1" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/visitor-keys" "5.28.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.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.27.1.tgz#b4678b68a94bc3b85bf08f243812a6868ac5128f" - integrity sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w== +"@typescript-eslint/utils@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.28.0.tgz#b27a136eac300a48160b36d2aad0da44a1341b99" + integrity sha512-E60N5L0fjv7iPJV3UGc4EC+A3Lcj4jle9zzR0gW7vXhflO7/J29kwiTGITA2RlrmPokKiZbBy2DgaclCaEUs6g== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/typescript-estree" "5.27.1" + "@typescript-eslint/scope-manager" "5.28.0" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/typescript-estree" "5.28.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.1.tgz#05a62666f2a89769dac2e6baa48f74e8472983af" - integrity sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ== +"@typescript-eslint/visitor-keys@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.28.0.tgz#982bb226b763c48fc1859a60de33fbf939d40a0f" + integrity sha512-BtfP1vCor8cWacovzzPFOoeW4kBQxzmhxGoOpt0v1SFvG+nJ0cWaVdJk7cky1ArTcFHHKNIxyo2LLr3oNkSuXA== dependencies: - "@typescript-eslint/types" "5.27.1" + "@typescript-eslint/types" "5.28.0" eslint-visitor-keys "^3.3.0" "@xobotyi/scrollbar-width@^1.9.5": @@ -2106,7 +2106,7 @@ braces@^3.0.2: dependencies: fill-range "^7.0.1" -browserslist@^4.20.2, browserslist@^4.20.3: +browserslist@^4.20.2, browserslist@^4.20.4: version "4.20.4" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477" integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw== @@ -2341,22 +2341,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.8" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.8.tgz#46fa34ce1ddf742acd7f95f575f66bbb21e05d62" - integrity sha512-pQnwg4xtuvc2Bs/5zYQPaEYYSuTxsF7LBWF0SvnVhthZo/Qe+rJpcEekrdNK5DWwDJ0gv0oI9NNX5Mppdy0ctg== + version "3.23.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.0.tgz#324191a23bfbd229802718dcc1d213414b244624" + integrity sha512-i4FgbtahOArZBEteiL+czI5N/bp17w16bXmLagGThdA2zuX1a5X4HbBmOVD7ERRtk3wMtPOFEmlXpVV4lsvwNw== dependencies: - browserslist "^4.20.3" + browserslist "^4.20.4" semver "7.0.0" core-js-pure@^3.20.2: - version "3.22.8" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.8.tgz#f2157793b58719196ccf9673cc14f3683adc0957" - integrity sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w== + version "3.23.0" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.23.0.tgz#f27426a6144a37484cfc5fd8b56eecc5180cd393" + integrity sha512-ksjJc/xVTQzT2q6trPja2qWynMEaGO36rDui2SiqLPYab9TmPgT8nIVcre/yscviPCSweUdCDGKe4MsQA9w1zQ== core-js@^3.1.3: - version "3.22.8" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.8.tgz#23f860b1fe60797cc4f704d76c93fea8a2f60631" - integrity sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA== + version "3.23.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.0.tgz#9e33448c8fd3b02ad023d85bd6e85da6335b5cc4" + integrity sha512-v2/hZoRcRrvQiBoGsHwmRdr+S4oICKcjA6xb2qjVurin6TpcDC1X2CIDa8rdu/d5n8RT/Sdoos2IlnpQ1rXs5A== cosmiconfig@^7.0.1: version "7.0.1" @@ -2584,9 +2584,9 @@ eastasianwidth@^0.2.0: integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== electron-to-chromium@^1.4.147: - version "1.4.152" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.152.tgz#7dedbe8f3dc1c597088982a203f392e60f7ee90a" - integrity sha512-jk4Ju5SGZAQQJ1iI4Rgru7dDlvkQPLpNPWH9gIZmwCD4YteA5Bbk1xPcPDUf5jUYs3e1e80RXdi8XgKQZaigeg== + version "1.4.153" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.153.tgz#7ed324c039745629041169221ba8dec653146f37" + integrity sha512-57AV9DNW1R52HjOqnGOCCTLHMHItLTGu/WjB1KYIa4BQ7p0u8J0j8N78akPcOBStKE801xcMjTpmbAylflfIYQ== emoji-regex@^8.0.0: version "8.0.0" @@ -2695,12 +2695,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.35: - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.1.7-canary.35.tgz#762e6fddb66695fdc797214c53ca724e23761288" - integrity sha512-j5QKtheZlGVFaXv9J0tt4vew4dJVXCzn2jsv5bvX1amMYG83gw76dGQ3gJgg6S2P5tZCCTneO5i7a+BD5szShA== +eslint-config-next@12.1.7-canary.37: + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.1.7-canary.37.tgz#56debe98561c5533802cc44e1dce9be34ff9f653" + integrity sha512-EnozfVWK6h9166nyhzjtUWaGhrb4vDzUXS3q3I9n2Q1HS5Wl1wgeVhVECGvecsMv2fVNOL8bmIFNOGbKH070Aw== dependencies: - "@next/eslint-plugin-next" "12.1.7-canary.35" + "@next/eslint-plugin-next" "12.1.7-canary.37" "@rushstack/eslint-patch" "^1.1.3" "@typescript-eslint/parser" "^5.21.0" eslint-import-resolver-node "^0.3.6" @@ -4712,31 +4712,31 @@ next-transpile-modules@^9.0.0: enhanced-resolve "^5.7.0" escalade "^3.1.1" -next@12.1.7-canary.35: - version "12.1.7-canary.35" - resolved "https://registry.yarnpkg.com/next/-/next-12.1.7-canary.35.tgz#d54d595ea1d4e3b4285d4f1895eac2fd35dc9fd3" - integrity sha512-6g6XJDVLv+WDtiSBMzlnpPZYyhzDchHPJOh8PTdwADwWjsGn2gAWLwktjHQweEqC31qhEB5FPXQoAQB9GbuxZw== +next@12.1.7-canary.37: + version "12.1.7-canary.37" + resolved "https://registry.yarnpkg.com/next/-/next-12.1.7-canary.37.tgz#b2de41f03d295d4b37a306a28da069691af8c71c" + integrity sha512-Se0/bxFhEx6JGSxRIkfNNAjvtuW+gPgy/cpVK1fyvY9I0xSTOxDtNxbXm2bCqfvoLKRzIcG0G5AsmrfkJ4+UBg== dependencies: - "@next/env" "12.1.7-canary.35" + "@next/env" "12.1.7-canary.37" "@swc/helpers" "0.3.17" 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.35" - "@next/swc-android-arm64" "12.1.7-canary.35" - "@next/swc-darwin-arm64" "12.1.7-canary.35" - "@next/swc-darwin-x64" "12.1.7-canary.35" - "@next/swc-freebsd-x64" "12.1.7-canary.35" - "@next/swc-linux-arm-gnueabihf" "12.1.7-canary.35" - "@next/swc-linux-arm64-gnu" "12.1.7-canary.35" - "@next/swc-linux-arm64-musl" "12.1.7-canary.35" - "@next/swc-linux-x64-gnu" "12.1.7-canary.35" - "@next/swc-linux-x64-musl" "12.1.7-canary.35" - "@next/swc-win32-arm64-msvc" "12.1.7-canary.35" - "@next/swc-win32-ia32-msvc" "12.1.7-canary.35" - "@next/swc-win32-x64-msvc" "12.1.7-canary.35" + "@next/swc-android-arm-eabi" "12.1.7-canary.37" + "@next/swc-android-arm64" "12.1.7-canary.37" + "@next/swc-darwin-arm64" "12.1.7-canary.37" + "@next/swc-darwin-x64" "12.1.7-canary.37" + "@next/swc-freebsd-x64" "12.1.7-canary.37" + "@next/swc-linux-arm-gnueabihf" "12.1.7-canary.37" + "@next/swc-linux-arm64-gnu" "12.1.7-canary.37" + "@next/swc-linux-arm64-musl" "12.1.7-canary.37" + "@next/swc-linux-x64-gnu" "12.1.7-canary.37" + "@next/swc-linux-x64-musl" "12.1.7-canary.37" + "@next/swc-win32-arm64-msvc" "12.1.7-canary.37" + "@next/swc-win32-ia32-msvc" "12.1.7-canary.37" + "@next/swc-win32-x64-msvc" "12.1.7-canary.37" nlcst-to-string@^2.0.0: version "2.0.4"