From 17c074b20222b7d9491905b808ec387ca58d9b96 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Thu, 4 May 2023 13:03:52 +0100 Subject: [PATCH 01/11] chore: update middleware changeset (#6986) --- .changeset/pretty-bears-deliver.md | 44 +++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/.changeset/pretty-bears-deliver.md b/.changeset/pretty-bears-deliver.md index 2b8bfc818..7be41ec06 100644 --- a/.changeset/pretty-bears-deliver.md +++ b/.changeset/pretty-bears-deliver.md @@ -2,4 +2,46 @@ 'astro': minor --- -New middleware API +Implements a new experimental middleware in Astro. + +The middleware is available under the following experimental flag: + +```js +export default defineConfig({ + experimental: { + middleware: true + } +}) +``` + +Or via CLI, using the new argument `--experimental-middleware`. + +Create a file called `middleware.{js,ts}` inside the `src` folder, and +export a `onRequest` function. + +From `astro/middleware`, use the `defineMiddleware` utility to take advantage of type-safety, and use +the `sequence` utility to chain multiple middleware functions. + +Example: + +```ts +import {defineMiddleware, sequence} from "astro/middleware"; + +const redirects = defineMiddleware((context, next) => { + if (context.request.url.endsWith("/old-url")) { + return context.redirect("/new-url") + } + return next(); +}); + +const minify = defineMiddleware(async (context, next) => { + const repsonse = await next(); + const minifiedHtml = await minifyHtml(response.text()); + return new Response(minifiedHtml, { + status: 200, + headers: response.headers + }); +}) + +export const onRequest = sequence(redirects, minify); +``` From dfb9e4270a7c05c292a549777408278fcbe162ab Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Thu, 4 May 2023 07:00:28 -0700 Subject: [PATCH 02/11] [ci] update lockfile (#6962) Co-authored-by: FredKSchott --- pnpm-lock.yaml | 1140 +++++++++++++++++++++++++----------------------- 1 file changed, 599 insertions(+), 541 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 83629c310..ade97c2da 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -193,7 +193,7 @@ importers: version: link:../../packages/astro preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -257,7 +257,7 @@ importers: version: link:../../packages/astro preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -269,7 +269,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.37 version: 3.2.40 @@ -281,13 +281,13 @@ importers: version: link:../../packages/integrations/preact '@preact/signals': specifier: ^1.1.0 - version: 1.1.1(preact@10.11.0) + version: 1.1.1(preact@10.13.2) astro: specifier: ^2.3.2 version: link:../../packages/astro preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 examples/framework-react: dependencies: @@ -332,7 +332,7 @@ importers: version: link:../../packages/astro svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 examples/framework-vue: dependencies: @@ -419,7 +419,7 @@ importers: version: 7.2.1 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 unocss: specifier: ^0.15.6 version: 0.15.6 @@ -482,7 +482,7 @@ importers: version: link:../../packages/astro preact: specifier: ^10.6.5 - version: 10.11.0 + version: 10.13.2 examples/with-nanostores: dependencies: @@ -491,7 +491,7 @@ importers: version: link:../../packages/integrations/preact '@nanostores/preact': specifier: ^0.1.3 - version: 0.1.3(nanostores@0.5.12)(preact@10.11.0) + version: 0.1.3(nanostores@0.5.12)(preact@10.13.2) astro: specifier: ^2.3.2 version: link:../../packages/astro @@ -500,7 +500,7 @@ importers: version: 0.5.12 preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 examples/with-tailwindcss: dependencies: @@ -896,7 +896,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/e2e/fixtures/astro-envs: dependencies: @@ -914,7 +914,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -926,7 +926,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.37 version: 3.2.40 @@ -972,7 +972,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/e2e/fixtures/error-sass: dependencies: @@ -1005,7 +1005,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -1017,7 +1017,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.50.1 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.39 version: 3.2.40 @@ -1032,7 +1032,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/e2e/fixtures/invalidate-script-deps: devDependencies: @@ -1065,7 +1065,7 @@ importers: version: 2.7.0 preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -1077,7 +1077,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.37 version: 3.2.40 @@ -1108,7 +1108,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 devDependencies: '@astrojs/mdx': specifier: workspace:* @@ -1124,7 +1124,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -1136,7 +1136,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.37 version: 3.2.40 @@ -1164,7 +1164,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -1176,7 +1176,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.37 version: 3.2.40 @@ -1204,7 +1204,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -1216,7 +1216,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.37 version: 3.2.40 @@ -1244,7 +1244,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -1256,7 +1256,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.37 version: 3.2.40 @@ -1284,7 +1284,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -1296,7 +1296,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.37 version: 3.2.40 @@ -1324,7 +1324,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -1336,7 +1336,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.36 version: 3.2.40 @@ -1392,7 +1392,7 @@ importers: version: link:../../.. preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 packages/astro/e2e/fixtures/preact-component: dependencies: @@ -1407,7 +1407,7 @@ importers: version: link:../../.. preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 packages/astro/e2e/fixtures/react-component: dependencies: @@ -1481,7 +1481,7 @@ importers: version: link:../../.. svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 packages/astro/e2e/fixtures/tailwindcss: dependencies: @@ -1661,7 +1661,7 @@ importers: version: 18.2.0(react@18.2.0) svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.39 version: 3.2.40 @@ -1676,7 +1676,7 @@ importers: version: link:../../.. svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 packages/astro/test/fixtures/alias-tsconfig: dependencies: @@ -1691,7 +1691,7 @@ importers: version: link:../../.. svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 packages/astro/test/fixtures/alias-tsconfig/deps/namespace-package: {} @@ -1759,7 +1759,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/astro-check-errors: dependencies: @@ -1795,10 +1795,10 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.39 version: 3.2.40 @@ -1831,7 +1831,7 @@ importers: version: 18.2.0(react@18.2.0) svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 packages/astro/test/fixtures/astro-client-only/pkg: {} @@ -1917,7 +1917,7 @@ importers: version: 18.2.0(react@18.2.0) svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 packages/astro/test/fixtures/astro-envs: dependencies: @@ -1941,7 +1941,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/astro-external-files: dependencies: @@ -1959,7 +1959,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/astro-generator: dependencies: @@ -2175,7 +2175,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/astro-slots: dependencies: @@ -2208,7 +2208,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/build-assets: dependencies: @@ -2220,7 +2220,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/client-address: dependencies: @@ -2268,7 +2268,7 @@ importers: dependencies: preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.2.0 version: 18.2.0 @@ -2549,7 +2549,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/error-bad-js: dependencies: @@ -2585,10 +2585,10 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.39 version: 3.2.40 @@ -2663,7 +2663,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/import-ts-with-js: dependencies: @@ -2702,7 +2702,7 @@ importers: dependencies: preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -2714,7 +2714,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.36 version: 3.2.40 @@ -2857,7 +2857,7 @@ importers: version: 1.5.6 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.39 version: 3.2.40 @@ -2879,7 +2879,7 @@ importers: version: link:../../.. preact: specifier: ^10.10.1 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/preact-compat-component/packages/react-lib: dependencies: @@ -2894,13 +2894,13 @@ importers: version: link:../../../../integrations/preact '@preact/signals': specifier: 1.1.1 - version: 1.1.1(preact@10.11.0) + version: 1.1.1(preact@10.13.2) astro: specifier: workspace:* version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/public-base-404: dependencies: @@ -2976,7 +2976,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/remote-css: dependencies: @@ -3027,7 +3027,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/slots-react: dependencies: @@ -3075,7 +3075,7 @@ importers: version: link:../../.. svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 packages/astro/test/fixtures/slots-vue: dependencies: @@ -3192,7 +3192,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/ssr-hoisted-script: dependencies: @@ -3279,7 +3279,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/static-build: dependencies: @@ -3294,7 +3294,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 packages/astro/test/fixtures/static-build-code-component: dependencies: @@ -3321,7 +3321,7 @@ importers: version: link:../../.. preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 react: specifier: ^18.1.0 version: 18.2.0 @@ -3371,7 +3371,7 @@ importers: version: link:../../.. svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 packages/astro/test/fixtures/tailwindcss: dependencies: @@ -3473,7 +3473,7 @@ importers: version: link:../../.. svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 vue: specifier: ^3.2.39 version: 3.2.40 @@ -4007,7 +4007,7 @@ importers: version: 2.3.0 acorn: specifier: ^8.8.0 - version: 8.8.1 + version: 8.8.2 es-module-lexer: specifier: ^1.1.1 version: 1.1.1 @@ -4173,7 +4173,7 @@ importers: version: link:../../../../../astro preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 packages/integrations/mdx/test/fixtures/mdx-namespace: dependencies: @@ -4458,13 +4458,13 @@ importers: version: 7.17.12(@babel/core@7.18.2) '@preact/signals': specifier: ^1.1.0 - version: 1.1.1(preact@10.11.0) + version: 1.1.1(preact@10.13.2) babel-plugin-module-resolver: specifier: ^5.0.0 version: 5.0.0 preact-render-to-string: specifier: ^5.2.4 - version: 5.2.4(preact@10.11.0) + version: 5.2.4(preact@10.13.2) devDependencies: astro: specifier: workspace:* @@ -4474,7 +4474,7 @@ importers: version: link:../../../scripts preact: specifier: ^10.7.3 - version: 10.11.0 + version: 10.13.2 packages/integrations/prefetch: dependencies: @@ -4619,10 +4619,10 @@ importers: dependencies: '@sveltejs/vite-plugin-svelte': specifier: ^2.1.1 - version: 2.1.1(svelte@3.54.0)(vite@4.3.1) + version: 2.1.1(svelte@3.58.0)(vite@4.3.1) svelte2tsx: specifier: ^0.5.11 - version: 0.5.11(svelte@3.54.0)(typescript@5.0.2) + version: 0.5.11(svelte@3.58.0)(typescript@5.0.2) devDependencies: astro: specifier: workspace:* @@ -4632,7 +4632,7 @@ importers: version: link:../../../scripts svelte: specifier: ^3.54.0 - version: 3.54.0 + version: 3.58.0 vite: specifier: ^4.3.1 version: 4.3.1(@types/node@18.7.21)(sass@1.52.2) @@ -4755,7 +4755,7 @@ importers: version: 3.0.0(vite@4.3.1)(vue@3.2.40) '@vue/babel-plugin-jsx': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.21.4) + version: 1.1.1(@babel/core@7.21.8) '@vue/compiler-sfc': specifier: ^3.2.39 version: 3.2.39 @@ -4843,10 +4843,10 @@ importers: version: link:../../../../../astro preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 packages/markdown/component/test/fixtures/astro-markdown-plugins: dependencies: @@ -4864,7 +4864,7 @@ importers: version: 5.0.2 preact: specifier: ^10.11.0 - version: 10.11.0 + version: 10.13.2 rehype-slug: specifier: ^5.0.1 version: 5.0.1 @@ -5140,7 +5140,7 @@ importers: version: 4.1.5 svelte: specifier: ^3.48.0 - version: 3.54.0 + version: 3.58.0 tar: specifier: ^6.1.11 version: 6.1.11 @@ -5416,13 +5416,13 @@ packages: dependencies: '@astrojs/compiler': 1.4.0 '@jridgewell/trace-mapping': 0.3.18 - '@vscode/emmet-helper': 2.8.6 + '@vscode/emmet-helper': 2.8.7 events: 3.3.0 prettier: 2.8.8 prettier-plugin-astro: 0.8.0 synckit: 0.8.5 - vscode-css-languageservice: 6.2.4 - vscode-html-languageservice: 5.0.4 + vscode-css-languageservice: 6.2.5 + vscode-html-languageservice: 5.0.5 vscode-languageserver: 8.1.0 vscode-languageserver-protocol: 3.17.3 vscode-languageserver-textdocument: 1.0.8 @@ -5436,8 +5436,8 @@ packages: dependencies: '@babel/highlight': 7.18.6 - /@babel/compat-data@7.21.4: - resolution: {integrity: sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==} + /@babel/compat-data@7.21.7: + resolution: {integrity: sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==} engines: {node: '>=6.9.0'} dev: false @@ -5448,9 +5448,9 @@ packages: '@ampproject/remapping': 2.2.1 '@babel/code-frame': 7.21.4 '@babel/generator': 7.18.2 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.18.2) - '@babel/helper-module-transforms': 7.21.2 - '@babel/helpers': 7.21.0 + '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.18.2) + '@babel/helper-module-transforms': 7.21.5 + '@babel/helpers': 7.21.5 '@babel/parser': 7.18.4 '@babel/template': 7.20.7 '@babel/traverse': 7.18.2 @@ -5464,20 +5464,20 @@ packages: - supports-color dev: false - /@babel/core@7.21.4: - resolution: {integrity: sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==} + /@babel/core@7.21.8: + resolution: {integrity: sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 '@babel/code-frame': 7.21.4 - '@babel/generator': 7.21.4 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4) - '@babel/helper-module-transforms': 7.21.2 - '@babel/helpers': 7.21.0 - '@babel/parser': 7.21.4 + '@babel/generator': 7.21.5 + '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) + '@babel/helper-module-transforms': 7.21.5 + '@babel/helpers': 7.21.5 + '@babel/parser': 7.21.8 '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 + '@babel/traverse': 7.21.5 + '@babel/types': 7.21.5 convert-source-map: 1.9.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -5496,11 +5496,11 @@ packages: jsesc: 2.5.2 dev: false - /@babel/generator@7.21.4: - resolution: {integrity: sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==} + /@babel/generator@7.21.5: + resolution: {integrity: sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.18 jsesc: 2.5.2 @@ -5510,19 +5510,18 @@ packages: resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false - /@babel/helper-builder-binary-assignment-operator-visitor@7.18.9: - resolution: {integrity: sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==} + /@babel/helper-builder-binary-assignment-operator-visitor@7.21.5: + resolution: {integrity: sha512-uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-explode-assignable-expression': 7.18.6 - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false - /@babel/helper-compilation-targets@7.21.4(@babel/core@7.18.2): - resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==} + /@babel/helper-compilation-targets@7.21.5(@babel/core@7.18.2): + resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -5530,7 +5529,7 @@ packages: '@babel/core': optional: true dependencies: - '@babel/compat-data': 7.21.4 + '@babel/compat-data': 7.21.7 '@babel/core': 7.18.2 '@babel/helper-validator-option': 7.21.0 browserslist: 4.21.5 @@ -5538,8 +5537,8 @@ packages: semver: 6.3.0 dev: false - /@babel/helper-compilation-targets@7.21.4(@babel/core@7.21.4): - resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==} + /@babel/helper-compilation-targets@7.21.5(@babel/core@7.21.8): + resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -5547,16 +5546,16 @@ packages: '@babel/core': optional: true dependencies: - '@babel/compat-data': 7.21.4 - '@babel/core': 7.21.4 + '@babel/compat-data': 7.21.7 + '@babel/core': 7.21.8 '@babel/helper-validator-option': 7.21.0 browserslist: 4.21.5 lru-cache: 5.1.1 semver: 6.3.0 dev: false - /@babel/helper-create-class-features-plugin@7.21.4(@babel/core@7.18.2): - resolution: {integrity: sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==} + /@babel/helper-create-class-features-plugin@7.21.8(@babel/core@7.18.2): + resolution: {integrity: sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -5566,19 +5565,20 @@ packages: dependencies: '@babel/core': 7.18.2 '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-environment-visitor': 7.21.5 '@babel/helper-function-name': 7.21.0 - '@babel/helper-member-expression-to-functions': 7.21.0 + '@babel/helper-member-expression-to-functions': 7.21.5 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-replace-supers': 7.20.7 + '@babel/helper-replace-supers': 7.21.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 '@babel/helper-split-export-declaration': 7.18.6 + semver: 6.3.0 transitivePeerDependencies: - supports-color dev: false - /@babel/helper-create-class-features-plugin@7.21.4(@babel/core@7.21.4): - resolution: {integrity: sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==} + /@babel/helper-create-class-features-plugin@7.21.8(@babel/core@7.21.8): + resolution: {integrity: sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -5586,21 +5586,22 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.4 + '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-environment-visitor': 7.21.5 '@babel/helper-function-name': 7.21.0 - '@babel/helper-member-expression-to-functions': 7.21.0 + '@babel/helper-member-expression-to-functions': 7.21.5 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-replace-supers': 7.20.7 + '@babel/helper-replace-supers': 7.21.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 '@babel/helper-split-export-declaration': 7.18.6 + semver: 6.3.0 transitivePeerDependencies: - supports-color dev: false - /@babel/helper-create-regexp-features-plugin@7.21.4(@babel/core@7.18.2): - resolution: {integrity: sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==} + /@babel/helper-create-regexp-features-plugin@7.21.8(@babel/core@7.18.2): + resolution: {integrity: sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -5611,6 +5612,7 @@ packages: '@babel/core': 7.18.2 '@babel/helper-annotate-as-pure': 7.18.6 regexpu-core: 5.3.2 + semver: 6.3.0 dev: false /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.18.2): @@ -5622,8 +5624,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 debug: 4.3.4 lodash.debounce: 4.0.8 resolve: 1.22.2 @@ -5632,38 +5634,31 @@ packages: - supports-color dev: false - /@babel/helper-environment-visitor@7.18.9: - resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==} + /@babel/helper-environment-visitor@7.21.5: + resolution: {integrity: sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==} engines: {node: '>=6.9.0'} dev: false - /@babel/helper-explode-assignable-expression@7.18.6: - resolution: {integrity: sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.21.4 - dev: false - /@babel/helper-function-name@7.21.0: resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.20.7 - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false /@babel/helper-hoist-variables@7.18.6: resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false - /@babel/helper-member-expression-to-functions@7.21.0: - resolution: {integrity: sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==} + /@babel/helper-member-expression-to-functions@7.21.5: + resolution: {integrity: sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false /@babel/helper-module-imports@7.16.0: @@ -5677,21 +5672,21 @@ packages: resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false - /@babel/helper-module-transforms@7.21.2: - resolution: {integrity: sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==} + /@babel/helper-module-transforms@7.21.5: + resolution: {integrity: sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-environment-visitor': 7.21.5 '@babel/helper-module-imports': 7.21.4 - '@babel/helper-simple-access': 7.20.2 + '@babel/helper-simple-access': 7.21.5 '@babel/helper-split-export-declaration': 7.18.6 '@babel/helper-validator-identifier': 7.19.1 '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 + '@babel/traverse': 7.21.5 + '@babel/types': 7.21.5 transitivePeerDependencies: - supports-color dev: false @@ -5700,11 +5695,11 @@ packages: resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false - /@babel/helper-plugin-utils@7.20.2: - resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==} + /@babel/helper-plugin-utils@7.21.5: + resolution: {integrity: sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==} engines: {node: '>=6.9.0'} dev: false @@ -5719,50 +5714,50 @@ packages: dependencies: '@babel/core': 7.18.2 '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-environment-visitor': 7.21.5 '@babel/helper-wrap-function': 7.20.5 - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 transitivePeerDependencies: - supports-color dev: false - /@babel/helper-replace-supers@7.20.7: - resolution: {integrity: sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==} + /@babel/helper-replace-supers@7.21.5: + resolution: {integrity: sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-member-expression-to-functions': 7.21.0 + '@babel/helper-environment-visitor': 7.21.5 + '@babel/helper-member-expression-to-functions': 7.21.5 '@babel/helper-optimise-call-expression': 7.18.6 '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 + '@babel/traverse': 7.21.5 + '@babel/types': 7.21.5 transitivePeerDependencies: - supports-color dev: false - /@babel/helper-simple-access@7.20.2: - resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==} + /@babel/helper-simple-access@7.21.5: + resolution: {integrity: sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false /@babel/helper-skip-transparent-expression-wrappers@7.20.0: resolution: {integrity: sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false /@babel/helper-split-export-declaration@7.18.6: resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 dev: false - /@babel/helper-string-parser@7.19.4: - resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==} + /@babel/helper-string-parser@7.21.5: + resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==} engines: {node: '>=6.9.0'} dev: false @@ -5781,19 +5776,19 @@ packages: dependencies: '@babel/helper-function-name': 7.21.0 '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 + '@babel/traverse': 7.21.5 + '@babel/types': 7.21.5 transitivePeerDependencies: - supports-color dev: false - /@babel/helpers@7.21.0: - resolution: {integrity: sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==} + /@babel/helpers@7.21.5: + resolution: {integrity: sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 + '@babel/traverse': 7.21.5 + '@babel/types': 7.21.5 transitivePeerDependencies: - supports-color dev: false @@ -5813,8 +5808,8 @@ packages: dependencies: '@babel/types': 7.18.4 - /@babel/parser@7.21.4: - resolution: {integrity: sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==} + /@babel/parser@7.21.8: + resolution: {integrity: sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==} engines: {node: '>=6.0.0'} hasBin: true dependencies: @@ -5831,7 +5826,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.20.7(@babel/core@7.18.2): @@ -5844,7 +5839,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.18.2) dev: false @@ -5859,8 +5854,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-environment-visitor': 7.21.5 + '@babel/helper-plugin-utils': 7.21.5 '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.18.2) '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.18.2) transitivePeerDependencies: @@ -5877,8 +5872,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-create-class-features-plugin': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 transitivePeerDependencies: - supports-color dev: false @@ -5893,8 +5888,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-create-class-features-plugin': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.18.2) transitivePeerDependencies: - supports-color @@ -5910,7 +5905,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.18.2) dev: false @@ -5924,7 +5919,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.18.2) dev: false @@ -5938,7 +5933,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.18.2) dev: false @@ -5952,7 +5947,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.18.2) dev: false @@ -5966,7 +5961,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.18.2) dev: false @@ -5980,7 +5975,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.18.2) dev: false @@ -5993,10 +5988,10 @@ packages: '@babel/core': optional: true dependencies: - '@babel/compat-data': 7.21.4 + '@babel/compat-data': 7.21.7 '@babel/core': 7.18.2 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.18.2) '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.18.2) dev: false @@ -6011,7 +6006,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.18.2) dev: false @@ -6025,7 +6020,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.18.2) dev: false @@ -6040,8 +6035,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-create-class-features-plugin': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 transitivePeerDependencies: - supports-color dev: false @@ -6057,8 +6052,8 @@ packages: dependencies: '@babel/core': 7.18.2 '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-create-class-features-plugin': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.18.2) transitivePeerDependencies: - supports-color @@ -6074,8 +6069,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-create-regexp-features-plugin': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.18.2): @@ -6087,7 +6082,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.18.2): @@ -6099,7 +6094,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.18.2): @@ -6112,7 +6107,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.18.2): @@ -6124,7 +6119,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.18.2): @@ -6136,7 +6131,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.18.2): @@ -6149,7 +6144,19 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 + dev: false + + /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.18.2): + resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} + peerDependencies: + '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true + dependencies: + '@babel/core': 7.18.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.18.2): @@ -6161,7 +6168,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-jsx@7.21.4(@babel/core@7.18.2): @@ -6174,10 +6181,10 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false - /@babel/plugin-syntax-jsx@7.21.4(@babel/core@7.21.4): + /@babel/plugin-syntax-jsx@7.21.4(@babel/core@7.21.8): resolution: {integrity: sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6186,8 +6193,8 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.4 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/core': 7.21.8 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.18.2): @@ -6199,7 +6206,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.18.2): @@ -6211,7 +6218,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.18.2): @@ -6223,7 +6230,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.18.2): @@ -6235,7 +6242,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.18.2): @@ -6247,7 +6254,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.18.2): @@ -6259,7 +6266,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.18.2): @@ -6272,7 +6279,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.18.2): @@ -6285,10 +6292,10 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false - /@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.21.4): + /@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.21.8): resolution: {integrity: sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6297,12 +6304,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.4 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/core': 7.21.8 + '@babel/helper-plugin-utils': 7.21.5 dev: false - /@babel/plugin-transform-arrow-functions@7.20.7(@babel/core@7.18.2): - resolution: {integrity: sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==} + /@babel/plugin-transform-arrow-functions@7.21.5(@babel/core@7.18.2): + resolution: {integrity: sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6311,7 +6318,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.18.2): @@ -6325,7 +6332,7 @@ packages: dependencies: '@babel/core': 7.18.2 '@babel/helper-module-imports': 7.21.4 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.18.2) transitivePeerDependencies: - supports-color @@ -6341,7 +6348,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-block-scoping@7.21.0(@babel/core@7.18.2): @@ -6354,7 +6361,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-classes@7.21.0(@babel/core@7.18.2): @@ -6368,20 +6375,20 @@ packages: dependencies: '@babel/core': 7.18.2 '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.18.2) - '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.18.2) + '@babel/helper-environment-visitor': 7.21.5 '@babel/helper-function-name': 7.21.0 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-plugin-utils': 7.20.2 - '@babel/helper-replace-supers': 7.20.7 + '@babel/helper-plugin-utils': 7.21.5 + '@babel/helper-replace-supers': 7.21.5 '@babel/helper-split-export-declaration': 7.18.6 globals: 11.12.0 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-computed-properties@7.20.7(@babel/core@7.18.2): - resolution: {integrity: sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==} + /@babel/plugin-transform-computed-properties@7.21.5(@babel/core@7.18.2): + resolution: {integrity: sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6390,7 +6397,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/template': 7.20.7 dev: false @@ -6404,7 +6411,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.18.2): @@ -6417,8 +6424,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-create-regexp-features-plugin': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-duplicate-keys@7.18.9(@babel/core@7.18.2): @@ -6431,7 +6438,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.18.2): @@ -6444,12 +6451,12 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-builder-binary-assignment-operator-visitor': 7.21.5 + '@babel/helper-plugin-utils': 7.21.5 dev: false - /@babel/plugin-transform-for-of@7.21.0(@babel/core@7.18.2): - resolution: {integrity: sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==} + /@babel/plugin-transform-for-of@7.21.5(@babel/core@7.18.2): + resolution: {integrity: sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6458,7 +6465,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.18.2): @@ -6471,9 +6478,9 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.18.2) + '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.18.2) '@babel/helper-function-name': 7.21.0 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-literals@7.18.9(@babel/core@7.18.2): @@ -6486,7 +6493,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.18.2): @@ -6499,7 +6506,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-modules-amd@7.20.11(@babel/core@7.18.2): @@ -6512,14 +6519,14 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-module-transforms': 7.21.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-module-transforms': 7.21.5 + '@babel/helper-plugin-utils': 7.21.5 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-modules-commonjs@7.21.2(@babel/core@7.18.2): - resolution: {integrity: sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==} + /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.18.2): + resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6528,9 +6535,9 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-module-transforms': 7.21.2 - '@babel/helper-plugin-utils': 7.20.2 - '@babel/helper-simple-access': 7.20.2 + '@babel/helper-module-transforms': 7.21.5 + '@babel/helper-plugin-utils': 7.21.5 + '@babel/helper-simple-access': 7.21.5 transitivePeerDependencies: - supports-color dev: false @@ -6546,8 +6553,8 @@ packages: dependencies: '@babel/core': 7.18.2 '@babel/helper-hoist-variables': 7.18.6 - '@babel/helper-module-transforms': 7.21.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-module-transforms': 7.21.5 + '@babel/helper-plugin-utils': 7.21.5 '@babel/helper-validator-identifier': 7.19.1 transitivePeerDependencies: - supports-color @@ -6563,8 +6570,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-module-transforms': 7.21.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-module-transforms': 7.21.5 + '@babel/helper-plugin-utils': 7.21.5 transitivePeerDependencies: - supports-color dev: false @@ -6579,8 +6586,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-create-regexp-features-plugin': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-new-target@7.18.6(@babel/core@7.18.2): @@ -6593,7 +6600,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.18.2): @@ -6606,8 +6613,8 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 - '@babel/helper-replace-supers': 7.20.7 + '@babel/helper-plugin-utils': 7.21.5 + '@babel/helper-replace-supers': 7.21.5 transitivePeerDependencies: - supports-color dev: false @@ -6622,7 +6629,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.18.2): @@ -6635,7 +6642,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-react-jsx@7.17.12(@babel/core@7.18.2): @@ -6650,13 +6657,13 @@ packages: '@babel/core': 7.18.2 '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-module-imports': 7.21.4 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.18.2) '@babel/types': 7.18.4 dev: false - /@babel/plugin-transform-regenerator@7.20.5(@babel/core@7.18.2): - resolution: {integrity: sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==} + /@babel/plugin-transform-regenerator@7.21.5(@babel/core@7.18.2): + resolution: {integrity: sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6665,7 +6672,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 regenerator-transform: 0.15.1 dev: false @@ -6679,7 +6686,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.18.2): @@ -6692,7 +6699,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-spread@7.20.7(@babel/core@7.18.2): @@ -6705,7 +6712,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 dev: false @@ -6719,7 +6726,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.18.2): @@ -6732,7 +6739,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-typeof-symbol@7.18.9(@babel/core@7.18.2): @@ -6745,10 +6752,10 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false - /@babel/plugin-transform-typescript@7.21.3(@babel/core@7.21.4): + /@babel/plugin-transform-typescript@7.21.3(@babel/core@7.21.8): resolution: {integrity: sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6757,17 +6764,17 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.4 + '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-create-class-features-plugin': 7.21.4(@babel/core@7.21.4) - '@babel/helper-plugin-utils': 7.20.2 - '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.21.4) + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) + '@babel/helper-plugin-utils': 7.21.5 + '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.21.8) transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-unicode-escapes@7.18.10(@babel/core@7.18.2): - resolution: {integrity: sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==} + /@babel/plugin-transform-unicode-escapes@7.21.5(@babel/core@7.18.2): + resolution: {integrity: sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6776,7 +6783,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 dev: false /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.18.2): @@ -6789,12 +6796,12 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-create-regexp-features-plugin': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 dev: false - /@babel/preset-env@7.21.4(@babel/core@7.18.2): - resolution: {integrity: sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==} + /@babel/preset-env@7.21.5(@babel/core@7.18.2): + resolution: {integrity: sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6802,10 +6809,10 @@ packages: '@babel/core': optional: true dependencies: - '@babel/compat-data': 7.21.4 + '@babel/compat-data': 7.21.7 '@babel/core': 7.18.2 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.18.2) - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.18.2) + '@babel/helper-plugin-utils': 7.21.5 '@babel/helper-validator-option': 7.21.0 '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6(@babel/core@7.18.2) '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.20.7(@babel/core@7.18.2) @@ -6830,6 +6837,7 @@ packages: '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.18.2) '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.18.2) '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.18.2) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.18.2) '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.18.2) '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.18.2) '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.18.2) @@ -6839,22 +6847,22 @@ packages: '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.18.2) '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.18.2) '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.18.2) - '@babel/plugin-transform-arrow-functions': 7.20.7(@babel/core@7.18.2) + '@babel/plugin-transform-arrow-functions': 7.21.5(@babel/core@7.18.2) '@babel/plugin-transform-async-to-generator': 7.20.7(@babel/core@7.18.2) '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.18.2) '@babel/plugin-transform-classes': 7.21.0(@babel/core@7.18.2) - '@babel/plugin-transform-computed-properties': 7.20.7(@babel/core@7.18.2) + '@babel/plugin-transform-computed-properties': 7.21.5(@babel/core@7.18.2) '@babel/plugin-transform-destructuring': 7.21.3(@babel/core@7.18.2) '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-duplicate-keys': 7.18.9(@babel/core@7.18.2) '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.18.2) - '@babel/plugin-transform-for-of': 7.21.0(@babel/core@7.18.2) + '@babel/plugin-transform-for-of': 7.21.5(@babel/core@7.18.2) '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.18.2) '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.18.2) '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-modules-amd': 7.20.11(@babel/core@7.18.2) - '@babel/plugin-transform-modules-commonjs': 7.21.2(@babel/core@7.18.2) + '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.18.2) '@babel/plugin-transform-modules-systemjs': 7.20.11(@babel/core@7.18.2) '@babel/plugin-transform-modules-umd': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-named-capturing-groups-regex': 7.20.5(@babel/core@7.18.2) @@ -6862,17 +6870,17 @@ packages: '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.18.2) '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.18.2) - '@babel/plugin-transform-regenerator': 7.20.5(@babel/core@7.18.2) + '@babel/plugin-transform-regenerator': 7.21.5(@babel/core@7.18.2) '@babel/plugin-transform-reserved-words': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-spread': 7.20.7(@babel/core@7.18.2) '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.18.2) '@babel/plugin-transform-typeof-symbol': 7.18.9(@babel/core@7.18.2) - '@babel/plugin-transform-unicode-escapes': 7.18.10(@babel/core@7.18.2) + '@babel/plugin-transform-unicode-escapes': 7.21.5(@babel/core@7.18.2) '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.18.2) '@babel/preset-modules': 0.1.5(@babel/core@7.18.2) - '@babel/types': 7.21.4 + '@babel/types': 7.21.5 babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.18.2) babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.18.2) babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.18.2) @@ -6891,7 +6899,7 @@ packages: optional: true dependencies: '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.18.2) '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.18.2) '@babel/types': 7.18.4 @@ -6902,8 +6910,8 @@ packages: resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==} dev: false - /@babel/runtime@7.21.0: - resolution: {integrity: sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==} + /@babel/runtime@7.21.5: + resolution: {integrity: sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.13.11 @@ -6913,8 +6921,8 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.21.4 - '@babel/parser': 7.21.4 - '@babel/types': 7.21.4 + '@babel/parser': 7.21.8 + '@babel/types': 7.21.5 dev: false /@babel/traverse@7.18.2: @@ -6923,7 +6931,7 @@ packages: dependencies: '@babel/code-frame': 7.21.4 '@babel/generator': 7.18.2 - '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-environment-visitor': 7.21.5 '@babel/helper-function-name': 7.21.0 '@babel/helper-hoist-variables': 7.18.6 '@babel/helper-split-export-declaration': 7.18.6 @@ -6935,18 +6943,18 @@ packages: - supports-color dev: false - /@babel/traverse@7.21.4: - resolution: {integrity: sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==} + /@babel/traverse@7.21.5: + resolution: {integrity: sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.21.4 - '@babel/generator': 7.21.4 - '@babel/helper-environment-visitor': 7.18.9 + '@babel/generator': 7.21.5 + '@babel/helper-environment-visitor': 7.21.5 '@babel/helper-function-name': 7.21.0 '@babel/helper-hoist-variables': 7.18.6 '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.21.4 - '@babel/types': 7.21.4 + '@babel/parser': 7.21.8 + '@babel/types': 7.21.5 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: @@ -6960,11 +6968,11 @@ packages: '@babel/helper-validator-identifier': 7.19.1 to-fast-properties: 2.0.0 - /@babel/types@7.21.4: - resolution: {integrity: sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==} + /@babel/types@7.21.5: + resolution: {integrity: sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-string-parser': 7.19.4 + '@babel/helper-string-parser': 7.21.5 '@babel/helper-validator-identifier': 7.19.1 to-fast-properties: 2.0.0 dev: false @@ -6977,7 +6985,7 @@ packages: /@changesets/apply-release-plan@6.1.3: resolution: {integrity: sha512-ECDNeoc3nfeAe1jqJb5aFQX7CqzQhD2klXRez2JDb/aVpGUbX673HgKrnrgJRuQR/9f2TtLoYIzrGB9qwD77mg==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/config': 2.3.0 '@changesets/get-version-range-type': 0.3.2 '@changesets/git': 2.0.0 @@ -6995,7 +7003,7 @@ packages: /@changesets/assemble-release-plan@5.2.3: resolution: {integrity: sha512-g7EVZCmnWz3zMBAdrcKhid4hkHT+Ft1n0mLussFMcB1dE2zCuwcvGoy9ec3yOgPGF4hoMtgHaMIk3T3TBdvU9g==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/errors': 0.1.4 '@changesets/get-dependents-graph': 1.3.5 '@changesets/types': 5.2.1 @@ -7023,7 +7031,7 @@ packages: resolution: {integrity: sha512-XnTa+b51vt057fyAudvDKGB0Sh72xutQZNAdXkCqPBKO2zvs2yYZx5hFZj1u9cbtpwM6Sxtcr02/FQJfZOzemQ==} hasBin: true dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/apply-release-plan': 6.1.3 '@changesets/assemble-release-plan': 5.2.3 '@changesets/changelog-git': 0.1.14 @@ -7099,7 +7107,7 @@ packages: /@changesets/get-release-plan@3.0.16: resolution: {integrity: sha512-OpP9QILpBp1bY2YNIKFzwigKh7Qe9KizRsZomzLe6pK8IUo8onkAAVUD8+JRKSr8R7d4+JRuQrfSSNlEwKyPYg==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/assemble-release-plan': 5.2.3 '@changesets/config': 2.3.0 '@changesets/pre': 1.0.14 @@ -7115,7 +7123,7 @@ packages: /@changesets/git@2.0.0: resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/errors': 0.1.4 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 @@ -7140,7 +7148,7 @@ packages: /@changesets/pre@1.0.14: resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/errors': 0.1.4 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 @@ -7150,7 +7158,7 @@ packages: /@changesets/read@0.5.9: resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/git': 2.0.0 '@changesets/logger': 0.0.5 '@changesets/parse': 0.3.16 @@ -7171,7 +7179,7 @@ packages: /@changesets/write@0.2.3: resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/types': 5.2.1 fs-extra: 7.0.1 human-id: 1.0.2 @@ -7197,9 +7205,9 @@ packages: peerDependencies: postcss: ^8.2 dependencies: - '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.11) + '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.12) postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /@csstools/postcss-color-function@1.1.1(postcss@8.4.23): @@ -7250,9 +7258,9 @@ packages: peerDependencies: postcss: ^8.2 dependencies: - '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.11) + '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.12) postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /@csstools/postcss-normalize-display-values@1.0.1(postcss@8.4.23): @@ -7315,13 +7323,13 @@ packages: postcss: 8.4.23 dev: true - /@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.0.11): + /@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.0.12): resolution: {integrity: sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss-selector-parser: ^6.0.10 dependencies: - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /@deno/shim-deno-test@0.3.3: @@ -7361,20 +7369,20 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /@emmetio/abbreviation@2.3.1: - resolution: {integrity: sha512-QXgYlXZGprqb6aCBJPPWVBN/Jb69khJF73GGJkOk//PoMgSbPGuaHn1hCRolctnzlBHjCIC6Om97Pw46/1A23g==} + /@emmetio/abbreviation@2.3.2: + resolution: {integrity: sha512-8vqkn4rtjm5Zv34RPgsq3/ij88ri+IcfC2MxPELytrQvfpaLyppscE0YSwDVuIUR6KL5GCBUfr5Mo7SHSbswpA==} dependencies: - '@emmetio/scanner': 1.0.2 + '@emmetio/scanner': 1.0.3 dev: false - /@emmetio/css-abbreviation@2.1.6: - resolution: {integrity: sha512-bvuPogt0OvwcILRg+ZD/oej1H72xwOhUDPWOmhCWLJrZZ8bMTazsWnvw8a8noaaVqUhOE9PsC0tYgGVv5N7fsw==} + /@emmetio/css-abbreviation@2.1.7: + resolution: {integrity: sha512-nrOt3/QROjYYK1cMjoO5fCfHIf0hFpcZeQQt7Ew6ixZ0ElEEs77ijnY57HC6ti91W/mn+c1T7ET8sClBMRHHBg==} dependencies: - '@emmetio/scanner': 1.0.2 + '@emmetio/scanner': 1.0.3 dev: false - /@emmetio/scanner@1.0.2: - resolution: {integrity: sha512-1ESCGgXRgn1r29hRmz8K0G4Ywr5jDWezMgRnICComBCWmg3znLWU8+tmakuM1og1Vn4W/sauvlABl/oq2pve8w==} + /@emmetio/scanner@1.0.3: + resolution: {integrity: sha512-/EFyTijquAwKMGSBd50RnjxsfDXmZAFp71PGu7sM6LEnEJXMV+FKL7Rvr6YLu4czQmPVRsfyhcbQz+WZnM4AZw==} dev: false /@esbuild-plugins/node-globals-polyfill@0.1.1(esbuild@0.14.47): @@ -7599,8 +7607,8 @@ packages: eslint-visitor-keys: 3.4.0 dev: true - /@eslint-community/regexpp@4.5.0: - resolution: {integrity: sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==} + /@eslint-community/regexpp@4.5.1: + resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: true @@ -7669,7 +7677,7 @@ packages: '@antfu/utils': 0.5.2 '@iconify/types': 1.1.0 debug: 4.3.4 - kolorist: 1.7.0 + kolorist: 1.8.0 local-pkg: 0.4.3 transitivePeerDependencies: - supports-color @@ -7719,7 +7727,7 @@ packages: dependencies: '@lit/reactive-element': 1.6.1 lit: 2.7.0 - lit-html: 2.7.2 + lit-html: 2.7.3 dev: false /@lit-labs/ssr-dom-shim@1.1.0: @@ -7733,11 +7741,11 @@ packages: '@lit-labs/ssr-dom-shim': 1.1.0 '@lit/reactive-element': 1.6.1 '@parse5/tools': 0.1.0 - '@types/node': 16.18.23 - enhanced-resolve: 5.12.0 + '@types/node': 16.18.25 + enhanced-resolve: 5.13.0 lit: 2.7.0 - lit-element: 3.3.1 - lit-html: 2.7.2 + lit-element: 3.3.2 + lit-html: 2.7.3 node-fetch: 3.3.1 parse5: 7.1.2 dev: false @@ -7754,7 +7762,7 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -7763,7 +7771,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -7782,7 +7790,7 @@ packages: nopt: 5.0.0 npmlog: 5.0.1 rimraf: 3.0.2 - semver: 7.5.0 + semver: 7.3.8 tar: 6.1.11 transitivePeerDependencies: - encoding @@ -7808,7 +7816,7 @@ packages: resolution: {integrity: sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA==} dependencies: '@types/estree-jsx': 1.0.0 - '@types/mdx': 2.0.4 + '@types/mdx': 2.0.5 estree-util-build-jsx: 2.2.2 estree-util-is-identifier-name: 2.1.0 estree-util-to-js: 1.2.0 @@ -8015,7 +8023,7 @@ packages: - utf-8-validate dev: true - /@nanostores/preact@0.1.3(nanostores@0.5.12)(preact@10.11.0): + /@nanostores/preact@0.1.3(nanostores@0.5.12)(preact@10.13.2): resolution: {integrity: sha512-uiX1ned0LrzASot+sPUjyJzr8Js3pX075omazgsSdLf0zPp4ss8xwTiuNh5FSKigTSQEVqZFiS+W8CnHIrX62A==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} peerDependencies: @@ -8023,7 +8031,7 @@ packages: preact: '>=10.0.0' dependencies: nanostores: 0.5.12 - preact: 10.11.0 + preact: 10.13.2 dev: false /@netlify/edge-functions@2.0.0: @@ -8095,7 +8103,7 @@ packages: resolution: {integrity: sha512-/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA==} engines: {node: '>= 14'} dependencies: - '@octokit/types': 9.0.0 + '@octokit/types': 9.2.0 dev: true /@octokit/core@3.6.0: @@ -8134,8 +8142,8 @@ packages: resolution: {integrity: sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==} dev: true - /@octokit/openapi-types@16.0.0: - resolution: {integrity: sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA==} + /@octokit/openapi-types@17.1.0: + resolution: {integrity: sha512-rnI26BAITDZTo5vqFOmA7oX4xRd18rO+gcK4MiTpJmsRMxAw0JmevNjPsjpry1bb9SVNo56P/0kbiyXXa4QluA==} dev: true /@octokit/plugin-paginate-rest@2.21.3(@octokit/core@3.6.0): @@ -8184,10 +8192,10 @@ packages: '@octokit/openapi-types': 12.11.0 dev: true - /@octokit/types@9.0.0: - resolution: {integrity: sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==} + /@octokit/types@9.2.0: + resolution: {integrity: sha512-xySzJG4noWrIBFyMu4lg4tu9vAgNg9S0aoLRONhAEz6ueyi1evBzb40HitIosaYS4XOexphG305IVcLrIX/30g==} dependencies: - '@octokit/openapi-types': 16.0.0 + '@octokit/openapi-types': 17.1.0 dev: true /@parse5/tools@0.1.0: @@ -8196,15 +8204,15 @@ packages: parse5: 7.1.2 dev: false - /@pkgr/utils@2.3.1: - resolution: {integrity: sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==} + /@pkgr/utils@2.4.0: + resolution: {integrity: sha512-2OCURAmRtdlL8iUDTypMrrxfwe8frXTeXaxGsVOaYtc/wrUyk8Z/0OBetM7cdlsy7ZFWlMX72VogKeh+A4Xcjw==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} dependencies: cross-spawn: 7.0.3 + fast-glob: 3.2.12 is-glob: 4.0.3 - open: 8.4.2 + open: 9.1.0 picocolors: 1.0.0 - tiny-glob: 0.2.9 tslib: 2.5.0 /@playwright/test@1.29.2: @@ -8224,13 +8232,13 @@ packages: resolution: {integrity: sha512-M+M3ZOtd1dtV/uasyk4SZu1vbfEJ4NeENv0F7F12nijZYedB5wSgbtZcuACyssnTznhF4ctUyrR0dZHuHfyWKA==} dev: false - /@preact/signals@1.1.1(preact@10.11.0): + /@preact/signals@1.1.1(preact@10.13.2): resolution: {integrity: sha512-I1DhYo2d1t9qDkEq1jYDVTQdBGmo4NlqatNEtulsS/87kVdwhZluP6TTDS4/5sc2h86TlBF6UA6LO+tDpIt/Gw==} peerDependencies: preact: 10.x dependencies: '@preact/signals-core': 1.3.0 - preact: 10.11.0 + preact: 10.13.2 dev: false /@proload/core@0.3.3: @@ -8408,7 +8416,7 @@ packages: string.prototype.matchall: 4.0.8 dev: false - /@sveltejs/vite-plugin-svelte@2.1.1(svelte@3.54.0)(vite@4.3.1): + /@sveltejs/vite-plugin-svelte@2.1.1(svelte@3.58.0)(vite@4.3.1): resolution: {integrity: sha512-7YeBDt4us0FiIMNsVXxyaP4Hwyn2/v9x3oqStkHU3ZdIc5O22pGwUwH33wUqYo+7Itdmo8zxJ45Qvfm3H7UUjQ==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -8422,8 +8430,8 @@ packages: deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.0 - svelte: 3.54.0 - svelte-hmr: 0.15.1(svelte@3.54.0) + svelte: 3.58.0 + svelte-hmr: 0.15.1(svelte@3.58.0) vite: 4.3.1(@types/node@18.7.21)(sass@1.52.2) vitefu: 0.2.4(vite@4.3.1) transitivePeerDependencies: @@ -8443,7 +8451,7 @@ packages: /@ts-morph/common@0.16.0: resolution: {integrity: sha512-SgJpzkTgZKLKqQniCjLaE3c2L2sdL7UShvmTmPBejAKd2OKV/yfMpQ2IWpAuA+VY5wy7PkSUaEObIqEK6afFuw==} dependencies: - fast-glob: 3.2.12 + fast-glob: 3.2.11 minimatch: 5.1.6 mkdirp: 1.0.4 path-browserify: 1.0.1 @@ -8641,8 +8649,8 @@ packages: dev: false optional: true - /@types/mdx@2.0.4: - resolution: {integrity: sha512-qCYrNdpKwN6YO6FVnx+ulfqifKlE3lQGsNhvDaW9Oxzyob/cRLBJWow8GHBBD4NxQ7BVvtsATgLsX0vZAWmtrg==} + /@types/mdx@2.0.5: + resolution: {integrity: sha512-76CqzuD6Q7LC+AtbPqrvD9AqsN0k8bsYo2bM2J8pmNldP1aIPAbzUQ7QbobyXL4eLr1wK5x8FZFe8eF/ubRuBg==} dev: false /@types/mime@1.3.2: @@ -8682,8 +8690,8 @@ packages: resolution: {integrity: sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==} dev: true - /@types/node@16.18.23: - resolution: {integrity: sha512-XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g==} + /@types/node@16.18.25: + resolution: {integrity: sha512-rUDO6s9Q/El1R1I21HG4qw/LstTHCPO/oQNAwI/4b2f9EWvMnqt4d3HJwPMawfZ3UvodB8516Yg+VAq54YM+eA==} dev: false /@types/node@17.0.45: @@ -8840,7 +8848,7 @@ packages: typescript: optional: true dependencies: - '@eslint-community/regexpp': 4.5.0 + '@eslint-community/regexpp': 4.5.1 '@typescript-eslint/parser': 5.58.0(eslint@8.38.0)(typescript@5.0.2) '@typescript-eslint/scope-manager': 5.58.0 '@typescript-eslint/type-utils': 5.58.0(eslint@8.38.0)(typescript@5.0.2) @@ -8924,7 +8932,7 @@ packages: debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.5.0 + semver: 7.3.8 tsutils: 3.21.0(typescript@5.0.2) typescript: 5.0.2 transitivePeerDependencies: @@ -8945,7 +8953,7 @@ packages: '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.2) eslint: 8.38.0 eslint-scope: 5.1.1 - semver: 7.5.0 + semver: 7.3.8 transitivePeerDependencies: - supports-color - typescript @@ -9002,9 +9010,9 @@ packages: '@unocss/preset-uno': 0.15.6 cac: 6.7.14 chokidar: 3.5.3 - colorette: 2.0.19 + colorette: 2.0.20 consola: 2.15.3 - fast-glob: 3.2.12 + fast-glob: 3.2.11 pathe: 0.2.0 dev: false @@ -9121,9 +9129,9 @@ packages: vite: optional: true dependencies: - '@babel/core': 7.21.4 - '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.21.4) - '@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.21.4) + '@babel/core': 7.21.8 + '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.21.8) + '@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.21.8) vite: 4.3.1(@types/node@18.7.21)(sass@1.52.2) vue: 3.2.40 transitivePeerDependencies: @@ -9144,29 +9152,29 @@ packages: vue: 3.2.40 dev: false - /@vscode/emmet-helper@2.8.6: - resolution: {integrity: sha512-IIB8jbiKy37zN8bAIHx59YmnIelY78CGHtThnibD/d3tQOKRY83bYVi9blwmZVUZh6l9nfkYH3tvReaiNxY9EQ==} + /@vscode/emmet-helper@2.8.7: + resolution: {integrity: sha512-y67wWaWBhlWKMX3FNOXcMPh83+xS31IqobBP6vi3HkMRxv14Bti3xgu+ya/c3oKZ0OM/QMvO+oBCwGWqbPv7Rw==} dependencies: - emmet: 2.4.2 + emmet: 2.4.3 jsonc-parser: 2.3.1 vscode-languageserver-textdocument: 1.0.8 vscode-languageserver-types: 3.17.3 vscode-uri: 2.1.2 dev: false - /@vscode/l10n@0.0.11: - resolution: {integrity: sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA==} + /@vscode/l10n@0.0.13: + resolution: {integrity: sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ==} dev: false /@vue/babel-helper-vue-transform-on@1.0.2: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: false - /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.21.4): + /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.21.8): resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: '@babel/helper-module-imports': 7.21.4 - '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.4) + '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.8) '@babel/template': 7.20.7 '@babel/traverse': 7.18.2 '@babel/types': 7.18.4 @@ -9374,12 +9382,6 @@ packages: hasBin: true dev: true - /acorn@8.8.1: - resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==} - engines: {node: '>=0.4.0'} - hasBin: true - dev: false - /acorn@8.8.2: resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} engines: {node: '>=0.4.0'} @@ -9648,7 +9650,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.5 - caniuse-lite: 1.0.30001478 + caniuse-lite: 1.0.30001482 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -9668,7 +9670,7 @@ packages: optional: true dependencies: '@babel/helper-module-imports': 7.16.0 - '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.4) + '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.8) '@babel/types': 7.18.4 html-entities: 2.3.2 dev: false @@ -9680,7 +9682,7 @@ packages: find-babel-config: 2.0.0 glob: 8.1.0 pkg-up: 3.1.0 - reselect: 4.1.7 + reselect: 4.1.8 resolve: 1.22.2 dev: false @@ -9692,7 +9694,7 @@ packages: '@babel/core': optional: true dependencies: - '@babel/compat-data': 7.21.4 + '@babel/compat-data': 7.21.7 '@babel/core': 7.18.2 '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.18.2) semver: 6.3.0 @@ -9761,6 +9763,10 @@ packages: is-windows: 1.0.2 dev: true + /big-integer@1.6.51: + resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==} + engines: {node: '>=0.6'} + /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} @@ -9821,6 +9827,12 @@ packages: wrap-ansi: 8.1.0 dev: false + /bplist-parser@0.2.0: + resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==} + engines: {node: '>= 5.10.0'} + dependencies: + big-integer: 1.6.51 + /brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -9856,10 +9868,10 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001478 - electron-to-chromium: 1.4.363 + caniuse-lite: 1.0.30001482 + electron-to-chromium: 1.4.382 node-releases: 2.0.10 - update-browserslist-db: 1.0.10(browserslist@4.21.5) + update-browserslist-db: 1.0.11(browserslist@4.21.5) /buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -9884,9 +9896,15 @@ packages: /builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} dependencies: - semver: 7.5.0 + semver: 7.3.8 dev: true + /bundle-name@3.0.0: + resolution: {integrity: sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==} + engines: {node: '>=12'} + dependencies: + run-applescript: 5.0.0 + /busboy@1.6.0: resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} engines: {node: '>=10.16.0'} @@ -9943,8 +9961,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - /caniuse-lite@1.0.30001478: - resolution: {integrity: sha512-gMhDyXGItTHipJj2ApIvR+iVB5hd0KP3svMWWXDvZOmjzJJassGLMfxRkQCSYgGd2gtdL/ReeiyvMSFD1Ss6Mw==} + /caniuse-lite@1.0.30001482: + resolution: {integrity: sha512-F1ZInsg53cegyjroxLNW9DmrEQ1SuGRTO1QlpA0o2/6OpQ0gFeDRoq1yFmnr8Sakn9qwwt9DmbxHB6w167OSuQ==} /canvas-confetti@1.5.1: resolution: {integrity: sha512-Ncz+oZJP6OvY7ti4E1slxVlyAV/3g7H7oQtcCDXgwGgARxPnwYY9PW5Oe+I8uvspYNtuHviAdgA0LfcKFWJfpg==} @@ -10043,7 +10061,7 @@ packages: css-what: 6.1.0 domelementtype: 2.3.0 domhandler: 5.0.3 - domutils: 3.0.1 + domutils: 3.1.0 dev: true /cheerio@1.0.0-rc.11: @@ -10053,7 +10071,7 @@ packages: cheerio-select: 2.1.0 dom-serializer: 2.0.0 domhandler: 5.0.3 - domutils: 3.0.1 + domutils: 3.1.0 htmlparser2: 8.0.2 parse5: 7.1.2 parse5-htmlparser2-tree-adapter: 7.0.0 @@ -10116,8 +10134,8 @@ packages: restore-cursor: 4.0.0 dev: false - /cli-spinners@2.8.0: - resolution: {integrity: sha512-/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ==} + /cli-spinners@2.9.0: + resolution: {integrity: sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==} engines: {node: '>=6'} dev: false @@ -10200,8 +10218,8 @@ packages: resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==} dev: true - /colorette@2.0.19: - resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==} + /colorette@2.0.20: + resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} dev: false /combined-stream@1.0.8: @@ -10248,14 +10266,14 @@ packages: hasBin: true dependencies: chalk: 4.1.2 - date-fns: 2.29.3 + date-fns: 2.30.0 lodash: 4.17.21 rxjs: 6.6.7 shell-quote: 1.8.1 spawn-command: 0.0.2-1 supports-color: 8.1.1 tree-kill: 1.2.2 - yargs: 17.7.1 + yargs: 17.7.2 dev: false /consola@2.15.3: @@ -10353,7 +10371,7 @@ packages: postcss: ^8.4 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /css-has-pseudo@3.0.4(postcss@8.4.23): @@ -10364,7 +10382,7 @@ packages: postcss: ^8.4 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /css-prefers-color-scheme@6.0.3(postcss@8.4.23): @@ -10383,7 +10401,7 @@ packages: boolbase: 1.0.0 css-what: 6.1.0 domhandler: 5.0.3 - domutils: 3.0.1 + domutils: 3.1.0 nth-check: 2.1.1 dev: true @@ -10471,9 +10489,11 @@ packages: resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==} dev: true - /date-fns@2.29.3: - resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==} + /date-fns@2.30.0: + resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} + dependencies: + '@babel/runtime': 7.21.5 dev: false /debug@2.6.9: @@ -10569,14 +10589,30 @@ packages: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} + /default-browser-id@3.0.0: + resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==} + engines: {node: '>=12'} + dependencies: + bplist-parser: 0.2.0 + untildify: 4.0.0 + + /default-browser@4.0.0: + resolution: {integrity: sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==} + engines: {node: '>=14.16'} + dependencies: + bundle-name: 3.0.0 + default-browser-id: 3.0.0 + execa: 7.1.1 + titleize: 3.0.0 + /defaults@1.0.4: resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} dependencies: clone: 1.0.4 - /define-lazy-prop@2.0.0: - resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} - engines: {node: '>=8'} + /define-lazy-prop@3.0.0: + resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==} + engines: {node: '>=12'} /define-properties@1.2.0: resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==} @@ -10593,14 +10629,14 @@ packages: resolution: {integrity: sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==} dev: false - /degenerator@3.0.3: - resolution: {integrity: sha512-FTq/qYMeBJACu1gHcXJvzsRBTK6aw5zWCYbEnIOyamOt5UJufWJRQ5XfDb6OuayfJWvmWAHgcZyt43vm/hbj7g==} + /degenerator@3.0.4: + resolution: {integrity: sha512-Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw==} engines: {node: '>= 6'} dependencies: ast-types: 0.13.4 escodegen: 1.14.3 esprima: 4.0.1 - vm2: 3.9.16 + vm2: 3.9.17 dev: true /del@7.0.0: @@ -10717,8 +10753,8 @@ packages: domelementtype: 2.3.0 dev: true - /domutils@3.0.1: - resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==} + /domutils@3.1.0: + resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==} dependencies: dom-serializer: 2.0.0 domelementtype: 2.3.0 @@ -10770,14 +10806,14 @@ packages: jake: 10.8.5 dev: false - /electron-to-chromium@1.4.363: - resolution: {integrity: sha512-ReX5qgmSU7ybhzMuMdlJAdYnRhT90UB3k9M05O5nF5WH3wR5wgdJjXw0uDeFyKNhmglmQiOxkAbzrP0hMKM59g==} + /electron-to-chromium@1.4.382: + resolution: {integrity: sha512-czMavlW52VIPgutbVL9JnZIZuFijzsG1ww/1z2Otu1r1q+9Qe2bTsH3My3sZarlvwyqHM6+mnZfEnt2Vr4dsIg==} - /emmet@2.4.2: - resolution: {integrity: sha512-YgmsMkhUgzhJMgH5noGudfxqrQn1bapvF0y7C1e7A0jWFImsRrrvVslzyZz0919NED/cjFOpVWx7c973V+2S/w==} + /emmet@2.4.3: + resolution: {integrity: sha512-Bq6zozVDVrLbBmKdosI9Q2DvrFh/ehwnNjgDRsvGVjPOEAhMKie9HwQnPuUi3NOZ2itVGyRwsLAdufnG9DVFwg==} dependencies: - '@emmetio/abbreviation': 2.3.1 - '@emmetio/css-abbreviation': 2.1.6 + '@emmetio/abbreviation': 2.3.2 + '@emmetio/css-abbreviation': 2.1.7 dev: false /emoji-regex@8.0.0: @@ -10797,8 +10833,8 @@ packages: dependencies: once: 1.4.0 - /enhanced-resolve@5.12.0: - resolution: {integrity: sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==} + /enhanced-resolve@5.13.0: + resolution: {integrity: sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==} engines: {node: '>=10.13.0'} dependencies: graceful-fs: 4.2.11 @@ -10856,7 +10892,7 @@ packages: object-inspect: 1.12.3 object-keys: 1.1.1 object.assign: 4.1.4 - regexp.prototype.flags: 1.4.3 + regexp.prototype.flags: 1.5.0 safe-regex-test: 1.0.0 string.prototype.trim: 1.2.7 string.prototype.trimend: 1.0.6 @@ -11453,7 +11489,7 @@ packages: hasBin: true dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.38.0) - '@eslint-community/regexpp': 4.5.0 + '@eslint-community/regexpp': 4.5.1 '@eslint/eslintrc': 2.0.2 '@eslint/js': 8.38.0 '@humanwhocodes/config-array': 0.11.8 @@ -11617,7 +11653,6 @@ packages: onetime: 5.1.2 signal-exit: 3.0.7 strip-final-newline: 2.0.0 - dev: false /execa@6.1.0: resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==} @@ -11633,6 +11668,20 @@ packages: signal-exit: 3.0.7 strip-final-newline: 3.0.0 + /execa@7.1.1: + resolution: {integrity: sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==} + engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} + dependencies: + cross-spawn: 7.0.3 + get-stream: 6.0.1 + human-signals: 4.3.1 + is-stream: 3.0.0 + merge-stream: 2.0.0 + npm-run-path: 5.1.0 + onetime: 6.0.0 + signal-exit: 3.0.7 + strip-final-newline: 3.0.0 + /expand-template@2.0.3: resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} engines: {node: '>=6'} @@ -11987,13 +12036,13 @@ packages: resolution: {integrity: sha512-KWELZn3Nxq5+0So485poHrFriK9Bn3V/x9y+wgqrHkbmnGbjfLmZ685/SVA/ovW+ewoqW0gVI47pI4yW/VNobQ==} hasBin: true dependencies: - colorette: 2.0.19 + colorette: 2.0.20 defu: 6.1.2 https-proxy-agent: 5.0.1 mri: 1.2.0 node-fetch-native: 1.1.0 pathe: 1.1.0 - tar: 6.1.13 + tar: 6.1.14 transitivePeerDependencies: - supports-color dev: false @@ -12088,7 +12137,7 @@ packages: '@types/glob': 7.2.0 array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.2.12 + fast-glob: 3.2.11 glob: 7.2.3 ignore: 5.2.4 merge2: 1.4.1 @@ -12101,7 +12150,7 @@ packages: dependencies: array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.2.12 + fast-glob: 3.2.11 ignore: 5.2.4 merge2: 1.4.1 slash: 3.0.0 @@ -12124,7 +12173,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: dir-glob: 3.0.1 - fast-glob: 3.2.12 + fast-glob: 3.2.11 ignore: 5.2.4 merge2: 1.4.1 slash: 4.0.0 @@ -12460,7 +12509,7 @@ packages: dependencies: domelementtype: 2.3.0 domhandler: 5.0.3 - domutils: 3.0.1 + domutils: 3.1.0 entities: 4.5.0 dev: true @@ -12519,12 +12568,15 @@ packages: /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} - dev: false /human-signals@3.0.1: resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==} engines: {node: '>=12.20.0'} + /human-signals@4.3.1: + resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} + engines: {node: '>=14.18.0'} + /hyperid@3.1.1: resolution: {integrity: sha512-RveV33kIksycSf7HLkq1sHB5wW0OwuX8ot8MYnY++gaaPXGFfKpBncHrAWxdpuEeRlazUMGWefwP1w6o6GaumA==} dependencies: @@ -12720,7 +12772,6 @@ packages: resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true - dev: false /is-extendable@0.1.1: resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==} @@ -12749,6 +12800,13 @@ packages: /is-hexadecimal@2.0.1: resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==} + /is-inside-container@1.0.0: + resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==} + engines: {node: '>=14.16'} + hasBin: true + dependencies: + is-docker: 3.0.0 + /is-interactive@2.0.0: resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==} engines: {node: '>=12'} @@ -12848,7 +12906,6 @@ packages: /is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} - dev: false /is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} @@ -13066,8 +13123,8 @@ packages: engines: {node: '>=0.10.0'} dev: false - /katex@0.16.4: - resolution: {integrity: sha512-WudRKUj8yyBeVDI4aYMNxhx5Vhh2PjpzQw1GRu/LVGqL4m1AxwD1GcUp0IMbdJaf5zsjtj8ghP0DOQRYhroNkw==} + /katex@0.16.7: + resolution: {integrity: sha512-Xk9C6oGKRwJTfqfIbtr0Kes9OSv6IFsuhFGc7tW4urlpMJtuh+7YhzU6YEG9n8gmWKcMAFzkp7nr+r69kV0zrA==} hasBin: true dependencies: commander: 8.3.0 @@ -13086,8 +13143,8 @@ packages: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} engines: {node: '>=6'} - /kolorist@1.7.0: - resolution: {integrity: sha512-ymToLHqL02udwVdbkowNpzjFd6UzozMtshPQKVi5k1EjKRqKqBrOnE9QbLEb0/pV76SAiIT13hdL8R6suc+f3g==} + /kolorist@1.8.0: + resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} dev: false /leven@3.1.0: @@ -13128,15 +13185,15 @@ packages: uhyphen: 0.1.0 dev: true - /lit-element@3.3.1: - resolution: {integrity: sha512-Gl+2409uXWbf7n6cCl7Kzasm7zjT9xmdwi2BhLNi70sRKAgRkqueDu5mSIH3hPYMM0/vqBCdPXod3NbGkRA2ww==} + /lit-element@3.3.2: + resolution: {integrity: sha512-xXAeVWKGr4/njq0rGC9dethMnYCq5hpKYrgQZYTzawt9YQhMiXfD+T1RgrdY3NamOxwq2aXlb0vOI6e29CKgVQ==} dependencies: '@lit-labs/ssr-dom-shim': 1.1.0 '@lit/reactive-element': 1.6.1 - lit-html: 2.7.2 + lit-html: 2.7.3 - /lit-html@2.7.2: - resolution: {integrity: sha512-ZJCfKlA2XELu5tn7XuzOziGFGvf1SeQm+ngLWoJ8bXtSkRrrR3ms6SWy+gsdxeYwySLij5xAhdd2C3EX0ftxdQ==} + /lit-html@2.7.3: + resolution: {integrity: sha512-9DyLzcn/kbRGowz2vFmSANFbRZTxYUgYYFqzie89w6GLpPUiBCDHfcdeRUV/k3Q2ueYxNjfv46yPCtKAEAPOVw==} dependencies: '@types/trusted-types': 2.0.3 @@ -13144,8 +13201,8 @@ packages: resolution: {integrity: sha512-qSy2BAVA+OiWtNptP404egcC/izDdNRw6iHGIbUmkZtbMJvPKfNsaoKrNs8Zmsbjmv5ZX2tur1l9TfzkSWWT4g==} dependencies: '@lit/reactive-element': 1.6.1 - lit-element: 3.3.1 - lit-html: 2.7.2 + lit-element: 3.3.2 + lit-html: 2.7.3 /lite-vimeo-embed@0.1.0: resolution: {integrity: sha512-XFzPdv4NaWlyaM9WpBaS5CIUkf+laIRZEXQGsBb2ZdDWkuMmnzfAZ5nriYv3a3MVx5tEEetGN0sNaUhAVRXr1g==} @@ -13657,14 +13714,13 @@ packages: micromark-util-types: 1.0.2 dev: false - /micromark-extension-gfm-autolink-literal@1.0.3: - resolution: {integrity: sha512-i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg==} + /micromark-extension-gfm-autolink-literal@1.0.4: + resolution: {integrity: sha512-WCssN+M9rUyfHN5zPBn3/f0mIA7tqArHL/EKbv3CZK+LT2rG77FEikIQEqBkv46fOqXQK4NEW/Pc7Z27gshpeg==} dependencies: micromark-util-character: 1.1.0 micromark-util-sanitize-uri: 1.1.0 micromark-util-symbol: 1.0.1 micromark-util-types: 1.0.2 - uvu: 0.5.6 dev: false /micromark-extension-gfm-footnote@1.1.0: @@ -13720,7 +13776,7 @@ packages: /micromark-extension-gfm@2.0.1: resolution: {integrity: sha512-p2sGjajLa0iYiGQdT0oelahRYtMWvLjy8J9LOCxzIQsllMCGLbsLW+Nc+N4vi02jcRJvedVJ68cjelKIO6bpDA==} dependencies: - micromark-extension-gfm-autolink-literal: 1.0.3 + micromark-extension-gfm-autolink-literal: 1.0.4 micromark-extension-gfm-footnote: 1.1.0 micromark-extension-gfm-strikethrough: 1.0.5 micromark-extension-gfm-table: 1.0.5 @@ -13734,7 +13790,7 @@ packages: resolution: {integrity: sha512-WH+fJkveMvM3ZN+deb/jT3UW623x8xO9ycfJNDC+UQXX+V72RO6hT9KqxA7c8XFwozAFJ7tufOeG+x/CVSXHUw==} dependencies: '@types/katex': 0.16.0 - katex: 0.16.4 + katex: 0.16.7 micromark-factory-space: 1.0.0 micromark-util-character: 1.1.0 micromark-util-symbol: 1.0.1 @@ -13990,7 +14046,6 @@ packages: /mimic-fn@2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} - dev: false /mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} @@ -14083,8 +14138,8 @@ packages: yallist: 4.0.0 dev: false - /minipass@4.2.8: - resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} + /minipass@5.0.0: + resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} dev: false @@ -14233,11 +14288,11 @@ packages: tslib: 2.5.0 dev: false - /node-abi@3.35.0: - resolution: {integrity: sha512-jAlSOFR1Bls963NmFwxeQkNTzqjUF0NThm8Le7eRIRGzFUVJuMOFZDLv5Y30W/Oaw+KEebEJLAigwO9gQHoEmw==} + /node-abi@3.40.0: + resolution: {integrity: sha512-zNy02qivjjRosswoYmPi8hIKJRr8MpQyeKT6qlcq/OnOgA3Rhoae+IYOqsM9V5+JnHWmxKnWOT2GxvtqdtOCXA==} engines: {node: '>=10'} dependencies: - semver: 7.5.0 + semver: 7.3.8 /node-addon-api@5.1.0: resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==} @@ -14354,7 +14409,6 @@ packages: engines: {node: '>=8'} dependencies: path-key: 3.1.1 - dev: false /npm-run-path@5.1.0: resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} @@ -14376,7 +14430,7 @@ packages: dependencies: execa: 6.1.0 parse-package-name: 1.0.0 - semver: 7.5.0 + semver: 7.3.8 validate-npm-package-name: 4.0.0 dev: true @@ -14435,7 +14489,6 @@ packages: engines: {node: '>=6'} dependencies: mimic-fn: 2.1.0 - dev: false /onetime@6.0.0: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} @@ -14451,12 +14504,13 @@ packages: which-pm-runs: 1.1.0 dev: true - /open@8.4.2: - resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} - engines: {node: '>=12'} + /open@9.1.0: + resolution: {integrity: sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==} + engines: {node: '>=14.16'} dependencies: - define-lazy-prop: 2.0.0 - is-docker: 2.2.1 + default-browser: 4.0.0 + define-lazy-prop: 3.0.0 + is-inside-container: 1.0.0 is-wsl: 2.2.0 /optionator@0.8.3: @@ -14490,7 +14544,7 @@ packages: bl: 5.1.0 chalk: 5.2.0 cli-cursor: 4.0.0 - cli-spinners: 2.8.0 + cli-spinners: 2.9.0 is-interactive: 2.0.0 is-unicode-supported: 1.3.0 log-symbols: 5.1.0 @@ -14592,7 +14646,7 @@ packages: resolution: {integrity: sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q==} engines: {node: '>= 8'} dependencies: - degenerator: 3.0.3 + degenerator: 3.0.4 ip: 1.1.8 netmask: 2.0.2 dev: true @@ -14822,7 +14876,7 @@ packages: postcss: ^8.2 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /postcss-clamp@4.1.0(postcss@8.4.23): @@ -14892,7 +14946,7 @@ packages: postcss: ^8.3 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /postcss-dir-pseudo-class@6.0.5(postcss@8.4.23): @@ -14902,7 +14956,7 @@ packages: postcss: ^8.2 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /postcss-double-position-gradients@3.1.2(postcss@8.4.23): @@ -14933,7 +14987,7 @@ packages: postcss: ^8.4 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /postcss-focus-within@5.0.4(postcss@8.4.23): @@ -14943,7 +14997,7 @@ packages: postcss: ^8.4 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /postcss-font-variant@5.0.0(postcss@8.4.23): @@ -15026,7 +15080,7 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.23 - yaml: 2.2.1 + yaml: 2.2.2 /postcss-logical@5.0.4(postcss@8.4.23): resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==} @@ -15053,7 +15107,7 @@ packages: postcss: ^8.2.14 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 /postcss-nesting@10.2.0(postcss@8.4.23): resolution: {integrity: sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==} @@ -15061,9 +15115,9 @@ packages: peerDependencies: postcss: ^8.2 dependencies: - '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.11) + '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.12) postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /postcss-opacity-percentage@1.1.3(postcss@8.4.23): @@ -15166,7 +15220,7 @@ packages: postcss: ^8.2 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true /postcss-replace-overflow-wrap@4.0.0(postcss@8.4.23): @@ -15184,11 +15238,11 @@ packages: postcss: ^8.2 dependencies: postcss: 8.4.23 - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 dev: true - /postcss-selector-parser@6.0.11: - resolution: {integrity: sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==} + /postcss-selector-parser@6.0.12: + resolution: {integrity: sha512-NdxGCAZdRrwVI1sy59+Wzrh+pMMHxapGnpfenDVlMEXoOcvt4pGE0JLK9YY2F5dLxcFYA/YbVQKhcGU+FtSYQg==} engines: {node: '>=4'} dependencies: cssesc: 3.0.0 @@ -15205,21 +15259,17 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 - /preact-render-to-string@5.2.4(preact@10.11.0): + /preact-render-to-string@5.2.4(preact@10.13.2): resolution: {integrity: sha512-iIPHb3BXUQ3Za6KNhkjN/waq11Oh+QWWtAgN3id3LrL+cszH3DYh8TxJPNQ6Aogsbu4JsqdJLBZltwPFpG6N6w==} peerDependencies: preact: '>=10' dependencies: - preact: 10.11.0 + preact: 10.13.2 pretty-format: 3.8.0 dev: false - /preact@10.11.0: - resolution: {integrity: sha512-Fk6+vB2kb6mSJfDgODq0YDhMfl0HNtK5+Uc9QqECO4nlyPAQwCI+BKyWO//idA7ikV7o+0Fm6LQmNuQi1wXI1w==} - /preact@10.13.2: resolution: {integrity: sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw==} - dev: false /prebuild-install@7.1.1: resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} @@ -15232,7 +15282,7 @@ packages: minimist: 1.2.8 mkdirp-classic: 0.5.3 napi-build-utils: 1.0.2 - node-abi: 3.35.0 + node-abi: 3.40.0 pump: 3.0.0 rc: 1.2.8 simple-get: 4.0.1 @@ -15510,11 +15560,11 @@ packages: /regenerator-transform@0.15.1: resolution: {integrity: sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 dev: false - /regexp.prototype.flags@1.4.3: - resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==} + /regexp.prototype.flags@1.5.0: + resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -15751,8 +15801,8 @@ packages: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} dev: true - /reselect@4.1.7: - resolution: {integrity: sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==} + /reselect@4.1.8: + resolution: {integrity: sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==} dev: false /resolve-from@4.0.0: @@ -15868,7 +15918,7 @@ packages: jest-worker: 26.6.2 rollup: 2.79.1 serialize-javascript: 4.0.0 - terser: 5.16.9 + terser: 5.17.1 dev: false /rollup-pluginutils@2.8.2: @@ -15891,13 +15941,19 @@ packages: fsevents: 2.3.2 dev: true - /rollup@3.20.6: - resolution: {integrity: sha512-2yEB3nQXp/tBQDN0hJScJQheXdvU2wFhh6ld7K/aiZ1vYcak6N/BKjY1QrU6BvO2JWYS8bEs14FRaxXosxy2zw==} + /rollup@3.21.4: + resolution: {integrity: sha512-N5LxpvDolOm9ueiCp4NfB80omMDqb45ShtsQw2+OT3f11uJ197dv703NZvznYHP6RWR85wfxanXurXKG3ux2GQ==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: fsevents: 2.3.2 + /run-applescript@5.0.0: + resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==} + engines: {node: '>=12'} + dependencies: + execa: 5.1.1 + /run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: @@ -16060,7 +16116,7 @@ packages: detect-libc: 2.0.1 node-addon-api: 5.1.0 prebuild-install: 7.1.1 - semver: 7.5.0 + semver: 7.3.8 simple-get: 4.0.1 tar-fs: 2.1.1 tunnel-agent: 0.6.0 @@ -16370,7 +16426,7 @@ packages: get-intrinsic: 1.2.0 has-symbols: 1.0.3 internal-slot: 1.0.5 - regexp.prototype.flags: 1.4.3 + regexp.prototype.flags: 1.5.0 side-channel: 1.0.4 dev: false @@ -16462,7 +16518,6 @@ packages: /strip-final-newline@2.0.0: resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} engines: {node: '>=6'} - dev: false /strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} @@ -16550,16 +16605,16 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - /svelte-hmr@0.15.1(svelte@3.54.0): + /svelte-hmr@0.15.1(svelte@3.58.0): resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: '>=3.19.0' dependencies: - svelte: 3.54.0 + svelte: 3.58.0 dev: false - /svelte2tsx@0.5.11(svelte@3.54.0)(typescript@5.0.2): + /svelte2tsx@0.5.11(svelte@3.58.0)(typescript@5.0.2): resolution: {integrity: sha512-Is95G1wqNvEUJZ9DITRS2zfMwVJRZztMduPs1vJJ0cm65WUg/avBl5vBXjHycQL/qmFpaqa3NG4qWnf7bCHPag==} peerDependencies: svelte: ^3.24 @@ -16570,18 +16625,13 @@ packages: dependencies: dedent-js: 1.0.1 pascal-case: 3.1.2 - svelte: 3.54.0 + svelte: 3.58.0 typescript: 5.0.2 dev: false - /svelte@3.54.0: - resolution: {integrity: sha512-tdrgeJU0hob0ZWAMoKXkhcxXA7dpTg6lZGxUeko5YqvPdJBiyRspGsCwV27kIrbrqPP2WUoSV9ca0gnLlw8YzQ==} - engines: {node: '>= 8'} - /svelte@3.58.0: resolution: {integrity: sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A==} engines: {node: '>= 8'} - dev: false /svg-tags@1.0.0: resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==} @@ -16595,7 +16645,7 @@ packages: resolution: {integrity: sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==} engines: {node: ^14.18.0 || >=16.0.0} dependencies: - '@pkgr/utils': 2.3.1 + '@pkgr/utils': 2.4.0 tslib: 2.5.0 /tailwindcss@3.3.2: @@ -16622,7 +16672,7 @@ packages: postcss-js: 4.0.1(postcss@8.4.23) postcss-load-config: 4.0.1(postcss@8.4.23) postcss-nested: 6.0.1(postcss@8.4.23) - postcss-selector-parser: 6.0.11 + postcss-selector-parser: 6.0.12 postcss-value-parser: 4.2.0 resolve: 1.22.2 sucrase: 3.32.0 @@ -16664,13 +16714,13 @@ packages: yallist: 4.0.0 dev: false - /tar@6.1.13: - resolution: {integrity: sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==} + /tar@6.1.14: + resolution: {integrity: sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==} engines: {node: '>=10'} dependencies: chownr: 2.0.0 fs-minipass: 2.1.0 - minipass: 4.2.8 + minipass: 5.0.0 minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0 @@ -16696,8 +16746,8 @@ packages: engines: {node: '>=8'} dev: true - /terser@5.16.9: - resolution: {integrity: sha512-HPa/FdTB9XGI2H1/keLFZHxl6WNvAI4YalHGtDQTlMnJcoqSab1UwL4l1hGEhs6/GmLHBZIg/YgB++jcbzoOEg==} + /terser@5.17.1: + resolution: {integrity: sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==} engines: {node: '>=10'} hasBin: true dependencies: @@ -16748,6 +16798,10 @@ packages: engines: {node: '>=14.0.0'} dev: false + /titleize@3.0.0: + resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==} + engines: {node: '>=12'} + /tmp@0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -16876,7 +16930,7 @@ packages: smartwrap: 2.0.2 strip-ansi: 6.0.1 wcwidth: 1.0.1 - yargs: 17.7.1 + yargs: 17.7.2 dev: true /tunnel-agent@0.6.0: @@ -17256,13 +17310,17 @@ packages: engines: {node: '>= 0.8'} dev: true + /untildify@4.0.0: + resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} + engines: {node: '>=8'} + /upath@1.2.0: resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==} engines: {node: '>=4'} dev: false - /update-browserslist-db@1.0.10(browserslist@4.21.5): - resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==} + /update-browserslist-db@1.0.11(browserslist@4.21.5): + resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -17443,7 +17501,7 @@ packages: '@types/node': 18.7.21 esbuild: 0.17.12 postcss: 8.4.23 - rollup: 3.20.6 + rollup: 3.21.4 sass: 1.52.2 optionalDependencies: fsevents: 2.3.2 @@ -17502,8 +17560,8 @@ packages: - terser dev: false - /vm2@3.9.16: - resolution: {integrity: sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w==} + /vm2@3.9.17: + resolution: {integrity: sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw==} engines: {node: '>=6.0'} hasBin: true dependencies: @@ -17511,19 +17569,19 @@ packages: acorn-walk: 8.2.0 dev: true - /vscode-css-languageservice@6.2.4: - resolution: {integrity: sha512-9UG0s3Ss8rbaaPZL1AkGzdjrGY8F+P+Ne9snsrvD9gxltDGhsn8C2dQpqQewHrMW37OvlqJoI8sUU2AWDb+qNw==} + /vscode-css-languageservice@6.2.5: + resolution: {integrity: sha512-/1oyBZK3jfx6A0cA46FCUpy6OlqEsMT47LUIldCIP1YMKRYezJ9No+aNj9IM0AqhRZ92DxZ1DmU5lJ+biuiacA==} dependencies: - '@vscode/l10n': 0.0.11 + '@vscode/l10n': 0.0.13 vscode-languageserver-textdocument: 1.0.8 vscode-languageserver-types: 3.17.3 vscode-uri: 3.0.7 dev: false - /vscode-html-languageservice@5.0.4: - resolution: {integrity: sha512-tvrySfpglu4B2rQgWGVO/IL+skvU7kBkQotRlxA7ocSyRXOZUd6GA13XHkxo8LPe07KWjeoBlN1aVGqdfTK4xA==} + /vscode-html-languageservice@5.0.5: + resolution: {integrity: sha512-7788ZT+I7/UhFoI4+bzaAiGGZEW7X39kTeuytLtw6jJA6W7ez85bWKYoFDcwrPNmywj3n/IkU9Op9asaje44jg==} dependencies: - '@vscode/l10n': 0.0.11 + '@vscode/l10n': 0.0.13 vscode-languageserver-textdocument: 1.0.8 vscode-languageserver-types: 3.17.3 vscode-uri: 3.0.7 @@ -17676,8 +17734,8 @@ packages: is-string: 1.0.7 is-symbol: 1.0.4 - /which-module@2.0.0: - resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==} + /which-module@2.0.1: + resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==} dev: true /which-pm-runs@1.1.0: @@ -17764,8 +17822,8 @@ packages: dependencies: '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0) '@babel/core': 7.18.2 - '@babel/preset-env': 7.21.4(@babel/core@7.18.2) - '@babel/runtime': 7.21.0 + '@babel/preset-env': 7.21.5(@babel/core@7.18.2) + '@babel/runtime': 7.21.5 '@rollup/plugin-babel': 5.3.1(@babel/core@7.18.2)(rollup@2.79.1) '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1) '@rollup/plugin-replace': 2.4.2(rollup@2.79.1) @@ -18034,8 +18092,8 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - /yaml@2.2.1: - resolution: {integrity: sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==} + /yaml@2.2.2: + resolution: {integrity: sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==} engines: {node: '>= 14'} /yargs-parser@18.1.3: @@ -18079,7 +18137,7 @@ packages: require-main-filename: 2.0.0 set-blocking: 2.0.0 string-width: 4.2.3 - which-module: 2.0.0 + which-module: 2.0.1 y18n: 4.0.3 yargs-parser: 18.1.3 dev: true @@ -18096,8 +18154,8 @@ packages: y18n: 5.0.8 yargs-parser: 20.2.4 - /yargs@17.7.1: - resolution: {integrity: sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==} + /yargs@17.7.2: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} dependencies: cliui: 8.0.1 From ca329bbcae7a6075af4f428f6f64466e9d152c8f Mon Sep 17 00:00:00 2001 From: Robin Neal Date: Thu, 4 May 2023 15:23:00 +0100 Subject: [PATCH 03/11] Generate unique ids within each React island (#6976) --- .changeset/happy-ears-call.md | 5 +++ .../react-component/src/components/WithId.jsx | 6 ++++ .../react-component/src/pages/index.astro | 3 ++ packages/astro/test/react-component.test.js | 9 ++++-- packages/integrations/react/client.js | 7 +++-- packages/integrations/react/context.js | 24 ++++++++++++++ packages/integrations/react/server.js | 31 +++++++++++++------ 7 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 .changeset/happy-ears-call.md create mode 100644 packages/astro/test/fixtures/react-component/src/components/WithId.jsx create mode 100644 packages/integrations/react/context.js diff --git a/.changeset/happy-ears-call.md b/.changeset/happy-ears-call.md new file mode 100644 index 000000000..42171e51b --- /dev/null +++ b/.changeset/happy-ears-call.md @@ -0,0 +1,5 @@ +--- +'@astrojs/react': patch +--- + +Prevent ID collisions in React.useId diff --git a/packages/astro/test/fixtures/react-component/src/components/WithId.jsx b/packages/astro/test/fixtures/react-component/src/components/WithId.jsx new file mode 100644 index 000000000..0abe91c72 --- /dev/null +++ b/packages/astro/test/fixtures/react-component/src/components/WithId.jsx @@ -0,0 +1,6 @@ +import React from 'react'; + +export default function () { + const id = React.useId(); + return

{id}

; +} diff --git a/packages/astro/test/fixtures/react-component/src/pages/index.astro b/packages/astro/test/fixtures/react-component/src/pages/index.astro index abd3d4299..3afd8233f 100644 --- a/packages/astro/test/fixtures/react-component/src/pages/index.astro +++ b/packages/astro/test/fixtures/react-component/src/pages/index.astro @@ -8,6 +8,7 @@ import Pure from '../components/Pure.jsx'; import TypeScriptComponent from '../components/TypeScriptComponent'; import CloneElement from '../components/CloneElement'; import WithChildren from '../components/WithChildren'; +import WithId from '../components/WithId'; const someProps = { text: 'Hello world!', @@ -34,5 +35,7 @@ const someProps = { test + + diff --git a/packages/astro/test/react-component.test.js b/packages/astro/test/react-component.test.js index 7205b0342..3565342c2 100644 --- a/packages/astro/test/react-component.test.js +++ b/packages/astro/test/react-component.test.js @@ -42,16 +42,21 @@ describe('React Components', () => { expect($('#pure')).to.have.lengthOf(1); // test 8: Check number of islands - expect($('astro-island[uid]')).to.have.lengthOf(7); + expect($('astro-island[uid]')).to.have.lengthOf(9); // test 9: Check island deduplication const uniqueRootUIDs = new Set($('astro-island').map((i, el) => $(el).attr('uid'))); - expect(uniqueRootUIDs.size).to.equal(6); + expect(uniqueRootUIDs.size).to.equal(8); // test 10: Should properly render children passed as props const islandsWithChildren = $('.with-children'); expect(islandsWithChildren).to.have.lengthOf(2); expect($(islandsWithChildren[0]).html()).to.equal($(islandsWithChildren[1]).html()); + + // test 11: Should generate unique React.useId per island + const islandsWithId = $('.react-use-id'); + expect(islandsWithId).to.have.lengthOf(2); + expect($(islandsWithId[0]).attr('id')).to.not.equal($(islandsWithId[1]).attr('id')) }); it('Can load Vue', async () => { diff --git a/packages/integrations/react/client.js b/packages/integrations/react/client.js index 3807ab410..366d499e3 100644 --- a/packages/integrations/react/client.js +++ b/packages/integrations/react/client.js @@ -13,6 +13,9 @@ function isAlreadyHydrated(element) { export default (element) => (Component, props, { default: children, ...slotted }, { client }) => { if (!element.hasAttribute('ssr')) return; + const renderOptions = { + identifierPrefix: element.getAttribute('prefix') + } for (const [key, value] of Object.entries(slotted)) { props[key] = createElement(StaticHtml, { value, name: key }); } @@ -28,10 +31,10 @@ export default (element) => } if (client === 'only') { return startTransition(() => { - createRoot(element).render(componentEl); + createRoot(element, renderOptions).render(componentEl); }); } return startTransition(() => { - hydrateRoot(element, componentEl); + hydrateRoot(element, componentEl, renderOptions); }); }; diff --git a/packages/integrations/react/context.js b/packages/integrations/react/context.js new file mode 100644 index 000000000..5d9b1d7b1 --- /dev/null +++ b/packages/integrations/react/context.js @@ -0,0 +1,24 @@ +const contexts = new WeakMap(); + +const ID_PREFIX = 'r'; + +function getContext(rendererContextResult) { + if (contexts.has(rendererContextResult)) { + return contexts.get(rendererContextResult); + } + const ctx = { + currentIndex: 0, + get id() { + return ID_PREFIX + this.currentIndex.toString(); + }, + }; + contexts.set(rendererContextResult, ctx); + return ctx; +} + +export function incrementId(rendererContextResult) { + const ctx = getContext(rendererContextResult) + const id = ctx.id; + ctx.currentIndex++; + return id; +} diff --git a/packages/integrations/react/server.js b/packages/integrations/react/server.js index 01a135a9b..0d85984f9 100644 --- a/packages/integrations/react/server.js +++ b/packages/integrations/react/server.js @@ -1,6 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom/server'; import StaticHtml from './static-html.js'; +import { incrementId } from './context.js'; const slotName = (str) => str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase()); const reactTypeof = Symbol.for('react.element'); @@ -58,6 +59,12 @@ async function getNodeWritable() { } async function renderToStaticMarkup(Component, props, { default: children, ...slotted }, metadata) { + let prefix; + if (this && this.result) { + prefix = incrementId(this.result) + } + const attrs = { prefix }; + delete props['class']; const slots = {}; for (const [key, value] of Object.entries(slotted)) { @@ -74,29 +81,33 @@ async function renderToStaticMarkup(Component, props, { default: children, ...sl newProps.children = React.createElement(StaticHtml, { value: newChildren }); } const vnode = React.createElement(Component, newProps); + const renderOptions = { + identifierPrefix: prefix + } let html; if (metadata && metadata.hydrate) { if ('renderToReadableStream' in ReactDOM) { - html = await renderToReadableStreamAsync(vnode); + html = await renderToReadableStreamAsync(vnode, renderOptions); } else { - html = await renderToPipeableStreamAsync(vnode); + html = await renderToPipeableStreamAsync(vnode, renderOptions); } } else { if ('renderToReadableStream' in ReactDOM) { - html = await renderToReadableStreamAsync(vnode); + html = await renderToReadableStreamAsync(vnode, renderOptions); } else { - html = await renderToStaticNodeStreamAsync(vnode); + html = await renderToStaticNodeStreamAsync(vnode, renderOptions); } } - return { html }; + return { html, attrs }; } -async function renderToPipeableStreamAsync(vnode) { +async function renderToPipeableStreamAsync(vnode, options) { const Writable = await getNodeWritable(); let html = ''; return new Promise((resolve, reject) => { let error = undefined; let stream = ReactDOM.renderToPipeableStream(vnode, { + ...options, onError(err) { error = err; reject(error); @@ -118,11 +129,11 @@ async function renderToPipeableStreamAsync(vnode) { }); } -async function renderToStaticNodeStreamAsync(vnode) { +async function renderToStaticNodeStreamAsync(vnode, options) { const Writable = await getNodeWritable(); let html = ''; return new Promise((resolve, reject) => { - let stream = ReactDOM.renderToStaticNodeStream(vnode); + let stream = ReactDOM.renderToStaticNodeStream(vnode, options); stream.on('error', (err) => { reject(err); }); @@ -164,8 +175,8 @@ async function readResult(stream) { } } -async function renderToReadableStreamAsync(vnode) { - return await readResult(await ReactDOM.renderToReadableStream(vnode)); +async function renderToReadableStreamAsync(vnode, options) { + return await readResult(await ReactDOM.renderToReadableStream(vnode, options)); } export default { From 14fd198ea51eb401c6e51970b69d85c17fc4fa7b Mon Sep 17 00:00:00 2001 From: ematipico Date: Thu, 4 May 2023 14:25:03 +0000 Subject: [PATCH 04/11] [ci] format --- packages/astro/test/react-component.test.js | 2 +- packages/integrations/react/client.js | 4 ++-- packages/integrations/react/context.js | 2 +- packages/integrations/react/server.js | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/astro/test/react-component.test.js b/packages/astro/test/react-component.test.js index 3565342c2..7c0de3686 100644 --- a/packages/astro/test/react-component.test.js +++ b/packages/astro/test/react-component.test.js @@ -56,7 +56,7 @@ describe('React Components', () => { // test 11: Should generate unique React.useId per island const islandsWithId = $('.react-use-id'); expect(islandsWithId).to.have.lengthOf(2); - expect($(islandsWithId[0]).attr('id')).to.not.equal($(islandsWithId[1]).attr('id')) + expect($(islandsWithId[0]).attr('id')).to.not.equal($(islandsWithId[1]).attr('id')); }); it('Can load Vue', async () => { diff --git a/packages/integrations/react/client.js b/packages/integrations/react/client.js index 366d499e3..ef5929af1 100644 --- a/packages/integrations/react/client.js +++ b/packages/integrations/react/client.js @@ -14,8 +14,8 @@ export default (element) => (Component, props, { default: children, ...slotted }, { client }) => { if (!element.hasAttribute('ssr')) return; const renderOptions = { - identifierPrefix: element.getAttribute('prefix') - } + identifierPrefix: element.getAttribute('prefix'), + }; for (const [key, value] of Object.entries(slotted)) { props[key] = createElement(StaticHtml, { value, name: key }); } diff --git a/packages/integrations/react/context.js b/packages/integrations/react/context.js index 5d9b1d7b1..2e3e37fd5 100644 --- a/packages/integrations/react/context.js +++ b/packages/integrations/react/context.js @@ -17,7 +17,7 @@ function getContext(rendererContextResult) { } export function incrementId(rendererContextResult) { - const ctx = getContext(rendererContextResult) + const ctx = getContext(rendererContextResult); const id = ctx.id; ctx.currentIndex++; return id; diff --git a/packages/integrations/react/server.js b/packages/integrations/react/server.js index 0d85984f9..3f7e786ac 100644 --- a/packages/integrations/react/server.js +++ b/packages/integrations/react/server.js @@ -61,7 +61,7 @@ async function getNodeWritable() { async function renderToStaticMarkup(Component, props, { default: children, ...slotted }, metadata) { let prefix; if (this && this.result) { - prefix = incrementId(this.result) + prefix = incrementId(this.result); } const attrs = { prefix }; @@ -82,8 +82,8 @@ async function renderToStaticMarkup(Component, props, { default: children, ...sl } const vnode = React.createElement(Component, newProps); const renderOptions = { - identifierPrefix: prefix - } + identifierPrefix: prefix, + }; let html; if (metadata && metadata.hydrate) { if ('renderToReadableStream' in ReactDOM) { From 818252acda3c00499cea51ffa0f26d4c2ccd3a02 Mon Sep 17 00:00:00 2001 From: Erika <3019731+Princesseuh@users.noreply.github.com> Date: Thu, 4 May 2023 17:49:55 +0200 Subject: [PATCH 05/11] Add caching for optimized images (#6990) --- .changeset/forty-horses-act.md | 5 ++ packages/astro/src/@types/astro.ts | 17 +++++++ packages/astro/src/assets/internal.ts | 59 ++++++++++++++++++++--- packages/astro/src/core/build/generate.ts | 11 ++--- packages/astro/src/core/config/schema.ts | 10 ++++ packages/astro/test/core-image.test.js | 38 +++++++++++++++ 6 files changed, 127 insertions(+), 13 deletions(-) create mode 100644 .changeset/forty-horses-act.md diff --git a/.changeset/forty-horses-act.md b/.changeset/forty-horses-act.md new file mode 100644 index 000000000..77eec497c --- /dev/null +++ b/.changeset/forty-horses-act.md @@ -0,0 +1,5 @@ +--- +'astro': minor +--- + +Generated optimized images are now cached inside the `node_modules/.astro/assets` folder. The cached images will be used to avoid doing extra work and speed up subsequent builds. diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 872f2bb56..5c9f46c2e 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -430,6 +430,23 @@ export interface AstroUserConfig { */ outDir?: string; + /** + * @docs + * @name cacheDir + * @type {string} + * @default `"./node_modules/.astro"` + * @description Set the directory for caching build artifacts. Files in this directory will be used in subsequent builds to speed up the build time. + * + * The value can be either an absolute file system path or a path relative to the project root. + * + * ```js + * { + * cacheDir: './my-custom-cache-directory' + * } + * ``` + */ + cacheDir?: string; + /** * @docs * @name site diff --git a/packages/astro/src/assets/internal.ts b/packages/astro/src/assets/internal.ts index c4b8ca751..365bbcf62 100644 --- a/packages/astro/src/assets/internal.ts +++ b/packages/astro/src/assets/internal.ts @@ -73,13 +73,20 @@ export function getStaticImageList(): Iterable< return globalThis.astroAsset.staticImages?.entries(); } -interface GenerationData { +interface GenerationDataUncached { + cached: false; weight: { before: number; after: number; }; } +interface GenerationDataCached { + cached: true; +} + +type GenerationData = GenerationDataUncached | GenerationDataCached; + export async function generateImage( buildOpts: StaticBuildOptions, options: ImageTransform, @@ -89,7 +96,19 @@ export async function generateImage( return undefined; } - const imageService = (await getConfiguredImageService()) as LocalImageService; + let useCache = true; + const assetsCacheDir = new URL('assets/', buildOpts.settings.config.cacheDir); + + // Ensure that the cache directory exists + try { + await fs.promises.mkdir(assetsCacheDir, { recursive: true }); + } catch (err) { + console.error( + 'An error was encountered while creating the cache directory. Proceeding without caching. Error: ', + err + ); + useCache = false; + } let serverRoot: URL, clientRoot: URL; if (buildOpts.settings.config.output === 'server') { @@ -100,6 +119,20 @@ export async function generateImage( clientRoot = buildOpts.settings.config.outDir; } + const finalFileURL = new URL('.' + filepath, clientRoot); + const finalFolderURL = new URL('./', finalFileURL); + const cachedFileURL = new URL(basename(filepath), assetsCacheDir); + + try { + await fs.promises.copyFile(cachedFileURL, finalFileURL); + + return { + cached: true, + }; + } catch (e) { + // no-op + } + // The original file's path (the `src` attribute of the ESM imported image passed by the user) const originalImagePath = options.src.src; @@ -112,19 +145,33 @@ export async function generateImage( serverRoot ) ); + + const imageService = (await getConfiguredImageService()) as LocalImageService; const resultData = await imageService.transform( fileData, { ...options, src: originalImagePath }, buildOpts.settings.config.image.service.config ); - const finalFileURL = new URL('.' + filepath, clientRoot); - const finalFolderURL = new URL('./', finalFileURL); - await fs.promises.mkdir(finalFolderURL, { recursive: true }); - await fs.promises.writeFile(finalFileURL, resultData.data); + + if (useCache) { + try { + await fs.promises.writeFile(cachedFileURL, resultData.data); + await fs.promises.copyFile(cachedFileURL, finalFileURL); + } catch (e) { + console.error( + `There was an error creating the cache entry for ${filepath}. Attempting to write directly to output directory. Error: `, + e + ); + await fs.promises.writeFile(finalFileURL, resultData.data); + } + } else { + await fs.promises.writeFile(finalFileURL, resultData.data); + } return { + cached: false, weight: { before: Math.trunc(fileData.byteLength / 1024), after: Math.trunc(resultData.data.byteLength / 1024), diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index 7d1f85211..8d195bab4 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -146,13 +146,10 @@ async function generateImage(opts: StaticBuildOptions, transform: ImageTransform const timeEnd = performance.now(); const timeChange = getTimeStat(timeStart, timeEnd); const timeIncrease = `(+${timeChange})`; - info( - opts.logging, - null, - ` ${green('▶')} ${path} ${dim( - `(before: ${generationData.weight.before}kb, after: ${generationData.weight.after}kb)` - )} ${dim(timeIncrease)}` - ); + const statsText = generationData.cached + ? `(reused cache entry)` + : `(before: ${generationData.weight.before}kb, after: ${generationData.weight.after}kb)`; + info(opts.logging, null, ` ${green('▶')} ${path} ${dim(statsText)} ${dim(timeIncrease)}`); } async function generatePage( diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts index 033e55222..fd8d88c4d 100644 --- a/packages/astro/src/core/config/schema.ts +++ b/packages/astro/src/core/config/schema.ts @@ -13,6 +13,7 @@ const ASTRO_CONFIG_DEFAULTS: AstroUserConfig & any = { srcDir: './src', publicDir: './public', outDir: './dist', + cacheDir: './node_modules/.astro', base: '/', trailingSlash: 'ignore', build: { @@ -63,6 +64,11 @@ export const AstroConfigSchema = z.object({ .optional() .default(ASTRO_CONFIG_DEFAULTS.outDir) .transform((val) => new URL(val)), + cacheDir: z + .string() + .optional() + .default(ASTRO_CONFIG_DEFAULTS.cacheDir) + .transform((val) => new URL(val)), site: z.string().url().optional(), base: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.base), trailingSlash: z @@ -220,6 +226,10 @@ export function createRelativeSchema(cmd: string, fileProtocolRoot: URL) { .string() .default(ASTRO_CONFIG_DEFAULTS.outDir) .transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)), + cacheDir: z + .string() + .default(ASTRO_CONFIG_DEFAULTS.cacheDir) + .transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)), build: z .object({ format: z diff --git a/packages/astro/test/core-image.test.js b/packages/astro/test/core-image.test.js index 57720f0c4..7417b4895 100644 --- a/packages/astro/test/core-image.test.js +++ b/packages/astro/test/core-image.test.js @@ -1,7 +1,9 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; +import { basename } from 'node:path'; import { Writable } from 'node:stream'; import { fileURLToPath } from 'node:url'; +import { removeDir } from '../dist/core/fs/index.js'; import testAdapter from './test-adapter.js'; import { loadFixture } from './test-utils.js'; @@ -455,6 +457,9 @@ describe('astro:image', () => { assets: true, }, }); + // Remove cache directory + removeDir(new URL('./fixtures/core-image-ssg/node_modules/.astro', import.meta.url)); + await fixture.build(); }); @@ -569,6 +574,39 @@ describe('astro:image', () => { const $ = cheerio.load(html); expect($('#no-format img').attr('src')).to.not.equal($('#format-avif img').attr('src')); }); + + it('has cache entries', async () => { + const generatedImages = (await fixture.glob('_astro/**/*.webp')).map((path) => + basename(path) + ); + const cachedImages = (await fixture.glob('../node_modules/.astro/assets/**/*.webp')).map( + (path) => basename(path) + ); + + expect(generatedImages).to.deep.equal(cachedImages); + }); + + it('uses cache entries', async () => { + const logs = []; + const logging = { + dest: { + write(chunk) { + logs.push(chunk); + }, + }, + }; + + await fixture.build({ logging }); + const generatingImageIndex = logs.findIndex((logLine) => + logLine.message.includes('generating optimized images') + ); + const relevantLogs = logs.slice(generatingImageIndex + 1, -1); + const isReusingCache = relevantLogs.every((logLine) => + logLine.message.includes('(reused cache entry)') + ); + + expect(isReusingCache).to.be.true; + }); }); describe('prod ssr', () => { From 51c8e7fe298df202edf93f0aa8e22aff58639995 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Thu, 4 May 2023 09:49:17 -0700 Subject: [PATCH 06/11] [ci] release (#6977) Co-authored-by: github-actions[bot] --- .changeset/chatty-dolls-visit.md | 5 -- .changeset/forty-horses-act.md | 5 -- .changeset/friendly-fishes-sing.md | 5 -- .changeset/green-cups-hammer.md | 21 ----- .changeset/happy-ears-call.md | 5 -- .changeset/nine-geckos-act.md | 5 -- .changeset/pretty-bears-deliver.md | 47 ----------- .changeset/smooth-cows-jog.md | 8 -- .changeset/twelve-feet-switch.md | 5 -- packages/astro/CHANGELOG.md | 81 +++++++++++++++++++ packages/astro/package.json | 4 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/image/package.json | 2 +- packages/integrations/markdoc/CHANGELOG.md | 9 +++ packages/integrations/markdoc/package.json | 4 +- packages/integrations/mdx/CHANGELOG.md | 9 +++ packages/integrations/mdx/package.json | 4 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/node/package.json | 2 +- packages/integrations/react/CHANGELOG.md | 6 ++ packages/integrations/react/package.json | 2 +- packages/integrations/sitemap/CHANGELOG.md | 6 ++ packages/integrations/sitemap/package.json | 2 +- packages/integrations/svelte/package.json | 2 +- packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/package.json | 2 +- packages/integrations/vue/package.json | 2 +- packages/markdown/remark/CHANGELOG.md | 11 +++ packages/markdown/remark/package.json | 4 +- pnpm-lock.yaml | 4 +- 31 files changed, 143 insertions(+), 127 deletions(-) delete mode 100644 .changeset/chatty-dolls-visit.md delete mode 100644 .changeset/forty-horses-act.md delete mode 100644 .changeset/friendly-fishes-sing.md delete mode 100644 .changeset/green-cups-hammer.md delete mode 100644 .changeset/happy-ears-call.md delete mode 100644 .changeset/nine-geckos-act.md delete mode 100644 .changeset/pretty-bears-deliver.md delete mode 100644 .changeset/smooth-cows-jog.md delete mode 100644 .changeset/twelve-feet-switch.md diff --git a/.changeset/chatty-dolls-visit.md b/.changeset/chatty-dolls-visit.md deleted file mode 100644 index 6b9e53e88..000000000 --- a/.changeset/chatty-dolls-visit.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/sitemap': minor ---- - -Adds support to SSR routes to sitemap generation. diff --git a/.changeset/forty-horses-act.md b/.changeset/forty-horses-act.md deleted file mode 100644 index 77eec497c..000000000 --- a/.changeset/forty-horses-act.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': minor ---- - -Generated optimized images are now cached inside the `node_modules/.astro/assets` folder. The cached images will be used to avoid doing extra work and speed up subsequent builds. diff --git a/.changeset/friendly-fishes-sing.md b/.changeset/friendly-fishes-sing.md deleted file mode 100644 index 9da10e6bf..000000000 --- a/.changeset/friendly-fishes-sing.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': minor ---- - -Implement Inline Stylesheets RFC as experimental diff --git a/.changeset/green-cups-hammer.md b/.changeset/green-cups-hammer.md deleted file mode 100644 index 1492f8d3c..000000000 --- a/.changeset/green-cups-hammer.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -'astro': minor ---- - -Implements a new class-based scoping strategy - -This implements the [Scoping RFC](https://github.com/withastro/roadmap/pull/543), providing a way to opt in to increased style specificity for Astro component styles. - -This prevents bugs where global styles override Astro component styles due to CSS ordering and the use of element selectors. - -To enable class-based scoping, you can set it in your config: - -```js -import { defineConfig } from 'astro/config'; - -export default defineConfig({ - scopedStyleStrategy: 'class' -}); -``` - -Note that the 0-specificity `:where` pseudo-selector is still the default strategy. The intent is to change `'class'` to be the default in 3.0. diff --git a/.changeset/happy-ears-call.md b/.changeset/happy-ears-call.md deleted file mode 100644 index 42171e51b..000000000 --- a/.changeset/happy-ears-call.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/react': patch ---- - -Prevent ID collisions in React.useId diff --git a/.changeset/nine-geckos-act.md b/.changeset/nine-geckos-act.md deleted file mode 100644 index 164dbbfd5..000000000 --- a/.changeset/nine-geckos-act.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': minor ---- - -Support `` to output inline code HTML (no `pre` tag) diff --git a/.changeset/pretty-bears-deliver.md b/.changeset/pretty-bears-deliver.md deleted file mode 100644 index 7be41ec06..000000000 --- a/.changeset/pretty-bears-deliver.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -'astro': minor ---- - -Implements a new experimental middleware in Astro. - -The middleware is available under the following experimental flag: - -```js -export default defineConfig({ - experimental: { - middleware: true - } -}) -``` - -Or via CLI, using the new argument `--experimental-middleware`. - -Create a file called `middleware.{js,ts}` inside the `src` folder, and -export a `onRequest` function. - -From `astro/middleware`, use the `defineMiddleware` utility to take advantage of type-safety, and use -the `sequence` utility to chain multiple middleware functions. - -Example: - -```ts -import {defineMiddleware, sequence} from "astro/middleware"; - -const redirects = defineMiddleware((context, next) => { - if (context.request.url.endsWith("/old-url")) { - return context.redirect("/new-url") - } - return next(); -}); - -const minify = defineMiddleware(async (context, next) => { - const repsonse = await next(); - const minifiedHtml = await minifyHtml(response.text()); - return new Response(minifiedHtml, { - status: 200, - headers: response.headers - }); -}) - -export const onRequest = sequence(redirects, minify); -``` diff --git a/.changeset/smooth-cows-jog.md b/.changeset/smooth-cows-jog.md deleted file mode 100644 index 8c6d4563c..000000000 --- a/.changeset/smooth-cows-jog.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@astrojs/markdoc': patch -'@astrojs/mdx': patch -'@astrojs/markdown-remark': minor -'astro': minor ---- - -Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `
`.
diff --git a/.changeset/twelve-feet-switch.md b/.changeset/twelve-feet-switch.md
deleted file mode 100644
index b581fb4c3..000000000
--- a/.changeset/twelve-feet-switch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Ensure multiple cookies set in dev result in multiple set-cookie headers
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 0ce75e341..1cfa35fd6 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,86 @@
 # astro
 
+## 2.4.0
+
+### Minor Changes
+
+- [#6990](https://github.com/withastro/astro/pull/6990) [`818252acd`](https://github.com/withastro/astro/commit/818252acda3c00499cea51ffa0f26d4c2ccd3a02) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Generated optimized images are now cached inside the `node_modules/.astro/assets` folder. The cached images will be used to avoid doing extra work and speed up subsequent builds.
+
+- [#6659](https://github.com/withastro/astro/pull/6659) [`80e3d4d3d`](https://github.com/withastro/astro/commit/80e3d4d3d0f7719d8eae5435bba3805503057511) Thanks [@lilnasy](https://github.com/lilnasy)! - Implement Inline Stylesheets RFC as experimental
+
+- [#6771](https://github.com/withastro/astro/pull/6771) [`3326492b9`](https://github.com/withastro/astro/commit/3326492b94f76ed2b0154dd9b9a1a9eb883c1e31) Thanks [@matthewp](https://github.com/matthewp)! - Implements a new class-based scoping strategy
+
+  This implements the [Scoping RFC](https://github.com/withastro/roadmap/pull/543), providing a way to opt in to increased style specificity for Astro component styles.
+
+  This prevents bugs where global styles override Astro component styles due to CSS ordering and the use of element selectors.
+
+  To enable class-based scoping, you can set it in your config:
+
+  ```js
+  import { defineConfig } from 'astro/config';
+
+  export default defineConfig({
+    scopedStyleStrategy: 'class',
+  });
+  ```
+
+  Note that the 0-specificity `:where` pseudo-selector is still the default strategy. The intent is to change `'class'` to be the default in 3.0.
+
+- [#6959](https://github.com/withastro/astro/pull/6959) [`cac4a321e`](https://github.com/withastro/astro/commit/cac4a321e814fb805eb0e3ced469e25261a50885) Thanks [@bluwy](https://github.com/bluwy)! - Support `` to output inline code HTML (no `pre` tag)
+
+- [#6721](https://github.com/withastro/astro/pull/6721) [`831b67cdb`](https://github.com/withastro/astro/commit/831b67cdb8250f93f66e3b171fab024652bf80f2) Thanks [@ematipico](https://github.com/ematipico)! - Implements a new experimental middleware in Astro.
+
+  The middleware is available under the following experimental flag:
+
+  ```js
+  export default defineConfig({
+    experimental: {
+      middleware: true,
+    },
+  });
+  ```
+
+  Or via CLI, using the new argument `--experimental-middleware`.
+
+  Create a file called `middleware.{js,ts}` inside the `src` folder, and
+  export a `onRequest` function.
+
+  From `astro/middleware`, use the `defineMiddleware` utility to take advantage of type-safety, and use
+  the `sequence` utility to chain multiple middleware functions.
+
+  Example:
+
+  ```ts
+  import { defineMiddleware, sequence } from 'astro/middleware';
+
+  const redirects = defineMiddleware((context, next) => {
+    if (context.request.url.endsWith('/old-url')) {
+      return context.redirect('/new-url');
+    }
+    return next();
+  });
+
+  const minify = defineMiddleware(async (context, next) => {
+    const repsonse = await next();
+    const minifiedHtml = await minifyHtml(response.text());
+    return new Response(minifiedHtml, {
+      status: 200,
+      headers: response.headers,
+    });
+  });
+
+  export const onRequest = sequence(redirects, minify);
+  ```
+
+- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `
`.
+
+### Patch Changes
+
+- [#6973](https://github.com/withastro/astro/pull/6973) [`0883fd487`](https://github.com/withastro/astro/commit/0883fd4875548a613df122f0b87a1ca8b7a7cf7d) Thanks [@matthewp](https://github.com/matthewp)! - Ensure multiple cookies set in dev result in multiple set-cookie headers
+
+- Updated dependencies [[`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7)]:
+  - @astrojs/markdown-remark@2.2.0
+
 ## 2.3.4
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 08ee274a6..4502c982a 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -112,7 +112,7 @@
   "dependencies": {
     "@astrojs/compiler": "^1.4.0",
     "@astrojs/language-server": "^1.0.0",
-    "@astrojs/markdown-remark": "^2.1.4",
+    "@astrojs/markdown-remark": "^2.2.0",
     "@astrojs/telemetry": "^2.1.1",
     "@astrojs/webapi": "^2.1.1",
     "@babel/core": "^7.18.2",
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index 7f0dbb514..bfd2e19e5 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -38,7 +38,7 @@
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4"
+    "astro": "workspace:^2.4.0"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json
index 5933de5e6..f9092a058 100644
--- a/packages/integrations/deno/package.json
+++ b/packages/integrations/deno/package.json
@@ -33,7 +33,7 @@
     "esbuild": "^0.15.18"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4"
+    "astro": "workspace:^2.4.0"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index 39ddb34ec..9e0c8b8c7 100644
--- a/packages/integrations/image/package.json
+++ b/packages/integrations/image/package.json
@@ -62,7 +62,7 @@
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4",
+    "astro": "workspace:^2.4.0",
     "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
diff --git a/packages/integrations/markdoc/CHANGELOG.md b/packages/integrations/markdoc/CHANGELOG.md
index 180ba6cf6..e46503412 100644
--- a/packages/integrations/markdoc/CHANGELOG.md
+++ b/packages/integrations/markdoc/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @astrojs/markdoc
 
+## 0.1.2
+
+### Patch Changes
+
+- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `
`.
+
+- Updated dependencies [[`818252acd`](https://github.com/withastro/astro/commit/818252acda3c00499cea51ffa0f26d4c2ccd3a02), [`80e3d4d3d`](https://github.com/withastro/astro/commit/80e3d4d3d0f7719d8eae5435bba3805503057511), [`3326492b9`](https://github.com/withastro/astro/commit/3326492b94f76ed2b0154dd9b9a1a9eb883c1e31), [`cac4a321e`](https://github.com/withastro/astro/commit/cac4a321e814fb805eb0e3ced469e25261a50885), [`831b67cdb`](https://github.com/withastro/astro/commit/831b67cdb8250f93f66e3b171fab024652bf80f2), [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7), [`0883fd487`](https://github.com/withastro/astro/commit/0883fd4875548a613df122f0b87a1ca8b7a7cf7d)]:
+  - astro@2.4.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index ae535d4c3..9d3677a7f 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc pages in your Astro site",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -41,7 +41,7 @@
     "zod": "^3.17.3"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4"
+    "astro": "workspace:^2.4.0"
   },
   "devDependencies": {
     "@types/chai": "^4.3.1",
diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md
index 1640e0579..e78ae02a7 100644
--- a/packages/integrations/mdx/CHANGELOG.md
+++ b/packages/integrations/mdx/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @astrojs/mdx
 
+## 0.19.1
+
+### Patch Changes
+
+- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `
`.
+
+- Updated dependencies [[`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7)]:
+  - @astrojs/markdown-remark@2.2.0
+
 ## 0.19.0
 
 ### Minor Changes
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index c801d674e..659e8b9a1 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -30,7 +30,7 @@
     "test:match": "mocha --timeout 20000 -g"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^2.1.4",
+    "@astrojs/markdown-remark": "^2.2.0",
     "@astrojs/prism": "^2.1.1",
     "@mdx-js/mdx": "^2.3.0",
     "@mdx-js/rollup": "^2.3.0",
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index ea8f30f09..ff2619274 100644
--- a/packages/integrations/netlify/package.json
+++ b/packages/integrations/netlify/package.json
@@ -39,7 +39,7 @@
     "esbuild": "^0.15.18"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4"
+    "astro": "workspace:^2.4.0"
   },
   "devDependencies": {
     "@netlify/edge-functions": "^2.0.0",
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index 5c7595190..924e9627f 100644
--- a/packages/integrations/node/package.json
+++ b/packages/integrations/node/package.json
@@ -35,7 +35,7 @@
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4"
+    "astro": "workspace:^2.4.0"
   },
   "devDependencies": {
     "@types/send": "^0.17.1",
diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md
index ee46c7bab..567a826a3 100644
--- a/packages/integrations/react/CHANGELOG.md
+++ b/packages/integrations/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/react
 
+## 2.1.3
+
+### Patch Changes
+
+- [#6976](https://github.com/withastro/astro/pull/6976) [`ca329bbca`](https://github.com/withastro/astro/commit/ca329bbcae7a6075af4f428f6f64466e9d152c8f) Thanks [@SudoCat](https://github.com/SudoCat)! - Prevent ID collisions in React.useId
+
 ## 2.1.2
 
 ### Patch Changes
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index 142376e9d..318c4bc27 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/react",
   "description": "Use React components within Astro",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/sitemap/CHANGELOG.md b/packages/integrations/sitemap/CHANGELOG.md
index a71b373ff..3165f6dfb 100644
--- a/packages/integrations/sitemap/CHANGELOG.md
+++ b/packages/integrations/sitemap/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/sitemap
 
+## 1.3.0
+
+### Minor Changes
+
+- [#6534](https://github.com/withastro/astro/pull/6534) [`ad907196c`](https://github.com/withastro/astro/commit/ad907196cb42f21d9540ae0d77aa742bf7adf030) Thanks [@atilafassina](https://github.com/atilafassina)! - Adds support to SSR routes to sitemap generation.
+
 ## 1.2.2
 
 ### Patch Changes
diff --git a/packages/integrations/sitemap/package.json b/packages/integrations/sitemap/package.json
index 7c465494e..102102985 100644
--- a/packages/integrations/sitemap/package.json
+++ b/packages/integrations/sitemap/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/sitemap",
   "description": "Generate a sitemap for your Astro site",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 427b97472..2423286f6 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -43,7 +43,7 @@
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4",
+    "astro": "workspace:^2.4.0",
     "svelte": "^3.54.0"
   },
   "engines": {
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index df770eb17..ca057aae6 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -40,7 +40,7 @@
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4",
+    "astro": "workspace:^2.4.0",
     "tailwindcss": "^3.0.24"
   },
   "pnpm": {
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index b639cc7ca..635465ad6 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -55,7 +55,7 @@
     "web-vitals": "^3.1.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4"
+    "astro": "workspace:^2.4.0"
   },
   "devDependencies": {
     "@types/set-cookie-parser": "^2.4.2",
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index 48760e11a..af94d6f97 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -50,7 +50,7 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.4",
+    "astro": "workspace:^2.4.0",
     "vue": "^3.2.30"
   },
   "engines": {
diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md
index cacfca845..0a4fe2f8a 100644
--- a/packages/markdown/remark/CHANGELOG.md
+++ b/packages/markdown/remark/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @astrojs/markdown-remark
 
+## 2.2.0
+
+### Minor Changes
+
+- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `
`.
+
+### Patch Changes
+
+- Updated dependencies [[`818252acd`](https://github.com/withastro/astro/commit/818252acda3c00499cea51ffa0f26d4c2ccd3a02), [`80e3d4d3d`](https://github.com/withastro/astro/commit/80e3d4d3d0f7719d8eae5435bba3805503057511), [`3326492b9`](https://github.com/withastro/astro/commit/3326492b94f76ed2b0154dd9b9a1a9eb883c1e31), [`cac4a321e`](https://github.com/withastro/astro/commit/cac4a321e814fb805eb0e3ced469e25261a50885), [`831b67cdb`](https://github.com/withastro/astro/commit/831b67cdb8250f93f66e3b171fab024652bf80f2), [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7), [`0883fd487`](https://github.com/withastro/astro/commit/0883fd4875548a613df122f0b87a1ca8b7a7cf7d)]:
+  - astro@2.4.0
+
 ## 2.1.4
 
 ### Patch Changes
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index edf4cfba5..bf9d4262d 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "test": "mocha --exit --timeout 20000"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.0"
+    "astro": "workspace:^2.4.0"
   },
   "dependencies": {
     "@astrojs/prism": "^2.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ade97c2da..ce71a60d8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -559,7 +559,7 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       '@astrojs/markdown-remark':
-        specifier: ^2.1.4
+        specifier: ^2.2.0
         version: link:../markdown/remark
       '@astrojs/telemetry':
         specifier: ^2.1.1
@@ -3994,7 +3994,7 @@ importers:
   packages/integrations/mdx:
     dependencies:
       '@astrojs/markdown-remark':
-        specifier: ^2.1.4
+        specifier: ^2.2.0
         version: link:../../markdown/remark
       '@astrojs/prism':
         specifier: ^2.1.1

From 1d2559c28b9cff197255b0c4f46fcc83ad3e138a Mon Sep 17 00:00:00 2001
From: Matthew Phillips 
Date: Thu, 4 May 2023 15:46:17 -0400
Subject: [PATCH 07/11] Fix scopedStyleStrategy description (#6994)

---
 packages/astro/src/@types/astro.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 5c9f46c2e..b7c5db5fc 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -517,8 +517,8 @@ export interface AstroUserConfig {
 	 * @name scopedStyleStrategy
 	 * @type {('where' | 'class')}
 	 * @default `'where'`
-	 * @description
 	 * @version 2.4
+	 * @description
 	 *
 	 * Specify the strategy used for scoping styles within Astro components. Choose from:
 	 *   - `'where'` - Use `:where` selectors, causing no specifity increase.

From 71332cf9697755884e5e2e63d6d2499cc2c5edd1 Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Thu, 4 May 2023 21:57:23 +0200
Subject: [PATCH 08/11] fix: move service functions from astro/assets to
 astro/config so it can be imported (#6995)

* fix: move service functions from astro/assets to astro/config so people can import it

* chore: changeset
---
 .changeset/mean-houses-exist.md    |  5 +++++
 packages/astro/config.d.ts         | 12 ++++++++++++
 packages/astro/config.mjs          | 14 ++++++++++++++
 packages/astro/src/assets/index.ts | 16 ----------------
 4 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/mean-houses-exist.md

diff --git a/.changeset/mean-houses-exist.md b/.changeset/mean-houses-exist.md
new file mode 100644
index 000000000..33090d4e4
--- /dev/null
+++ b/.changeset/mean-houses-exist.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Move sharpImageService and squooshImageService functions to `astro/config` so they can be imported
diff --git a/packages/astro/config.d.ts b/packages/astro/config.d.ts
index f117c6345..33aebd4f7 100644
--- a/packages/astro/config.d.ts
+++ b/packages/astro/config.d.ts
@@ -1,6 +1,7 @@
 type ViteUserConfig = import('vite').UserConfig;
 type ViteUserConfigFn = import('vite').UserConfigFn;
 type AstroUserConfig = import('./dist/@types/astro.js').AstroUserConfig;
+type ImageServiceConfig = import('./dist/@types/astro.js').ImageServiceConfig;
 
 /**
  * See the full Astro Configuration API Documentation
@@ -12,3 +13,14 @@ export function defineConfig(config: AstroUserConfig): AstroUserConfig;
  * Use Astro to generate a fully resolved Vite config
  */
 export function getViteConfig(config: ViteUserConfig): ViteUserConfigFn;
+
+/**
+ * Return the configuration needed to use the Sharp-based image service
+ * See: https://docs.astro.build/en/guides/assets/#using-sharp
+ */
+export function sharpImageService(): ImageServiceConfig;
+
+/**
+ * Return the configuration needed to use the Squoosh-based image service
+ */
+export function squooshImageService(): ImageServiceConfig;
diff --git a/packages/astro/config.mjs b/packages/astro/config.mjs
index f39fb8abc..9f5883015 100644
--- a/packages/astro/config.mjs
+++ b/packages/astro/config.mjs
@@ -1 +1,15 @@
 export { defineConfig, getViteConfig } from './dist/config/index.js';
+
+export function sharpImageService() {
+	return {
+		entrypoint: 'astro/assets/services/sharp',
+		config: {},
+	};
+}
+
+export function squooshImageService() {
+	return {
+		entrypoint: 'astro/assets/services/squoosh',
+		config: {},
+	};
+}
diff --git a/packages/astro/src/assets/index.ts b/packages/astro/src/assets/index.ts
index bab74a815..6b792fa97 100644
--- a/packages/astro/src/assets/index.ts
+++ b/packages/astro/src/assets/index.ts
@@ -1,21 +1,5 @@
-import type { ImageServiceConfig } from '../@types/astro.js';
-
 export { getConfiguredImageService, getImage } from './internal.js';
 export { baseService, isLocalService } from './services/service.js';
 export { type LocalImageProps, type RemoteImageProps } from './types.js';
 export { emitESMImage } from './utils/emitAsset.js';
 export { imageMetadata } from './utils/metadata.js';
-
-export function sharpImageService(): ImageServiceConfig {
-	return {
-		entrypoint: 'astro/assets/services/sharp',
-		config: {},
-	};
-}
-
-export function squooshImageService(): ImageServiceConfig {
-	return {
-		entrypoint: 'astro/assets/services/squoosh',
-		config: {},
-	};
-}

From 170140083c5374cdb458b890070953777eb6fcfb Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Thu, 4 May 2023 13:19:01 -0700
Subject: [PATCH 09/11] [ci] release (#6996)

Co-authored-by: github-actions[bot] 
---
 .changeset/mean-houses-exist.md               | 5 -----
 packages/astro/CHANGELOG.md                   | 6 ++++++
 packages/astro/package.json                   | 2 +-
 packages/integrations/cloudflare/package.json | 2 +-
 packages/integrations/deno/package.json       | 2 +-
 packages/integrations/image/package.json      | 2 +-
 packages/integrations/markdoc/package.json    | 2 +-
 packages/integrations/netlify/package.json    | 2 +-
 packages/integrations/node/package.json       | 2 +-
 packages/integrations/svelte/package.json     | 2 +-
 packages/integrations/tailwind/package.json   | 2 +-
 packages/integrations/vercel/package.json     | 2 +-
 packages/integrations/vue/package.json        | 2 +-
 13 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 .changeset/mean-houses-exist.md

diff --git a/.changeset/mean-houses-exist.md b/.changeset/mean-houses-exist.md
deleted file mode 100644
index 33090d4e4..000000000
--- a/.changeset/mean-houses-exist.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Move sharpImageService and squooshImageService functions to `astro/config` so they can be imported
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 1cfa35fd6..eac50154c 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,11 @@
 # astro
 
+## 2.4.1
+
+### Patch Changes
+
+- [#6995](https://github.com/withastro/astro/pull/6995) [`71332cf96`](https://github.com/withastro/astro/commit/71332cf9697755884e5e2e63d6d2499cc2c5edd1) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Move sharpImageService and squooshImageService functions to `astro/config` so they can be imported
+
 ## 2.4.0
 
 ### Minor Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 4502c982a..1cc91c896 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index bfd2e19e5..5933b1399 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -38,7 +38,7 @@
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0"
+    "astro": "workspace:^2.4.1"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json
index f9092a058..7c0ba87df 100644
--- a/packages/integrations/deno/package.json
+++ b/packages/integrations/deno/package.json
@@ -33,7 +33,7 @@
     "esbuild": "^0.15.18"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0"
+    "astro": "workspace:^2.4.1"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index 9e0c8b8c7..8743c3384 100644
--- a/packages/integrations/image/package.json
+++ b/packages/integrations/image/package.json
@@ -62,7 +62,7 @@
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0",
+    "astro": "workspace:^2.4.1",
     "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index 9d3677a7f..0d7aae951 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -41,7 +41,7 @@
     "zod": "^3.17.3"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0"
+    "astro": "workspace:^2.4.1"
   },
   "devDependencies": {
     "@types/chai": "^4.3.1",
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index ff2619274..521fe678e 100644
--- a/packages/integrations/netlify/package.json
+++ b/packages/integrations/netlify/package.json
@@ -39,7 +39,7 @@
     "esbuild": "^0.15.18"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0"
+    "astro": "workspace:^2.4.1"
   },
   "devDependencies": {
     "@netlify/edge-functions": "^2.0.0",
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index 924e9627f..05dd66225 100644
--- a/packages/integrations/node/package.json
+++ b/packages/integrations/node/package.json
@@ -35,7 +35,7 @@
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0"
+    "astro": "workspace:^2.4.1"
   },
   "devDependencies": {
     "@types/send": "^0.17.1",
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 2423286f6..20a7176bd 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -43,7 +43,7 @@
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0",
+    "astro": "workspace:^2.4.1",
     "svelte": "^3.54.0"
   },
   "engines": {
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index ca057aae6..479646800 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -40,7 +40,7 @@
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0",
+    "astro": "workspace:^2.4.1",
     "tailwindcss": "^3.0.24"
   },
   "pnpm": {
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 635465ad6..253fddab5 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -55,7 +55,7 @@
     "web-vitals": "^3.1.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0"
+    "astro": "workspace:^2.4.1"
   },
   "devDependencies": {
     "@types/set-cookie-parser": "^2.4.2",
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index af94d6f97..a3a0c5c54 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -50,7 +50,7 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.0",
+    "astro": "workspace:^2.4.1",
     "vue": "^3.2.30"
   },
   "engines": {

From 2ff31e5c7bafe038f1a036d7da2352ce188315e7 Mon Sep 17 00:00:00 2001
From: Matthew Phillips 
Date: Thu, 4 May 2023 17:04:19 -0400
Subject: [PATCH 10/11] Fix formatting problem in experimental feature docs
 (#6997)

---
 packages/astro/src/@types/astro.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index b7c5db5fc..441318e0b 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1050,6 +1050,7 @@ export interface AstroUserConfig {
 		 *		assets: true,
 		 * 	},
 		 * }
+		 * ```
 		 */
 		assets?: boolean;
 
@@ -1070,6 +1071,7 @@ export interface AstroUserConfig {
 		 *		inlineStylesheets: `auto`,
 		 * 	},
 		 * }
+		 * ```
 		 */
 		inlineStylesheets?: 'always' | 'auto' | 'never';
 
@@ -1090,6 +1092,7 @@ export interface AstroUserConfig {
 		 *		middleware: true,
 		 * 	},
 		 * }
+		 * ```
 		 */
 		middleware?: boolean;
 	};

From 60688a7d167667ada7fe2a7e7d7da8e363b902c1 Mon Sep 17 00:00:00 2001
From: Sarah Rainsberger 
Date: Thu, 4 May 2023 19:04:21 -0300
Subject: [PATCH 11/11] Update astro.ts (#6999)

---
 packages/astro/src/@types/astro.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 441318e0b..0f8cf4240 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1060,8 +1060,8 @@ export interface AstroUserConfig {
 		 * @type {('always' | 'auto' | 'never')}
 		 * @default `never`
 		 * @description
-		 * Control whether styles are sent to the browser in a separate css file or inlined into