From 0325bf7e0feae3531f38d3659b9175750d0f228e Mon Sep 17 00:00:00 2001 From: Chris Swithinbank Date: Mon, 12 Jun 2023 11:48:53 +0200 Subject: [PATCH 01/60] Add `@message` to `DuplicateContentEntrySlugError` (#7369) --- packages/astro/src/core/errors/errors-data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts index 54dd32fba7cd..8139c0fcd147 100644 --- a/packages/astro/src/core/errors/errors-data.ts +++ b/packages/astro/src/core/errors/errors-data.ts @@ -1114,6 +1114,7 @@ See https://docs.astro.build/en/guides/server-side-rendering/ for more informati }, /** * @docs + * @message `COLLECTION_NAME` contains multiple entries with the same slug: `SLUG`. Slugs must be unique. * @description * Content collection entries must have unique slugs. Duplicates are often caused by the `slug` frontmatter property. */ From 718cebd52667d15719763d66b37c9ac4890fcb74 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 12 Jun 2023 20:48:04 +0800 Subject: [PATCH 02/60] Update example dependencies versions with a script (#7367) --- .prettierrc.js => .prettierrc.cjs | 8 -- package.json | 9 +- patches/@changesets__cli@2.23.0.patch | 14 --- pnpm-lock.yaml | 145 +++++++++++++++++------- scripts/deps/update-example-versions.js | 74 ++++++++++++ 5 files changed, 183 insertions(+), 67 deletions(-) rename .prettierrc.js => .prettierrc.cjs (61%) delete mode 100644 patches/@changesets__cli@2.23.0.patch create mode 100644 scripts/deps/update-example-versions.js diff --git a/.prettierrc.js b/.prettierrc.cjs similarity index 61% rename from .prettierrc.js rename to .prettierrc.cjs index d43df33f5b7a..0909ba219d02 100644 --- a/.prettierrc.js +++ b/.prettierrc.cjs @@ -8,14 +8,6 @@ module.exports = { useTabs: true, plugins: ['./node_modules/prettier-plugin-astro'], overrides: [ - { - // Changesets run Prettier using our configuration, however it uses a very old version of Prettier that does - // not support our plugin and it ends up doing more harm than good. As such, we'll disable our plugin for changelogs - files: ['CHANGELOG.md'], - options: { - plugins: [], - }, - }, { files: ['.*', '*.json', '*.md', '*.toml', '*.yml'], options: { diff --git a/package.json b/package.json index 5c369d22d448..14c20296a0c9 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "test:e2e:match": "cd packages/astro && pnpm playwright install && pnpm run test:e2e:match", "benchmark": "astro-benchmark", "lint": "eslint --cache .", - "version": "changeset version && pnpm install --no-frozen-lockfile && pnpm run format", + "version": "changeset version && node ./scripts/deps/update-example-versions.js && pnpm install --no-frozen-lockfile && pnpm run format", "preinstall": "npx only-allow pnpm" }, "workspaces": [ @@ -68,9 +68,6 @@ "allowAny": [ "astro" ] - }, - "patchedDependencies": { - "@changesets/cli@2.23.0": "patches/@changesets__cli@2.23.0.patch" } }, "dependencies": { @@ -78,8 +75,8 @@ "astro-benchmark": "workspace:*" }, "devDependencies": { - "@changesets/changelog-github": "0.4.4", - "@changesets/cli": "2.23.0", + "@changesets/changelog-github": "^0.4.8", + "@changesets/cli": "^2.26.1", "@types/node": "^18.7.21", "@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/parser": "^5.58.0", diff --git a/patches/@changesets__cli@2.23.0.patch b/patches/@changesets__cli@2.23.0.patch deleted file mode 100644 index 621c0596e9e6..000000000000 --- a/patches/@changesets__cli@2.23.0.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/dist/cli.cjs.dev.js b/dist/cli.cjs.dev.js -index 5511d0c05d3b7472876dcc8410e938ccf612654f..aa75e3982b68e1226ba1877a7f32017e517480f5 100644 ---- a/dist/cli.cjs.dev.js -+++ b/dist/cli.cjs.dev.js -@@ -279,6 +279,9 @@ async function confirmMajorRelease(pkgJSON) { - } - - async function getPackagesToRelease(changedPackages, allPackages) { -+ const isPrivate = (name) => name === 'astro-scripts' || name.startsWith('@example/') || name.startsWith('@test/') || name.startsWith('@e2e/'); -+ changedPackages = changedPackages.filter(name => !isPrivate(name)); -+ allPackages = allPackages.filter(({ packageJson: { name }}) => !isPrivate(name)); - function askInitialReleaseQuestion(defaultChoiceList) { - return askCheckboxPlus( // TODO: Make this wording better - // TODO: take objects and be fancy with matching \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 82a7e337a9a2..51ca99c868ef 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,11 +9,6 @@ overrides: packageExtensionsChecksum: 01871422d489547c532184effb134b35 -patchedDependencies: - '@changesets/cli@2.23.0': - hash: kcozqtpxuwjzskw6zg5royevn4 - path: patches/@changesets__cli@2.23.0.patch - importers: .: @@ -26,11 +21,11 @@ importers: version: link:benchmark devDependencies: '@changesets/changelog-github': - specifier: 0.4.4 - version: 0.4.4 + specifier: ^0.4.8 + version: 0.4.8 '@changesets/cli': - specifier: 2.23.0 - version: 2.23.0(patch_hash=kcozqtpxuwjzskw6zg5royevn4) + specifier: ^2.26.1 + version: 2.26.1 '@types/node': specifier: ^18.7.21 version: 18.16.3 @@ -4390,7 +4385,7 @@ importers: version: 9.2.2 vite: specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + version: 4.3.1(@types/node@14.18.21) packages/integrations/netlify/test/edge-functions/fixtures/dynimport: dependencies: @@ -4908,7 +4903,7 @@ importers: version: 3.0.0(vite@4.3.1)(vue@3.2.47) '@vue/babel-plugin-jsx': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.21.8) + version: 1.1.1 '@vue/compiler-sfc': specifier: ^3.2.39 version: 3.2.39 @@ -5472,7 +5467,7 @@ packages: astro: '*' svelte: ^3.54.0 dependencies: - '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.58.0)(vite@4.3.1) + '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.58.0) astro: link:packages/astro svelte: 3.58.0 svelte2tsx: 0.5.23(svelte@3.58.0)(typescript@5.0.2) @@ -7054,8 +7049,8 @@ packages: '@changesets/types': 5.2.1 dev: true - /@changesets/changelog-github@0.4.4: - resolution: {integrity: sha512-htSILqCkyYtTB5/LoVKwx7GCJQGxAiBcYbfUKWiz/QoDARuM01owYtMXhV6/iytJZq/Dqqz3PjMZUNB4MphpbQ==} + /@changesets/changelog-github@0.4.8: + resolution: {integrity: sha512-jR1DHibkMAb5v/8ym77E4AMNWZKB5NPzw5a5Wtqm1JepAuIF+hrKp2u04NKM14oBZhHglkCfrla9uq8ORnK/dw==} dependencies: '@changesets/get-github-info': 0.5.2 '@changesets/types': 5.2.1 @@ -7064,8 +7059,8 @@ packages: - encoding dev: true - /@changesets/cli@2.23.0(patch_hash=kcozqtpxuwjzskw6zg5royevn4): - resolution: {integrity: sha512-Gi3tMi0Vr6eNd8GX6q73tbOm9XOzGfuLEm4PYVeWG2neg5DlRGNOjYwrFULJ/An3N9MHtHn4r5h1Qvnju9Ijug==} + /@changesets/cli@2.26.1: + resolution: {integrity: sha512-XnTa+b51vt057fyAudvDKGB0Sh72xutQZNAdXkCqPBKO2zvs2yYZx5hFZj1u9cbtpwM6Sxtcr02/FQJfZOzemQ==} hasBin: true dependencies: '@babel/runtime': 7.21.5 @@ -7076,12 +7071,12 @@ packages: '@changesets/errors': 0.1.4 '@changesets/get-dependents-graph': 1.3.5 '@changesets/get-release-plan': 3.0.16 - '@changesets/git': 1.5.0 + '@changesets/git': 2.0.0 '@changesets/logger': 0.0.5 '@changesets/pre': 1.0.14 '@changesets/read': 0.5.9 '@changesets/types': 5.2.1 - '@changesets/write': 0.1.9 + '@changesets/write': 0.2.3 '@manypkg/get-packages': 1.1.3 '@types/is-ci': 3.0.0 '@types/semver': 6.2.3 @@ -7102,7 +7097,6 @@ packages: term-size: 2.2.1 tty-table: 4.2.1 dev: true - patched: true /@changesets/config@2.3.0: resolution: {integrity: sha512-EgP/px6mhCx8QeaMAvWtRrgyxW08k/Bx2tpGT+M84jEdX37v3VKfh4Cz1BkwrYKuMV2HZKeHOh8sHvja/HcXfQ==} @@ -7157,17 +7151,6 @@ packages: resolution: {integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==} dev: true - /@changesets/git@1.5.0: - resolution: {integrity: sha512-Xo8AT2G7rQJSwV87c8PwMm6BAc98BnufRMsML7m7Iw8Or18WFvFmxqG5aOL5PBvhgq9KrKvaeIBNIymracSuHg==} - dependencies: - '@babel/runtime': 7.21.5 - '@changesets/errors': 0.1.4 - '@changesets/types': 5.2.1 - '@manypkg/get-packages': 1.1.3 - is-subdir: 1.2.0 - spawndamnit: 2.0.0 - dev: true - /@changesets/git@2.0.0: resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==} dependencies: @@ -7224,14 +7207,14 @@ packages: resolution: {integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==} dev: true - /@changesets/write@0.1.9: - resolution: {integrity: sha512-E90ZrsrfJVOOQaP3Mm5Xd7uDwBAqq3z5paVEavTHKA8wxi7NAL8CmjgbGxSFuiP7ubnJA2BuHlrdE4z86voGOg==} + /@changesets/write@0.2.3: + resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==} dependencies: '@babel/runtime': 7.21.5 '@changesets/types': 5.2.1 fs-extra: 7.0.1 human-id: 1.0.2 - prettier: 1.19.1 + prettier: 2.8.8 dev: true /@cloudflare/kv-asset-handler@0.2.0: @@ -8594,6 +8577,24 @@ packages: string.prototype.matchall: 4.0.8 dev: false + /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.58.0): + resolution: {integrity: sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==} + engines: {node: ^14.18.0 || >= 16} + peerDependencies: + '@sveltejs/vite-plugin-svelte': ^2.2.0 + svelte: ^3.54.0 || ^4.0.0-next.0 + vite: ^4.0.0 + peerDependenciesMeta: + vite: + optional: true + dependencies: + '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.58.0) + debug: 4.3.4 + svelte: 3.58.0 + transitivePeerDependencies: + - supports-color + dev: false + /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.58.0)(vite@4.3.1): resolution: {integrity: sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==} engines: {node: ^14.18.0 || >= 16} @@ -8613,6 +8614,28 @@ packages: - supports-color dev: false + /@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.58.0): + resolution: {integrity: sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==} + engines: {node: ^14.18.0 || >= 16} + peerDependencies: + svelte: ^3.54.0 || ^4.0.0-next.0 + vite: ^4.0.0 + peerDependenciesMeta: + vite: + optional: true + dependencies: + '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.58.0) + debug: 4.3.4 + deepmerge: 4.3.1 + kleur: 4.1.5 + magic-string: 0.30.0 + svelte: 3.58.0 + svelte-hmr: 0.15.1(svelte@3.58.0) + vitefu: 0.2.4(vite@4.3.1) + transitivePeerDependencies: + - supports-color + dev: false + /@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.58.0)(vite@4.3.1): resolution: {integrity: sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==} engines: {node: ^14.18.0 || >= 16} @@ -9327,6 +9350,23 @@ packages: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: false + /@vue/babel-plugin-jsx@1.1.1: + 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.18.2) + '@babel/template': 7.20.7 + '@babel/traverse': 7.18.2 + '@babel/types': 7.21.5 + '@vue/babel-helper-vue-transform-on': 1.0.2 + camelcase: 6.3.0 + html-tags: 3.3.1 + svg-tags: 1.0.0 + transitivePeerDependencies: + - '@babel/core' + - supports-color + dev: false + /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.21.8): resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: @@ -15499,12 +15539,6 @@ packages: synckit: 0.8.5 dev: false - /prettier@1.19.1: - resolution: {integrity: sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==} - engines: {node: '>=4'} - hasBin: true - dev: true - /prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} @@ -17630,6 +17664,39 @@ packages: - supports-color dev: false + /vite@4.3.1(@types/node@14.18.21): + resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 14.18.21 + esbuild: 0.17.18 + postcss: 8.4.23 + rollup: 3.21.8 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /vite@4.3.1(@types/node@18.16.3)(sass@1.52.2): resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} engines: {node: ^14.18.0 || >=16.0.0} diff --git a/scripts/deps/update-example-versions.js b/scripts/deps/update-example-versions.js new file mode 100644 index 000000000000..13018a791996 --- /dev/null +++ b/scripts/deps/update-example-versions.js @@ -0,0 +1,74 @@ +import path from 'node:path'; +import fs from 'node:fs/promises'; +import { globby as glob } from 'globby'; + +/* + This file updates the dependencies' versions in `examples/*` to match the workspace packages' versions. + This should be run after `changeset version` so the release PR updates all the versions together. +*/ + +const rootUrl = new URL('../..', import.meta.url); +const rootPackageJson = JSON.parse(await fs.readFile(new URL('./package.json', rootUrl), 'utf-8')); + +// get all workspace package name to versions +/** @type {Map} */ +const packageToVersions = new Map(); + +// Changeset detects workspace packages to publish via `workspaces` in package.json. +// Although this conflicts with the `pnpm-workspace.yaml` config, it's easier to configure what gets +// published through this field, so this file also respects this field when updating the versions. +const workspaceDirs = await glob(rootPackageJson.workspaces, { + onlyDirectories: true, + cwd: rootUrl, +}); +for (const workspaceDir of workspaceDirs) { + const packageJsonPath = path.join(workspaceDir, './package.json'); + const packageJson = await readAndParsePackageJson(packageJsonPath); + if (!packageJson) continue; + + if (!packageJson.name) { + throw new Error(`${packageJsonPath} does not contain a "name" field.`); + } + if (!packageJson.version) { + throw new Error(`${packageJsonPath} does not contain a "version" field.`); + } + + packageToVersions.set(packageJson.name, packageJson.version); +} + +// Update all examples' package.json +const exampleDirs = await glob('examples/*', { + onlyDirectories: true, + cwd: rootUrl, +}); +for (const exampleDir of exampleDirs) { + const packageJsonPath = path.join(exampleDir, './package.json'); + const packageJson = await readAndParsePackageJson(packageJsonPath); + if (!packageJson) continue; + + // Update dependencies + for (const depName of Object.keys(packageJson.dependencies ?? [])) { + if (packageToVersions.has(depName)) { + packageJson.dependencies[depName] = `^${packageToVersions.get(depName)}`; + } + } + + // Update devDependencies + for (const depName of Object.keys(packageJson.devDependencies ?? [])) { + if (packageToVersions.has(depName)) { + packageJson.devDependencies[depName] = `^${packageToVersions.get(depName)}`; + } + } + + await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n'); +} + +/** + * @param {string} packageJsonPath + * @returns {Promise | undefined>} + */ +async function readAndParsePackageJson(packageJsonPath) { + try { + return JSON.parse(await fs.readFile(packageJsonPath, 'utf-8')); + } catch {} +} From 807f46791dadded488bfa5caf5fa97a2a286dfe9 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 12 Jun 2023 21:51:20 +0800 Subject: [PATCH 03/60] Increase parallel test time tolerance (#7372) --- packages/astro/test/parallel.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/astro/test/parallel.js b/packages/astro/test/parallel.js index 2ad50f2d6ca2..22b76eda01c2 100644 --- a/packages/astro/test/parallel.js +++ b/packages/astro/test/parallel.js @@ -21,15 +21,15 @@ describe('Component parallelization', () => { Number(element.children[0].data) ); - let renderStartWithin = Math.max(...startTimes) - Math.min(...startTimes); + const renderStartWithin = Math.max(...startTimes) - Math.min(...startTimes); expect(renderStartWithin).to.be.lessThan( - 10, // in theory, this should be 0, so 10ms tolerance + 40, // in theory, this should be 0, but add 40ms tolerance for CI "The components didn't start rendering in parallel" ); const totalRenderTime = Math.max(...finishTimes) - Math.min(...startTimes); expect(totalRenderTime).to.be.lessThan( - 60, // max component delay is 40ms + 80, // max component delay is 40ms, add 40ms tolerance for CI 'The total render time was significantly longer than the max component delay' ); }); From 0986a44ddd2b48edbe318f6fceb7f4ce4670ce05 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 12 Jun 2023 22:52:13 +0300 Subject: [PATCH 04/60] Upgrade lit deps (#7373) * Upgrade lit deps * Add changeset * Downgrade peer dep * Upgrade lockfile * add client dep --- .changeset/cool-readers-stare.md | 5 + .../integrations/lit/hydration-support.js | 3 +- packages/integrations/lit/package.json | 7 +- pnpm-lock.yaml | 143 ++++-------------- 4 files changed, 43 insertions(+), 115 deletions(-) create mode 100644 .changeset/cool-readers-stare.md diff --git a/.changeset/cool-readers-stare.md b/.changeset/cool-readers-stare.md new file mode 100644 index 000000000000..c7fb65872db8 --- /dev/null +++ b/.changeset/cool-readers-stare.md @@ -0,0 +1,5 @@ +--- +'@astrojs/lit': minor +--- + +Upgrade lit dependencies diff --git a/packages/integrations/lit/hydration-support.js b/packages/integrations/lit/hydration-support.js index 0c21646fbb0d..0f367ae0ba70 100644 --- a/packages/integrations/lit/hydration-support.js +++ b/packages/integrations/lit/hydration-support.js @@ -1 +1,2 @@ -import 'lit/experimental-hydrate-support.js'; +// @ts-check +import '@lit-labs/ssr-client/lit-element-hydrate-support.js'; diff --git a/packages/integrations/lit/package.json b/packages/integrations/lit/package.json index 41c03a2183c3..964e86adbd14 100644 --- a/packages/integrations/lit/package.json +++ b/packages/integrations/lit/package.json @@ -42,8 +42,9 @@ "test": "mocha" }, "dependencies": { - "@lit-labs/ssr": "^3.1.0", - "@lit-labs/ssr-dom-shim": "^1.1.0", + "@lit-labs/ssr": "^3.1.3", + "@lit-labs/ssr-client": "^1.1.2", + "@lit-labs/ssr-dom-shim": "^1.1.1", "parse5": "^7.1.2" }, "devDependencies": { @@ -51,7 +52,7 @@ "astro-scripts": "workspace:*", "chai": "^4.3.6", "cheerio": "^1.0.0-rc.11", - "lit": "^2.7.0", + "lit": "^2.7.5", "mocha": "^9.2.2", "sass": "^1.52.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 51ca99c868ef..be3b20224991 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3902,11 +3902,14 @@ importers: packages/integrations/lit: dependencies: '@lit-labs/ssr': - specifier: ^3.1.0 - version: 3.1.0 + specifier: ^3.1.3 + version: 3.1.3 + '@lit-labs/ssr-client': + specifier: ^1.1.2 + version: 1.1.2 '@lit-labs/ssr-dom-shim': - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.1.1 + version: 1.1.1 parse5: specifier: ^7.1.2 version: 7.1.2 @@ -3924,8 +3927,8 @@ importers: specifier: ^1.0.0-rc.11 version: 1.0.0-rc.11 lit: - specifier: ^2.7.0 - version: 2.7.4 + specifier: ^2.7.5 + version: 2.7.5 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -4385,7 +4388,7 @@ importers: version: 9.2.2 vite: specifier: ^4.3.1 - version: 4.3.1(@types/node@14.18.21) + version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) packages/integrations/netlify/test/edge-functions/fixtures/dynimport: dependencies: @@ -4903,7 +4906,7 @@ importers: version: 3.0.0(vite@4.3.1)(vue@3.2.47) '@vue/babel-plugin-jsx': specifier: ^1.1.1 - version: 1.1.1 + version: 1.1.1(@babel/core@7.21.8) '@vue/compiler-sfc': specifier: ^3.2.39 version: 3.2.39 @@ -5467,7 +5470,7 @@ packages: astro: '*' svelte: ^3.54.0 dependencies: - '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.58.0) + '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.58.0)(vite@4.3.1) astro: link:packages/astro svelte: 3.58.0 svelte2tsx: 0.5.23(svelte@3.58.0)(typescript@5.0.2) @@ -7886,28 +7889,28 @@ packages: resolution: {integrity: sha512-n5JEf16Wr4mdkRMZ8wMP/wN9/sHmTjRPbouXjJH371mZ2LEGDl72t8tEsMRNFerQN/QJtivOxqK1frdGa4QK5Q==} engines: {node: '>=10'} - /@lit-labs/ssr-client@1.1.1: - resolution: {integrity: sha512-IwR/DgV4RUgnvTaZmSd7u48dhcRiKcCYyKn7b9OoQZloBGhnG4MWIPIAJVFHpccC7/S0qXJamCANzw9+rjbltg==} + /@lit-labs/ssr-client@1.1.2: + resolution: {integrity: sha512-hb10IRTmxtnQ2fcYYJE7bC2f+6UmucBgFnkfxepoE1cZ5mO6ZiTZGoFzFrNd5EQXeQq+HpYmYOF4W/JBwBE+AA==} dependencies: '@lit/reactive-element': 1.6.1 - lit: 2.7.4 + lit: 2.7.5 lit-html: 2.7.4 dev: false - /@lit-labs/ssr-dom-shim@1.1.0: - resolution: {integrity: sha512-92uQ5ARf7UXYrzaFcAX3T2rTvaS9Z1//ukV+DqjACM4c8s0ZBQd7ayJU5Dh2AFLD/Ayuyz4uMmxQec8q3U4Ong==} + /@lit-labs/ssr-dom-shim@1.1.1: + resolution: {integrity: sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ==} - /@lit-labs/ssr@3.1.0: - resolution: {integrity: sha512-D4Ut27bmmj5AV9iQaEOxdjPHSZGp11ww0DI3zAniyFf2KBOH7y/X2U163oOdmKh6KQNFLQDOkVx+A6NlmxcY4Q==} + /@lit-labs/ssr@3.1.3: + resolution: {integrity: sha512-2iyV2X0uSfbBxPIggrud8imVfsSnLnssB/WsTJ2NhIlu70KO2W/BG0yZW02vqG0O4dVT1YEfxjNq5VCF0BAVlQ==} engines: {node: '>=13.9.0'} dependencies: - '@lit-labs/ssr-client': 1.1.1 - '@lit-labs/ssr-dom-shim': 1.1.0 + '@lit-labs/ssr-client': 1.1.2 + '@lit-labs/ssr-dom-shim': 1.1.1 '@lit/reactive-element': 1.6.1 '@parse5/tools': 0.1.0 '@types/node': 16.18.30 enhanced-resolve: 5.14.0 - lit: 2.7.4 + lit: 2.7.5 lit-element: 3.3.2 lit-html: 2.7.4 node-fetch: 3.3.1 @@ -7917,7 +7920,7 @@ packages: /@lit/reactive-element@1.6.1: resolution: {integrity: sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==} dependencies: - '@lit-labs/ssr-dom-shim': 1.1.0 + '@lit-labs/ssr-dom-shim': 1.1.1 /@ljharb/has-package-exports-patterns@0.0.2: resolution: {integrity: sha512-4/RWEeXDO6bocPONheFe6gX/oQdP/bEpv0oL4HqjPP5DCenBSt0mHgahppY49N0CpsaqffdwPq+TlX9CYOq2Dw==} @@ -8577,24 +8580,6 @@ packages: string.prototype.matchall: 4.0.8 dev: false - /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.58.0): - resolution: {integrity: sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==} - engines: {node: ^14.18.0 || >= 16} - peerDependencies: - '@sveltejs/vite-plugin-svelte': ^2.2.0 - svelte: ^3.54.0 || ^4.0.0-next.0 - vite: ^4.0.0 - peerDependenciesMeta: - vite: - optional: true - dependencies: - '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.58.0) - debug: 4.3.4 - svelte: 3.58.0 - transitivePeerDependencies: - - supports-color - dev: false - /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.58.0)(vite@4.3.1): resolution: {integrity: sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==} engines: {node: ^14.18.0 || >= 16} @@ -8614,28 +8599,6 @@ packages: - supports-color dev: false - /@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.58.0): - resolution: {integrity: sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==} - engines: {node: ^14.18.0 || >= 16} - peerDependencies: - svelte: ^3.54.0 || ^4.0.0-next.0 - vite: ^4.0.0 - peerDependenciesMeta: - vite: - optional: true - dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.58.0) - debug: 4.3.4 - deepmerge: 4.3.1 - kleur: 4.1.5 - magic-string: 0.30.0 - svelte: 3.58.0 - svelte-hmr: 0.15.1(svelte@3.58.0) - vitefu: 0.2.4(vite@4.3.1) - transitivePeerDependencies: - - supports-color - dev: false - /@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.58.0)(vite@4.3.1): resolution: {integrity: sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==} engines: {node: ^14.18.0 || >= 16} @@ -9350,23 +9313,6 @@ packages: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: false - /@vue/babel-plugin-jsx@1.1.1: - 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.18.2) - '@babel/template': 7.20.7 - '@babel/traverse': 7.18.2 - '@babel/types': 7.21.5 - '@vue/babel-helper-vue-transform-on': 1.0.2 - camelcase: 6.3.0 - html-tags: 3.3.1 - svg-tags: 1.0.0 - transitivePeerDependencies: - - '@babel/core' - - supports-color - dev: false - /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.21.8): resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: @@ -13375,7 +13321,7 @@ packages: /lit-element@3.3.2: resolution: {integrity: sha512-xXAeVWKGr4/njq0rGC9dethMnYCq5hpKYrgQZYTzawt9YQhMiXfD+T1RgrdY3NamOxwq2aXlb0vOI6e29CKgVQ==} dependencies: - '@lit-labs/ssr-dom-shim': 1.1.0 + '@lit-labs/ssr-dom-shim': 1.1.1 '@lit/reactive-element': 1.6.1 lit-html: 2.7.4 @@ -13390,6 +13336,14 @@ packages: '@lit/reactive-element': 1.6.1 lit-element: 3.3.2 lit-html: 2.7.4 + dev: false + + /lit@2.7.5: + resolution: {integrity: sha512-i/cH7Ye6nBDUASMnfwcictBnsTN91+aBjXoTHF2xARghXScKxpD4F4WYI+VLXg9lqbMinDfvoI7VnZXjyHgdfQ==} + dependencies: + '@lit/reactive-element': 1.6.1 + lit-element: 3.3.2 + lit-html: 2.7.4 /lite-vimeo-embed@0.1.0: resolution: {integrity: sha512-XFzPdv4NaWlyaM9WpBaS5CIUkf+laIRZEXQGsBb2ZdDWkuMmnzfAZ5nriYv3a3MVx5tEEetGN0sNaUhAVRXr1g==} @@ -17664,39 +17618,6 @@ packages: - supports-color dev: false - /vite@4.3.1(@types/node@14.18.21): - resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 14.18.21 - esbuild: 0.17.18 - postcss: 8.4.23 - rollup: 3.21.8 - optionalDependencies: - fsevents: 2.3.2 - dev: true - /vite@4.3.1(@types/node@18.16.3)(sass@1.52.2): resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} engines: {node: ^14.18.0 || >=16.0.0} From 1c7b6359563f5e83325121efb2e61915d818a35a Mon Sep 17 00:00:00 2001 From: Ben Holmes Date: Mon, 12 Jun 2023 17:20:04 -0400 Subject: [PATCH 05/60] Fix: Zod errors missing stacktrace (#7380) * wip: figure out stack issue, weird JSON stringify bug on zod issue * refactor: return data instead of mutating * refactor: remove need for reassignment * fix: e.stack only * chore: changeset --- .changeset/real-dryers-leave.md | 5 +++ packages/astro/src/core/errors/dev/utils.ts | 35 ++++++++++++++------- 2 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 .changeset/real-dryers-leave.md diff --git a/.changeset/real-dryers-leave.md b/.changeset/real-dryers-leave.md new file mode 100644 index 000000000000..4d31e082a382 --- /dev/null +++ b/.changeset/real-dryers-leave.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix missing stacktraces for Zod errors diff --git a/packages/astro/src/core/errors/dev/utils.ts b/packages/astro/src/core/errors/dev/utils.ts index 28445ba32385..29468c7fd8d2 100644 --- a/packages/astro/src/core/errors/dev/utils.ts +++ b/packages/astro/src/core/errors/dev/utils.ts @@ -24,9 +24,13 @@ export function collectErrorMetadata(e: any, rootFolder?: URL | undefined): Erro ? (e.errors as SSRError[]) : [e as SSRError]; - err.forEach((error) => { - if (error.stack) { - error = collectInfoFromStacktrace(e); + err.forEach((error, idx) => { + if (e.stack) { + const stackInfo = collectInfoFromStacktrace(e); + error.stack = stackInfo.stack; + error.loc = stackInfo.loc; + error.plugin = stackInfo.plugin; + error.pluginCode = stackInfo.pluginCode; } // Make sure the file location is absolute, otherwise: @@ -141,15 +145,22 @@ See https://docs.astro.build/en/guides/troubleshooting/#document-or-window-is-no return err.hint; } -function collectInfoFromStacktrace(error: SSRError): SSRError { - if (!error.stack) return error; +type StackInfo = Pick; + +function collectInfoFromStacktrace(error: SSRError & { stack: string }): StackInfo { + let stackInfo: StackInfo = { + stack: error.stack, + plugin: error.plugin, + pluginCode: error.pluginCode, + loc: error.loc, + }; // normalize error stack line-endings to \n - error.stack = normalizeLF(error.stack); + stackInfo.stack = normalizeLF(error.stack); const stackText = stripAnsi(error.stack); // Try to find possible location from stack if we don't have one - if (!error.loc || (!error.loc.column && !error.loc.line)) { + if (!stackInfo.loc || (!stackInfo.loc.column && !stackInfo.loc.line)) { const possibleFilePath = error.loc?.file || error.pluginCode || @@ -168,7 +179,7 @@ function collectInfoFromStacktrace(error: SSRError): SSRError { file = fileURLToPath(file); } catch {} - error.loc = { + stackInfo.loc = { file, line: Number.parseInt(line), column: Number.parseInt(column), @@ -177,17 +188,17 @@ function collectInfoFromStacktrace(error: SSRError): SSRError { } // Derive plugin from stack (if possible) - if (!error.plugin) { - error.plugin = + if (!stackInfo.plugin) { + stackInfo.plugin = /withastro\/astro\/packages\/integrations\/([\w-]+)/gim.exec(stackText)?.at(1) || /(@astrojs\/[\w-]+)\/(server|client|index)/gim.exec(stackText)?.at(1) || undefined; } // Normalize stack (remove `/@fs/` urls, etc) - error.stack = cleanErrorStack(error.stack); + stackInfo.stack = cleanErrorStack(error.stack); - return error; + return stackInfo; } function cleanErrorStack(stack: string) { From 3e1fbc2c8f1f19063815580583f3765cf678b1b6 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Tue, 13 Jun 2023 22:47:24 +0800 Subject: [PATCH 06/60] Use stub image service for tests (#7376) --- .../astro-assets-prefix/astro.config.mjs | 24 +++++++++++-------- .../astro.config.mjs | 10 +++++--- .../fixtures/image-assets/astro.config.mjs | 4 ++++ .../test/fixtures/mdx-images/astro.config.ts | 8 +++++-- .../test/fixtures/image/astro.config.mjs | 8 +++++-- .../test/fixtures/redirects/astro.config.mjs | 7 ++---- 6 files changed, 39 insertions(+), 22 deletions(-) diff --git a/packages/astro/test/fixtures/astro-assets-prefix/astro.config.mjs b/packages/astro/test/fixtures/astro-assets-prefix/astro.config.mjs index 869cf811b06d..7393b72b8aff 100644 --- a/packages/astro/test/fixtures/astro-assets-prefix/astro.config.mjs +++ b/packages/astro/test/fixtures/astro-assets-prefix/astro.config.mjs @@ -1,15 +1,19 @@ import { defineConfig } from 'astro/config'; -import react from '@astrojs/react' +import react from '@astrojs/react'; +import { testImageService } from '../../test-image-service.js'; // https://astro.build/config export default defineConfig({ - // test custom base to make sure things work - base: '/custom-base', - integrations: [react()], - build: { - assetsPrefix: 'http://localhost:4321' - }, - experimental: { - assets: true - } + // test custom base to make sure things work + base: '/custom-base', + integrations: [react()], + build: { + assetsPrefix: 'http://localhost:4321', + }, + experimental: { + assets: true, + }, + image: { + service: testImageService(), + }, }); diff --git a/packages/astro/test/fixtures/content-collection-references/astro.config.mjs b/packages/astro/test/fixtures/content-collection-references/astro.config.mjs index 913ddc87651f..7287a125921a 100644 --- a/packages/astro/test/fixtures/content-collection-references/astro.config.mjs +++ b/packages/astro/test/fixtures/content-collection-references/astro.config.mjs @@ -1,8 +1,12 @@ import { defineConfig } from 'astro/config'; +import { testImageService } from '../../test-image-service.js'; // https://astro.build/config export default defineConfig({ - experimental: { - assets: true - }, + experimental: { + assets: true, + }, + image: { + service: testImageService(), + }, }); diff --git a/packages/integrations/markdoc/test/fixtures/image-assets/astro.config.mjs b/packages/integrations/markdoc/test/fixtures/image-assets/astro.config.mjs index 9e64af363bc1..50d395ec7636 100644 --- a/packages/integrations/markdoc/test/fixtures/image-assets/astro.config.mjs +++ b/packages/integrations/markdoc/test/fixtures/image-assets/astro.config.mjs @@ -1,10 +1,14 @@ import { defineConfig } from 'astro/config'; import markdoc from '@astrojs/markdoc'; +import { testImageService } from '../../../../../astro/test/test-image-service.js'; // https://astro.build/config export default defineConfig({ experimental: { assets: true, }, + image: { + service: testImageService(), + }, integrations: [markdoc()], }); diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/astro.config.ts b/packages/integrations/mdx/test/fixtures/mdx-images/astro.config.ts index fe92bd37f97e..30ce31bc293c 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-images/astro.config.ts +++ b/packages/integrations/mdx/test/fixtures/mdx-images/astro.config.ts @@ -1,8 +1,12 @@ import mdx from '@astrojs/mdx'; +import { testImageService } from '../../../../../astro/test/test-image-service.js'; export default { integrations: [mdx()], experimental: { - assets: true - } + assets: true, + }, + image: { + service: testImageService(), + }, } diff --git a/packages/integrations/vercel/test/fixtures/image/astro.config.mjs b/packages/integrations/vercel/test/fixtures/image/astro.config.mjs index a38be5065f8e..febdb92ec6f5 100644 --- a/packages/integrations/vercel/test/fixtures/image/astro.config.mjs +++ b/packages/integrations/vercel/test/fixtures/image/astro.config.mjs @@ -1,9 +1,13 @@ import vercel from '@astrojs/vercel/static'; import { defineConfig } from 'astro/config'; +import { testImageService } from '../../../../../astro/test/test-image-service.js'; export default defineConfig({ adapter: vercel({imageService: true}), experimental: { - assets: true - } + assets: true, + }, + image: { + service: testImageService(), + }, }); diff --git a/packages/integrations/vercel/test/fixtures/redirects/astro.config.mjs b/packages/integrations/vercel/test/fixtures/redirects/astro.config.mjs index a38be5065f8e..6268bf916ddd 100644 --- a/packages/integrations/vercel/test/fixtures/redirects/astro.config.mjs +++ b/packages/integrations/vercel/test/fixtures/redirects/astro.config.mjs @@ -1,9 +1,6 @@ -import vercel from '@astrojs/vercel/static'; import { defineConfig } from 'astro/config'; +import vercel from '@astrojs/vercel/static'; export default defineConfig({ - adapter: vercel({imageService: true}), - experimental: { - assets: true - } + adapter: vercel(), }); From 6d8aa4b61f22df2c5052d06dac8e53bbce73f5f5 Mon Sep 17 00:00:00 2001 From: beynar <21969002+beynar@users.noreply.github.com> Date: Tue, 13 Jun 2023 22:34:44 +0200 Subject: [PATCH 07/60] [Cloudflare integration] Expose cf metadata and Cloudflare caches API (#7386) * Add cf and cache properties to runtime * add changeset * reorder import * fix types and add tests * fix package name * test --- .changeset/angry-socks-sell.md | 5 +++ packages/integrations/cloudflare/package.json | 1 + .../integrations/cloudflare/src/runtime.ts | 6 ++++ .../cloudflare/src/server.advanced.ts | 11 ++++-- .../cloudflare/src/server.directory.ts | 5 ++- packages/integrations/cloudflare/test/cf.js | 35 +++++++++++++++++++ .../test/fixtures/cf/astro.config.mjs | 8 +++++ .../cloudflare/test/fixtures/cf/package.json | 9 +++++ .../test/fixtures/cf/src/pages/index.astro | 14 ++++++++ .../cloudflare/test/test-utils.js | 4 +-- pnpm-lock.yaml | 26 +++++++++++--- 11 files changed, 114 insertions(+), 10 deletions(-) create mode 100644 .changeset/angry-socks-sell.md create mode 100644 packages/integrations/cloudflare/test/cf.js create mode 100644 packages/integrations/cloudflare/test/fixtures/cf/astro.config.mjs create mode 100644 packages/integrations/cloudflare/test/fixtures/cf/package.json create mode 100644 packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro diff --git a/.changeset/angry-socks-sell.md b/.changeset/angry-socks-sell.md new file mode 100644 index 000000000000..d04d01cb230b --- /dev/null +++ b/.changeset/angry-socks-sell.md @@ -0,0 +1,5 @@ +--- +'@astrojs/cloudflare': minor +--- + +Expose cf metadata and Cloudflare Worker Cache API through `caches` in runtime. diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 91bb1ae6acab..46f401674732 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -39,6 +39,7 @@ }, "dependencies": { "@astrojs/underscore-redirects": "^0.1.0", + "@cloudflare/workers-types": "^4.20230518.0", "esbuild": "^0.17.12", "tiny-glob": "^0.2.9" }, diff --git a/packages/integrations/cloudflare/src/runtime.ts b/packages/integrations/cloudflare/src/runtime.ts index ddf372cb4d40..cd3dfff4755a 100644 --- a/packages/integrations/cloudflare/src/runtime.ts +++ b/packages/integrations/cloudflare/src/runtime.ts @@ -1,8 +1,12 @@ +import type { Cache, CacheStorage, IncomingRequestCfProperties } from '@cloudflare/workers-types'; + export type WorkerRuntime = { name: 'cloudflare'; env: T; waitUntil(promise: Promise): void; passThroughOnException(): void; + caches?: CacheStorage & { default: Cache }; + cf?: IncomingRequestCfProperties; }; export type PagesRuntime = { @@ -13,6 +17,8 @@ export type PagesRuntime = { data: U; waitUntil(promise: Promise): void; next(request: Request): void; + caches?: CacheStorage & { default: Cache }; + cf?: IncomingRequestCfProperties; }; export function getRuntime( diff --git a/packages/integrations/cloudflare/src/server.advanced.ts b/packages/integrations/cloudflare/src/server.advanced.ts index 669e95ebca6a..0fc7af855f7d 100644 --- a/packages/integrations/cloudflare/src/server.advanced.ts +++ b/packages/integrations/cloudflare/src/server.advanced.ts @@ -1,4 +1,5 @@ import type { SSRManifest } from 'astro'; +import type { Request as CFRequest } from '@cloudflare/workers-types'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from './util.js'; @@ -14,7 +15,7 @@ type Env = { export function createExports(manifest: SSRManifest) { const app = new App(manifest); - const fetch = async (request: Request, env: Env, context: any) => { + const fetch = async (request: Request & CFRequest, env: Env, context: any) => { process.env = env as any; const { pathname } = new URL(request.url); @@ -31,7 +32,13 @@ export function createExports(manifest: SSRManifest) { Symbol.for('astro.clientAddress'), request.headers.get('cf-connecting-ip') ); - Reflect.set(request, Symbol.for('runtime'), { env, name: 'cloudflare', ...context }); + Reflect.set(request, Symbol.for('runtime'), { + env, + name: 'cloudflare', + caches, + cf: request.cf, + ...context, + }); let response = await app.render(request, routeData); if (app.setCookieHeaders) { diff --git a/packages/integrations/cloudflare/src/server.directory.ts b/packages/integrations/cloudflare/src/server.directory.ts index 2a0e06e5c2a7..1c134c6d38b4 100644 --- a/packages/integrations/cloudflare/src/server.directory.ts +++ b/packages/integrations/cloudflare/src/server.directory.ts @@ -1,4 +1,5 @@ import type { SSRManifest } from 'astro'; +import type { Request as CFRequest } from '@cloudflare/workers-types'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from './util.js'; @@ -14,7 +15,7 @@ export function createExports(manifest: SSRManifest) { next, ...runtimeEnv }: { - request: Request; + request: Request & CFRequest; next: (request: Request) => void; } & Record) => { process.env = runtimeEnv.env as any; @@ -36,6 +37,8 @@ export function createExports(manifest: SSRManifest) { ...runtimeEnv, name: 'cloudflare', next, + caches, + cf: request.cf, }); let response = await app.render(request, routeData); diff --git a/packages/integrations/cloudflare/test/cf.js b/packages/integrations/cloudflare/test/cf.js new file mode 100644 index 000000000000..ba4efedef001 --- /dev/null +++ b/packages/integrations/cloudflare/test/cf.js @@ -0,0 +1,35 @@ +import { loadFixture, runCLI } from './test-utils.js'; +import { expect } from 'chai'; +import * as cheerio from 'cheerio'; +import cloudflare from '../dist/index.js'; + +describe('Cf metadata and caches', () => { + /** @type {import('./test-utils').Fixture} */ + let fixture; + + before(async () => { + fixture = await loadFixture({ + root: './fixtures/cf/', + output: 'server', + adapter: cloudflare(), + }); + await fixture.build(); + }); + + it('Load cf and caches API', async () => { + const { ready, stop } = runCLI('./fixtures/cf/', { silent: false, port: 8788 }); + + try { + await ready; + let res = await fetch(`http://localhost:8788/`); + expect(res.status).to.equal(200); + let html = await res.text(); + let $ = cheerio.load(html); + // console.log($('#cf').text(), html); + expect($('#cf').text()).to.contain('city'); + expect($('#hasCache').text()).to.equal('true'); + } finally { + stop(); + } + }); +}); diff --git a/packages/integrations/cloudflare/test/fixtures/cf/astro.config.mjs b/packages/integrations/cloudflare/test/fixtures/cf/astro.config.mjs new file mode 100644 index 000000000000..f92829843d3c --- /dev/null +++ b/packages/integrations/cloudflare/test/fixtures/cf/astro.config.mjs @@ -0,0 +1,8 @@ +import { defineConfig } from 'astro/config'; +import cloudflare from '@astrojs/cloudflare'; + + +export default defineConfig({ + adapter: cloudflare(), + output: 'server', +}); diff --git a/packages/integrations/cloudflare/test/fixtures/cf/package.json b/packages/integrations/cloudflare/test/fixtures/cf/package.json new file mode 100644 index 000000000000..cf8ae0082436 --- /dev/null +++ b/packages/integrations/cloudflare/test/fixtures/cf/package.json @@ -0,0 +1,9 @@ +{ + "name": "@test/astro-cloudflare-cf", + "version": "0.0.0", + "private": true, + "dependencies": { + "@astrojs/cloudflare": "workspace:*", + "astro": "workspace:*" + } +} diff --git a/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro new file mode 100644 index 000000000000..c9e67bb05af4 --- /dev/null +++ b/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro @@ -0,0 +1,14 @@ +--- +import { getRuntime } from '@astrojs/cloudflare/runtime'; +const runtime = getRuntime(Astro.request); +--- + + + Testing + + +

Testing

+
{JSON.stringify(runtime.cf)}
+
{!!runtime.caches}
+ + diff --git a/packages/integrations/cloudflare/test/test-utils.js b/packages/integrations/cloudflare/test/test-utils.js index b4628825cf66..399b978120b6 100644 --- a/packages/integrations/cloudflare/test/test-utils.js +++ b/packages/integrations/cloudflare/test/test-utils.js @@ -19,9 +19,9 @@ const wranglerPath = fileURLToPath( new URL('../node_modules/wrangler/bin/wrangler.js', import.meta.url) ); -export function runCLI(basePath, { silent }) { +export function runCLI(basePath, { silent, port = 8787 }) { const script = fileURLToPath(new URL(`${basePath}/dist/_worker.js`, import.meta.url)); - const p = spawn('node', [wranglerPath, 'dev', '-l', script]); + const p = spawn('node', [wranglerPath, 'dev', '-l', script, '--port', port]); p.stderr.setEncoding('utf-8'); p.stdout.setEncoding('utf-8'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index be3b20224991..f5d6fee1d14d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,8 +1,4 @@ -lockfileVersion: '6.1' - -settings: - autoInstallPeers: false - excludeLinksFromLockfile: false +lockfileVersion: '6.0' overrides: tsconfig-resolver>type-fest: 3.0.0 @@ -3589,6 +3585,9 @@ importers: '@astrojs/underscore-redirects': specifier: ^0.1.0 version: link:../../underscore-redirects + '@cloudflare/workers-types': + specifier: ^4.20230518.0 + version: 4.20230518.0 esbuild: specifier: ^0.17.12 version: 0.17.12 @@ -3627,6 +3626,15 @@ importers: specifier: workspace:* version: link:../../../../../astro + packages/integrations/cloudflare/test/fixtures/cf: + dependencies: + '@astrojs/cloudflare': + specifier: workspace:* + version: link:../../.. + astro: + specifier: workspace:* + version: link:../../../../../astro + packages/integrations/cloudflare/test/fixtures/no-output: dependencies: '@astrojs/cloudflare': @@ -7226,6 +7234,10 @@ packages: mime: 3.0.0 dev: true + /@cloudflare/workers-types@4.20230518.0: + resolution: {integrity: sha512-A0w1V+5SUawGaaPRlhFhSC/SCDT9oQG8TMoWOKFLA4qbqagELqEAFD4KySBIkeVOvCBLT1DZSYBMCxbXddl0kw==} + dev: false + /@colors/colors@1.5.0: resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} @@ -18393,3 +18405,7 @@ packages: dependencies: solid-js: 1.7.4 dev: false + +settings: + autoInstallPeers: false + excludeLinksFromLockfile: false From 32b0f84a1c13fa6745d5455cb78caa0f8a6d4f02 Mon Sep 17 00:00:00 2001 From: matthewp Date: Tue, 13 Jun 2023 20:37:42 +0000 Subject: [PATCH 08/60] [ci] format --- packages/integrations/cloudflare/src/server.advanced.ts | 2 +- packages/integrations/cloudflare/src/server.directory.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/integrations/cloudflare/src/server.advanced.ts b/packages/integrations/cloudflare/src/server.advanced.ts index 0fc7af855f7d..510e4e7e5a00 100644 --- a/packages/integrations/cloudflare/src/server.advanced.ts +++ b/packages/integrations/cloudflare/src/server.advanced.ts @@ -1,5 +1,5 @@ -import type { SSRManifest } from 'astro'; import type { Request as CFRequest } from '@cloudflare/workers-types'; +import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from './util.js'; diff --git a/packages/integrations/cloudflare/src/server.directory.ts b/packages/integrations/cloudflare/src/server.directory.ts index 1c134c6d38b4..a0f3299fd438 100644 --- a/packages/integrations/cloudflare/src/server.directory.ts +++ b/packages/integrations/cloudflare/src/server.directory.ts @@ -1,5 +1,5 @@ -import type { SSRManifest } from 'astro'; import type { Request as CFRequest } from '@cloudflare/workers-types'; +import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from './util.js'; From 06315a1fdea7b9f89878e2c89ba854bc638e9c79 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:55:58 -0700 Subject: [PATCH 09/60] [ci] release (#7368) Co-authored-by: github-actions[bot] --- .changeset/angry-socks-sell.md | 5 - .changeset/cool-readers-stare.md | 5 - .changeset/proud-vans-approve.md | 5 - .changeset/real-dryers-leave.md | 5 - examples/basics/package.json | 2 +- examples/blog/package.json | 6 +- examples/component/package.json | 2 +- examples/deno/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 4 +- examples/framework-multiple/package.json | 4 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 4 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 4 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 4 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 6 +- examples/with-markdoc/package.json | 4 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 4 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 4 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 8 ++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/CHANGELOG.md | 11 ++ packages/integrations/cloudflare/package.json | 4 +- packages/integrations/deno/package.json | 2 +- packages/integrations/image/package.json | 2 +- packages/integrations/lit/CHANGELOG.md | 6 + packages/integrations/lit/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 +- pnpm-lock.yaml | 126 +++++++----------- 47 files changed, 124 insertions(+), 151 deletions(-) delete mode 100644 .changeset/angry-socks-sell.md delete mode 100644 .changeset/cool-readers-stare.md delete mode 100644 .changeset/proud-vans-approve.md delete mode 100644 .changeset/real-dryers-leave.md diff --git a/.changeset/angry-socks-sell.md b/.changeset/angry-socks-sell.md deleted file mode 100644 index d04d01cb230b..000000000000 --- a/.changeset/angry-socks-sell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/cloudflare': minor ---- - -Expose cf metadata and Cloudflare Worker Cache API through `caches` in runtime. diff --git a/.changeset/cool-readers-stare.md b/.changeset/cool-readers-stare.md deleted file mode 100644 index c7fb65872db8..000000000000 --- a/.changeset/cool-readers-stare.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/lit': minor ---- - -Upgrade lit dependencies diff --git a/.changeset/proud-vans-approve.md b/.changeset/proud-vans-approve.md deleted file mode 100644 index c58b5279957c..000000000000 --- a/.changeset/proud-vans-approve.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixed `RedirectConfig` type definition diff --git a/.changeset/real-dryers-leave.md b/.changeset/real-dryers-leave.md deleted file mode 100644 index 4d31e082a382..000000000000 --- a/.changeset/real-dryers-leave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix missing stacktraces for Zod errors diff --git a/examples/basics/package.json b/examples/basics/package.json index faaed5dbae73..5f35d1d4fa0f 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.5.6" + "astro": "^2.6.4" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 8aad8cdf1281..f02d4d9d53c9 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^0.19.5", + "@astrojs/mdx": "^0.19.7", "@astrojs/rss": "^2.4.3", - "@astrojs/sitemap": "^1.3.2", - "astro": "^2.5.6" + "@astrojs/sitemap": "^1.3.3", + "astro": "^2.6.4" } } diff --git a/examples/component/package.json b/examples/component/package.json index 0d91bd079839..f5fd04490bae 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.5.6" + "astro": "^2.6.4" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index b267befb24d8..243587845fd6 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.5.6" + "astro": "^2.6.4" }, "devDependencies": { "@astrojs/deno": "^4.1.1" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 6d686ba768ea..cc1cc3b5d71b 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.2.2", "@types/alpinejs": "^3.7.1", "alpinejs": "^3.12.0", - "astro": "^2.5.6" + "astro": "^2.6.4" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index aa176cac9008..7610bf90a516 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/lit": "^2.0.2", + "@astrojs/lit": "^2.1.0", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^2.5.6", + "astro": "^2.6.4", "lit": "^2.7.4" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index e5fb7b468df2..5c358a378bbc 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -14,9 +14,9 @@ "@astrojs/preact": "^2.2.1", "@astrojs/react": "^2.2.1", "@astrojs/solid-js": "^2.2.0", - "@astrojs/svelte": "^2.2.0", + "@astrojs/svelte": "^3.0.0", "@astrojs/vue": "^2.2.1", - "astro": "^2.5.6", + "astro": "^2.6.4", "preact": "^10.13.2", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 5b9b5ca9926e..f5db19219382 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^2.2.1", "@preact/signals": "^1.1.3", - "astro": "^2.5.6", + "astro": "^2.6.4", "preact": "^10.13.2" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index b57022042c7e..7c8ea9eb2400 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^2.2.1", "@types/react": "^18.2.5", "@types/react-dom": "^18.2.3", - "astro": "^2.5.6", + "astro": "^2.6.4", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index f399110b840d..b06ad23cee69 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^2.2.0", - "astro": "^2.5.6", + "astro": "^2.6.4", "solid-js": "^1.7.4" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index a3c348e62f30..86f146fd359b 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/svelte": "^2.2.0", - "astro": "^2.5.6", + "@astrojs/svelte": "^3.0.0", + "astro": "^2.6.4", "svelte": "^3.58.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index f6ea660a6ac0..2398462a4abe 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^2.2.1", - "astro": "^2.5.6", + "astro": "^2.6.4", "vue": "^3.2.47" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index fb43330ae91b..2077ab4e7115 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "@astrojs/node": "^5.1.4", - "astro": "^2.5.6" + "@astrojs/node": "^5.2.0", + "astro": "^2.6.4" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 9e38a05899d5..28fad4578482 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.5.6" + "astro": "^2.6.4" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 9cd76a52f152..48e3b11310d0 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -12,8 +12,8 @@ "server": "node dist/server/entry.mjs" }, "dependencies": { - "@astrojs/node": "^5.1.4", - "astro": "^2.5.6", + "@astrojs/node": "^5.2.0", + "astro": "^2.6.4", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index da59a3f411c4..395f66d89e0a 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.5.6" + "astro": "^2.6.4" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 5f161e8f5b4d..5e33bffa18b4 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.5.6" + "astro": "^2.6.4" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 1aeb84bce35f..65133a7352e3 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.5.6" + "astro": "^2.6.4" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 039523d19df9..fd3c02747f24 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -12,9 +12,9 @@ "server": "node dist/server/entry.mjs" }, "dependencies": { - "@astrojs/node": "^5.1.4", - "@astrojs/svelte": "^2.2.0", - "astro": "^2.5.6", + "@astrojs/node": "^5.2.0", + "@astrojs/svelte": "^3.0.0", + "astro": "^2.6.4", "svelte": "^3.58.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 78464f67725b..79fc6581aa6c 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "@astrojs/markdoc": "^0.3.0", - "astro": "^2.6.2" + "@astrojs/markdoc": "^0.3.3", + "astro": "^2.6.4" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 73074cd65b41..21d0fac8de58 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^2.2.1", - "astro": "^2.5.6", + "astro": "^2.6.4", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 3693a32f3f9d..c863aa4b3b4c 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.5.6" + "astro": "^2.6.4" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 5c92ed78fdef..98f1b326cc2c 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^0.19.5", + "@astrojs/mdx": "^0.19.7", "@astrojs/preact": "^2.2.1", - "astro": "^2.5.6", + "astro": "^2.6.4", "preact": "^10.13.2" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 6aacc796638f..9e933d6f172c 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^2.2.1", "@nanostores/preact": "^0.4.1", - "astro": "^2.5.6", + "astro": "^2.6.4", "nanostores": "^0.8.1", "preact": "^10.13.2" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index e8792dc38eff..4fe651cfd3c2 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -11,10 +11,10 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^0.19.5", + "@astrojs/mdx": "^0.19.7", "@astrojs/tailwind": "^3.1.3", "@types/canvas-confetti": "^1.6.0", - "astro": "^2.5.6", + "astro": "^2.6.4", "autoprefixer": "^10.4.14", "canvas-confetti": "^1.6.0", "postcss": "^8.4.23", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 8182f61fe9a9..7e6f0edbcc3e 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.5.6", + "astro": "^2.6.4", "vite-plugin-pwa": "0.14.7", "workbox-window": "^6.5.4" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 307feda3ec12..ac02ea277d4c 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^2.5.6", + "astro": "^2.6.4", "vitest": "^0.31.0" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index ea3dbffc23bc..e950af964fbc 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 2.6.4 + +### Patch Changes + +- [#7366](https://github.com/withastro/astro/pull/7366) [`42baf62e7`](https://github.com/withastro/astro/commit/42baf62e7ca0351a2f2c7d06ec58086f90519bb7) Thanks [@aappaapp](https://github.com/aappaapp)! - Fixed `RedirectConfig` type definition + +- [#7380](https://github.com/withastro/astro/pull/7380) [`1c7b63595`](https://github.com/withastro/astro/commit/1c7b6359563f5e83325121efb2e61915d818a35a) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix missing stacktraces for Zod errors + ## 2.6.3 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 91bd00560873..8aec60cdae59 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "2.6.3", + "version": "2.6.4", "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/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md index c53c919e15bd..efd60d2551dd 100644 --- a/packages/integrations/cloudflare/CHANGELOG.md +++ b/packages/integrations/cloudflare/CHANGELOG.md @@ -1,5 +1,16 @@ # @astrojs/cloudflare +## 6.5.0 + +### Minor Changes + +- [#7386](https://github.com/withastro/astro/pull/7386) [`6d8aa4b61`](https://github.com/withastro/astro/commit/6d8aa4b61f22df2c5052d06dac8e53bbce73f5f5) Thanks [@beynar](https://github.com/beynar)! - Expose cf metadata and Cloudflare Worker Cache API through `caches` in runtime. + +### Patch Changes + +- Updated dependencies [[`42baf62e7`](https://github.com/withastro/astro/commit/42baf62e7ca0351a2f2c7d06ec58086f90519bb7), [`1c7b63595`](https://github.com/withastro/astro/commit/1c7b6359563f5e83325121efb2e61915d818a35a)]: + - astro@2.6.4 + ## 6.4.0 ### Minor Changes diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 46f401674732..bf4186d65692 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/cloudflare", "description": "Deploy your site to Cloudflare Workers/Pages", - "version": "6.4.0", + "version": "6.5.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -44,7 +44,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^2.6.3" + "astro": "workspace:^2.6.4" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 861961a7bc2a..7d211b42d6ea 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.6.3" + "astro": "workspace:^2.6.4" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index 17d420d1a662..28dffe972c45 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.6.3", + "astro": "workspace:^2.6.4", "sharp": ">=0.31.0" }, "peerDependenciesMeta": { diff --git a/packages/integrations/lit/CHANGELOG.md b/packages/integrations/lit/CHANGELOG.md index 6a1fa51bb942..edf38dfa90ec 100644 --- a/packages/integrations/lit/CHANGELOG.md +++ b/packages/integrations/lit/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/lit +## 2.1.0 + +### Minor Changes + +- [#7373](https://github.com/withastro/astro/pull/7373) [`0986a44dd`](https://github.com/withastro/astro/commit/0986a44ddd2b48edbe318f6fceb7f4ce4670ce05) Thanks [@matthewp](https://github.com/matthewp)! - Upgrade lit dependencies + ## 2.0.2 ### Patch Changes diff --git a/packages/integrations/lit/package.json b/packages/integrations/lit/package.json index 964e86adbd14..22fe219eb31b 100644 --- a/packages/integrations/lit/package.json +++ b/packages/integrations/lit/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/lit", - "version": "2.0.2", + "version": "2.1.0", "description": "Use Lit components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 35c215d00dfe..47ad27a6d3f8 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -73,7 +73,7 @@ "zod": "^3.17.3" }, "peerDependencies": { - "astro": "workspace:^2.6.3" + "astro": "workspace:^2.6.4" }, "devDependencies": { "@astrojs/markdown-remark": "^2.2.1", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 6f9df58324f9..1c1eca5eb25c 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.6.3" + "astro": "workspace:^2.6.4" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index d29800d80ea8..9a0812bd8887 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -38,7 +38,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^2.6.3" + "astro": "workspace:^2.6.4" }, "devDependencies": { "@types/node": "^18.7.21", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 136f901ac99f..b039795abc4b 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -48,7 +48,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.6.3", + "astro": "workspace:^2.6.4", "svelte": "^3.55.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 21e0838f5b9c..750962842e6f 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -44,7 +44,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.6.3", + "astro": "workspace:^2.6.4", "tailwindcss": "^3.0.24" }, "pnpm": { diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 4290880a5968..6fc901dc73fd 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -60,7 +60,7 @@ "web-vitals": "^3.1.1" }, "peerDependencies": { - "astro": "workspace:^2.6.3" + "astro": "workspace:^2.6.4" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.2", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 1cc065462f07..ca1c8ad3eb45 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.2.37" }, "peerDependencies": { - "astro": "workspace:^2.6.3", + "astro": "workspace:^2.6.4", "vue": "^3.2.30" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f5d6fee1d14d..47bf785694c7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,8 @@ -lockfileVersion: '6.0' +lockfileVersion: '6.1' + +settings: + autoInstallPeers: false + excludeLinksFromLockfile: false overrides: tsconfig-resolver>type-fest: 3.0.0 @@ -123,34 +127,34 @@ importers: examples/basics: dependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/blog: dependencies: '@astrojs/mdx': - specifier: ^0.19.5 + specifier: ^0.19.7 version: link:../../packages/integrations/mdx '@astrojs/rss': specifier: ^2.4.3 version: link:../../packages/astro-rss '@astrojs/sitemap': - specifier: ^1.3.2 + specifier: ^1.3.3 version: link:../../packages/integrations/sitemap astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -169,19 +173,19 @@ importers: specifier: ^3.12.0 version: 3.12.0 astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/framework-lit: dependencies: '@astrojs/lit': - specifier: ^2.0.2 + specifier: ^2.1.0 version: link:../../packages/integrations/lit '@webcomponents/template-shadowroot': specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro lit: specifier: ^2.7.4 @@ -199,13 +203,13 @@ importers: specifier: ^2.2.0 version: link:../../packages/integrations/solid '@astrojs/svelte': - specifier: ^2.2.0 - version: 2.2.0(astro@packages+astro)(svelte@3.58.0)(typescript@5.0.2) + specifier: ^3.0.0 + version: link:../../packages/integrations/svelte '@astrojs/vue': specifier: ^2.2.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -235,7 +239,7 @@ importers: specifier: ^1.1.3 version: 1.1.3(preact@10.13.2) astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -253,7 +257,7 @@ importers: specifier: ^18.2.3 version: 18.2.3 astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -268,7 +272,7 @@ importers: specifier: ^2.2.0 version: link:../../packages/integrations/solid astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro solid-js: specifier: ^1.7.4 @@ -277,10 +281,10 @@ importers: examples/framework-svelte: dependencies: '@astrojs/svelte': - specifier: ^2.2.0 - version: 2.2.0(astro@packages+astro)(svelte@3.58.0)(typescript@5.0.2) + specifier: ^3.0.0 + version: link:../../packages/integrations/svelte astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro svelte: specifier: ^3.58.0 @@ -292,7 +296,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro vue: specifier: ^3.2.47 @@ -301,25 +305,25 @@ importers: examples/hackernews: dependencies: '@astrojs/node': - specifier: ^5.1.4 + specifier: ^5.2.0 version: link:../../packages/integrations/node astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/middleware: dependencies: '@astrojs/node': - specifier: ^5.1.4 + specifier: ^5.2.0 version: link:../../packages/integrations/node astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -328,31 +332,31 @@ importers: examples/minimal: dependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/ssr: dependencies: '@astrojs/node': - specifier: ^5.1.4 + specifier: ^5.2.0 version: link:../../packages/integrations/node '@astrojs/svelte': - specifier: ^2.2.0 - version: 2.2.0(astro@packages+astro)(svelte@3.58.0)(typescript@5.0.2) + specifier: ^3.0.0 + version: link:../../packages/integrations/svelte astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro svelte: specifier: ^3.58.0 @@ -361,10 +365,10 @@ importers: examples/with-markdoc: dependencies: '@astrojs/markdoc': - specifier: ^0.3.0 + specifier: ^0.3.3 version: link:../../packages/integrations/markdoc astro: - specifier: ^2.6.2 + specifier: ^2.6.4 version: link:../../packages/astro examples/with-markdown-plugins: @@ -373,7 +377,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/markdown/remark astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -394,19 +398,19 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro examples/with-mdx: dependencies: '@astrojs/mdx': - specifier: ^0.19.5 + specifier: ^0.19.7 version: link:../../packages/integrations/mdx '@astrojs/preact': specifier: ^2.2.1 version: link:../../packages/integrations/preact astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -421,7 +425,7 @@ importers: specifier: ^0.4.1 version: 0.4.1(nanostores@0.8.1)(preact@10.13.2) astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro nanostores: specifier: ^0.8.1 @@ -433,7 +437,7 @@ importers: examples/with-tailwindcss: dependencies: '@astrojs/mdx': - specifier: ^0.19.5 + specifier: ^0.19.7 version: link:../../packages/integrations/mdx '@astrojs/tailwind': specifier: ^3.1.3 @@ -442,7 +446,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro autoprefixer: specifier: ^10.4.14 @@ -460,7 +464,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.14.7 @@ -472,7 +476,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^2.5.6 + specifier: ^2.6.4 version: link:../../packages/astro vitest: specifier: ^0.31.0 @@ -5471,23 +5475,6 @@ packages: vscode-uri: 3.0.7 dev: false - /@astrojs/svelte@2.2.0(astro@packages+astro)(svelte@3.58.0)(typescript@5.0.2): - resolution: {integrity: sha512-4kfh3GEIIOqH/wwTwLloRsZJ3z7rJ1eZWZ1oFrfEIjiQny5XqxyRJp/tUseKfaeDwKQGL+9t31ePTuwxx5oung==} - engines: {node: '>=16.12.0'} - peerDependencies: - astro: '*' - svelte: ^3.54.0 - dependencies: - '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.58.0)(vite@4.3.1) - astro: link:packages/astro - svelte: 3.58.0 - svelte2tsx: 0.5.23(svelte@3.58.0)(typescript@5.0.2) - transitivePeerDependencies: - - supports-color - - typescript - - vite - dev: false - /@babel/code-frame@7.21.4: resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==} engines: {node: '>=6.9.0'} @@ -16796,21 +16783,6 @@ packages: svelte: 3.58.0 dev: false - /svelte2tsx@0.5.23(svelte@3.58.0)(typescript@5.0.2): - resolution: {integrity: sha512-jYFnugTQRFmUpvLXPQrKzVYcW5ErT+0QCxg027Zx9BuvYefMZFuoBSTDYe7viPEFGrPPiLgT2m7f5n9khE7f7Q==} - peerDependencies: - svelte: ^3.24 - typescript: ^4.1.2 - peerDependenciesMeta: - typescript: - optional: true - dependencies: - dedent-js: 1.0.1 - pascal-case: 3.1.2 - svelte: 3.58.0 - typescript: 5.0.2 - dev: false - /svelte2tsx@0.6.15(svelte@3.58.0)(typescript@5.0.2): resolution: {integrity: sha512-+j6RmA3g5pPs1DHa/rdzJjjhZuCfWx0IbNPaR99A2bvOSPPY6BlVkBGU0urI+DGcWHhYEG28Flo942KqlAkpEQ==} peerDependencies: @@ -18405,7 +18377,3 @@ packages: dependencies: solid-js: 1.7.4 dev: false - -settings: - autoInstallPeers: false - excludeLinksFromLockfile: false From 3f1cb6b1a001fb03419a313f72c9f4846b890fe0 Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 14 Jun 2023 11:55:37 +0200 Subject: [PATCH 10/60] @astrojs/tailwind: simplify, upgrade & fix support for ts config file (#6724) Co-authored-by: bluwy --- .changeset/real-spies-pretend.md | 34 +++++ .../e2e/fixtures/tailwindcss/astro.config.mjs | 9 +- .../fixtures/tailwindcss/postcss.config.js | 9 -- packages/astro/test/astro-scripts.test.js | 2 - .../fixtures/astro-scripts/astro.config.mjs | 11 +- .../test/fixtures/astro-scripts/deps.mjs | 2 - .../astro-scripts/tailwind.config.cjs | 8 ++ .../middleware-tailwind/astro.config.mjs | 10 +- .../middleware-tailwind/tailwind.config.cjs | 8 ++ .../fixtures/tailwindcss-ts/astro.config.ts | 13 +- .../fixtures/tailwindcss/astro.config.mjs | 10 +- .../fixtures/tailwindcss/postcss.config.js | 10 -- packages/integrations/tailwind/package.json | 3 +- packages/integrations/tailwind/src/index.ts | 111 ++--------------- pnpm-lock.yaml | 117 +++++++++++++++--- 15 files changed, 205 insertions(+), 152 deletions(-) create mode 100644 .changeset/real-spies-pretend.md delete mode 100644 packages/astro/e2e/fixtures/tailwindcss/postcss.config.js delete mode 100644 packages/astro/test/fixtures/astro-scripts/deps.mjs create mode 100644 packages/astro/test/fixtures/astro-scripts/tailwind.config.cjs create mode 100644 packages/astro/test/fixtures/middleware-tailwind/tailwind.config.cjs delete mode 100644 packages/astro/test/fixtures/tailwindcss/postcss.config.js diff --git a/.changeset/real-spies-pretend.md b/.changeset/real-spies-pretend.md new file mode 100644 index 000000000000..009585c7c14b --- /dev/null +++ b/.changeset/real-spies-pretend.md @@ -0,0 +1,34 @@ +--- +'@astrojs/tailwind': major +--- + +Let tailwind postcss plugin load its config file itself. This changes the `tailwind.config.js` loading behaviour where Tailwind would load the config file from `process.cwd()` instead of the project `root`. You can configure the integration's `config.path` option to load from a specific path instead. + +```js +import { defineConfig } from 'astro/config'; +import tailwind from '@astrojs/tailwind'; +import { fileURLToPath } from 'url'; + +export default defineConfig({ + integrations: [ + tailwind({ + config: { + path: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), + }, + }), + ], +}); +``` + +This change also requires a Tailwind config file to exist in your project as Astro's fallback value is no longer provided. It is set up automatically during `astro add tailwind`, but you can also manually create a `tailwind.config.cjs` file in your project root: + +```js +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], + theme: { + extend: {}, + }, + plugins: [], +} +``` diff --git a/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs b/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs index 473be9666e1e..681ec1bc25ba 100644 --- a/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs +++ b/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs @@ -1,9 +1,16 @@ import { defineConfig } from 'astro/config'; import tailwind from '@astrojs/tailwind'; +import { fileURLToPath } from 'url'; // https://astro.build/config export default defineConfig({ - integrations: [tailwind()], + integrations: [ + tailwind({ + config: { + path: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), + }, + }), + ], vite: { build: { assetsInlineLimit: 0, diff --git a/packages/astro/e2e/fixtures/tailwindcss/postcss.config.js b/packages/astro/e2e/fixtures/tailwindcss/postcss.config.js deleted file mode 100644 index 7df5ecb39683..000000000000 --- a/packages/astro/e2e/fixtures/tailwindcss/postcss.config.js +++ /dev/null @@ -1,9 +0,0 @@ -const path = require('path'); -module.exports = { - plugins: { - tailwindcss: { - config: path.join(__dirname, 'tailwind.config.js'), // update this if your path differs! - }, - autoprefixer: {} - }, -}; diff --git a/packages/astro/test/astro-scripts.test.js b/packages/astro/test/astro-scripts.test.js index da3fc7c6660d..ae2268d8097f 100644 --- a/packages/astro/test/astro-scripts.test.js +++ b/packages/astro/test/astro-scripts.test.js @@ -1,7 +1,6 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; import { loadFixture } from './test-utils.js'; -import { tailwind } from './fixtures/astro-scripts/deps.mjs'; describe('Scripts (hoisted and not)', () => { describe('Build', () => { @@ -141,7 +140,6 @@ describe('Scripts (hoisted and not)', () => { fixture = await loadFixture({ root: './fixtures/astro-scripts/', integrations: [ - tailwind(), { name: 'test-script-injection-with-injected-route', hooks: { diff --git a/packages/astro/test/fixtures/astro-scripts/astro.config.mjs b/packages/astro/test/fixtures/astro-scripts/astro.config.mjs index e841c915cfed..8e44acd75f44 100644 --- a/packages/astro/test/fixtures/astro-scripts/astro.config.mjs +++ b/packages/astro/test/fixtures/astro-scripts/astro.config.mjs @@ -1,8 +1,13 @@ import { defineConfig } from 'astro/config'; import tailwind from '@astrojs/tailwind'; +import { fileURLToPath } from 'url'; export default defineConfig({ integrations: [ - tailwind() - ] -}) + tailwind({ + config: { + path: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), + }, + }), + ], +}); diff --git a/packages/astro/test/fixtures/astro-scripts/deps.mjs b/packages/astro/test/fixtures/astro-scripts/deps.mjs deleted file mode 100644 index e6a090e7ba97..000000000000 --- a/packages/astro/test/fixtures/astro-scripts/deps.mjs +++ /dev/null @@ -1,2 +0,0 @@ -export { default as tailwind } from '@astrojs/tailwind'; - diff --git a/packages/astro/test/fixtures/astro-scripts/tailwind.config.cjs b/packages/astro/test/fixtures/astro-scripts/tailwind.config.cjs new file mode 100644 index 000000000000..f5368a76ab04 --- /dev/null +++ b/packages/astro/test/fixtures/astro-scripts/tailwind.config.cjs @@ -0,0 +1,8 @@ +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], + theme: { + extend: {}, + }, + plugins: [], +} diff --git a/packages/astro/test/fixtures/middleware-tailwind/astro.config.mjs b/packages/astro/test/fixtures/middleware-tailwind/astro.config.mjs index db58bbf858ea..73ece68e02b7 100644 --- a/packages/astro/test/fixtures/middleware-tailwind/astro.config.mjs +++ b/packages/astro/test/fixtures/middleware-tailwind/astro.config.mjs @@ -1,8 +1,14 @@ import { defineConfig } from 'astro/config'; import tailwind from '@astrojs/tailwind'; - +import { fileURLToPath } from 'url'; // https://astro.build/config export default defineConfig({ - integrations: [tailwind()], + integrations: [ + tailwind({ + config: { + path: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), + }, + }), + ], }); diff --git a/packages/astro/test/fixtures/middleware-tailwind/tailwind.config.cjs b/packages/astro/test/fixtures/middleware-tailwind/tailwind.config.cjs new file mode 100644 index 000000000000..f5368a76ab04 --- /dev/null +++ b/packages/astro/test/fixtures/middleware-tailwind/tailwind.config.cjs @@ -0,0 +1,8 @@ +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], + theme: { + extend: {}, + }, + plugins: [], +} diff --git a/packages/astro/test/fixtures/tailwindcss-ts/astro.config.ts b/packages/astro/test/fixtures/tailwindcss-ts/astro.config.ts index 0a5f36a87f53..936426736216 100644 --- a/packages/astro/test/fixtures/tailwindcss-ts/astro.config.ts +++ b/packages/astro/test/fixtures/tailwindcss-ts/astro.config.ts @@ -1,7 +1,14 @@ import { defineConfig } from 'astro/config'; -import tailwind from "@astrojs/tailwind"; +import tailwind from '@astrojs/tailwind'; +import { fileURLToPath } from 'url'; // https://astro.build/config export default defineConfig({ - integrations: [tailwind()] -}); \ No newline at end of file + integrations: [ + tailwind({ + config: { + path: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), + }, + }), + ], +}); diff --git a/packages/astro/test/fixtures/tailwindcss/astro.config.mjs b/packages/astro/test/fixtures/tailwindcss/astro.config.mjs index 8274fd3b9e58..390bd3b73504 100644 --- a/packages/astro/test/fixtures/tailwindcss/astro.config.mjs +++ b/packages/astro/test/fixtures/tailwindcss/astro.config.mjs @@ -1,10 +1,18 @@ import { defineConfig } from 'astro/config'; import tailwind from '@astrojs/tailwind'; import mdx from '@astrojs/mdx'; +import { fileURLToPath } from 'url'; // https://astro.build/config export default defineConfig({ - integrations: [tailwind(), mdx()], + integrations: [ + tailwind({ + config: { + path: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), + }, + }), + mdx(), + ], vite: { build: { assetsInlineLimit: 0, diff --git a/packages/astro/test/fixtures/tailwindcss/postcss.config.js b/packages/astro/test/fixtures/tailwindcss/postcss.config.js deleted file mode 100644 index 779a7e47fb53..000000000000 --- a/packages/astro/test/fixtures/tailwindcss/postcss.config.js +++ /dev/null @@ -1,10 +0,0 @@ -const path = require('path'); - -module.exports = { - plugins: { - tailwindcss: { - config: path.join(__dirname, 'tailwind.config.js'), // update this if your path differs! - }, - autoprefixer: {} - }, -}; diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 750962842e6f..e1349e01024e 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -32,9 +32,8 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "@proload/core": "^0.3.3", "autoprefixer": "^10.4.14", - "postcss": "^8.4.23", + "postcss": "^8.4.24", "postcss-load-config": "^4.0.1" }, "devDependencies": { diff --git a/packages/integrations/tailwind/src/index.ts b/packages/integrations/tailwind/src/index.ts index 04be569b9470..d489c019684f 100644 --- a/packages/integrations/tailwind/src/index.ts +++ b/packages/integrations/tailwind/src/index.ts @@ -1,72 +1,9 @@ -import load, { resolve } from '@proload/core'; -import type { AstroConfig, AstroIntegration } from 'astro'; +import type { AstroIntegration } from 'astro'; import autoprefixerPlugin from 'autoprefixer'; -import fs from 'fs/promises'; -import path from 'path'; -import tailwindPlugin, { type Config as TailwindConfig } from 'tailwindcss'; -import resolveConfig from 'tailwindcss/resolveConfig.js'; -import { fileURLToPath } from 'url'; +import type { ResultPlugin } from 'postcss-load-config'; +import tailwindPlugin from 'tailwindcss'; import type { CSSOptions, UserConfig } from 'vite'; -function getDefaultTailwindConfig(srcUrl: URL): TailwindConfig { - return resolveConfig({ - theme: { - extend: {}, - }, - plugins: [], - content: [path.join(fileURLToPath(srcUrl), `**`, `*.{astro,html,js,jsx,svelte,ts,tsx,vue}`)], - presets: undefined, // enable Tailwind's default preset - }) as TailwindConfig; -} - -async function getUserConfig(root: URL, configPath?: string, isRestart = false) { - const resolvedRoot = fileURLToPath(root); - let userConfigPath: string | undefined; - - if (configPath) { - const configPathWithLeadingSlash = /^\.*\//.test(configPath) ? configPath : `./${configPath}`; - userConfigPath = fileURLToPath(new URL(configPathWithLeadingSlash, root)); - } - - if (isRestart) { - // Hack: Write config to temporary file at project root - // This invalidates and reloads file contents when using ESM imports or "resolve" - const resolvedConfigPath = (await resolve('tailwind', { - mustExist: false, - cwd: resolvedRoot, - filePath: userConfigPath, - })) as string; - - const { dir, base } = path.parse(resolvedConfigPath); - const tempConfigPath = path.join(dir, `.temp.${Date.now()}.${base}`); - await fs.copyFile(resolvedConfigPath, tempConfigPath); - - let result: load.Config> | undefined; - try { - result = await load('tailwind', { - mustExist: false, - cwd: resolvedRoot, - filePath: tempConfigPath, - }); - } catch (err) { - console.error(err); - } finally { - await fs.unlink(tempConfigPath); - } - - return { - ...result, - filePath: resolvedConfigPath, - }; - } else { - return await load('tailwind', { - mustExist: false, - cwd: resolvedRoot, - filePath: userConfigPath, - }); - } -} - async function getPostCssConfig( root: UserConfig['root'], postcssInlineOptions: CSSOptions['postcss'] @@ -86,20 +23,19 @@ async function getPostCssConfig( } async function getViteConfiguration( - tailwindConfig: TailwindConfig, - viteConfig: AstroConfig['vite'] + tailwindConfigPath: string | undefined, + viteConfig: UserConfig ) { // We need to manually load postcss config files because when inlining the tailwind and autoprefixer plugins, // that causes vite to ignore postcss config files const postcssConfigResult = await getPostCssConfig(viteConfig.root, viteConfig.css?.postcss); - const postcssOptions = (postcssConfigResult && postcssConfigResult.options) || {}; - - const postcssPlugins = - postcssConfigResult && postcssConfigResult.plugins ? postcssConfigResult.plugins.slice() : []; - postcssPlugins.push(tailwindPlugin(tailwindConfig)); + const postcssOptions = postcssConfigResult?.options ?? {}; + const postcssPlugins = postcssConfigResult?.plugins?.slice() ?? []; + postcssPlugins.push(tailwindPlugin(tailwindConfigPath) as ResultPlugin); postcssPlugins.push(autoprefixerPlugin()); + return { css: { postcss: { @@ -123,7 +59,7 @@ type TailwindOptions = * Disabling this is useful when further customization of Tailwind styles * and directives is required. See {@link https://tailwindcss.com/docs/functions-and-directives#tailwind Tailwind's docs} * for more details on directives and customization. - * @default: true + * @default true */ applyBaseStyles?: boolean; }; @@ -136,33 +72,10 @@ export default function tailwindIntegration(options?: TailwindOptions): AstroInt return { name: '@astrojs/tailwind', hooks: { - 'astro:config:setup': async ({ - config, - updateConfig, - injectScript, - addWatchFile, - isRestart, - }) => { + 'astro:config:setup': async ({ config, updateConfig, injectScript }) => { // Inject the Tailwind postcss plugin - const userConfig = await getUserConfig(config.root, customConfigPath, isRestart); - - if (customConfigPath && !userConfig?.value) { - throw new Error( - `Could not find a Tailwind config at ${JSON.stringify( - customConfigPath - )}. Does the file exist?` - ); - } - - if (addWatchFile && userConfig?.filePath) { - addWatchFile(userConfig.filePath); - } - - const tailwindConfig = - (userConfig?.value as TailwindConfig) ?? getDefaultTailwindConfig(config.srcDir); - updateConfig({ - vite: await getViteConfiguration(tailwindConfig, config.vite), + vite: await getViteConfiguration(customConfigPath, config.vite), }); if (applyBaseStyles) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 47bf785694c7..548b8b4d9887 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4400,7 +4400,7 @@ importers: version: 9.2.2 vite: specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + version: 4.3.1(@types/node@14.18.21) packages/integrations/netlify/test/edge-functions/fixtures/dynimport: dependencies: @@ -4787,18 +4787,15 @@ importers: packages/integrations/tailwind: dependencies: - '@proload/core': - specifier: ^0.3.3 - version: 0.3.3 autoprefixer: specifier: ^10.4.14 - version: 10.4.14(postcss@8.4.23) + version: 10.4.14(postcss@8.4.24) postcss: - specifier: ^8.4.23 - version: 8.4.23 + specifier: ^8.4.24 + version: 8.4.24 postcss-load-config: specifier: ^4.0.1 - version: 4.0.1(postcss@8.4.23) + version: 4.0.1(postcss@8.4.24) devDependencies: astro: specifier: workspace:* @@ -4918,7 +4915,7 @@ importers: version: 3.0.0(vite@4.3.1)(vue@3.2.47) '@vue/babel-plugin-jsx': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.21.8) + version: 1.1.1 '@vue/compiler-sfc': specifier: ^3.2.39 version: 3.2.39 @@ -8397,13 +8394,6 @@ packages: preact: 10.13.2 dev: false - /@proload/core@0.3.3: - resolution: {integrity: sha512-7dAFWsIK84C90AMl24+N/ProHKm4iw0akcnoKjRvbfHifJZBLhaDsDus1QJmhG12lXj4e/uB/8mB/0aduCW+NQ==} - dependencies: - deepmerge: 4.3.1 - escalade: 3.1.1 - dev: false - /@rollup/plugin-alias@3.1.9(rollup@2.79.1): resolution: {integrity: sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==} engines: {node: '>=8.0.0'} @@ -9312,6 +9302,23 @@ packages: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: false + /@vue/babel-plugin-jsx@1.1.1: + 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.18.2) + '@babel/template': 7.20.7 + '@babel/traverse': 7.18.2 + '@babel/types': 7.21.5 + '@vue/babel-helper-vue-transform-on': 1.0.2 + camelcase: 6.3.0 + html-tags: 3.3.1 + svg-tags: 1.0.0 + transitivePeerDependencies: + - '@babel/core' + - supports-color + dev: false + /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.21.8): resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: @@ -9370,7 +9377,7 @@ packages: '@vue/shared': 3.2.39 estree-walker: 2.0.2 magic-string: 0.25.9 - postcss: 8.4.23 + postcss: 8.4.24 source-map: 0.6.1 dev: false @@ -9385,7 +9392,7 @@ packages: '@vue/shared': 3.2.47 estree-walker: 2.0.2 magic-string: 0.25.9 - postcss: 8.4.23 + postcss: 8.4.24 source-map: 0.6.1 /@vue/compiler-ssr@3.2.39: @@ -9784,6 +9791,22 @@ packages: postcss: 8.4.23 postcss-value-parser: 4.2.0 + /autoprefixer@10.4.14(postcss@8.4.24): + resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==} + engines: {node: ^10 || ^12 || >=14} + hasBin: true + peerDependencies: + postcss: ^8.1.0 + dependencies: + browserslist: 4.21.5 + caniuse-lite: 1.0.30001487 + fraction.js: 4.2.0 + normalize-range: 0.1.2 + picocolors: 1.0.0 + postcss: 8.4.24 + postcss-value-parser: 4.2.0 + dev: false + /available-typed-arrays@1.0.5: resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} engines: {node: '>= 0.4'} @@ -15239,6 +15262,23 @@ packages: postcss: 8.4.23 yaml: 2.2.2 + /postcss-load-config@4.0.1(postcss@8.4.24): + resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} + engines: {node: '>= 14'} + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 2.1.0 + postcss: 8.4.24 + yaml: 2.2.2 + dev: false + /postcss-logical@5.0.4(postcss@8.4.23): resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==} engines: {node: ^12 || ^14 || >=16} @@ -15416,6 +15456,14 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 + /postcss@8.4.24: + resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.6 + picocolors: 1.0.0 + source-map-js: 1.0.2 + /preact-render-to-string@5.2.4(preact@10.13.2): resolution: {integrity: sha512-iIPHb3BXUQ3Za6KNhkjN/waq11Oh+QWWtAgN3id3LrL+cszH3DYh8TxJPNQ6Aogsbu4JsqdJLBZltwPFpG6N6w==} peerDependencies: @@ -17602,6 +17650,39 @@ packages: - supports-color dev: false + /vite@4.3.1(@types/node@14.18.21): + resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 14.18.21 + esbuild: 0.17.18 + postcss: 8.4.23 + rollup: 3.21.8 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /vite@4.3.1(@types/node@18.16.3)(sass@1.52.2): resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} engines: {node: ^14.18.0 || >=16.0.0} From d67ae846103c42ff0464c578813749940326e8ba Mon Sep 17 00:00:00 2001 From: Arsh <69170106+lilnasy@users.noreply.github.com> Date: Thu, 15 Jun 2023 19:50:35 +0530 Subject: [PATCH 11/60] Node built-in modules support for Deno adapter (#7288) * feature(deno adapter): allow built-in node modules * Add changeset * format --- .changeset/modern-lobsters-sparkle.md | 5 ++ .github/workflows/ci.yml | 2 +- packages/integrations/deno/src/index.ts | 70 ++++++++++++++++++- .../integrations/deno/test/basics.test.ts | 6 ++ .../basics/src/pages/nodecompat.astro | 15 ++++ 5 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 .changeset/modern-lobsters-sparkle.md create mode 100644 packages/integrations/deno/test/fixtures/basics/src/pages/nodecompat.astro diff --git a/.changeset/modern-lobsters-sparkle.md b/.changeset/modern-lobsters-sparkle.md new file mode 100644 index 000000000000..057afdc0401d --- /dev/null +++ b/.changeset/modern-lobsters-sparkle.md @@ -0,0 +1,5 @@ +--- +'@astrojs/deno': minor +--- + +The deno adapter now supports npm package that require built-in node modules. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 970dc1d7c0d8..17848dfd9306 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,7 +148,7 @@ jobs: - name: Use Deno uses: denoland/setup-deno@v1 with: - deno-version: v1.26.1 + deno-version: v1.34.1 - name: Install dependencies run: pnpm install diff --git a/packages/integrations/deno/src/index.ts b/packages/integrations/deno/src/index.ts index 7e4a520ca798..8b1f38959fa9 100644 --- a/packages/integrations/deno/src/index.ts +++ b/packages/integrations/deno/src/index.ts @@ -21,6 +21,59 @@ const SHIM = `globalThis.process = { };`; const DENO_VERSION = `0.177.0`; +// REF: https://github.com/denoland/deno/tree/main/ext/node/polyfills +const COMPATIBLE_NODE_MODULES = [ + 'assert', + 'assert/strict', + 'async_hooks', + 'buffer', + 'child_process', + 'cluster', + 'console', + 'constants', + 'crypto', + 'dgram', + 'diagnostics_channel', + 'dns', + 'events', + 'fs', + 'fs/promises', + 'http', + // 'http2', + 'https', + 'inspector', + 'module', + 'net', + 'os', + 'path', + 'path/posix', + 'path/win32', + 'perf_hooks', + 'process', + 'punycode', + 'querystring', + 'readline', + 'repl', + 'stream', + 'stream/promises', + 'stream/web', + 'string_decoder', + 'sys', + 'timers', + 'timers/promises', + // 'tls', + 'trace_events', + 'tty', + 'url', + 'util', + 'util/types', + // 'v8', + // 'vm', + // 'wasi', + // 'webcrypto', + 'worker_threads', + 'zlib', +]; // We shim deno-specific imports so we can run the code in Node // to prerender pages. In the final Deno build, this import is @@ -51,6 +104,14 @@ const denoImportsShimPlugin = { }, }; +const denoRenameNodeModulesPlugin = { + name: '@astrojs/esbuild-rename-node-modules', + setup(build: esbuild.PluginBuild) { + const filter = new RegExp(COMPATIBLE_NODE_MODULES.map((mod) => `(^${mod}$)`).join('|')); + build.onResolve({ filter }, (args) => ({ path: 'node:' + args.path, external: true })); + }, +}; + export default function createIntegration(args?: Options): AstroIntegration { let _buildConfig: BuildConfig; let _vite: any; @@ -89,7 +150,7 @@ export default function createIntegration(args?: Options): AstroIntegration { } } vite.ssr = { - noExternal: true, + noExternal: COMPATIBLE_NODE_MODULES, }; if (Array.isArray(vite.build.rollupOptions.external)) { @@ -114,8 +175,11 @@ export default function createIntegration(args?: Options): AstroIntegration { allowOverwrite: true, format: 'esm', bundle: true, - external: ['@astrojs/markdown-remark'], - plugins: [denoImportsShimPlugin], + external: [ + ...COMPATIBLE_NODE_MODULES.map((mod) => `node:${mod}`), + '@astrojs/markdown-remark', + ], + plugins: [denoImportsShimPlugin, denoRenameNodeModulesPlugin], banner: { js: SHIM, }, diff --git a/packages/integrations/deno/test/basics.test.ts b/packages/integrations/deno/test/basics.test.ts index 381343d06999..9e417450688a 100644 --- a/packages/integrations/deno/test/basics.test.ts +++ b/packages/integrations/deno/test/basics.test.ts @@ -104,6 +104,12 @@ Deno.test({ assertEquals(h1!.innerText, 'test'); }); + await t.step('node compatibility', async () => { + const resp = await fetch(new URL('/nodecompat', app.url)); + assertEquals(resp.status, 200); + await resp.text(); + }); + app.stop(); }, }); diff --git a/packages/integrations/deno/test/fixtures/basics/src/pages/nodecompat.astro b/packages/integrations/deno/test/fixtures/basics/src/pages/nodecompat.astro new file mode 100644 index 000000000000..35c47793fddd --- /dev/null +++ b/packages/integrations/deno/test/fixtures/basics/src/pages/nodecompat.astro @@ -0,0 +1,15 @@ +--- +// unprefixed node built-in module +import path from 'path' + +// prefixed node built-in module +import os from 'node:os' +--- + +Go to my file +
+ CPU Architecture + {os.arch()} +
+

Everything went fine.

+ \ No newline at end of file From e407073c9e7ff984077c6a80cc10209b33b3ea5c Mon Sep 17 00:00:00 2001 From: Alvin Bryan <107407814+alvinometric@users.noreply.github.com> Date: Thu, 15 Jun 2023 08:40:32 -0700 Subject: [PATCH 12/60] Update error message for custom slugs in collection (#7395) Co-authored-by: Sarah Rainsberger --- packages/astro/src/core/errors/errors-data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts index 8139c0fcd147..a47087336073 100644 --- a/packages/astro/src/core/errors/errors-data.ts +++ b/packages/astro/src/core/errors/errors-data.ts @@ -1042,9 +1042,9 @@ See https://docs.astro.build/en/guides/server-side-rendering/ for more informati /** * @docs * @see - * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/) + * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/#defining-custom-slugs) * @description - * A content collection schema should not contain the `slug` field. This is reserved by Astro for generating entry slugs. Remove the `slug` field from your schema, or choose a different name. + * A content collection schema should not contain the `slug` field. This is reserved by Astro for generating entry slugs. Remove `slug` from your schema. You can still use custom slugs in your frontmatter. */ ContentSchemaContainsSlugError: { title: 'Content Schema should not contain `slug`.', From 556fd694a6672572caffce964b852d212d013ac8 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Thu, 15 Jun 2023 23:40:42 +0800 Subject: [PATCH 13/60] Rename tailwind integration options (#7391) --- .changeset/beige-schools-hang.md | 24 ++++++++++++ .changeset/real-spies-pretend.md | 12 +++--- .../e2e/fixtures/tailwindcss/astro.config.mjs | 4 +- .../fixtures/astro-scripts/astro.config.mjs | 4 +- .../middleware-tailwind/astro.config.mjs | 4 +- .../fixtures/tailwindcss-ts/astro.config.ts | 4 +- .../fixtures/tailwindcss/astro.config.mjs | 4 +- packages/integrations/tailwind/README.md | 18 +++++---- packages/integrations/tailwind/src/index.ts | 38 +++++++++---------- 9 files changed, 64 insertions(+), 48 deletions(-) create mode 100644 .changeset/beige-schools-hang.md diff --git a/.changeset/beige-schools-hang.md b/.changeset/beige-schools-hang.md new file mode 100644 index 000000000000..4b964f1823b9 --- /dev/null +++ b/.changeset/beige-schools-hang.md @@ -0,0 +1,24 @@ +--- +'@astrojs/tailwind': major +--- + +Rename options `config.path` to `configFile`, and `config.applyBaseStyles` to `applyBaseStyles`. If you are using these options, you need to migrate to the new names. + +```diff +// astro.config.mjs +import { defineConfig } from 'astro/config'; +import tailwind from '@astrojs/tailwind'; + +export default defineConfig({ + integrations: [ + tailwind({ +- config: { +- path: '...', +- applyBaseStyles: true, +- }, ++ configFile: '...', ++ applyBaseStyles: true, + }), + ], +}); +``` diff --git a/.changeset/real-spies-pretend.md b/.changeset/real-spies-pretend.md index 009585c7c14b..b38af662cefc 100644 --- a/.changeset/real-spies-pretend.md +++ b/.changeset/real-spies-pretend.md @@ -2,9 +2,12 @@ '@astrojs/tailwind': major --- -Let tailwind postcss plugin load its config file itself. This changes the `tailwind.config.js` loading behaviour where Tailwind would load the config file from `process.cwd()` instead of the project `root`. You can configure the integration's `config.path` option to load from a specific path instead. +Let the `tailwindcss` PostCSS plugin load its config file itself. This changes the Tailwind config loading behaviour where it is loaded from `process.cwd()` instead of the project `root`. + +If your Tailwind config file is not located in the current working directory, you will need to configure the integration's `configFile` option to load from a specific path: ```js +// astro.config.mjs import { defineConfig } from 'astro/config'; import tailwind from '@astrojs/tailwind'; import { fileURLToPath } from 'url'; @@ -12,17 +15,16 @@ import { fileURLToPath } from 'url'; export default defineConfig({ integrations: [ tailwind({ - config: { - path: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), - }, + configFile: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), }), ], }); ``` -This change also requires a Tailwind config file to exist in your project as Astro's fallback value is no longer provided. It is set up automatically during `astro add tailwind`, but you can also manually create a `tailwind.config.cjs` file in your project root: +This change also requires a Tailwind config file to exist in your project as a fallback config is no longer provided. It is set up automatically during `astro add tailwind`, but if it does not exist, you can manually create a `tailwind.config.cjs` file in your project root: ```js +// tailwind.config.cjs /** @type {import('tailwindcss').Config} */ module.exports = { content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], diff --git a/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs b/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs index 681ec1bc25ba..1db9d12bb664 100644 --- a/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs +++ b/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs @@ -6,9 +6,7 @@ import { fileURLToPath } from 'url'; export default defineConfig({ integrations: [ tailwind({ - config: { - path: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), - }, + configFile: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), }), ], vite: { diff --git a/packages/astro/test/fixtures/astro-scripts/astro.config.mjs b/packages/astro/test/fixtures/astro-scripts/astro.config.mjs index 8e44acd75f44..f34407295d8a 100644 --- a/packages/astro/test/fixtures/astro-scripts/astro.config.mjs +++ b/packages/astro/test/fixtures/astro-scripts/astro.config.mjs @@ -5,9 +5,7 @@ import { fileURLToPath } from 'url'; export default defineConfig({ integrations: [ tailwind({ - config: { - path: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), - }, + configFile: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), }), ], }); diff --git a/packages/astro/test/fixtures/middleware-tailwind/astro.config.mjs b/packages/astro/test/fixtures/middleware-tailwind/astro.config.mjs index 73ece68e02b7..ebb824269aa5 100644 --- a/packages/astro/test/fixtures/middleware-tailwind/astro.config.mjs +++ b/packages/astro/test/fixtures/middleware-tailwind/astro.config.mjs @@ -6,9 +6,7 @@ import { fileURLToPath } from 'url'; export default defineConfig({ integrations: [ tailwind({ - config: { - path: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), - }, + configFile: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), }), ], }); diff --git a/packages/astro/test/fixtures/tailwindcss-ts/astro.config.ts b/packages/astro/test/fixtures/tailwindcss-ts/astro.config.ts index 936426736216..5b16f3f9b341 100644 --- a/packages/astro/test/fixtures/tailwindcss-ts/astro.config.ts +++ b/packages/astro/test/fixtures/tailwindcss-ts/astro.config.ts @@ -6,9 +6,7 @@ import { fileURLToPath } from 'url'; export default defineConfig({ integrations: [ tailwind({ - config: { - path: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), - }, + configFile: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), }), ], }); diff --git a/packages/astro/test/fixtures/tailwindcss/astro.config.mjs b/packages/astro/test/fixtures/tailwindcss/astro.config.mjs index 390bd3b73504..6b584904c19c 100644 --- a/packages/astro/test/fixtures/tailwindcss/astro.config.mjs +++ b/packages/astro/test/fixtures/tailwindcss/astro.config.mjs @@ -7,9 +7,7 @@ import { fileURLToPath } from 'url'; export default defineConfig({ integrations: [ tailwind({ - config: { - path: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), - }, + configFile: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)), }), mdx(), ], diff --git a/packages/integrations/tailwind/README.md b/packages/integrations/tailwind/README.md index cfaef24956e4..f0595dbe527e 100644 --- a/packages/integrations/tailwind/README.md +++ b/packages/integrations/tailwind/README.md @@ -84,9 +84,11 @@ If it isn't there, you add your own `tailwind.config.(js|cjs|mjs)` file to the r The Astro Tailwind integration handles the communication between Astro and Tailwind and it has its own options. Change these in the `astro.config.mjs` file (_not_ the Tailwind configuration file) which is where your project's integration settings live. -#### config.path +#### configFile + +Previously known as `config.path` in `@astrojs/tailwind` v3. See the [v4 changelog](https://github.com/withastro/astro/blob/main/packages/integrations/tailwind/CHANGELOG.md#400) for updating your config. -If you want to use a different Tailwind configuration file instead of the default `tailwind.config.(js|cjs|mjs)`, specify that file's location using this integration's `config.path` option. If `config.path` is relative, it will be resolved relative to the root. +If you want to use a different Tailwind configuration file instead of the default `tailwind.config.(js|cjs|mjs)`, specify that file's location using this integration's `configFile` option. If `configFile` is relative, it will be resolved relative to the current working directory. > **Warning** > Changing this isn't recommended since it can cause problems with other tools that integrate with Tailwind, like the official Tailwind VSCode extension. @@ -100,14 +102,16 @@ import tailwind from '@astrojs/tailwind'; export default defineConfig({ integrations: [tailwind({ // Example: Provide a custom path to a Tailwind config file - config: { path: './custom-config.cjs' }, + configFile: './custom-config.cjs', })], }); ``` -#### config.applyBaseStyles +#### applyBaseStyles + +Previously known as `config.applyBaseStyles` in `@astrojs/tailwind` v3. See the [v4 changelog](https://github.com/withastro/astro/blob/main/packages/integrations/tailwind/CHANGELOG.md#400) for updating your config. - By default, the integration imports a basic `base.css` file on every page of your project. This basic CSS file includes the three main `@tailwind` directives: +By default, the integration imports a basic `base.css` file on every page of your project. This basic CSS file includes the three main `@tailwind` directives: ```css /* The integration's default injected base.css file */ @@ -116,7 +120,7 @@ export default defineConfig({ @tailwind utilities; ``` -To disable this default behavior, set `config.applyBaseStyles` to `false`. This can be useful if you need to define your own `base.css` file (to include a [`@layer` directive](https://tailwindcss.com/docs/functions-and-directives#layer), for example). This can also be useful if you do not want `base.css` to be imported on every page of your project. +To disable this default behavior, set `applyBaseStyles` to `false`. This can be useful if you need to define your own `base.css` file (to include a [`@layer` directive](https://tailwindcss.com/docs/functions-and-directives#layer), for example). This can also be useful if you do not want `base.css` to be imported on every page of your project. __`astro.config.mjs`__ @@ -127,7 +131,7 @@ export default defineConfig({ integrations: [tailwind({ // Example: Disable injecting a basic `base.css` import on every page. // Useful if you need to define and/or import your own custom `base.css`. - config: { applyBaseStyles: false }, + applyBaseStyles: false, })], }); ``` diff --git a/packages/integrations/tailwind/src/index.ts b/packages/integrations/tailwind/src/index.ts index d489c019684f..df0f01723abe 100644 --- a/packages/integrations/tailwind/src/index.ts +++ b/packages/integrations/tailwind/src/index.ts @@ -46,29 +46,25 @@ async function getViteConfiguration( }; } -type TailwindOptions = - | { - config?: { - /** - * Path to your tailwind config file - * @default 'tailwind.config.js' - */ - path?: string; - /** - * Apply Tailwind's base styles - * Disabling this is useful when further customization of Tailwind styles - * and directives is required. See {@link https://tailwindcss.com/docs/functions-and-directives#tailwind Tailwind's docs} - * for more details on directives and customization. - * @default true - */ - applyBaseStyles?: boolean; - }; - } - | undefined; +type TailwindOptions = { + /** + * Path to your tailwind config file + * @default 'tailwind.config.js' + */ + configFile?: string; + /** + * Apply Tailwind's base styles + * Disabling this is useful when further customization of Tailwind styles + * and directives is required. See {@link https://tailwindcss.com/docs/functions-and-directives#tailwind Tailwind's docs} + * for more details on directives and customization. + * @default true + */ + applyBaseStyles?: boolean; +}; export default function tailwindIntegration(options?: TailwindOptions): AstroIntegration { - const applyBaseStyles = options?.config?.applyBaseStyles ?? true; - const customConfigPath = options?.config?.path; + const applyBaseStyles = options?.applyBaseStyles ?? true; + const customConfigPath = options?.configFile; return { name: '@astrojs/tailwind', hooks: { From d2020c29cf285e699f92143a70ffa30a85122bb4 Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Fri, 16 Jun 2023 16:58:07 -0400 Subject: [PATCH 14/60] Fix injected route edge case (#7399) * fix(#7397): update astro page entryname logic * chore: add changeset * fix: update printed log for injected routes * fix: ensure /index is included * test: add custom-404-pkg test * chore: cleanup --- .changeset/large-ants-tap.md | 5 +++ packages/astro/src/core/build/generate.ts | 7 +++- packages/astro/src/core/build/static-build.ts | 38 +++++++++---------- .../test/custom-404-injected-from-dep.test.js | 22 +++++++++++ .../astro.config.mjs | 18 +++++++++ .../custom-404-injected-from-dep/package.json | 9 +++++ .../src/pages/index.astro | 11 ++++++ .../test/fixtures/custom-404-pkg/404.astro | 13 +++++++ .../test/fixtures/custom-404-pkg/package.json | 8 ++++ pnpm-lock.yaml | 17 ++++++++- 10 files changed, 127 insertions(+), 21 deletions(-) create mode 100644 .changeset/large-ants-tap.md create mode 100644 packages/astro/test/custom-404-injected-from-dep.test.js create mode 100644 packages/astro/test/fixtures/custom-404-injected-from-dep/astro.config.mjs create mode 100644 packages/astro/test/fixtures/custom-404-injected-from-dep/package.json create mode 100644 packages/astro/test/fixtures/custom-404-injected-from-dep/src/pages/index.astro create mode 100644 packages/astro/test/fixtures/custom-404-pkg/404.astro create mode 100644 packages/astro/test/fixtures/custom-404-pkg/package.json diff --git a/.changeset/large-ants-tap.md b/.changeset/large-ants-tap.md new file mode 100644 index 000000000000..f99945aee5de --- /dev/null +++ b/.changeset/large-ants-tap.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix edge case where injected routes would cause builds to fail in a PNPM workspace diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index c1fd34654a10..a6a1ece54d4c 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -29,6 +29,7 @@ import { type BuildInternals, } from '../../core/build/internal.js'; import { + isRelativePath, prependForwardSlash, removeLeadingForwardSlash, removeTrailingForwardSlash, @@ -252,7 +253,11 @@ async function generatePage( }; const icon = pageData.route.type === 'page' ? green('▶') : magenta('λ'); - info(opts.logging, null, `${icon} ${pageData.route.component}`); + if (isRelativePath(pageData.route.component)) { + info(opts.logging, null, `${icon} ${pageData.route.route}`); + } else { + info(opts.logging, null, `${icon} ${pageData.route.component}`); + } // Get paths for the route, calling getStaticPaths if needed. const paths = await getPathsForRoute(pageData, pageModule, opts, builtPaths); diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 72bfd698836f..647b31983066 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -30,7 +30,7 @@ import { } from './plugins/plugin-pages.js'; import { RESOLVED_RENDERERS_MODULE_ID } from './plugins/plugin-renderers.js'; import { SSR_VIRTUAL_MODULE_ID } from './plugins/plugin-ssr.js'; -import type { PageBuildData, StaticBuildOptions } from './types'; +import type { AllPagesData, PageBuildData, StaticBuildOptions } from './types'; import { getTimeStat } from './util.js'; export async function viteBuild(opts: StaticBuildOptions) { @@ -143,7 +143,7 @@ async function ssrBuild( input: Set, container: AstroBuildPluginContainer ) { - const { settings, viteConfig } = opts; + const { allPages, settings, viteConfig } = opts; const ssr = isServerLikeOutput(settings.config); const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir); @@ -175,7 +175,7 @@ async function ssrBuild( ...viteConfig.build?.rollupOptions?.output, entryFileNames(chunkInfo) { if (chunkInfo.facadeModuleId?.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) { - return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId); + return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId, allPages); } else if ( // checks if the path of the module we have middleware, e.g. middleware.js / middleware/index.js chunkInfo.moduleIds.find((m) => m.includes('middleware')) !== undefined && @@ -418,27 +418,27 @@ async function ssrMoveAssets(opts: StaticBuildOptions) { } /** - * This function takes as input the virtual module name of an astro page and transform - * to generate an `.mjs` file: + * This function takes the virtual module name of any page entrypoint and + * transforms it to generate a final `.mjs` output file. * * Input: `@astro-page:src/pages/index@_@astro` - * * Output: `pages/index.astro.mjs` + * Input: `@astro-page:../node_modules/my-dep/injected@_@astro` + * Output: `pages/injected.mjs` * - * 1. We remove the module id prefix, `@astro-page:` - * 2. We remove `src/` - * 3. We replace square brackets with underscore, for example `[slug]` - * 4. At last, we replace the extension pattern with a simple dot - * 5. We append the `.mjs` string, so the file will always be a JS file + * 1. We clean the `facadeModuleId` by removing the `@astro-page:` prefix and `@_@` suffix + * 2. We find the matching route pattern in the manifest (or fallback to the cleaned module id) + * 3. We replace square brackets with underscore (`[slug]` => `_slug_`) and `...` with `` (`[...slug]` => `_---slug_`). + * 4. We append the `.mjs` extension, so the file will always be an ESM module * - * @param facadeModuleId + * @param facadeModuleId string + * @param pages AllPagesData */ -function makeAstroPageEntryPointFileName(facadeModuleId: string) { - return `${facadeModuleId +function makeAstroPageEntryPointFileName(facadeModuleId: string, pages: AllPagesData) { + const pageModuleId = facadeModuleId .replace(ASTRO_PAGE_RESOLVED_MODULE_ID, '') - .replace('src/', '') - .replaceAll('[', '_') - .replaceAll(']', '_') - // this must be last - .replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.')}.mjs`; + .replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.'); + let name = pages[pageModuleId]?.route?.route ?? pageModuleId; + if (name.endsWith('/')) name += 'index'; + return `pages${name.replaceAll('[', '_').replaceAll(']', '_').replaceAll('...', '---')}.mjs`; } diff --git a/packages/astro/test/custom-404-injected-from-dep.test.js b/packages/astro/test/custom-404-injected-from-dep.test.js new file mode 100644 index 000000000000..d9a822f4ed61 --- /dev/null +++ b/packages/astro/test/custom-404-injected-from-dep.test.js @@ -0,0 +1,22 @@ +import { expect } from 'chai'; +import { loadFixture } from './test-utils.js'; + +describe('Custom 404 with injectRoute from dependency', () => { + describe('build', () => { + /** @type {import('./test-utils.js').Fixture} */ + let fixture; + + before(async () => { + fixture = await loadFixture({ + root: './fixtures/custom-404-injected-from-dep/', + site: 'http://example.com', + }); + await fixture.build(); + }); + + it('Build succeeds', async () => { + const html = await fixture.readFile('/404.html'); + expect(html).to.contain(''); + }); + }); +}); diff --git a/packages/astro/test/fixtures/custom-404-injected-from-dep/astro.config.mjs b/packages/astro/test/fixtures/custom-404-injected-from-dep/astro.config.mjs new file mode 100644 index 000000000000..840a9524cbdb --- /dev/null +++ b/packages/astro/test/fixtures/custom-404-injected-from-dep/astro.config.mjs @@ -0,0 +1,18 @@ +import { defineConfig } from 'astro/config'; + +// https://astro.build/config +export default defineConfig({ + integrations: [ + { + name: '404-integration', + hooks: { + 'astro:config:setup': ({ injectRoute }) => { + injectRoute({ + pattern: '404', + entryPoint: '@test/custom-404-pkg/404.astro', + }); + }, + }, + }, + ], +}); diff --git a/packages/astro/test/fixtures/custom-404-injected-from-dep/package.json b/packages/astro/test/fixtures/custom-404-injected-from-dep/package.json new file mode 100644 index 000000000000..6af83260253a --- /dev/null +++ b/packages/astro/test/fixtures/custom-404-injected-from-dep/package.json @@ -0,0 +1,9 @@ +{ + "name": "@test/custom-404-injected-from-dep", + "version": "0.0.0", + "private": true, + "dependencies": { + "astro": "workspace:*", + "@test/custom-404-pkg": "workspace:*" + } +} diff --git a/packages/astro/test/fixtures/custom-404-injected-from-dep/src/pages/index.astro b/packages/astro/test/fixtures/custom-404-injected-from-dep/src/pages/index.astro new file mode 100644 index 000000000000..cf5ef9b586c6 --- /dev/null +++ b/packages/astro/test/fixtures/custom-404-injected-from-dep/src/pages/index.astro @@ -0,0 +1,11 @@ +--- +--- + + + + Custom 404 + + +

Home

+ + diff --git a/packages/astro/test/fixtures/custom-404-pkg/404.astro b/packages/astro/test/fixtures/custom-404-pkg/404.astro new file mode 100644 index 000000000000..63d560b0fb91 --- /dev/null +++ b/packages/astro/test/fixtures/custom-404-pkg/404.astro @@ -0,0 +1,13 @@ +--- +const canonicalURL = new URL(Astro.url.pathname, Astro.site); +--- + + + + Not Found - Custom 404 + + +

Page not found

+

{canonicalURL.pathname}

+ + diff --git a/packages/astro/test/fixtures/custom-404-pkg/package.json b/packages/astro/test/fixtures/custom-404-pkg/package.json new file mode 100644 index 000000000000..f3207353448b --- /dev/null +++ b/packages/astro/test/fixtures/custom-404-pkg/package.json @@ -0,0 +1,8 @@ +{ + "name": "@test/custom-404-pkg", + "version": "0.0.0", + "private": true, + "dependencies": { + "astro": "workspace:*" + } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 548b8b4d9887..29a708e959ec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.1' +lockfileVersion: '6.0' settings: autoInstallPeers: false @@ -2499,12 +2499,27 @@ importers: specifier: workspace:* version: link:../../.. + packages/astro/test/fixtures/custom-404-injected-from-dep: + dependencies: + '@test/custom-404-pkg': + specifier: workspace:* + version: link:../custom-404-pkg + astro: + specifier: workspace:* + version: link:../../.. + packages/astro/test/fixtures/custom-404-md: dependencies: astro: specifier: workspace:* version: link:../../.. + packages/astro/test/fixtures/custom-404-pkg: + dependencies: + astro: + specifier: workspace:* + version: link:../../.. + packages/astro/test/fixtures/custom-assets-name: dependencies: '@astrojs/node': From 354387c68e15966d185ae1eb88d79ac7919b3f1f Mon Sep 17 00:00:00 2001 From: Kevin Zuniga Cuellar <46791833+kevinzunigacuellar@users.noreply.github.com> Date: Sun, 18 Jun 2023 23:55:40 -0400 Subject: [PATCH 15/60] remove extra "ago" in hackernews example (#7409) --- examples/hackernews/src/components/Comment.astro | 2 +- examples/hackernews/src/pages/stories/[id].astro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/hackernews/src/components/Comment.astro b/examples/hackernews/src/components/Comment.astro index 8327e666c743..6137f4e1d09e 100644 --- a/examples/hackernews/src/components/Comment.astro +++ b/examples/hackernews/src/components/Comment.astro @@ -14,7 +14,7 @@ const { comment } = Astro.props;
  • {comment.user}{' '} - {comment.time_ago} ago + {comment.time_ago}
    diff --git a/examples/hackernews/src/pages/stories/[id].astro b/examples/hackernews/src/pages/stories/[id].astro index 6cd17ea456bf..84383aa9e4ab 100644 --- a/examples/hackernews/src/pages/stories/[id].astro +++ b/examples/hackernews/src/pages/stories/[id].astro @@ -25,7 +25,7 @@ const story = (await fetchAPI(`item/${id}`)) as IStory; {story.user} - {story.time_ago} ago +  {story.time_ago}

    From 8f4a04d46bff97625ce72f459b036901af578be9 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 19 Jun 2023 15:29:30 +0800 Subject: [PATCH 16/60] Bump pnpm to 8.6.2 (#7413) --- CONTRIBUTING.md | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff03da2868a5..25baacecb52e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ We welcome contributions of any size and skill level. As an open source project, ```shell node: "^>=16.12.0" -pnpm: "^8.2.0" +pnpm: "^8.6.2" # otherwise, your build will fail ``` diff --git a/package.json b/package.json index 14c20296a0c9..4ce4c3e5e919 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ ], "engines": { "node": ">=16.12.0", - "pnpm": ">=8.2.0" + "pnpm": ">=8.6.2" }, - "packageManager": "pnpm@8.6.0", + "packageManager": "pnpm@8.6.2", "pnpm": { "packageExtensions": { "svelte2tsx": { From bb644834ef03bc00048c7381f20a1c01388438e2 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 19 Jun 2023 17:18:46 +0800 Subject: [PATCH 17/60] Simplify telemetry Vite version detection (#7414) --- .changeset/brave-candles-invent.md | 5 +++++ packages/astro/src/events/index.ts | 13 ++----------- 2 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 .changeset/brave-candles-invent.md diff --git a/.changeset/brave-candles-invent.md b/.changeset/brave-candles-invent.md new file mode 100644 index 000000000000..e63ffcb3cb5c --- /dev/null +++ b/.changeset/brave-candles-invent.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Simplify telemetry Vite version detection diff --git a/packages/astro/src/events/index.ts b/packages/astro/src/events/index.ts index 31e549ad7bdd..7af647d449e5 100644 --- a/packages/astro/src/events/index.ts +++ b/packages/astro/src/events/index.ts @@ -1,19 +1,10 @@ import { AstroTelemetry } from '@astrojs/telemetry'; -import { createRequire } from 'module'; +import { version as viteVersion } from 'vite'; import { ASTRO_VERSION } from '../core/constants.js'; -const require = createRequire(import.meta.url); - -function getViteVersion() { - try { - const { version } = require('vite/package.json'); - return version; - } catch (e) {} - return undefined; -} export const telemetry = new AstroTelemetry({ astroVersion: ASTRO_VERSION, - viteVersion: getViteVersion(), + viteVersion, }); export * from './error.js'; From f87680f6df2e8525d9b8667e2ae7e600543e1c73 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Mon, 19 Jun 2023 08:36:45 -0700 Subject: [PATCH 18/60] [ci] release (#7390) Co-authored-by: github-actions[bot] --- .changeset/beige-schools-hang.md | 24 ------- .changeset/brave-candles-invent.md | 5 -- .changeset/large-ants-tap.md | 5 -- .changeset/modern-lobsters-sparkle.md | 5 -- .changeset/real-spies-pretend.md | 36 ----------- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/deno/package.json | 4 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 4 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 8 +++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/CHANGELOG.md | 11 ++++ packages/integrations/deno/package.json | 4 +- 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/CHANGELOG.md | 63 +++++++++++++++++++ packages/integrations/tailwind/package.json | 4 +- packages/integrations/vercel/package.json | 2 +- packages/integrations/vue/package.json | 2 +- pnpm-lock.yaml | 58 ++++++++--------- 47 files changed, 153 insertions(+), 146 deletions(-) delete mode 100644 .changeset/beige-schools-hang.md delete mode 100644 .changeset/brave-candles-invent.md delete mode 100644 .changeset/large-ants-tap.md delete mode 100644 .changeset/modern-lobsters-sparkle.md delete mode 100644 .changeset/real-spies-pretend.md diff --git a/.changeset/beige-schools-hang.md b/.changeset/beige-schools-hang.md deleted file mode 100644 index 4b964f1823b9..000000000000 --- a/.changeset/beige-schools-hang.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -'@astrojs/tailwind': major ---- - -Rename options `config.path` to `configFile`, and `config.applyBaseStyles` to `applyBaseStyles`. If you are using these options, you need to migrate to the new names. - -```diff -// astro.config.mjs -import { defineConfig } from 'astro/config'; -import tailwind from '@astrojs/tailwind'; - -export default defineConfig({ - integrations: [ - tailwind({ -- config: { -- path: '...', -- applyBaseStyles: true, -- }, -+ configFile: '...', -+ applyBaseStyles: true, - }), - ], -}); -``` diff --git a/.changeset/brave-candles-invent.md b/.changeset/brave-candles-invent.md deleted file mode 100644 index e63ffcb3cb5c..000000000000 --- a/.changeset/brave-candles-invent.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Simplify telemetry Vite version detection diff --git a/.changeset/large-ants-tap.md b/.changeset/large-ants-tap.md deleted file mode 100644 index f99945aee5de..000000000000 --- a/.changeset/large-ants-tap.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix edge case where injected routes would cause builds to fail in a PNPM workspace diff --git a/.changeset/modern-lobsters-sparkle.md b/.changeset/modern-lobsters-sparkle.md deleted file mode 100644 index 057afdc0401d..000000000000 --- a/.changeset/modern-lobsters-sparkle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/deno': minor ---- - -The deno adapter now supports npm package that require built-in node modules. diff --git a/.changeset/real-spies-pretend.md b/.changeset/real-spies-pretend.md deleted file mode 100644 index b38af662cefc..000000000000 --- a/.changeset/real-spies-pretend.md +++ /dev/null @@ -1,36 +0,0 @@ ---- -'@astrojs/tailwind': major ---- - -Let the `tailwindcss` PostCSS plugin load its config file itself. This changes the Tailwind config loading behaviour where it is loaded from `process.cwd()` instead of the project `root`. - -If your Tailwind config file is not located in the current working directory, you will need to configure the integration's `configFile` option to load from a specific path: - -```js -// astro.config.mjs -import { defineConfig } from 'astro/config'; -import tailwind from '@astrojs/tailwind'; -import { fileURLToPath } from 'url'; - -export default defineConfig({ - integrations: [ - tailwind({ - configFile: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), - }), - ], -}); -``` - -This change also requires a Tailwind config file to exist in your project as a fallback config is no longer provided. It is set up automatically during `astro add tailwind`, but if it does not exist, you can manually create a `tailwind.config.cjs` file in your project root: - -```js -// tailwind.config.cjs -/** @type {import('tailwindcss').Config} */ -module.exports = { - content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], - theme: { - extend: {}, - }, - plugins: [], -} -``` diff --git a/examples/basics/package.json b/examples/basics/package.json index 5f35d1d4fa0f..a8e0d63af5e4 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index f02d4d9d53c9..f45c0c205c8b 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^0.19.7", "@astrojs/rss": "^2.4.3", "@astrojs/sitemap": "^1.3.3", - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/component/package.json b/examples/component/package.json index f5fd04490bae..5a025c0bce03 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.6.4" + "astro": "^2.6.5" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index 243587845fd6..c37cc3e0a05b 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,9 +10,9 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.4" + "astro": "^2.6.5" }, "devDependencies": { - "@astrojs/deno": "^4.1.1" + "@astrojs/deno": "^4.2.0" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index cc1cc3b5d71b..685bfc268914 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.2.2", "@types/alpinejs": "^3.7.1", "alpinejs": "^3.12.0", - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 7610bf90a516..608c5ec7d200 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^2.1.0", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^2.6.4", + "astro": "^2.6.5", "lit": "^2.7.4" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 5c358a378bbc..8c08f122424e 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^2.2.0", "@astrojs/svelte": "^3.0.0", "@astrojs/vue": "^2.2.1", - "astro": "^2.6.4", + "astro": "^2.6.5", "preact": "^10.13.2", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index f5db19219382..5b2b95571b2c 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^2.2.1", "@preact/signals": "^1.1.3", - "astro": "^2.6.4", + "astro": "^2.6.5", "preact": "^10.13.2" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 7c8ea9eb2400..ee060886b653 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^2.2.1", "@types/react": "^18.2.5", "@types/react-dom": "^18.2.3", - "astro": "^2.6.4", + "astro": "^2.6.5", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index b06ad23cee69..5015954bee39 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^2.2.0", - "astro": "^2.6.4", + "astro": "^2.6.5", "solid-js": "^1.7.4" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 86f146fd359b..1666ad9e8d9e 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^3.0.0", - "astro": "^2.6.4", + "astro": "^2.6.5", "svelte": "^3.58.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 2398462a4abe..509a0b0c68b2 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^2.2.1", - "astro": "^2.6.4", + "astro": "^2.6.5", "vue": "^3.2.47" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 2077ab4e7115..1b0a30b4da2e 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^5.2.0", - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 28fad4578482..ea79e019a52b 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.6.4" + "astro": "^2.6.5" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 48e3b11310d0..254cfe33687c 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^5.2.0", - "astro": "^2.6.4", + "astro": "^2.6.5", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 395f66d89e0a..7cf09f3a851b 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 5e33bffa18b4..753cb963de40 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 65133a7352e3..8796772e352a 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index fd3c02747f24..127fe6db28b2 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^5.2.0", "@astrojs/svelte": "^3.0.0", - "astro": "^2.6.4", + "astro": "^2.6.5", "svelte": "^3.58.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 79fc6581aa6c..6673957a5acd 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.3.3", - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 21d0fac8de58..97e5510a5260 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^2.2.1", - "astro": "^2.6.4", + "astro": "^2.6.5", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index c863aa4b3b4c..a4c0c505dcbf 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.4" + "astro": "^2.6.5" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 98f1b326cc2c..2a690222f8b7 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^0.19.7", "@astrojs/preact": "^2.2.1", - "astro": "^2.6.4", + "astro": "^2.6.5", "preact": "^10.13.2" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 9e933d6f172c..fcb589a9ab8c 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^2.2.1", "@nanostores/preact": "^0.4.1", - "astro": "^2.6.4", + "astro": "^2.6.5", "nanostores": "^0.8.1", "preact": "^10.13.2" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 4fe651cfd3c2..86d04fde9679 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@astrojs/mdx": "^0.19.7", - "@astrojs/tailwind": "^3.1.3", + "@astrojs/tailwind": "^4.0.0", "@types/canvas-confetti": "^1.6.0", - "astro": "^2.6.4", + "astro": "^2.6.5", "autoprefixer": "^10.4.14", "canvas-confetti": "^1.6.0", "postcss": "^8.4.23", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 7e6f0edbcc3e..67b47583707d 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.4", + "astro": "^2.6.5", "vite-plugin-pwa": "0.14.7", "workbox-window": "^6.5.4" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index ac02ea277d4c..a345e81ea7cf 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^2.6.4", + "astro": "^2.6.5", "vitest": "^0.31.0" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index e950af964fbc..d2326efe06ac 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 2.6.5 + +### Patch Changes + +- [#7414](https://github.com/withastro/astro/pull/7414) [`bb644834e`](https://github.com/withastro/astro/commit/bb644834ef03bc00048c7381f20a1c01388438e2) Thanks [@bluwy](https://github.com/bluwy)! - Simplify telemetry Vite version detection + +- [#7399](https://github.com/withastro/astro/pull/7399) [`d2020c29c`](https://github.com/withastro/astro/commit/d2020c29cf285e699f92143a70ffa30a85122bb4) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fix edge case where injected routes would cause builds to fail in a PNPM workspace + ## 2.6.4 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 8aec60cdae59..0d853bb27234 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "2.6.4", + "version": "2.6.5", "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 bf4186d65692..73bc57f8bcf4 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -44,7 +44,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^2.6.4" + "astro": "workspace:^2.6.5" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/CHANGELOG.md b/packages/integrations/deno/CHANGELOG.md index e3a51071e673..4cf99f142f68 100644 --- a/packages/integrations/deno/CHANGELOG.md +++ b/packages/integrations/deno/CHANGELOG.md @@ -1,5 +1,16 @@ # @astrojs/deno +## 4.2.0 + +### Minor Changes + +- [#7288](https://github.com/withastro/astro/pull/7288) [`d67ae8461`](https://github.com/withastro/astro/commit/d67ae846103c42ff0464c578813749940326e8ba) Thanks [@lilnasy](https://github.com/lilnasy)! - The deno adapter now supports npm package that require built-in node modules. + +### Patch Changes + +- Updated dependencies [[`bb644834e`](https://github.com/withastro/astro/commit/bb644834ef03bc00048c7381f20a1c01388438e2), [`d2020c29c`](https://github.com/withastro/astro/commit/d2020c29cf285e699f92143a70ffa30a85122bb4)]: + - astro@2.6.5 + ## 4.1.1 ### Patch Changes diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 7d211b42d6ea..0540d103a37e 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/deno", "description": "Deploy your site to a Deno server", - "version": "4.1.1", + "version": "4.2.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -36,7 +36,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.6.4" + "astro": "workspace:^2.6.5" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index 28dffe972c45..d6af7c8ecf23 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.6.4", + "astro": "workspace:^2.6.5", "sharp": ">=0.31.0" }, "peerDependenciesMeta": { diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 47ad27a6d3f8..36756035d46a 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -73,7 +73,7 @@ "zod": "^3.17.3" }, "peerDependencies": { - "astro": "workspace:^2.6.4" + "astro": "workspace:^2.6.5" }, "devDependencies": { "@astrojs/markdown-remark": "^2.2.1", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 1c1eca5eb25c..4f4a014b9325 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.6.4" + "astro": "workspace:^2.6.5" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 9a0812bd8887..76525eec1ed9 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -38,7 +38,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^2.6.4" + "astro": "workspace:^2.6.5" }, "devDependencies": { "@types/node": "^18.7.21", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index b039795abc4b..fd98e3944916 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -48,7 +48,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.6.4", + "astro": "workspace:^2.6.5", "svelte": "^3.55.0" }, "engines": { diff --git a/packages/integrations/tailwind/CHANGELOG.md b/packages/integrations/tailwind/CHANGELOG.md index 6fff2f2f0b62..fa55606bc834 100644 --- a/packages/integrations/tailwind/CHANGELOG.md +++ b/packages/integrations/tailwind/CHANGELOG.md @@ -1,5 +1,68 @@ # @astrojs/tailwind +## 4.0.0 + +### Major Changes + +- [#7391](https://github.com/withastro/astro/pull/7391) [`556fd694a`](https://github.com/withastro/astro/commit/556fd694a6672572caffce964b852d212d013ac8) Thanks [@bluwy](https://github.com/bluwy)! - Rename options `config.path` to `configFile`, and `config.applyBaseStyles` to `applyBaseStyles`. If you are using these options, you need to migrate to the new names. + + ```diff + // astro.config.mjs + import { defineConfig } from 'astro/config'; + import tailwind from '@astrojs/tailwind'; + + export default defineConfig({ + integrations: [ + tailwind({ + - config: { + - path: '...', + - applyBaseStyles: true, + - }, + + configFile: '...', + + applyBaseStyles: true, + }), + ], + }); + ``` + +- [#6724](https://github.com/withastro/astro/pull/6724) [`3f1cb6b1a`](https://github.com/withastro/astro/commit/3f1cb6b1a001fb03419a313f72c9f4846b890fe0) Thanks [@TomPichaud](https://github.com/TomPichaud)! - Let the `tailwindcss` PostCSS plugin load its config file itself. This changes the Tailwind config loading behaviour where it is loaded from `process.cwd()` instead of the project `root`. + + If your Tailwind config file is not located in the current working directory, you will need to configure the integration's `configFile` option to load from a specific path: + + ```js + // astro.config.mjs + import { defineConfig } from 'astro/config'; + import tailwind from '@astrojs/tailwind'; + import { fileURLToPath } from 'url'; + + export default defineConfig({ + integrations: [ + tailwind({ + configFile: fileURLToPath(new URL('./tailwind.config.cjs', import.meta.url)), + }), + ], + }); + ``` + + This change also requires a Tailwind config file to exist in your project as a fallback config is no longer provided. It is set up automatically during `astro add tailwind`, but if it does not exist, you can manually create a `tailwind.config.cjs` file in your project root: + + ```js + // tailwind.config.cjs + /** @type {import('tailwindcss').Config} */ + module.exports = { + content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], + theme: { + extend: {}, + }, + plugins: [], + }; + ``` + +### Patch Changes + +- Updated dependencies [[`bb644834e`](https://github.com/withastro/astro/commit/bb644834ef03bc00048c7381f20a1c01388438e2), [`d2020c29c`](https://github.com/withastro/astro/commit/d2020c29cf285e699f92143a70ffa30a85122bb4)]: + - astro@2.6.5 + ## 3.1.3 ### Patch Changes diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index e1349e01024e..4dc78bbf9a7b 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/tailwind", "description": "Use Tailwind CSS to style your Astro site", - "version": "3.1.3", + "version": "4.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -43,7 +43,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.6.4", + "astro": "workspace:^2.6.5", "tailwindcss": "^3.0.24" }, "pnpm": { diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 6fc901dc73fd..189effdacd45 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -60,7 +60,7 @@ "web-vitals": "^3.1.1" }, "peerDependencies": { - "astro": "workspace:^2.6.4" + "astro": "workspace:^2.6.5" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.2", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index ca1c8ad3eb45..a41aaf5a3413 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.2.37" }, "peerDependencies": { - "astro": "workspace:^2.6.4", + "astro": "workspace:^2.6.5", "vue": "^3.2.30" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 29a708e959ec..4d3ebec005fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -127,7 +127,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/blog: @@ -142,23 +142,23 @@ importers: specifier: ^1.3.3 version: link:../../packages/integrations/sitemap astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro devDependencies: '@astrojs/deno': - specifier: ^4.1.1 + specifier: ^4.2.0 version: link:../../packages/integrations/deno examples/framework-alpine: @@ -173,7 +173,7 @@ importers: specifier: ^3.12.0 version: 3.12.0 astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/framework-lit: @@ -185,7 +185,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro lit: specifier: ^2.7.4 @@ -209,7 +209,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -239,7 +239,7 @@ importers: specifier: ^1.1.3 version: 1.1.3(preact@10.13.2) astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -257,7 +257,7 @@ importers: specifier: ^18.2.3 version: 18.2.3 astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -272,7 +272,7 @@ importers: specifier: ^2.2.0 version: link:../../packages/integrations/solid astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro solid-js: specifier: ^1.7.4 @@ -284,7 +284,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/svelte astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro svelte: specifier: ^3.58.0 @@ -296,7 +296,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro vue: specifier: ^3.2.47 @@ -308,13 +308,13 @@ importers: specifier: ^5.2.0 version: link:../../packages/integrations/node astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/middleware: @@ -323,7 +323,7 @@ importers: specifier: ^5.2.0 version: link:../../packages/integrations/node astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -332,19 +332,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/ssr: @@ -356,7 +356,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/svelte astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro svelte: specifier: ^3.58.0 @@ -368,7 +368,7 @@ importers: specifier: ^0.3.3 version: link:../../packages/integrations/markdoc astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/with-markdown-plugins: @@ -377,7 +377,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/markdown/remark astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -398,7 +398,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro examples/with-mdx: @@ -410,7 +410,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/preact astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -425,7 +425,7 @@ importers: specifier: ^0.4.1 version: 0.4.1(nanostores@0.8.1)(preact@10.13.2) astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro nanostores: specifier: ^0.8.1 @@ -440,13 +440,13 @@ importers: specifier: ^0.19.7 version: link:../../packages/integrations/mdx '@astrojs/tailwind': - specifier: ^3.1.3 + specifier: ^4.0.0 version: link:../../packages/integrations/tailwind '@types/canvas-confetti': specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro autoprefixer: specifier: ^10.4.14 @@ -464,7 +464,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.14.7 @@ -476,7 +476,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^2.6.4 + specifier: ^2.6.5 version: link:../../packages/astro vitest: specifier: ^0.31.0 From 94afaa3e501f77e919c719937eb1dbfe170e3dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Holtmon?= <46750288+TorbjornHoltmon@users.noreply.github.com> Date: Tue, 20 Jun 2023 12:24:32 +0200 Subject: [PATCH 19/60] fix: cloudflare waitUntil not working as inteded with getRuntime (#7419) Co-authored-by: Bjorn Lu --- .changeset/clever-apes-shop.md | 6 ++++++ packages/integrations/cloudflare/src/server.advanced.ts | 7 +++++-- packages/integrations/cloudflare/src/server.directory.ts | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 .changeset/clever-apes-shop.md diff --git a/.changeset/clever-apes-shop.md b/.changeset/clever-apes-shop.md new file mode 100644 index 000000000000..0b5a4acd62df --- /dev/null +++ b/.changeset/clever-apes-shop.md @@ -0,0 +1,6 @@ +--- +'@astrojs/cloudflare': patch +--- + +Fixed issue with cloudflare runtime `waitUntil` not working as intended. + diff --git a/packages/integrations/cloudflare/src/server.advanced.ts b/packages/integrations/cloudflare/src/server.advanced.ts index 510e4e7e5a00..9758b8b19566 100644 --- a/packages/integrations/cloudflare/src/server.advanced.ts +++ b/packages/integrations/cloudflare/src/server.advanced.ts @@ -1,4 +1,4 @@ -import type { Request as CFRequest } from '@cloudflare/workers-types'; +import type { Request as CFRequest, ExecutionContext } from '@cloudflare/workers-types'; import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from './util.js'; @@ -15,7 +15,7 @@ type Env = { export function createExports(manifest: SSRManifest) { const app = new App(manifest); - const fetch = async (request: Request & CFRequest, env: Env, context: any) => { + const fetch = async (request: Request & CFRequest, env: Env, context: ExecutionContext) => { process.env = env as any; const { pathname } = new URL(request.url); @@ -38,6 +38,9 @@ export function createExports(manifest: SSRManifest) { caches, cf: request.cf, ...context, + waitUntil: (promise: Promise) => { + context.waitUntil(promise); + }, }); let response = await app.render(request, routeData); diff --git a/packages/integrations/cloudflare/src/server.directory.ts b/packages/integrations/cloudflare/src/server.directory.ts index a0f3299fd438..649d0d99bf2a 100644 --- a/packages/integrations/cloudflare/src/server.directory.ts +++ b/packages/integrations/cloudflare/src/server.directory.ts @@ -1,4 +1,4 @@ -import type { Request as CFRequest } from '@cloudflare/workers-types'; +import type { Request as CFRequest, EventContext } from '@cloudflare/workers-types'; import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from './util.js'; @@ -17,6 +17,7 @@ export function createExports(manifest: SSRManifest) { }: { request: Request & CFRequest; next: (request: Request) => void; + waitUntil: EventContext['waitUntil']; } & Record) => { process.env = runtimeEnv.env as any; @@ -35,6 +36,9 @@ export function createExports(manifest: SSRManifest) { ); Reflect.set(request, Symbol.for('runtime'), { ...runtimeEnv, + waitUntil: (promise: Promise) => { + runtimeEnv.waitUntil(promise); + }, name: 'cloudflare', next, caches, From 82b19644329fbda14503146efb79a4943f4eb642 Mon Sep 17 00:00:00 2001 From: ematipico Date: Tue, 20 Jun 2023 10:26:55 +0000 Subject: [PATCH 20/60] [ci] format --- packages/integrations/cloudflare/src/server.advanced.ts | 2 +- packages/integrations/cloudflare/src/server.directory.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/integrations/cloudflare/src/server.advanced.ts b/packages/integrations/cloudflare/src/server.advanced.ts index 9758b8b19566..5335db8dc51a 100644 --- a/packages/integrations/cloudflare/src/server.advanced.ts +++ b/packages/integrations/cloudflare/src/server.advanced.ts @@ -1,4 +1,4 @@ -import type { Request as CFRequest, ExecutionContext } from '@cloudflare/workers-types'; +import type { ExecutionContext, Request as CFRequest } from '@cloudflare/workers-types'; import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from './util.js'; diff --git a/packages/integrations/cloudflare/src/server.directory.ts b/packages/integrations/cloudflare/src/server.directory.ts index 649d0d99bf2a..da23605573e3 100644 --- a/packages/integrations/cloudflare/src/server.directory.ts +++ b/packages/integrations/cloudflare/src/server.directory.ts @@ -1,4 +1,4 @@ -import type { Request as CFRequest, EventContext } from '@cloudflare/workers-types'; +import type { EventContext, Request as CFRequest } from '@cloudflare/workers-types'; import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from './util.js'; From 89a4835202f05d9571aeb42740dbe907a8afc28b Mon Sep 17 00:00:00 2001 From: Chris Swithinbank Date: Tue, 20 Jun 2023 14:42:49 +0200 Subject: [PATCH 21/60] Fix telemetry reporting for integrations that return an array (#7429) --- .changeset/witty-roses-relate.md | 5 +++++ packages/astro/src/events/session.ts | 5 ++++- packages/astro/test/events.test.js | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .changeset/witty-roses-relate.md diff --git a/.changeset/witty-roses-relate.md b/.changeset/witty-roses-relate.md new file mode 100644 index 000000000000..ef46e2a7aa97 --- /dev/null +++ b/.changeset/witty-roses-relate.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix telemetry reporting for integrations that return an array diff --git a/packages/astro/src/events/session.ts b/packages/astro/src/events/session.ts index f2c26d980750..706779d4b8c2 100644 --- a/packages/astro/src/events/session.ts +++ b/packages/astro/src/events/session.ts @@ -83,7 +83,10 @@ export function eventCliSession( ) ?? []), ] as string[], adapter: userConfig?.adapter?.name ?? null, - integrations: (userConfig?.integrations ?? []).filter(Boolean).map((i: any) => i?.name), + integrations: (userConfig?.integrations ?? []) + .filter(Boolean) + .flat() + .map((i: any) => i?.name), trailingSlash: userConfig?.trailingSlash, build: userConfig?.build ? { diff --git a/packages/astro/test/events.test.js b/packages/astro/test/events.test.js index 98eaa2d54097..b67c889b5d42 100644 --- a/packages/astro/test/events.test.js +++ b/packages/astro/test/events.test.js @@ -385,6 +385,14 @@ describe('Events', () => { expect(payload.config.integrations.length).to.equal(0); }); + it('finds names for integration arrays', () => { + const config = { + integrations: [{ name: 'foo' }, [{ name: 'bar' }, { name: 'baz' }]], + }; + const [{ payload }] = events.eventCliSession({ cliCommand: 'dev' }, config); + expect(payload.config.integrations).to.deep.equal(['foo', 'bar', 'baz']); + }); + it('includes cli flags in payload', () => { const config = {}; const flags = { From 2b34fc49282cbf5bf89de46359b51a67a5c4b8bb Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Tue, 20 Jun 2023 15:24:29 +0100 Subject: [PATCH 22/60] fix: document `open` option (#7418) Co-authored-by: Yan Thomas <61414485+Yan-Thomas@users.noreply.github.com> --- .changeset/sour-teachers-kiss.md | 5 +++++ packages/astro/src/@types/astro.ts | 31 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .changeset/sour-teachers-kiss.md diff --git a/.changeset/sour-teachers-kiss.md b/.changeset/sour-teachers-kiss.md new file mode 100644 index 000000000000..3e280de089f5 --- /dev/null +++ b/.changeset/sour-teachers-kiss.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Correctly type the option `server.open` diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 59594446c110..a3fcdcedda9a 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -335,6 +335,22 @@ type ServerConfig = { * Set custom HTTP response headers to be sent in `astro dev` and `astro preview`. */ headers?: OutgoingHttpHeaders; + + /** + * @name server.open + * @type {boolean} + * @default `false` + * @version 2.1.8 + * @description + * Control whether the dev server should open in your browser window on startup. + * + * ```js + * { + * server: { open: true } + * } + * ``` + */ + open?: boolean; }; export interface ViteUserConfig extends vite.UserConfig { @@ -878,6 +894,21 @@ export interface AstroUserConfig { * ``` */ + /** + * @name server.open + * @type {boolean} + * @default `false` + * @version 2.1.8 + * @description + * Control whether the dev server should open in your browser window on startup. + * + * ```js + * { + * server: { open: true } + * } + * ``` + */ + /** * @docs * @name server.headers From 1589eaabcdfeab12e585fd40c98978e2dfab4981 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Tue, 20 Jun 2023 07:32:26 -0700 Subject: [PATCH 23/60] [ci] release (#7428) Co-authored-by: github-actions[bot] --- .changeset/clever-apes-shop.md | 6 --- .changeset/sour-teachers-kiss.md | 5 -- .changeset/witty-roses-relate.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/deno/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 8 +++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/CHANGELOG.md | 9 ++++ packages/integrations/cloudflare/package.json | 4 +- 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 +- pnpm-lock.yaml | 54 +++++++++---------- 44 files changed, 83 insertions(+), 82 deletions(-) delete mode 100644 .changeset/clever-apes-shop.md delete mode 100644 .changeset/sour-teachers-kiss.md delete mode 100644 .changeset/witty-roses-relate.md diff --git a/.changeset/clever-apes-shop.md b/.changeset/clever-apes-shop.md deleted file mode 100644 index 0b5a4acd62df..000000000000 --- a/.changeset/clever-apes-shop.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@astrojs/cloudflare': patch ---- - -Fixed issue with cloudflare runtime `waitUntil` not working as intended. - diff --git a/.changeset/sour-teachers-kiss.md b/.changeset/sour-teachers-kiss.md deleted file mode 100644 index 3e280de089f5..000000000000 --- a/.changeset/sour-teachers-kiss.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Correctly type the option `server.open` diff --git a/.changeset/witty-roses-relate.md b/.changeset/witty-roses-relate.md deleted file mode 100644 index ef46e2a7aa97..000000000000 --- a/.changeset/witty-roses-relate.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix telemetry reporting for integrations that return an array diff --git a/examples/basics/package.json b/examples/basics/package.json index a8e0d63af5e4..2a225c60d39f 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index f45c0c205c8b..1c1693142a60 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^0.19.7", "@astrojs/rss": "^2.4.3", "@astrojs/sitemap": "^1.3.3", - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/component/package.json b/examples/component/package.json index 5a025c0bce03..6d65d622c82b 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.6.5" + "astro": "^2.6.6" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index c37cc3e0a05b..d043e219d1e8 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.5" + "astro": "^2.6.6" }, "devDependencies": { "@astrojs/deno": "^4.2.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 685bfc268914..4eef3a017c33 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.2.2", "@types/alpinejs": "^3.7.1", "alpinejs": "^3.12.0", - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 608c5ec7d200..01c4c54c3b07 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^2.1.0", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^2.6.5", + "astro": "^2.6.6", "lit": "^2.7.4" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 8c08f122424e..2763c24c6e29 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^2.2.0", "@astrojs/svelte": "^3.0.0", "@astrojs/vue": "^2.2.1", - "astro": "^2.6.5", + "astro": "^2.6.6", "preact": "^10.13.2", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 5b2b95571b2c..182528d7826c 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^2.2.1", "@preact/signals": "^1.1.3", - "astro": "^2.6.5", + "astro": "^2.6.6", "preact": "^10.13.2" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index ee060886b653..607234f8a7a5 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^2.2.1", "@types/react": "^18.2.5", "@types/react-dom": "^18.2.3", - "astro": "^2.6.5", + "astro": "^2.6.6", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 5015954bee39..8075d608de48 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^2.2.0", - "astro": "^2.6.5", + "astro": "^2.6.6", "solid-js": "^1.7.4" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 1666ad9e8d9e..d819be23a4cf 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^3.0.0", - "astro": "^2.6.5", + "astro": "^2.6.6", "svelte": "^3.58.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 509a0b0c68b2..93fd4a758218 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^2.2.1", - "astro": "^2.6.5", + "astro": "^2.6.6", "vue": "^3.2.47" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 1b0a30b4da2e..930367a046a9 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^5.2.0", - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index ea79e019a52b..421c461e8a41 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.6.5" + "astro": "^2.6.6" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 254cfe33687c..80b064770e74 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^5.2.0", - "astro": "^2.6.5", + "astro": "^2.6.6", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 7cf09f3a851b..ce905e255680 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 753cb963de40..7af4c6d4b9cd 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 8796772e352a..39d76d5fff1c 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 127fe6db28b2..978eb75d3629 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^5.2.0", "@astrojs/svelte": "^3.0.0", - "astro": "^2.6.5", + "astro": "^2.6.6", "svelte": "^3.58.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 6673957a5acd..c56ad11db706 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.3.3", - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 97e5510a5260..915f4f4fe671 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^2.2.1", - "astro": "^2.6.5", + "astro": "^2.6.6", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index a4c0c505dcbf..67450111a441 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.5" + "astro": "^2.6.6" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 2a690222f8b7..aa34a4bf53b1 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^0.19.7", "@astrojs/preact": "^2.2.1", - "astro": "^2.6.5", + "astro": "^2.6.6", "preact": "^10.13.2" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index fcb589a9ab8c..fe7fd7af86a3 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^2.2.1", "@nanostores/preact": "^0.4.1", - "astro": "^2.6.5", + "astro": "^2.6.6", "nanostores": "^0.8.1", "preact": "^10.13.2" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 86d04fde9679..e903d7987835 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^0.19.7", "@astrojs/tailwind": "^4.0.0", "@types/canvas-confetti": "^1.6.0", - "astro": "^2.6.5", + "astro": "^2.6.6", "autoprefixer": "^10.4.14", "canvas-confetti": "^1.6.0", "postcss": "^8.4.23", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 67b47583707d..2890429d30de 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.5", + "astro": "^2.6.6", "vite-plugin-pwa": "0.14.7", "workbox-window": "^6.5.4" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index a345e81ea7cf..1ea7d337cea4 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^2.6.5", + "astro": "^2.6.6", "vitest": "^0.31.0" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index d2326efe06ac..edce05e0e136 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 2.6.6 + +### Patch Changes + +- [#7418](https://github.com/withastro/astro/pull/7418) [`2b34fc492`](https://github.com/withastro/astro/commit/2b34fc49282cbf5bf89de46359b51a67a5c4b8bb) Thanks [@ematipico](https://github.com/ematipico)! - Correctly type the option `server.open` + +- [#7429](https://github.com/withastro/astro/pull/7429) [`89a483520`](https://github.com/withastro/astro/commit/89a4835202f05d9571aeb42740dbe907a8afc28b) Thanks [@delucis](https://github.com/delucis)! - Fix telemetry reporting for integrations that return an array + ## 2.6.5 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 0d853bb27234..8e513b9b2751 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "2.6.5", + "version": "2.6.6", "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/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md index efd60d2551dd..5de3b38fff4f 100644 --- a/packages/integrations/cloudflare/CHANGELOG.md +++ b/packages/integrations/cloudflare/CHANGELOG.md @@ -1,5 +1,14 @@ # @astrojs/cloudflare +## 6.5.1 + +### Patch Changes + +- [#7419](https://github.com/withastro/astro/pull/7419) [`94afaa3e5`](https://github.com/withastro/astro/commit/94afaa3e501f77e919c719937eb1dbfe170e3dc9) Thanks [@TorbjornHoltmon](https://github.com/TorbjornHoltmon)! - Fixed issue with cloudflare runtime `waitUntil` not working as intended. + +- Updated dependencies [[`2b34fc492`](https://github.com/withastro/astro/commit/2b34fc49282cbf5bf89de46359b51a67a5c4b8bb), [`89a483520`](https://github.com/withastro/astro/commit/89a4835202f05d9571aeb42740dbe907a8afc28b)]: + - astro@2.6.6 + ## 6.5.0 ### Minor Changes diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 73bc57f8bcf4..2cffb6dcc1f4 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/cloudflare", "description": "Deploy your site to Cloudflare Workers/Pages", - "version": "6.5.0", + "version": "6.5.1", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -44,7 +44,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^2.6.5" + "astro": "workspace:^2.6.6" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 0540d103a37e..01e8b0062007 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.6.5" + "astro": "workspace:^2.6.6" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index d6af7c8ecf23..7a9137e466f5 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.6.5", + "astro": "workspace:^2.6.6", "sharp": ">=0.31.0" }, "peerDependenciesMeta": { diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 36756035d46a..fb7c4a13196d 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -73,7 +73,7 @@ "zod": "^3.17.3" }, "peerDependencies": { - "astro": "workspace:^2.6.5" + "astro": "workspace:^2.6.6" }, "devDependencies": { "@astrojs/markdown-remark": "^2.2.1", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 4f4a014b9325..1c7b6bc60384 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.6.5" + "astro": "workspace:^2.6.6" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 76525eec1ed9..255bb0081fae 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -38,7 +38,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^2.6.5" + "astro": "workspace:^2.6.6" }, "devDependencies": { "@types/node": "^18.7.21", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index fd98e3944916..054a02a6f87e 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -48,7 +48,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.6.5", + "astro": "workspace:^2.6.6", "svelte": "^3.55.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 4dc78bbf9a7b..bd50d630ce79 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -43,7 +43,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.6.5", + "astro": "workspace:^2.6.6", "tailwindcss": "^3.0.24" }, "pnpm": { diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 189effdacd45..d11a2d85d90a 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -60,7 +60,7 @@ "web-vitals": "^3.1.1" }, "peerDependencies": { - "astro": "workspace:^2.6.5" + "astro": "workspace:^2.6.6" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.2", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index a41aaf5a3413..52b4627dccda 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.2.37" }, "peerDependencies": { - "astro": "workspace:^2.6.5", + "astro": "workspace:^2.6.6", "vue": "^3.2.30" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4d3ebec005fc..f985a716b452 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -127,7 +127,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/blog: @@ -142,19 +142,19 @@ importers: specifier: ^1.3.3 version: link:../../packages/integrations/sitemap astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -173,7 +173,7 @@ importers: specifier: ^3.12.0 version: 3.12.0 astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/framework-lit: @@ -185,7 +185,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro lit: specifier: ^2.7.4 @@ -209,7 +209,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -239,7 +239,7 @@ importers: specifier: ^1.1.3 version: 1.1.3(preact@10.13.2) astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -257,7 +257,7 @@ importers: specifier: ^18.2.3 version: 18.2.3 astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -272,7 +272,7 @@ importers: specifier: ^2.2.0 version: link:../../packages/integrations/solid astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro solid-js: specifier: ^1.7.4 @@ -284,7 +284,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/svelte astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro svelte: specifier: ^3.58.0 @@ -296,7 +296,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro vue: specifier: ^3.2.47 @@ -308,13 +308,13 @@ importers: specifier: ^5.2.0 version: link:../../packages/integrations/node astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/middleware: @@ -323,7 +323,7 @@ importers: specifier: ^5.2.0 version: link:../../packages/integrations/node astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -332,19 +332,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/ssr: @@ -356,7 +356,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/svelte astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro svelte: specifier: ^3.58.0 @@ -368,7 +368,7 @@ importers: specifier: ^0.3.3 version: link:../../packages/integrations/markdoc astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/with-markdown-plugins: @@ -377,7 +377,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/markdown/remark astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -398,7 +398,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro examples/with-mdx: @@ -410,7 +410,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/preact astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro preact: specifier: ^10.13.2 @@ -425,7 +425,7 @@ importers: specifier: ^0.4.1 version: 0.4.1(nanostores@0.8.1)(preact@10.13.2) astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro nanostores: specifier: ^0.8.1 @@ -446,7 +446,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro autoprefixer: specifier: ^10.4.14 @@ -464,7 +464,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.14.7 @@ -476,7 +476,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^2.6.5 + specifier: ^2.6.6 version: link:../../packages/astro vitest: specifier: ^0.31.0 From 008af95a751add5b129f7f2216e52c1069c9cf05 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Tue, 20 Jun 2023 17:29:41 +0100 Subject: [PATCH 24/60] chore: update bug report template (#7431) Co-authored-by: Bjorn Lu --- .github/ISSUE_TEMPLATE/---01-bug-report.yml | 7 +++++++ .github/ISSUE_TEMPLATE/config.yml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/---01-bug-report.yml b/.github/ISSUE_TEMPLATE/---01-bug-report.yml index 32e636cce7c7..a9786522b28f 100644 --- a/.github/ISSUE_TEMPLATE/---01-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/---01-bug-report.yml @@ -53,6 +53,13 @@ body: description: A clear and concise description of what the bug is. validations: required: true + - type: textarea + id: bug-expectation + attributes: + label: What's the expected result? + description: Describe what you expect to happen. + validations: + required: true - type: input id: bug-reproduction attributes: diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index e896bd2f2275..7774667cf6af 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,7 +4,7 @@ contact_links: url: https://github.com/withastro/docs about: File an issue or make an improvement to the docs website. - name: 💡 Ideas for New Features, Improvements and RFCs - url: https://github.com/withastro/rfcs/discussions + url: https://github.com/withastro/roadmap/discussions about: Propose and discuss future improvements to Astro - name: 👾 Chat url: https://astro.build/chat From e314a04bfbf0526838b7c9aac452251b27d69719 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Tue, 20 Jun 2023 17:32:30 +0100 Subject: [PATCH 25/60] fix: correctly emit middleware file name (#7427) --- .changeset/great-crabs-march.md | 5 +++++ packages/astro/src/core/app/index.ts | 7 +++---- packages/astro/src/core/build/generate.ts | 10 +++++----- .../core/build/plugins/plugin-middleware.ts | 18 ++++++++++++++++++ .../src/core/build/plugins/plugin-pages.ts | 4 ++-- packages/astro/src/core/build/static-build.ts | 8 ++------ packages/astro/src/core/build/types.ts | 6 +++++- packages/astro/src/core/endpoint/dev/index.ts | 2 +- packages/astro/src/core/endpoint/index.ts | 8 ++++---- packages/astro/src/core/redirects/component.ts | 7 ++----- 10 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 .changeset/great-crabs-march.md diff --git a/.changeset/great-crabs-march.md b/.changeset/great-crabs-march.md new file mode 100644 index 000000000000..5f58b2bb4111 --- /dev/null +++ b/.changeset/great-crabs-march.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Correctly emit the middleware code during the build phase. The file emitted is now `dist/middleware.mjs` diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts index 56d22eafcdf2..d9926f70cce5 100644 --- a/packages/astro/src/core/app/index.ts +++ b/packages/astro/src/core/app/index.ts @@ -236,12 +236,11 @@ export class App { site: this.#env.site, adapterName: this.#env.adapterName, }); - const onRequest = page.middleware?.onRequest; let response; - if (onRequest) { + if (page.onRequest) { response = await callMiddleware( this.#env.logging, - onRequest as MiddlewareResponseHandler, + page.onRequest as MiddlewareResponseHandler, apiContext, () => { return renderPage({ mod, renderContext, env: this.#env, apiContext }); @@ -287,7 +286,7 @@ export class App { mod: handler as any, }); - const result = await callEndpoint(handler, this.#env, ctx, this.#logging, page.middleware); + const result = await callEndpoint(handler, this.#env, ctx, this.#logging, page.onRequest); if (result.type === 'response') { if (result.response.headers.get('X-Astro-Response') === 'Not-Found') { diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index a6a1ece54d4c..8fe090fc175e 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -12,6 +12,7 @@ import type { EndpointOutput, GetStaticPathsItem, ImageTransform, + MiddlewareHandler, MiddlewareResponseHandler, RouteData, RouteType, @@ -229,7 +230,7 @@ async function generatePage( .reduce(mergeInlineCss, []); const pageModulePromise = ssrEntry.page; - const middleware = ssrEntry.middleware; + const onRequest = ssrEntry.onRequest; if (!pageModulePromise) { throw new Error( @@ -264,7 +265,7 @@ async function generatePage( for (let i = 0; i < paths.length; i++) { const path = paths[i]; - await generatePath(path, opts, generationOptions, middleware); + await generatePath(path, opts, generationOptions, onRequest); const timeEnd = performance.now(); const timeChange = getTimeStat(timeStart, timeEnd); const timeIncrease = `(+${timeChange})`; @@ -448,7 +449,7 @@ async function generatePath( pathname: string, opts: StaticBuildOptions, gopts: GeneratePathOptions, - middleware?: AstroMiddlewareInstance + onRequest?: MiddlewareHandler ) { const { settings, logging, origin, routeCache } = opts; const { @@ -569,7 +570,7 @@ async function generatePath( env, renderContext, logging, - middleware as AstroMiddlewareInstance + onRequest as MiddlewareHandler ); if (result.type === 'response') { @@ -593,7 +594,6 @@ async function generatePath( adapterName: env.adapterName, }); - const onRequest = middleware?.onRequest; if (onRequest) { response = await callMiddleware( env.logging, diff --git a/packages/astro/src/core/build/plugins/plugin-middleware.ts b/packages/astro/src/core/build/plugins/plugin-middleware.ts index 6bd63b44f3a0..e65a112dd288 100644 --- a/packages/astro/src/core/build/plugins/plugin-middleware.ts +++ b/packages/astro/src/core/build/plugins/plugin-middleware.ts @@ -3,9 +3,12 @@ import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js'; import type { BuildInternals } from '../internal.js'; import type { AstroBuildPlugin } from '../plugin'; import type { StaticBuildOptions } from '../types'; +import { addRollupInput } from '../add-rollup-input.js'; export const MIDDLEWARE_MODULE_ID = '@astro-middleware'; +const EMPTY_MIDDLEWARE = '\0empty-middleware'; + export function vitePluginMiddleware( opts: StaticBuildOptions, _internals: BuildInternals @@ -13,6 +16,10 @@ export function vitePluginMiddleware( return { name: '@astro/plugin-middleware', + options(options) { + return addRollupInput(options, [MIDDLEWARE_MODULE_ID]); + }, + async resolveId(id) { if (id === MIDDLEWARE_MODULE_ID) { const middlewareId = await this.resolve( @@ -20,8 +27,19 @@ export function vitePluginMiddleware( ); if (middlewareId) { return middlewareId.id; + } else { + return EMPTY_MIDDLEWARE; } } + if (id === EMPTY_MIDDLEWARE) { + return EMPTY_MIDDLEWARE; + } + }, + + load(id) { + if (id === EMPTY_MIDDLEWARE) { + return 'export const onRequest = undefined'; + } }, }; } diff --git a/packages/astro/src/core/build/plugins/plugin-pages.ts b/packages/astro/src/core/build/plugins/plugin-pages.ts index f767a9c5bd79..c6f89a558bee 100644 --- a/packages/astro/src/core/build/plugins/plugin-pages.ts +++ b/packages/astro/src/core/build/plugins/plugin-pages.ts @@ -82,8 +82,8 @@ function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): V const middlewareModule = await this.resolve(MIDDLEWARE_MODULE_ID); if (middlewareModule) { - imports.push(`import * as middleware from "${middlewareModule.id}";`); - exports.push(`export { middleware };`); + imports.push(`import { onRequest } from "${middlewareModule.id}";`); + exports.push(`export { onRequest };`); } return `${imports.join('\n')}${exports.join('\n')}`; diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 647b31983066..48f70a15e3cf 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -32,6 +32,7 @@ import { RESOLVED_RENDERERS_MODULE_ID } from './plugins/plugin-renderers.js'; import { SSR_VIRTUAL_MODULE_ID } from './plugins/plugin-ssr.js'; import type { AllPagesData, PageBuildData, StaticBuildOptions } from './types'; import { getTimeStat } from './util.js'; +import { MIDDLEWARE_MODULE_ID } from './plugins/plugin-middleware.js'; export async function viteBuild(opts: StaticBuildOptions) { const { allPages, settings } = opts; @@ -176,12 +177,7 @@ async function ssrBuild( entryFileNames(chunkInfo) { if (chunkInfo.facadeModuleId?.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) { return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId, allPages); - } else if ( - // checks if the path of the module we have middleware, e.g. middleware.js / middleware/index.js - chunkInfo.moduleIds.find((m) => m.includes('middleware')) !== undefined && - // checks if the file actually export the `onRequest` function - chunkInfo.exports.includes('_middleware') - ) { + } else if (chunkInfo.facadeModuleId === MIDDLEWARE_MODULE_ID) { return 'middleware.mjs'; } else if (chunkInfo.facadeModuleId === SSR_VIRTUAL_MODULE_ID) { return opts.settings.config.build.serverEntry; diff --git a/packages/astro/src/core/build/types.ts b/packages/astro/src/core/build/types.ts index 772235697751..8409a8cff03c 100644 --- a/packages/astro/src/core/build/types.ts +++ b/packages/astro/src/core/build/types.ts @@ -6,6 +6,7 @@ import type { BuildConfig, ComponentInstance, ManifestData, + MiddlewareHandler, RouteData, RuntimeMode, SSRLoadedRenderer, @@ -51,7 +52,10 @@ type ImportComponentInstance = () => Promise; export interface SinglePageBuiltModule { page: ImportComponentInstance; - middleware: AstroMiddlewareInstance; + /** + * The `onRequest` hook exported by the middleware + */ + onRequest?: MiddlewareHandler; renderers: SSRLoadedRenderer[]; } diff --git a/packages/astro/src/core/endpoint/dev/index.ts b/packages/astro/src/core/endpoint/dev/index.ts index b829754765ec..04e11b578007 100644 --- a/packages/astro/src/core/endpoint/dev/index.ts +++ b/packages/astro/src/core/endpoint/dev/index.ts @@ -21,5 +21,5 @@ export async function call(options: SSROptions, logging: LogOptions) { mod: endpointHandler as any, }); - return await callEndpoint(endpointHandler, env, ctx, logging, middleware); + return await callEndpoint(endpointHandler, env, ctx, logging, middleware?.onRequest); } diff --git a/packages/astro/src/core/endpoint/index.ts b/packages/astro/src/core/endpoint/index.ts index 5822685cf987..5390b97dddb1 100644 --- a/packages/astro/src/core/endpoint/index.ts +++ b/packages/astro/src/core/endpoint/index.ts @@ -5,6 +5,7 @@ import type { EndpointHandler, EndpointOutput, MiddlewareEndpointHandler, + MiddlewareHandler, Params, } from '../../@types/astro'; import type { Environment, RenderContext } from '../render/index'; @@ -97,7 +98,7 @@ export async function callEndpoint env: Environment, ctx: RenderContext, logging: LogOptions, - middleware?: AstroMiddlewareInstance | undefined + onRequest?: MiddlewareHandler | undefined ): Promise { const context = createAPIContext({ request: ctx.request, @@ -108,11 +109,10 @@ export async function callEndpoint }); let response; - if (middleware && middleware.onRequest) { - const onRequest = middleware.onRequest as MiddlewareEndpointHandler; + if (onRequest) { response = await callMiddleware( env.logging, - onRequest, + onRequest as MiddlewareEndpointHandler, context, async () => { return await renderEndpoint(mod, context, env.ssr); diff --git a/packages/astro/src/core/redirects/component.ts b/packages/astro/src/core/redirects/component.ts index f76b82517887..fc6f07b54ef9 100644 --- a/packages/astro/src/core/redirects/component.ts +++ b/packages/astro/src/core/redirects/component.ts @@ -1,5 +1,6 @@ import type { AstroMiddlewareInstance, ComponentInstance } from '../../@types/astro'; import type { SinglePageBuiltModule } from '../build/types'; +import type { MiddlewareHandler } from '../../@types/astro'; // A stub of a component instance for a given route export const RedirectComponentInstance: ComponentInstance = { @@ -10,12 +11,8 @@ export const RedirectComponentInstance: ComponentInstance = { }, }; -const StaticMiddlewareInstance: AstroMiddlewareInstance = { - onRequest: (ctx, next) => next(), -}; - export const RedirectSinglePageBuiltModule: SinglePageBuiltModule = { page: () => Promise.resolve(RedirectComponentInstance), - middleware: StaticMiddlewareInstance, + onRequest: (ctx, next) => next(), renderers: [], }; From 3fd10f4597712080a12dcd98e74d39c2e78d032a Mon Sep 17 00:00:00 2001 From: ematipico Date: Tue, 20 Jun 2023 16:34:32 +0000 Subject: [PATCH 26/60] [ci] format --- packages/astro/src/core/build/generate.ts | 1 - packages/astro/src/core/build/plugins/plugin-middleware.ts | 2 +- packages/astro/src/core/build/static-build.ts | 2 +- packages/astro/src/core/build/types.ts | 1 - packages/astro/src/core/endpoint/index.ts | 1 - packages/astro/src/core/redirects/component.ts | 3 +-- 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index 8fe090fc175e..8eabd260ecbd 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -5,7 +5,6 @@ import type { OutputAsset, OutputChunk } from 'rollup'; import { fileURLToPath } from 'url'; import type { AstroConfig, - AstroMiddlewareInstance, AstroSettings, ComponentInstance, EndpointHandler, diff --git a/packages/astro/src/core/build/plugins/plugin-middleware.ts b/packages/astro/src/core/build/plugins/plugin-middleware.ts index e65a112dd288..7e3ea8cb9d9a 100644 --- a/packages/astro/src/core/build/plugins/plugin-middleware.ts +++ b/packages/astro/src/core/build/plugins/plugin-middleware.ts @@ -1,9 +1,9 @@ import type { Plugin as VitePlugin } from 'vite'; import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js'; +import { addRollupInput } from '../add-rollup-input.js'; import type { BuildInternals } from '../internal.js'; import type { AstroBuildPlugin } from '../plugin'; import type { StaticBuildOptions } from '../types'; -import { addRollupInput } from '../add-rollup-input.js'; export const MIDDLEWARE_MODULE_ID = '@astro-middleware'; diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 48f70a15e3cf..327ef5f16035 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -24,6 +24,7 @@ import { generatePages } from './generate.js'; import { trackPageData } from './internal.js'; import { createPluginContainer, type AstroBuildPluginContainer } from './plugin.js'; import { registerAllPlugins } from './plugins/index.js'; +import { MIDDLEWARE_MODULE_ID } from './plugins/plugin-middleware.js'; import { ASTRO_PAGE_EXTENSION_POST_PATTERN, ASTRO_PAGE_RESOLVED_MODULE_ID, @@ -32,7 +33,6 @@ import { RESOLVED_RENDERERS_MODULE_ID } from './plugins/plugin-renderers.js'; import { SSR_VIRTUAL_MODULE_ID } from './plugins/plugin-ssr.js'; import type { AllPagesData, PageBuildData, StaticBuildOptions } from './types'; import { getTimeStat } from './util.js'; -import { MIDDLEWARE_MODULE_ID } from './plugins/plugin-middleware.js'; export async function viteBuild(opts: StaticBuildOptions) { const { allPages, settings } = opts; diff --git a/packages/astro/src/core/build/types.ts b/packages/astro/src/core/build/types.ts index 8409a8cff03c..5b6db5d49d9a 100644 --- a/packages/astro/src/core/build/types.ts +++ b/packages/astro/src/core/build/types.ts @@ -1,7 +1,6 @@ import type { default as vite, InlineConfig } from 'vite'; import type { AstroConfig, - AstroMiddlewareInstance, AstroSettings, BuildConfig, ComponentInstance, diff --git a/packages/astro/src/core/endpoint/index.ts b/packages/astro/src/core/endpoint/index.ts index 5390b97dddb1..ef5b514c6ff9 100644 --- a/packages/astro/src/core/endpoint/index.ts +++ b/packages/astro/src/core/endpoint/index.ts @@ -1,7 +1,6 @@ import type { APIContext, AstroConfig, - AstroMiddlewareInstance, EndpointHandler, EndpointOutput, MiddlewareEndpointHandler, diff --git a/packages/astro/src/core/redirects/component.ts b/packages/astro/src/core/redirects/component.ts index fc6f07b54ef9..d10cae4feed5 100644 --- a/packages/astro/src/core/redirects/component.ts +++ b/packages/astro/src/core/redirects/component.ts @@ -1,6 +1,5 @@ -import type { AstroMiddlewareInstance, ComponentInstance } from '../../@types/astro'; +import type { ComponentInstance } from '../../@types/astro'; import type { SinglePageBuiltModule } from '../build/types'; -import type { MiddlewareHandler } from '../../@types/astro'; // A stub of a component instance for a given route export const RedirectComponentInstance: ComponentInstance = { From 7877a06d829305eed356fbb8bfd1ef578cd5466e Mon Sep 17 00:00:00 2001 From: Ben Holmes Date: Tue, 20 Jun 2023 14:06:36 -0400 Subject: [PATCH 27/60] Fix up `pnpm dev` (#7424) * feat: use persistent per turbo recs * feat: preserve types yay * fix: *actually* solve problem * fix: type failures from content types template * fix: bad JS doc comments * fix: bad src/content/template path * chore: changeset --------- Co-authored-by: Nate Moore --- .changeset/fluffy-pandas-breathe.md | 5 +++++ package.json | 2 +- .../virtual-mod.mjs => content-module.template.mjs} | 0 .../types.d.ts => content-types.template.d.ts} | 0 packages/astro/package.json | 5 +++-- packages/astro/src/content/utils.ts | 10 ++++------ .../src/content/vite-plugin-content-virtual-mod.ts | 2 +- .../test/units/content-collections/frontmatter.test.js | 2 +- scripts/cmd/build.js | 4 +++- turbo.json | 3 ++- 10 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 .changeset/fluffy-pandas-breathe.md rename packages/astro/{src/content/template/virtual-mod.mjs => content-module.template.mjs} (100%) rename packages/astro/{src/content/template/types.d.ts => content-types.template.d.ts} (100%) diff --git a/.changeset/fluffy-pandas-breathe.md b/.changeset/fluffy-pandas-breathe.md new file mode 100644 index 000000000000..f3d1fdffbda0 --- /dev/null +++ b/.changeset/fluffy-pandas-breathe.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Update internal types for more stable builds for Astro maintainers. diff --git a/package.json b/package.json index 4ce4c3e5e919..e41f11a5c177 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "build": "turbo run build --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", "build:ci": "turbo run build:ci --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", "build:examples": "turbo run build --filter=\"@example/*\"", - "dev": "turbo run dev --parallel --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", + "dev": "turbo run dev --concurrency=40 --parallel --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", "format": "pnpm run format:code", "format:ci": "pnpm run format:imports && pnpm run format:code", "format:code": "prettier -w . --cache --plugin-search-dir=.", diff --git a/packages/astro/src/content/template/virtual-mod.mjs b/packages/astro/content-module.template.mjs similarity index 100% rename from packages/astro/src/content/template/virtual-mod.mjs rename to packages/astro/content-module.template.mjs diff --git a/packages/astro/src/content/template/types.d.ts b/packages/astro/content-types.template.d.ts similarity index 100% rename from packages/astro/src/content/template/types.d.ts rename to packages/astro/content-types.template.d.ts diff --git a/packages/astro/package.json b/packages/astro/package.json index 8e513b9b2751..a9b4854a7f84 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -91,12 +91,13 @@ "client.d.ts", "client-base.d.ts", "client-image.d.ts", + "content-types.template.d.ts", + "content-module.template.mjs", "import-meta.d.ts", "astro-jsx.d.ts", "types.d.ts", "README.md", - "vendor", - "src/content/template" + "vendor" ], "scripts": { "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"", diff --git a/packages/astro/src/content/utils.ts b/packages/astro/src/content/utils.ts index 3cee0765c293..631f30e1f19f 100644 --- a/packages/astro/src/content/utils.ts +++ b/packages/astro/src/content/utils.ts @@ -24,7 +24,7 @@ import { createImage } from './runtime-assets.js'; /** * Amap from a collection + slug to the local file path. * This is used internally to resolve entry imports when using `getEntry()`. - * @see `src/content/virtual-mod.mjs` + * @see `content-module.template.mjs` */ export type ContentLookupMap = { [collectionName: string]: { type: 'content' | 'data'; entries: { [lookupId: string]: string } }; @@ -432,7 +432,6 @@ export type ContentPaths = { cacheDir: URL; typesTemplate: URL; virtualModTemplate: URL; - virtualAssetsModTemplate: URL; config: { exists: boolean; url: URL; @@ -444,14 +443,13 @@ export function getContentPaths( fs: typeof fsMod = fsMod ): ContentPaths { const configStats = search(fs, srcDir); - const templateDir = new URL('../../src/content/template/', import.meta.url); + const pkgBase = new URL('../../', import.meta.url); return { cacheDir: new URL('.astro/', root), contentDir: new URL('./content/', srcDir), assetsDir: new URL('./assets/', srcDir), - typesTemplate: new URL('types.d.ts', templateDir), - virtualModTemplate: new URL('virtual-mod.mjs', templateDir), - virtualAssetsModTemplate: new URL('virtual-mod-assets.mjs', templateDir), + typesTemplate: new URL('content-types.template.d.ts', pkgBase), + virtualModTemplate: new URL('content-module.template.mjs', pkgBase), config: configStats, }; } diff --git a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts index 33aae964d890..ecda537e2094 100644 --- a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts +++ b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts @@ -94,7 +94,7 @@ export function astroContentVirtualModPlugin({ /** * Generate a map from a collection + slug to the local file path. * This is used internally to resolve entry imports when using `getEntry()`. - * @see `src/content/virtual-mod.mjs` + * @see `content-module.template.mjs` */ export async function getStringifiedLookupMap({ contentPaths, diff --git a/packages/astro/test/units/content-collections/frontmatter.test.js b/packages/astro/test/units/content-collections/frontmatter.test.js index c4c9826fddb5..f264f994a5cc 100644 --- a/packages/astro/test/units/content-collections/frontmatter.test.js +++ b/packages/astro/test/units/content-collections/frontmatter.test.js @@ -10,7 +10,7 @@ import { createFs, triggerFSEvent } from '../test-utils.js'; const root = new URL('../../fixtures/alias/', import.meta.url); function getTypesDts() { - const typesdtsURL = new URL('../../../src/content/template/types.d.ts', import.meta.url); + const typesdtsURL = new URL('../../../content-types.template.d.ts', import.meta.url); const relpath = slash(path.relative(fileURLToPath(root), fileURLToPath(typesdtsURL))); return { [relpath]: nodeFS.readFileSync(typesdtsURL, 'utf-8'), diff --git a/scripts/cmd/build.js b/scripts/cmd/build.js index 8a38eacf30cb..54afa7af72fe 100644 --- a/scripts/cmd/build.js +++ b/scripts/cmd/build.js @@ -133,5 +133,7 @@ export default async function build(...args) { } async function clean(outdir) { - return deleteAsync([`${outdir}/**`, `!${outdir}/**/*.d.ts`]); + await deleteAsync([`${outdir}/**`, `!${outdir}/**/*.d.ts`], { + onlyFiles: true, + }); } diff --git a/turbo.json b/turbo.json index 43f9c00e7bad..158618ffed07 100644 --- a/turbo.json +++ b/turbo.json @@ -32,7 +32,8 @@ "outputMode": "new-only" }, "dev": { - "cache": false + "cache": false, + "persistent": true }, "test": { "env": ["RUNNER_OS", "NODE_VERSION"], From b9b57d901d753507243a1a93ec05fd0182647434 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Tue, 20 Jun 2023 20:37:04 +0100 Subject: [PATCH 28/60] ci: don't run workflow for `ISSUE_TEMPLATE` (#7433) --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17848dfd9306..3c54ee2061e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,7 @@ on: paths-ignore: - ".vscode/**" - "**/*.md" + - ".github/ISSUE_TEMPLATE/**" # Automatically cancel older in-progress jobs on the same branch concurrency: From 3943fa390a0bd41317a673d0f841e0461c7499cd Mon Sep 17 00:00:00 2001 From: KDTS Date: Wed, 21 Jun 2023 11:40:52 +0200 Subject: [PATCH 29/60] Fix minior issue in the documentation related to port customization (#7436) --- .changeset/five-ghosts-sit.md | 5 +++++ packages/astro/src/@types/astro.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/five-ghosts-sit.md diff --git a/.changeset/five-ghosts-sit.md b/.changeset/five-ghosts-sit.md new file mode 100644 index 000000000000..3b23736a3ac0 --- /dev/null +++ b/.changeset/five-ghosts-sit.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix an issue related to the documentation. Destructure the argument of the function to customize the Astro dev server based on the command run. diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index a3fcdcedda9a..fea28d092a87 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -859,7 +859,7 @@ export interface AstroUserConfig { * ```js * { * // Example: Use the function syntax to customize based on command - * server: (command) => ({ port: command === 'dev' ? 3000 : 4000 }) + * server: ({ command }) => ({ port: command === 'dev' ? 3000 : 4000 }) * } * ``` */ From 61d6e45cef6082faa1255ee336db39a15f08a006 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Wed, 21 Jun 2023 13:06:43 +0100 Subject: [PATCH 30/60] docs: add snippet for `base` option (#7384) --- packages/integrations/node/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/integrations/node/README.md b/packages/integrations/node/README.md index 3eb8d1caf09c..165a0733d9f3 100644 --- a/packages/integrations/node/README.md +++ b/packages/integrations/node/README.md @@ -92,7 +92,10 @@ import express from 'express'; import { handler as ssrHandler } from './dist/server/entry.mjs'; const app = express(); -app.use(express.static('dist/client/')) +// Change this based on your astro.config.mjs, `base` option. +// They should match. The default value is "/". +const base = "/"; +app.use(base, express.static('dist/client/')) app.use(ssrHandler); app.listen(8080); From 8e2923cc6219eda01ca2c749f5c7fa2fe4319455 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Wed, 21 Jun 2023 13:07:16 +0100 Subject: [PATCH 31/60] feat: expose locals to render api and from requests in dev mode (#7385) Co-authored-by: Emanuele Stoppa Co-authored-by: wrapperup --- .changeset/smooth-jokes-watch.md | 6 ++ packages/astro/src/core/app/index.ts | 8 +-- packages/astro/src/core/app/node.ts | 14 ++-- packages/astro/src/core/build/generate.ts | 4 +- packages/astro/src/core/endpoint/index.ts | 1 + packages/astro/src/core/render/context.ts | 24 ++++++- packages/astro/src/core/render/core.ts | 14 ++-- packages/astro/src/core/render/dev/index.ts | 27 +++++--- packages/astro/src/core/request.ts | 4 +- .../src/vite-plugin-astro-server/route.ts | 3 + .../test/fixtures/ssr-locals/package.json | 8 +++ .../test/fixtures/ssr-locals/src/pages/api.js | 10 +++ .../fixtures/ssr-locals/src/pages/foo.astro | 4 ++ packages/astro/test/ssr-locals.test.js | 40 +++++++++++ packages/astro/test/test-adapter.js | 5 +- packages/integrations/node/README.md | 19 +++++ .../integrations/node/src/nodeMiddleware.ts | 5 +- .../node/test/fixtures/locals/package.json | 9 +++ .../test/fixtures/locals/src/pages/api.js | 10 +++ .../test/fixtures/locals/src/pages/foo.astro | 4 ++ .../integrations/node/test/locals.test.js | 53 ++++++++++++++ pnpm-lock.yaml | 69 +++++-------------- 22 files changed, 254 insertions(+), 87 deletions(-) create mode 100644 .changeset/smooth-jokes-watch.md create mode 100644 packages/astro/test/fixtures/ssr-locals/package.json create mode 100644 packages/astro/test/fixtures/ssr-locals/src/pages/api.js create mode 100644 packages/astro/test/fixtures/ssr-locals/src/pages/foo.astro create mode 100644 packages/astro/test/ssr-locals.test.js create mode 100644 packages/integrations/node/test/fixtures/locals/package.json create mode 100644 packages/integrations/node/test/fixtures/locals/src/pages/api.js create mode 100644 packages/integrations/node/test/fixtures/locals/src/pages/foo.astro create mode 100644 packages/integrations/node/test/locals.test.js diff --git a/.changeset/smooth-jokes-watch.md b/.changeset/smooth-jokes-watch.md new file mode 100644 index 000000000000..c28c51d2b4f8 --- /dev/null +++ b/.changeset/smooth-jokes-watch.md @@ -0,0 +1,6 @@ +--- +'astro': minor +'@astrojs/node': minor +--- + +`Astro.locals` is now exposed to the adapter API. Node Adapter can now pass in a `locals` object in the SSR handler middleware. diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts index d9926f70cce5..ae83b301623a 100644 --- a/packages/astro/src/core/app/index.ts +++ b/packages/astro/src/core/app/index.ts @@ -115,7 +115,7 @@ export class App { return undefined; } } - async render(request: Request, routeData?: RouteData): Promise { + async render(request: Request, routeData?: RouteData, locals?: object): Promise { let defaultStatus = 200; if (!routeData) { routeData = this.match(request); @@ -131,7 +131,7 @@ export class App { } } - Reflect.set(request, clientLocalsSymbol, {}); + Reflect.set(request, clientLocalsSymbol, locals ?? {}); // Use the 404 status code for 404.astro components if (routeData.route === '/404') { @@ -243,7 +243,7 @@ export class App { page.onRequest as MiddlewareResponseHandler, apiContext, () => { - return renderPage({ mod, renderContext, env: this.#env, apiContext }); + return renderPage({ mod, renderContext, env: this.#env, cookies: apiContext.cookies }); } ); } else { @@ -251,7 +251,7 @@ export class App { mod, renderContext, env: this.#env, - apiContext, + cookies: apiContext.cookies, }); } Reflect.set(request, responseSentSymbol, true); diff --git a/packages/astro/src/core/app/node.ts b/packages/astro/src/core/app/node.ts index 6bd2677a79e0..40b7b4e7ce6e 100644 --- a/packages/astro/src/core/app/node.ts +++ b/packages/astro/src/core/app/node.ts @@ -41,11 +41,12 @@ export class NodeApp extends App { match(req: NodeIncomingMessage | Request, opts: MatchOptions = {}) { return super.match(req instanceof Request ? req : createRequestFromNodeRequest(req), opts); } - render(req: NodeIncomingMessage | Request, routeData?: RouteData) { + render(req: NodeIncomingMessage | Request, routeData?: RouteData, locals?: object) { if (typeof req.body === 'string' && req.body.length > 0) { return super.render( req instanceof Request ? req : createRequestFromNodeRequest(req, Buffer.from(req.body)), - routeData + routeData, + locals ); } @@ -54,7 +55,8 @@ export class NodeApp extends App { req instanceof Request ? req : createRequestFromNodeRequest(req, Buffer.from(JSON.stringify(req.body))), - routeData + routeData, + locals ); } @@ -75,13 +77,15 @@ export class NodeApp extends App { return reqBodyComplete.then(() => { return super.render( req instanceof Request ? req : createRequestFromNodeRequest(req, body), - routeData + routeData, + locals ); }); } return super.render( req instanceof Request ? req : createRequestFromNodeRequest(req), - routeData + routeData, + locals ); } } diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index 8eabd260ecbd..551f7afa8395 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -603,8 +603,8 @@ async function generatePath( mod, renderContext, env, - apiContext, isCompressHTML: settings.config.compressHTML, + cookies: apiContext.cookies, }); } ); @@ -613,8 +613,8 @@ async function generatePath( mod, renderContext, env, - apiContext, isCompressHTML: settings.config.compressHTML, + cookies: apiContext.cookies, }); } } catch (err) { diff --git a/packages/astro/src/core/endpoint/index.ts b/packages/astro/src/core/endpoint/index.ts index ef5b514c6ff9..dde07cd9c625 100644 --- a/packages/astro/src/core/endpoint/index.ts +++ b/packages/astro/src/core/endpoint/index.ts @@ -78,6 +78,7 @@ export function createAPIContext({ // We define a custom property, so we can check the value passed to locals Object.defineProperty(context, 'locals', { + enumerable: true, get() { return Reflect.get(request, clientLocalsSymbol); }, diff --git a/packages/astro/src/core/render/context.ts b/packages/astro/src/core/render/context.ts index 90aaae0d2029..a43650a556cb 100644 --- a/packages/astro/src/core/render/context.ts +++ b/packages/astro/src/core/render/context.ts @@ -7,9 +7,12 @@ import type { SSRElement, SSRResult, } from '../../@types/astro'; +import { AstroError, AstroErrorData } from '../errors/index.js'; import { getParamsAndPropsOrThrow } from './core.js'; import type { Environment } from './environment'; +const clientLocalsSymbol = Symbol.for('astro.locals'); + /** * The RenderContext represents the parts of rendering that are specific to one request. */ @@ -27,6 +30,7 @@ export interface RenderContext { cookies?: AstroCookies; params: Params; props: Props; + locals?: object; } export type CreateRenderContextArgs = Partial & { @@ -51,7 +55,8 @@ export async function createRenderContext( logging: options.env.logging, ssr: options.env.ssr, }); - return { + + let context = { ...options, origin, pathname, @@ -59,4 +64,21 @@ export async function createRenderContext( params, props, }; + + // We define a custom property, so we can check the value passed to locals + Object.defineProperty(context, 'locals', { + enumerable: true, + get() { + return Reflect.get(request, clientLocalsSymbol); + }, + set(val) { + if (typeof val !== 'object') { + throw new AstroError(AstroErrorData.LocalsNotAnObject); + } else { + Reflect.set(request, clientLocalsSymbol, val); + } + }, + }); + + return context; } diff --git a/packages/astro/src/core/render/core.ts b/packages/astro/src/core/render/core.ts index 282c78f2b903..0ed599548eb4 100644 --- a/packages/astro/src/core/render/core.ts +++ b/packages/astro/src/core/render/core.ts @@ -1,5 +1,5 @@ -import type { APIContext, ComponentInstance, Params, Props, RouteData } from '../../@types/astro'; -import { renderPage as runtimeRenderPage } from '../../runtime/server/index.js'; +import type { AstroCookies, ComponentInstance, Params, Props, RouteData } from '../../@types/astro'; +import { render, renderPage as runtimeRenderPage } from '../../runtime/server/index.js'; import { attachToResponse } from '../cookies/index.js'; import { AstroError, AstroErrorData } from '../errors/index.js'; import type { LogOptions } from '../logger/core.js'; @@ -108,15 +108,15 @@ export type RenderPage = { mod: ComponentInstance; renderContext: RenderContext; env: Environment; - apiContext?: APIContext; isCompressHTML?: boolean; + cookies: AstroCookies; }; export async function renderPage({ mod, renderContext, env, - apiContext, + cookies, isCompressHTML = false, }: RenderPage) { if (routeIsRedirect(renderContext.route)) { @@ -133,8 +133,6 @@ export async function renderPage({ if (!Component) throw new Error(`Expected an exported Astro component but received typeof ${typeof Component}`); - let locals = apiContext?.locals ?? {}; - const result = createResult({ adapterName: env.adapterName, links: renderContext.links, @@ -155,8 +153,8 @@ export async function renderPage({ scripts: renderContext.scripts, ssr: env.ssr, status: renderContext.status ?? 200, - cookies: apiContext?.cookies, - locals, + cookies, + locals: renderContext.locals ?? {}, }); // Support `export const components` for `MDX` pages diff --git a/packages/astro/src/core/render/dev/index.ts b/packages/astro/src/core/render/dev/index.ts index c0113739285a..67d0b0581266 100644 --- a/packages/astro/src/core/render/dev/index.ts +++ b/packages/astro/src/core/render/dev/index.ts @@ -180,22 +180,31 @@ export async function renderPage(options: SSROptions): Promise { mod, env, }); + const apiContext = createAPIContext({ + request: options.request, + params: renderContext.params, + props: renderContext.props, + adapterName: options.env.adapterName, + }); if (options.middleware) { if (options.middleware && options.middleware.onRequest) { - const apiContext = createAPIContext({ - request: options.request, - params: renderContext.params, - props: renderContext.props, - adapterName: options.env.adapterName, - }); - const onRequest = options.middleware.onRequest as MiddlewareResponseHandler; const response = await callMiddleware(env.logging, onRequest, apiContext, () => { - return coreRenderPage({ mod, renderContext, env: options.env, apiContext }); + return coreRenderPage({ + mod, + renderContext, + env: options.env, + cookies: apiContext.cookies, + }); }); return response; } } - return await coreRenderPage({ mod, renderContext, env: options.env }); // NOTE: without "await", errors won’t get caught below + return await coreRenderPage({ + mod, + renderContext, + env: options.env, + cookies: apiContext.cookies, + }); // NOTE: without "await", errors won’t get caught below } diff --git a/packages/astro/src/core/request.ts b/packages/astro/src/core/request.ts index d8ac9033db1a..d229ceaa4c84 100644 --- a/packages/astro/src/core/request.ts +++ b/packages/astro/src/core/request.ts @@ -13,6 +13,7 @@ export interface CreateRequestOptions { body?: RequestBody | undefined; logging: LogOptions; ssr: boolean; + locals?: object | undefined; } const clientAddressSymbol = Symbol.for('astro.clientAddress'); @@ -26,6 +27,7 @@ export function createRequest({ body = undefined, logging, ssr, + locals, }: CreateRequestOptions): Request { let headersObj = headers instanceof Headers @@ -66,7 +68,7 @@ export function createRequest({ Reflect.set(request, clientAddressSymbol, clientAddress); } - Reflect.set(request, clientLocalsSymbol, {}); + Reflect.set(request, clientLocalsSymbol, locals ?? {}); return request; } diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts index 9be1c81afc05..a610b4b743da 100644 --- a/packages/astro/src/vite-plugin-astro-server/route.ts +++ b/packages/astro/src/vite-plugin-astro-server/route.ts @@ -21,6 +21,8 @@ import { isServerLikeOutput } from '../prerender/utils.js'; import { log404 } from './common.js'; import { handle404Response, writeSSRResult, writeWebResponse } from './response.js'; +const clientLocalsSymbol = Symbol.for('astro.locals'); + type AsyncReturnType Promise> = T extends ( ...args: any ) => Promise @@ -153,6 +155,7 @@ export async function handleRoute( logging, ssr: buildingToSSR, clientAddress: buildingToSSR ? req.socket.remoteAddress : undefined, + locals: Reflect.get(req, clientLocalsSymbol), // Allows adapters to pass in locals in dev mode. }); // Set user specified headers to response object. diff --git a/packages/astro/test/fixtures/ssr-locals/package.json b/packages/astro/test/fixtures/ssr-locals/package.json new file mode 100644 index 000000000000..ae9ee4649690 --- /dev/null +++ b/packages/astro/test/fixtures/ssr-locals/package.json @@ -0,0 +1,8 @@ +{ + "name": "@test/ssr-locals", + "version": "0.0.0", + "private": true, + "dependencies": { + "astro": "workspace:*" + } +} diff --git a/packages/astro/test/fixtures/ssr-locals/src/pages/api.js b/packages/astro/test/fixtures/ssr-locals/src/pages/api.js new file mode 100644 index 000000000000..d4f7386fb85c --- /dev/null +++ b/packages/astro/test/fixtures/ssr-locals/src/pages/api.js @@ -0,0 +1,10 @@ + +export async function get({ locals }) { + let out = { ...locals }; + + return new Response(JSON.stringify(out), { + headers: { + 'Content-Type': 'application/json' + } + }); +} diff --git a/packages/astro/test/fixtures/ssr-locals/src/pages/foo.astro b/packages/astro/test/fixtures/ssr-locals/src/pages/foo.astro new file mode 100644 index 000000000000..66b1f7a045b1 --- /dev/null +++ b/packages/astro/test/fixtures/ssr-locals/src/pages/foo.astro @@ -0,0 +1,4 @@ +--- +const { foo } = Astro.locals; +--- +

    { foo }

    diff --git a/packages/astro/test/ssr-locals.test.js b/packages/astro/test/ssr-locals.test.js new file mode 100644 index 000000000000..41e5710fbbb8 --- /dev/null +++ b/packages/astro/test/ssr-locals.test.js @@ -0,0 +1,40 @@ +import { expect } from 'chai'; +import * as cheerio from 'cheerio'; +import { loadFixture } from './test-utils.js'; +import testAdapter from './test-adapter.js'; + +describe('SSR Astro.locals from server', () => { + /** @type {import('./test-utils').Fixture} */ + let fixture; + + before(async () => { + fixture = await loadFixture({ + root: './fixtures/ssr-locals/', + output: 'server', + adapter: testAdapter(), + }); + await fixture.build(); + }); + + it('Can access Astro.locals in page', async () => { + const app = await fixture.loadTestAdapterApp(); + const request = new Request('http://example.com/foo'); + const locals = { foo: 'bar' }; + const response = await app.render(request, undefined, locals); + const html = await response.text(); + + const $ = cheerio.load(html); + expect($('#foo').text()).to.equal('bar'); + }); + + it('Can access Astro.locals in api context', async () => { + const app = await fixture.loadTestAdapterApp(); + const request = new Request('http://example.com/api'); + const locals = { foo: 'bar' }; + const response = await app.render(request, undefined, locals); + expect(response.status).to.equal(200); + const body = await response.json(); + + expect(body.foo).to.equal('bar'); + }); +}); diff --git a/packages/astro/test/test-adapter.js b/packages/astro/test/test-adapter.js index cc34e3c3373c..d74cfaf81a71 100644 --- a/packages/astro/test/test-adapter.js +++ b/packages/astro/test/test-adapter.js @@ -34,7 +34,7 @@ export default function ({ provideAddress = true, extendAdapter } = { provideAdd this.#manifest = manifest; } - async render(request, routeData) { + async render(request, routeData, locals) { const url = new URL(request.url); if(this.#manifest.assets.has(url.pathname)) { const filePath = new URL('../client/' + this.removeBase(url.pathname), import.meta.url); @@ -42,9 +42,8 @@ export default function ({ provideAddress = true, extendAdapter } = { provideAdd return new Response(data); } - Reflect.set(request, Symbol.for('astro.locals'), {}); ${provideAddress ? `request[Symbol.for('astro.clientAddress')] = '0.0.0.0';` : ''} - return super.render(request, routeData); + return super.render(request, routeData, locals); } } diff --git a/packages/integrations/node/README.md b/packages/integrations/node/README.md index 165a0733d9f3..2464892a928d 100644 --- a/packages/integrations/node/README.md +++ b/packages/integrations/node/README.md @@ -122,6 +122,25 @@ app.use(ssrHandler); app.listen({ port: 8080 }); ``` +Additionally, you can also pass in an object to be accessed with `Astro.locals` or in Astro middleware: + +```js +import express from 'express'; +import { handler as ssrHandler } from './dist/server/entry.mjs'; + +const app = express(); +app.use(express.static('dist/client/')) +app.use((req, res, next) => { + const locals = { + title: 'New title' + }; + + ssrHandler(req, res, next, locals); +); + +app.listen(8080); +``` + Note that middleware mode does not do file serving. You'll need to configure your HTTP framework to do that for you. By default the client assets are written to `./dist/client/`. ### Standalone diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts index c0d439ba0b32..63ba246bd837 100644 --- a/packages/integrations/node/src/nodeMiddleware.ts +++ b/packages/integrations/node/src/nodeMiddleware.ts @@ -9,14 +9,15 @@ export default function (app: NodeApp, mode: Options['mode']) { return async function ( req: IncomingMessage, res: ServerResponse, - next?: (err?: unknown) => void + next?: (err?: unknown) => void, + locals?: object ) { try { const route = mode === 'standalone' ? app.match(req, { matchNotFound: true }) : app.match(req); if (route) { try { - const response = await app.render(req); + const response = await app.render(req, route, locals); await writeWebResponse(app, res, response); } catch (err: unknown) { if (next) { diff --git a/packages/integrations/node/test/fixtures/locals/package.json b/packages/integrations/node/test/fixtures/locals/package.json new file mode 100644 index 000000000000..35be7dc01ef2 --- /dev/null +++ b/packages/integrations/node/test/fixtures/locals/package.json @@ -0,0 +1,9 @@ +{ + "name": "@test/locals", + "version": "0.0.0", + "private": true, + "dependencies": { + "astro": "workspace:*", + "@astrojs/node": "workspace:*" + } +} diff --git a/packages/integrations/node/test/fixtures/locals/src/pages/api.js b/packages/integrations/node/test/fixtures/locals/src/pages/api.js new file mode 100644 index 000000000000..8b209c5826c3 --- /dev/null +++ b/packages/integrations/node/test/fixtures/locals/src/pages/api.js @@ -0,0 +1,10 @@ + +export async function post({ locals }) { + let out = { ...locals }; + + return new Response(JSON.stringify(out), { + headers: { + 'Content-Type': 'application/json' + } + }); +} diff --git a/packages/integrations/node/test/fixtures/locals/src/pages/foo.astro b/packages/integrations/node/test/fixtures/locals/src/pages/foo.astro new file mode 100644 index 000000000000..224a875ecc8f --- /dev/null +++ b/packages/integrations/node/test/fixtures/locals/src/pages/foo.astro @@ -0,0 +1,4 @@ +--- +const { foo } = Astro.locals; +--- +

    {foo}

    diff --git a/packages/integrations/node/test/locals.test.js b/packages/integrations/node/test/locals.test.js new file mode 100644 index 000000000000..f7fc6b73f320 --- /dev/null +++ b/packages/integrations/node/test/locals.test.js @@ -0,0 +1,53 @@ +import nodejs from '../dist/index.js'; +import { loadFixture, createRequestAndResponse } from './test-utils.js'; +import { expect } from 'chai'; + +describe('API routes', () => { + /** @type {import('./test-utils').Fixture} */ + let fixture; + + before(async () => { + fixture = await loadFixture({ + root: './fixtures/locals/', + output: 'server', + adapter: nodejs({ mode: 'middleware' }), + }); + await fixture.build(); + }); + + it('Can render locals in page', async () => { + const { handler } = await import('./fixtures/locals/dist/server/entry.mjs'); + let { req, res, text } = createRequestAndResponse({ + method: 'POST', + url: '/foo', + }); + + let locals = { foo: 'bar' }; + + handler(req, res, () => {}, locals); + req.send(); + + let html = await text(); + + expect(html).to.contain('

    bar

    '); + }); + + it('Can access locals in API', async () => { + const { handler } = await import('./fixtures/locals/dist/server/entry.mjs'); + let { req, res, done } = createRequestAndResponse({ + method: 'POST', + url: '/api', + }); + + let locals = { foo: 'bar' }; + + handler(req, res, () => {}, locals); + req.send(); + + let [buffer] = await done; + + let json = JSON.parse(buffer.toString('utf-8')); + + expect(json.foo).to.equal('bar'); + }); +}); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f985a716b452..29d581936ece 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3252,6 +3252,12 @@ importers: specifier: workspace:* version: link:../../.. + packages/astro/test/fixtures/ssr-locals: + dependencies: + astro: + specifier: workspace:* + version: link:../../.. + packages/astro/test/fixtures/ssr-manifest: dependencies: astro: @@ -4415,7 +4421,7 @@ importers: version: 9.2.2 vite: specifier: ^4.3.1 - version: 4.3.1(@types/node@14.18.21) + version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) packages/integrations/netlify/test/edge-functions/fixtures/dynimport: dependencies: @@ -4550,6 +4556,15 @@ importers: specifier: workspace:* version: link:../../../../../astro + packages/integrations/node/test/fixtures/locals: + dependencies: + '@astrojs/node': + specifier: workspace:* + version: link:../../.. + astro: + specifier: workspace:* + version: link:../../../../../astro + packages/integrations/node/test/fixtures/node-middleware: dependencies: '@astrojs/node': @@ -4930,7 +4945,7 @@ importers: version: 3.0.0(vite@4.3.1)(vue@3.2.47) '@vue/babel-plugin-jsx': specifier: ^1.1.1 - version: 1.1.1 + version: 1.1.1(@babel/core@7.21.8) '@vue/compiler-sfc': specifier: ^3.2.39 version: 3.2.39 @@ -9317,23 +9332,6 @@ packages: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: false - /@vue/babel-plugin-jsx@1.1.1: - 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.18.2) - '@babel/template': 7.20.7 - '@babel/traverse': 7.18.2 - '@babel/types': 7.21.5 - '@vue/babel-helper-vue-transform-on': 1.0.2 - camelcase: 6.3.0 - html-tags: 3.3.1 - svg-tags: 1.0.0 - transitivePeerDependencies: - - '@babel/core' - - supports-color - dev: false - /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.21.8): resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: @@ -17665,39 +17663,6 @@ packages: - supports-color dev: false - /vite@4.3.1(@types/node@14.18.21): - resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 14.18.21 - esbuild: 0.17.18 - postcss: 8.4.23 - rollup: 3.21.8 - optionalDependencies: - fsevents: 2.3.2 - dev: true - /vite@4.3.1(@types/node@18.16.3)(sass@1.52.2): resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} engines: {node: ^14.18.0 || >=16.0.0} From c8bccb47d373a1968c22586a976b578530e258b0 Mon Sep 17 00:00:00 2001 From: ematipico Date: Wed, 21 Jun 2023 12:10:24 +0000 Subject: [PATCH 32/60] [ci] format --- packages/astro/src/core/render/core.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/astro/src/core/render/core.ts b/packages/astro/src/core/render/core.ts index 0ed599548eb4..91b668479b0a 100644 --- a/packages/astro/src/core/render/core.ts +++ b/packages/astro/src/core/render/core.ts @@ -1,5 +1,5 @@ import type { AstroCookies, ComponentInstance, Params, Props, RouteData } from '../../@types/astro'; -import { render, renderPage as runtimeRenderPage } from '../../runtime/server/index.js'; +import { renderPage as runtimeRenderPage } from '../../runtime/server/index.js'; import { attachToResponse } from '../cookies/index.js'; import { AstroError, AstroErrorData } from '../errors/index.js'; import type { LogOptions } from '../logger/core.js'; From 459b5bd05f562238f7250520efe3cf0fa156bb45 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Wed, 21 Jun 2023 13:32:20 +0100 Subject: [PATCH 33/60] feat: SSR `split` mode (#7220) Co-authored-by: Sarah Rainsberger --- .changeset/wet-readers-join.md | 31 ++ packages/astro/src/@types/astro.ts | 33 +- packages/astro/src/core/app/index.ts | 27 +- packages/astro/src/core/app/types.ts | 10 +- packages/astro/src/core/build/internal.ts | 13 +- .../astro/src/core/build/plugins/index.ts | 3 +- .../src/core/build/plugins/plugin-pages.ts | 17 +- .../src/core/build/plugins/plugin-ssr.ts | 361 ++++++++++++++---- packages/astro/src/core/build/plugins/util.ts | 31 ++ packages/astro/src/core/build/static-build.ts | 76 +++- packages/astro/src/core/config/schema.ts | 5 + packages/astro/src/core/errors/errors-data.ts | 11 + packages/astro/src/integrations/index.ts | 4 +- .../fixtures/ssr-request/astro.config.mjs | 8 + .../ssr-split-manifest/astro.config.mjs | 7 + .../fixtures/ssr-split-manifest/package.json | 8 + .../src/pages/[...post].astro | 18 + .../ssr-split-manifest/src/pages/index.astro | 17 + .../ssr-split-manifest/src/pages/lorem.md | 1 + .../ssr-split-manifest/src/pages/zod.astro | 17 + .../astro/test/ssr-split-manifest.test.js | 49 +++ packages/astro/test/test-adapter.js | 16 +- packages/astro/test/test-utils.js | 12 + pnpm-lock.yaml | 60 ++- 24 files changed, 702 insertions(+), 133 deletions(-) create mode 100644 .changeset/wet-readers-join.md create mode 100644 packages/astro/test/fixtures/ssr-request/astro.config.mjs create mode 100644 packages/astro/test/fixtures/ssr-split-manifest/astro.config.mjs create mode 100644 packages/astro/test/fixtures/ssr-split-manifest/package.json create mode 100644 packages/astro/test/fixtures/ssr-split-manifest/src/pages/[...post].astro create mode 100644 packages/astro/test/fixtures/ssr-split-manifest/src/pages/index.astro create mode 100644 packages/astro/test/fixtures/ssr-split-manifest/src/pages/lorem.md create mode 100644 packages/astro/test/fixtures/ssr-split-manifest/src/pages/zod.astro create mode 100644 packages/astro/test/ssr-split-manifest.test.js diff --git a/.changeset/wet-readers-join.md b/.changeset/wet-readers-join.md new file mode 100644 index 000000000000..abf77e6c97ca --- /dev/null +++ b/.changeset/wet-readers-join.md @@ -0,0 +1,31 @@ +--- +'astro': minor +--- + +Shipped a new SSR build configuration mode: `split`. +When enabled, Astro will "split" the single `entry.mjs` file and instead emit a separate file to render each individual page during the build process. + +These files will be emitted inside `dist/pages`, mirroring the directory structure of your page files in `src/pages/`, for example: + +``` +├── pages +│ ├── blog +│ │ ├── entry._slug_.astro.mjs +│ │ └── entry.about.astro.mjs +│ └── entry.index.astro.mjs +``` + +To enable, set `build.split: true` in your Astro config: + +```js +// src/astro.config.mjs +export default defineConfig({ + output: "server", + adapter: node({ + mode: "standalone" + }), + build: { + split: true + } +}) +``` \ No newline at end of file diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index fea28d092a87..1a5679f03e9c 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -838,6 +838,30 @@ export interface AstroUserConfig { * ``` */ inlineStylesheets?: 'always' | 'auto' | 'never'; + + /** + * @docs + * @name build.split + * @type {boolean} + * @default {false} + * @version 2.7.0 + * @description + * Defines how the SSR code should be bundled when built. + * + * When `split` is `true`, Astro will emit a file for each page. + * Each file emitted will render only one page. The pages will be emitted + * inside a `dist/pages/` directory, and the emitted files will keep the same file paths + * of the `src/pages` directory. + * + * ```js + * { + * build: { + * split: true + * } + * } + * ``` + */ + split?: boolean; }; /** @@ -1824,7 +1848,14 @@ export interface AstroIntegration { 'astro:server:setup'?: (options: { server: vite.ViteDevServer }) => void | Promise; 'astro:server:start'?: (options: { address: AddressInfo }) => void | Promise; 'astro:server:done'?: () => void | Promise; - 'astro:build:ssr'?: (options: { manifest: SerializedSSRManifest }) => void | Promise; + 'astro:build:ssr'?: (options: { + manifest: SerializedSSRManifest; + /** + * This maps a {@link RouteData} to an {@link URL}, this URL represents + * the physical file you should import. + */ + entryPoints: Map; + }) => void | Promise; 'astro:build:start'?: () => void | Promise; 'astro:build:setup'?: (options: { vite: vite.InlineConfig; diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts index ae83b301623a..00b93cd09cce 100644 --- a/packages/astro/src/core/app/index.ts +++ b/packages/astro/src/core/app/index.ts @@ -4,9 +4,9 @@ import type { MiddlewareResponseHandler, RouteData, SSRElement, + SSRManifest, } from '../../@types/astro'; -import type { RouteInfo, SSRManifest as Manifest } from './types'; - +import type { RouteInfo } from './types'; import mime from 'mime'; import type { SinglePageBuiltModule } from '../build/types'; import { attachToResponse, getSetCookiesFromResponse } from '../cookies/index.js'; @@ -41,7 +41,7 @@ export interface MatchOptions { export class App { #env: Environment; - #manifest: Manifest; + #manifest: SSRManifest; #manifestData: ManifestData; #routeDataToRouteInfo: Map; #encoder = new TextEncoder(); @@ -52,7 +52,7 @@ export class App { #base: string; #baseWithoutTrailingSlash: string; - constructor(manifest: Manifest, streaming = true) { + constructor(manifest: SSRManifest, streaming = true) { this.#manifest = manifest; this.#manifestData = { routes: manifest.routes.map((route) => route.routeData), @@ -175,14 +175,23 @@ export class App { if (route.type === 'redirect') { return RedirectSinglePageBuiltModule; } else { - const importComponentInstance = this.#manifest.pageMap.get(route.component); - if (!importComponentInstance) { + if (this.#manifest.pageMap) { + const importComponentInstance = this.#manifest.pageMap.get(route.component); + if (!importComponentInstance) { + throw new Error( + `Unexpectedly unable to find a component instance for route ${route.route}` + ); + } + const pageModule = await importComponentInstance(); + return pageModule; + } else if (this.#manifest.pageModule) { + const importComponentInstance = this.#manifest.pageModule; + return importComponentInstance; + } else { throw new Error( - `Unexpectedly unable to find a component instance for route ${route.route}` + "Astro couldn't find the correct page to render, probably because it wasn't correctly mapped for SSR usage. This is an internal error, please file an issue." ); } - const built = await importComponentInstance(); - return built; } } diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts index 1283f1a10f26..9af15bf50252 100644 --- a/packages/astro/src/core/app/types.ts +++ b/packages/astro/src/core/app/types.ts @@ -30,16 +30,16 @@ export interface RouteInfo { export type SerializedRouteInfo = Omit & { routeData: SerializedRouteData; }; -type ImportComponentInstance = () => Promise; -export interface SSRManifest { +export type ImportComponentInstance = () => Promise; + +export type SSRManifest = { adapterName: string; routes: RouteInfo[]; site?: string; base?: string; assetsPrefix?: string; markdown: MarkdownRenderingOptions; - pageMap: Map; renderers: SSRLoadedRenderer[]; /** * Map of directive name (e.g. `load`) to the directive script code @@ -48,7 +48,9 @@ export interface SSRManifest { entryModules: Record; assets: Set; componentMetadata: SSRResult['componentMetadata']; -} + pageModule?: SinglePageBuiltModule; + pageMap?: Map; +}; export type SerializedSSRManifest = Omit< SSRManifest, diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts index 4cf40cb9ad83..7a13e4d08a73 100644 --- a/packages/astro/src/core/build/internal.ts +++ b/packages/astro/src/core/build/internal.ts @@ -1,14 +1,11 @@ import type { Rollup } from 'vite'; -import type { SSRResult } from '../../@types/astro'; +import type { RouteData, SSRResult } from '../../@types/astro'; import type { PageOptions } from '../../vite-plugin-astro/types'; import { prependForwardSlash, removeFileExtension } from '../path.js'; import { viteID } from '../util.js'; -import { - ASTRO_PAGE_EXTENSION_POST_PATTERN, - ASTRO_PAGE_MODULE_ID, - getVirtualModulePageIdFromPath, -} from './plugins/plugin-pages.js'; +import { ASTRO_PAGE_MODULE_ID, getVirtualModulePageIdFromPath } from './plugins/plugin-pages.js'; import type { PageBuildData, StylesheetAsset, ViteID } from './types'; +import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from './plugins/util.js'; export interface BuildInternals { /** @@ -84,6 +81,8 @@ export interface BuildInternals { staticFiles: Set; // The SSR entry chunk. Kept in internals to share between ssr/client build steps ssrEntryChunk?: Rollup.OutputChunk; + entryPoints: Map; + ssrSplitEntryChunks: Map; componentMetadata: SSRResult['componentMetadata']; } @@ -114,6 +113,8 @@ export function createBuildInternals(): BuildInternals { discoveredScripts: new Set(), staticFiles: new Set(), componentMetadata: new Map(), + ssrSplitEntryChunks: new Map(), + entryPoints: new Map(), }; } diff --git a/packages/astro/src/core/build/plugins/index.ts b/packages/astro/src/core/build/plugins/index.ts index f6fcacfb1b7d..4563bb6964d7 100644 --- a/packages/astro/src/core/build/plugins/index.ts +++ b/packages/astro/src/core/build/plugins/index.ts @@ -11,7 +11,7 @@ import { pluginMiddleware } from './plugin-middleware.js'; import { pluginPages } from './plugin-pages.js'; import { pluginPrerender } from './plugin-prerender.js'; import { pluginRenderers } from './plugin-renderers.js'; -import { pluginSSR } from './plugin-ssr.js'; +import { pluginSSR, pluginSSRSplit } from './plugin-ssr.js'; export function registerAllPlugins({ internals, options, register }: AstroBuildPluginContainer) { register(pluginComponentEntry(internals)); @@ -27,4 +27,5 @@ export function registerAllPlugins({ internals, options, register }: AstroBuildP register(astroConfigBuildPlugin(options, internals)); register(pluginHoistedScripts(options, internals)); register(pluginSSR(options, internals)); + register(pluginSSRSplit(options, internals)); } diff --git a/packages/astro/src/core/build/plugins/plugin-pages.ts b/packages/astro/src/core/build/plugins/plugin-pages.ts index c6f89a558bee..ca224d851d25 100644 --- a/packages/astro/src/core/build/plugins/plugin-pages.ts +++ b/packages/astro/src/core/build/plugins/plugin-pages.ts @@ -1,4 +1,4 @@ -import { extname } from 'node:path'; +import { getPathFromVirtualModulePageName, ASTRO_PAGE_EXTENSION_POST_PATTERN } from './util.js'; import type { Plugin as VitePlugin } from 'vite'; import { routeIsRedirect } from '../../redirects/index.js'; import { addRollupInput } from '../add-rollup-input.js'; @@ -7,12 +7,10 @@ import type { AstroBuildPlugin } from '../plugin'; import type { StaticBuildOptions } from '../types'; import { MIDDLEWARE_MODULE_ID } from './plugin-middleware.js'; import { RENDERERS_MODULE_ID } from './plugin-renderers.js'; +import { extname } from 'node:path'; export const ASTRO_PAGE_MODULE_ID = '@astro-page:'; -export const ASTRO_PAGE_RESOLVED_MODULE_ID = '\0@astro-page:'; - -// This is an arbitrary string that we are going to replace the dot of the extension -export const ASTRO_PAGE_EXTENSION_POST_PATTERN = '@_@'; +export const ASTRO_PAGE_RESOLVED_MODULE_ID = '\0' + ASTRO_PAGE_MODULE_ID; /** * 1. We add a fixed prefix, which is used as virtual module naming convention; @@ -64,13 +62,8 @@ function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): V if (id.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) { const imports: string[] = []; const exports: string[] = []; - - // we remove the module name prefix from id, this will result into a string that will start with "src/..." - const pageName = id.slice(ASTRO_PAGE_RESOLVED_MODULE_ID.length); - // We replaced the `.` of the extension with ASTRO_PAGE_EXTENSION_POST_PATTERN, let's replace it back - const pageData = internals.pagesByComponent.get( - `${pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.')}` - ); + const pageName = getPathFromVirtualModulePageName(ASTRO_PAGE_RESOLVED_MODULE_ID, id); + const pageData = internals.pagesByComponent.get(pageName); if (pageData) { const resolvedPage = await this.resolve(pageData.moduleSpecifier); if (resolvedPage) { diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts index 3c2825e4c63c..f9ba9190922f 100644 --- a/packages/astro/src/core/build/plugins/plugin-ssr.ts +++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts @@ -1,7 +1,7 @@ import glob from 'fast-glob'; -import { fileURLToPath } from 'url'; +import { fileURLToPath, pathToFileURL } from 'node:url'; import type { Plugin as VitePlugin } from 'vite'; -import type { AstroAdapter } from '../../../@types/astro'; +import type { AstroAdapter, AstroConfig } from '../../../@types/astro'; import { runHookBuildSsr } from '../../../integrations/index.js'; import { isServerLikeOutput } from '../../../prerender/utils.js'; import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from '../../../vite-plugin-scripts/index.js'; @@ -13,9 +13,11 @@ import { addRollupInput } from '../add-rollup-input.js'; import { getOutFile, getOutFolder } from '../common.js'; import { cssOrder, mergeInlineCss, type BuildInternals } from '../internal.js'; import type { AstroBuildPlugin } from '../plugin'; -import type { StaticBuildOptions } from '../types'; -import { getVirtualModulePageNameFromPath } from './plugin-pages.js'; +import type { OutputChunk, StaticBuildOptions } from '../types'; +import { getPathFromVirtualModulePageName, getVirtualModulePageNameFromPath } from './util.js'; import { RENDERERS_MODULE_ID } from './plugin-renderers.js'; +import { ASTRO_PAGE_MODULE_ID } from './plugin-pages.js'; +import { join } from 'node:path'; export const SSR_VIRTUAL_MODULE_ID = '@astrojs-ssr-virtual-entry'; const RESOLVED_SSR_VIRTUAL_MODULE_ID = '\0' + SSR_VIRTUAL_MODULE_ID; @@ -28,7 +30,7 @@ function vitePluginSSR( options: StaticBuildOptions ): VitePlugin { return { - name: '@astrojs/vite-plugin-astro-ssr', + name: '@astrojs/vite-plugin-astro-ssr-server', enforce: 'post', options(opts) { return addRollupInput(opts, [SSR_VIRTUAL_MODULE_ID]); @@ -54,7 +56,7 @@ function vitePluginSSR( if (routeIsRedirect(pageData.route)) { continue; } - const virtualModuleName = getVirtualModulePageNameFromPath(path); + const virtualModuleName = getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, path); let module = await this.resolve(virtualModuleName); if (module) { const variable = `_page${i}`; @@ -71,12 +73,226 @@ function vitePluginSSR( contents.push(`const pageMap = new Map([${pageMap.join(',')}]);`); exports.push(`export { pageMap }`); - const content = `import * as adapter from '${adapter.serverEntrypoint}'; + const ssrCode = generateSSRCode(options.settings.config, adapter); + imports.push(...ssrCode.imports); + contents.push(...ssrCode.contents); + return `${imports.join('\n')}${contents.join('\n')}${exports.join('\n')}`; + } + return void 0; + }, + async generateBundle(_opts, bundle) { + // Add assets from this SSR chunk as well. + for (const [_chunkName, chunk] of Object.entries(bundle)) { + if (chunk.type === 'asset') { + internals.staticFiles.add(chunk.fileName); + } + } + + for (const [chunkName, chunk] of Object.entries(bundle)) { + if (chunk.type === 'asset') { + continue; + } + if (chunk.modules[RESOLVED_SSR_VIRTUAL_MODULE_ID]) { + internals.ssrEntryChunk = chunk; + delete bundle[chunkName]; + } + } + }, + }; +} + +export function pluginSSR( + options: StaticBuildOptions, + internals: BuildInternals +): AstroBuildPlugin { + const ssr = isServerLikeOutput(options.settings.config); + return { + build: 'ssr', + hooks: { + 'build:before': () => { + let vitePlugin = + ssr && !options.settings.config.build.split + ? vitePluginSSR(internals, options.settings.adapter!, options) + : undefined; + + return { + enforce: 'after-user-plugins', + vitePlugin, + }; + }, + 'build:post': async ({ mutate }) => { + if (!ssr) { + return; + } + + if (options.settings.config.build.split) { + return; + } + + if (!internals.ssrEntryChunk) { + throw new Error(`Did not generate an entry chunk for SSR`); + } + // Mutate the filename + internals.ssrEntryChunk.fileName = options.settings.config.build.serverEntry; + + const manifest = await createManifest(options, internals); + await runHookBuildSsr({ + config: options.settings.config, + manifest, + logging: options.logging, + entryPoints: internals.entryPoints, + }); + const code = injectManifest(manifest, internals.ssrEntryChunk); + mutate(internals.ssrEntryChunk, 'server', code); + }, + }, + }; +} + +export const SPLIT_MODULE_ID = '@astro-page-split:'; +export const RESOLVED_SPLIT_MODULE_ID = '\0@astro-page-split:'; + +function vitePluginSSRSplit( + internals: BuildInternals, + adapter: AstroAdapter, + options: StaticBuildOptions +): VitePlugin { + return { + name: '@astrojs/vite-plugin-astro-ssr-split', + enforce: 'post', + options(opts) { + if (options.settings.config.build.split) { + const inputs: Set = new Set(); + + for (const path of Object.keys(options.allPages)) { + inputs.add(getVirtualModulePageNameFromPath(SPLIT_MODULE_ID, path)); + } + + return addRollupInput(opts, Array.from(inputs)); + } + }, + resolveId(id) { + if (id.startsWith(SPLIT_MODULE_ID)) { + return '\0' + id; + } + }, + async load(id) { + if (id.startsWith(RESOLVED_SPLIT_MODULE_ID)) { + const { + settings: { config }, + allPages, + } = options; + const imports: string[] = []; + const contents: string[] = []; + const exports: string[] = []; + + const path = getPathFromVirtualModulePageName(RESOLVED_SPLIT_MODULE_ID, id); + const virtualModuleName = getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, path); + let module = await this.resolve(virtualModuleName); + if (module) { + // we need to use the non-resolved ID in order to resolve correctly the virtual module + imports.push(`import * as pageModule from "${virtualModuleName}";`); + } + + const ssrCode = generateSSRCode(options.settings.config, adapter); + imports.push(...ssrCode.imports); + contents.push(...ssrCode.contents); + + return `${imports.join('\n')}${contents.join('\n')}${exports.join('\n')}`; + } + return void 0; + }, + async generateBundle(_opts, bundle) { + // Add assets from this SSR chunk as well. + for (const [_chunkName, chunk] of Object.entries(bundle)) { + if (chunk.type === 'asset') { + internals.staticFiles.add(chunk.fileName); + } + } + + for (const [chunkName, chunk] of Object.entries(bundle)) { + if (chunk.type === 'asset') { + continue; + } + let shouldDeleteBundle = false; + for (const moduleKey of Object.keys(chunk.modules)) { + if (moduleKey.startsWith(RESOLVED_SPLIT_MODULE_ID)) { + internals.ssrSplitEntryChunks.set(moduleKey, chunk); + storeEntryPoint(moduleKey, options, internals, chunk.fileName); + shouldDeleteBundle = true; + } + } + if (shouldDeleteBundle) { + delete bundle[chunkName]; + } + } + }, + }; +} + +export function pluginSSRSplit( + options: StaticBuildOptions, + internals: BuildInternals +): AstroBuildPlugin { + const ssr = isServerLikeOutput(options.settings.config); + return { + build: 'ssr', + hooks: { + 'build:before': () => { + let vitePlugin = + ssr && options.settings.config.build.split + ? vitePluginSSRSplit(internals, options.settings.adapter!, options) + : undefined; + + return { + enforce: 'after-user-plugins', + vitePlugin, + }; + }, + 'build:post': async ({ mutate }) => { + if (!ssr) { + return; + } + if (!options.settings.config.build.split) { + return; + } + + if (internals.ssrSplitEntryChunks.size === 0) { + throw new Error(`Did not generate an entry chunk for SSR serverless`); + } + + const manifest = await createManifest(options, internals); + await runHookBuildSsr({ + config: options.settings.config, + manifest, + logging: options.logging, + entryPoints: internals.entryPoints, + }); + for (const [moduleName, chunk] of internals.ssrSplitEntryChunks) { + const code = injectManifest(manifest, chunk); + mutate(chunk, 'server', code); + } + }, + }, + }; +} + +function generateSSRCode(config: AstroConfig, adapter: AstroAdapter) { + const imports: string[] = []; + const contents: string[] = []; + let pageMap; + if (config.build.split) { + pageMap = 'pageModule'; + } else { + pageMap = 'pageMap'; + } + + contents.push(`import * as adapter from '${adapter.serverEntrypoint}'; import { renderers } from '${RENDERERS_MODULE_ID}'; import { deserializeManifest as _deserializeManifest } from 'astro/app'; import { _privateSetManifestDontUseThis } from 'astro:ssr-manifest'; const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), { - pageMap, + ${pageMap}, renderers, }); _privateSetManifestDontUseThis(_manifest); @@ -101,41 +317,45 @@ export { _default as default };`; const _start = 'start'; if(_start in adapter) { adapter[_start](_manifest, _args); -}`; - return `${imports.join('\n')}${contents.join('\n')}${content}${exports.join('\n')}`; - } - return void 0; - }, - async generateBundle(_opts, bundle) { - // Add assets from this SSR chunk as well. - for (const [_chunkName, chunk] of Object.entries(bundle)) { - if (chunk.type === 'asset') { - internals.staticFiles.add(chunk.fileName); - } - } - - for (const [chunkName, chunk] of Object.entries(bundle)) { - if (chunk.type === 'asset') { - continue; - } - if (chunk.modules[RESOLVED_SSR_VIRTUAL_MODULE_ID]) { - internals.ssrEntryChunk = chunk; - delete bundle[chunkName]; - } - } - }, +}`); + return { + imports, + contents, }; } -export async function injectManifest(buildOpts: StaticBuildOptions, internals: BuildInternals) { - if (!internals.ssrEntryChunk) { - throw new Error(`Did not generate an entry chunk for SSR`); +/** + * It injects the manifest in the given output rollup chunk. It returns the new emitted code + * @param buildOpts + * @param internals + * @param chunk + */ +export function injectManifest(manifest: SerializedSSRManifest, chunk: Readonly) { + const code = chunk.code; + + return code.replace(replaceExp, () => { + return JSON.stringify(manifest); + }); +} + +export async function createManifest( + buildOpts: StaticBuildOptions, + internals: BuildInternals +): Promise { + if (buildOpts.settings.config.build.split) { + if (internals.ssrSplitEntryChunks.size === 0) { + throw new Error(`Did not generate an entry chunk for SSR in serverless mode`); + } + } else { + if (!internals.ssrEntryChunk) { + throw new Error(`Did not generate an entry chunk for SSR`); + } } // Add assets from the client build. const clientStatics = new Set( await glob('**/*', { - cwd: fileURLToPath(buildOpts.buildConfig.client), + cwd: fileURLToPath(buildOpts.settings.config.build.client), }) ); for (const file of clientStatics) { @@ -143,19 +363,29 @@ export async function injectManifest(buildOpts: StaticBuildOptions, internals: B } const staticFiles = internals.staticFiles; - const manifest = buildManifest(buildOpts, internals, Array.from(staticFiles)); - await runHookBuildSsr({ - config: buildOpts.settings.config, - manifest, - logging: buildOpts.logging, - }); - - const chunk = internals.ssrEntryChunk; - const code = chunk.code; + return buildManifest(buildOpts, internals, Array.from(staticFiles)); +} - return code.replace(replaceExp, () => { - return JSON.stringify(manifest); - }); +/** + * Because we delete the bundle from rollup at the end of this function, + * we can't use `writeBundle` hook to get the final file name of the entry point written on disk. + * We use this hook instead. + * + * We retrieve the {@link RouteData} that belongs the current moduleKey + */ +function storeEntryPoint( + moduleKey: string, + options: StaticBuildOptions, + internals: BuildInternals, + fileName: string +) { + const componentPath = getPathFromVirtualModulePageName(RESOLVED_SPLIT_MODULE_ID, moduleKey); + for (const [page, pageData] of Object.entries(options.allPages)) { + if (componentPath == page) { + const publicPath = fileURLToPath(options.settings.config.outDir); + internals.entryPoints.set(pageData.route, pathToFileURL(join(publicPath, fileName))); + } + } } function buildManifest( @@ -254,7 +484,6 @@ function buildManifest( base: settings.config.base, assetsPrefix: settings.config.build.assetsPrefix, markdown: settings.config.markdown, - pageMap: null as any, componentMetadata: Array.from(internals.componentMetadata), renderers: [], clientDirectives: Array.from(settings.clientDirectives), @@ -264,39 +493,3 @@ function buildManifest( return ssrManifest; } - -export function pluginSSR( - options: StaticBuildOptions, - internals: BuildInternals -): AstroBuildPlugin { - const ssr = isServerLikeOutput(options.settings.config); - return { - build: 'ssr', - hooks: { - 'build:before': () => { - let vitePlugin = ssr - ? vitePluginSSR(internals, options.settings.adapter!, options) - : undefined; - - return { - enforce: 'after-user-plugins', - vitePlugin, - }; - }, - 'build:post': async ({ mutate }) => { - if (!ssr) { - return; - } - - if (!internals.ssrEntryChunk) { - throw new Error(`Did not generate an entry chunk for SSR`); - } - // Mutate the filename - internals.ssrEntryChunk.fileName = options.settings.config.build.serverEntry; - - const code = await injectManifest(options, internals); - mutate(internals.ssrEntryChunk, 'server', code); - }, - }, - }; -} diff --git a/packages/astro/src/core/build/plugins/util.ts b/packages/astro/src/core/build/plugins/util.ts index 50f5e07059b8..1fbf0fcdc133 100644 --- a/packages/astro/src/core/build/plugins/util.ts +++ b/packages/astro/src/core/build/plugins/util.ts @@ -1,4 +1,5 @@ import type { Plugin as VitePlugin } from 'vite'; +import { extname } from 'node:path'; // eslint-disable-next-line @typescript-eslint/ban-types type OutputOptionsHook = Extract; @@ -38,3 +39,33 @@ export function extendManualChunks(outputOptions: OutputOptions, hooks: ExtendMa return null; }; } + +// This is an arbitrary string that we are going to replace the dot of the extension +export const ASTRO_PAGE_EXTENSION_POST_PATTERN = '@_@'; + +/** + * 1. We add a fixed prefix, which is used as virtual module naming convention; + * 2. We replace the dot that belongs extension with an arbitrary string. + * + * @param virtualModulePrefix + * @param path + */ +export function getVirtualModulePageNameFromPath(virtualModulePrefix: string, path: string) { + // we mask the extension, so this virtual file + // so rollup won't trigger other plugins in the process + const extension = extname(path); + return `${virtualModulePrefix}${path.replace( + extension, + extension.replace('.', ASTRO_PAGE_EXTENSION_POST_PATTERN) + )}`; +} + +/** + * + * @param virtualModulePrefix + * @param id + */ +export function getPathFromVirtualModulePageName(virtualModulePrefix: string, id: string) { + const pageName = id.slice(virtualModulePrefix.length); + return pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.'); +} diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 327ef5f16035..e783c28b11cb 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -25,14 +25,14 @@ import { trackPageData } from './internal.js'; import { createPluginContainer, type AstroBuildPluginContainer } from './plugin.js'; import { registerAllPlugins } from './plugins/index.js'; import { MIDDLEWARE_MODULE_ID } from './plugins/plugin-middleware.js'; -import { - ASTRO_PAGE_EXTENSION_POST_PATTERN, - ASTRO_PAGE_RESOLVED_MODULE_ID, -} from './plugins/plugin-pages.js'; +import { ASTRO_PAGE_RESOLVED_MODULE_ID } from './plugins/plugin-pages.js'; import { RESOLVED_RENDERERS_MODULE_ID } from './plugins/plugin-renderers.js'; -import { SSR_VIRTUAL_MODULE_ID } from './plugins/plugin-ssr.js'; +import { RESOLVED_SPLIT_MODULE_ID, SSR_VIRTUAL_MODULE_ID } from './plugins/plugin-ssr.js'; import type { AllPagesData, PageBuildData, StaticBuildOptions } from './types'; import { getTimeStat } from './util.js'; +import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from './plugins/util.js'; +import { extname } from 'node:path'; +import type { RouteData } from '../../@types/astro'; export async function viteBuild(opts: StaticBuildOptions) { const { allPages, settings } = opts; @@ -147,7 +147,7 @@ async function ssrBuild( const { allPages, settings, viteConfig } = opts; const ssr = isServerLikeOutput(settings.config); const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir); - + const routes = Object.values(allPages).map((pd) => pd.route); const { lastVitePlugins, vitePlugins } = container.runBeforeHook('ssr', input); const viteBuildConfig: vite.InlineConfig = { @@ -176,7 +176,13 @@ async function ssrBuild( ...viteConfig.build?.rollupOptions?.output, entryFileNames(chunkInfo) { if (chunkInfo.facadeModuleId?.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) { - return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId, allPages); + return makeAstroPageEntryPointFileName( + ASTRO_PAGE_RESOLVED_MODULE_ID, + chunkInfo.facadeModuleId, + routes + ); + } else if (chunkInfo.facadeModuleId?.startsWith(RESOLVED_SPLIT_MODULE_ID)) { + return makeSplitEntryPointFileName(chunkInfo.facadeModuleId, routes); } else if (chunkInfo.facadeModuleId === MIDDLEWARE_MODULE_ID) { return 'middleware.mjs'; } else if (chunkInfo.facadeModuleId === SSR_VIRTUAL_MODULE_ID) { @@ -422,19 +428,65 @@ async function ssrMoveAssets(opts: StaticBuildOptions) { * Input: `@astro-page:../node_modules/my-dep/injected@_@astro` * Output: `pages/injected.mjs` * - * 1. We clean the `facadeModuleId` by removing the `@astro-page:` prefix and `@_@` suffix + * 1. We clean the `facadeModuleId` by removing the `ASTRO_PAGE_MODULE_ID` prefix and `ASTRO_PAGE_EXTENSION_POST_PATTERN`. * 2. We find the matching route pattern in the manifest (or fallback to the cleaned module id) * 3. We replace square brackets with underscore (`[slug]` => `_slug_`) and `...` with `` (`[...slug]` => `_---slug_`). * 4. We append the `.mjs` extension, so the file will always be an ESM module * + * @param prefix string * @param facadeModuleId string * @param pages AllPagesData */ -function makeAstroPageEntryPointFileName(facadeModuleId: string, pages: AllPagesData) { +export function makeAstroPageEntryPointFileName( + prefix: string, + facadeModuleId: string, + routes: RouteData[] +) { const pageModuleId = facadeModuleId - .replace(ASTRO_PAGE_RESOLVED_MODULE_ID, '') + .replace(prefix, '') .replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.'); - let name = pages[pageModuleId]?.route?.route ?? pageModuleId; + let route = routes.find((routeData) => { + return routeData.route === pageModuleId; + }); + let name = pageModuleId; + if (route) { + name = route.route; + } if (name.endsWith('/')) name += 'index'; - return `pages${name.replaceAll('[', '_').replaceAll(']', '_').replaceAll('...', '---')}.mjs`; + const fileName = `${name.replaceAll('[', '_').replaceAll(']', '_').replaceAll('...', '---')}.mjs`; + if (name.startsWith('..')) { + return `pages${fileName}`; + } + return fileName; +} + +/** + * The `facadeModuleId` has a shape like: \0@astro-serverless-page:src/pages/index@_@astro. + * + * 1. We call `makeAstroPageEntryPointFileName` which normalise its name, making it like a file path + * 2. We split the file path using the file system separator and attempt to retrieve the last entry + * 3. The last entry should be the file + * 4. We prepend the file name with `entry.` + * 5. We built the file path again, using the new entry built in the previous step + * + * @param facadeModuleId + * @param opts + */ +export function makeSplitEntryPointFileName(facadeModuleId: string, routes: RouteData[]) { + const filePath = `${makeAstroPageEntryPointFileName( + RESOLVED_SPLIT_MODULE_ID, + facadeModuleId, + routes + )}`; + + const pathComponents = filePath.split(path.sep); + const lastPathComponent = pathComponents.pop(); + if (lastPathComponent) { + const extension = extname(lastPathComponent); + if (extension.length > 0) { + const newFileName = `entry.${lastPathComponent}`; + return [...pathComponents, newFileName].join(path.sep); + } + } + return filePath; } diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts index 3edabc5d54e3..99ef653d0788 100644 --- a/packages/astro/src/core/config/schema.ts +++ b/packages/astro/src/core/config/schema.ts @@ -24,6 +24,7 @@ const ASTRO_CONFIG_DEFAULTS: AstroUserConfig & any = { serverEntry: 'entry.mjs', redirects: true, inlineStylesheets: 'never', + split: false, }, compressHTML: false, server: { @@ -120,6 +121,8 @@ export const AstroConfigSchema = z.object({ .enum(['always', 'auto', 'never']) .optional() .default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets), + + split: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.split), }) .optional() .default({}), @@ -279,6 +282,8 @@ export function createRelativeSchema(cmd: string, fileProtocolRoot: URL) { .enum(['always', 'auto', 'never']) .optional() .default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets), + + split: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.split), }) .optional() .default({}), diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts index a47087336073..b8babd91a06d 100644 --- a/packages/astro/src/core/errors/errors-data.ts +++ b/packages/astro/src/core/errors/errors-data.ts @@ -817,6 +817,17 @@ See https://docs.astro.build/en/guides/server-side-rendering/ for more informati `Invalid glob pattern: \`${globPattern}\`. Glob patterns must start with './', '../' or '/'.`, hint: 'See https://docs.astro.build/en/guides/imports/#glob-patterns for more information on supported glob patterns.', }, + /** + * @docs + * @description + * Astro couldn't find the correct page to render, probably because it wasn't correctly mapped for SSR usage. This is an internal error. + */ + FailedToFindPageMapSSR: { + title: "Astro couldn't find the correct page to render", + code: 4003, + message: + "Astro couldn't find the correct page to render, probably because it wasn't correctly mapped for SSR usage. This is an internal error. Please file an issue.", + }, /** * @docs * @kind heading diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts index 53a75fbea1ad..ae1ff97618d1 100644 --- a/packages/astro/src/integrations/index.ts +++ b/packages/astro/src/integrations/index.ts @@ -309,16 +309,18 @@ export async function runHookBuildSsr({ config, manifest, logging, + entryPoints, }: { config: AstroConfig; manifest: SerializedSSRManifest; logging: LogOptions; + entryPoints: Map; }) { for (const integration of config.integrations) { if (integration?.hooks?.['astro:build:ssr']) { await withTakingALongTimeMsg({ name: integration.name, - hookResult: integration.hooks['astro:build:ssr']({ manifest }), + hookResult: integration.hooks['astro:build:ssr']({ manifest, entryPoints }), logging, }); } diff --git a/packages/astro/test/fixtures/ssr-request/astro.config.mjs b/packages/astro/test/fixtures/ssr-request/astro.config.mjs new file mode 100644 index 000000000000..3bd2a19a386e --- /dev/null +++ b/packages/astro/test/fixtures/ssr-request/astro.config.mjs @@ -0,0 +1,8 @@ +import { defineConfig } from 'astro/config'; + +// https://astro.build/config +export default defineConfig({ + build: { + split: false + } +}); diff --git a/packages/astro/test/fixtures/ssr-split-manifest/astro.config.mjs b/packages/astro/test/fixtures/ssr-split-manifest/astro.config.mjs new file mode 100644 index 000000000000..171de39d9e24 --- /dev/null +++ b/packages/astro/test/fixtures/ssr-split-manifest/astro.config.mjs @@ -0,0 +1,7 @@ +import { defineConfig } from 'astro/config'; +export default defineConfig({ + build: { + split: true + }, + output: "server" +}) \ No newline at end of file diff --git a/packages/astro/test/fixtures/ssr-split-manifest/package.json b/packages/astro/test/fixtures/ssr-split-manifest/package.json new file mode 100644 index 000000000000..b980cc8a7b2e --- /dev/null +++ b/packages/astro/test/fixtures/ssr-split-manifest/package.json @@ -0,0 +1,8 @@ +{ + "name": "@test/ssr-split-manifest", + "version": "0.0.0", + "private": true, + "dependencies": { + "astro": "workspace:*" + } +} diff --git a/packages/astro/test/fixtures/ssr-split-manifest/src/pages/[...post].astro b/packages/astro/test/fixtures/ssr-split-manifest/src/pages/[...post].astro new file mode 100644 index 000000000000..8bac75eb9404 --- /dev/null +++ b/packages/astro/test/fixtures/ssr-split-manifest/src/pages/[...post].astro @@ -0,0 +1,18 @@ +--- +export async function getStaticPaths() { + return [ + { + params: { page: 1 }, + }, + { + params: { page: 2 }, + }, + { + params: { page: 3 } + } + ] +}; +--- + + + \ No newline at end of file diff --git a/packages/astro/test/fixtures/ssr-split-manifest/src/pages/index.astro b/packages/astro/test/fixtures/ssr-split-manifest/src/pages/index.astro new file mode 100644 index 000000000000..f189e711c19a --- /dev/null +++ b/packages/astro/test/fixtures/ssr-split-manifest/src/pages/index.astro @@ -0,0 +1,17 @@ +--- +import { manifest } from 'astro:ssr-manifest'; +--- + + + Testing + + + +

    Testing

    +
    + + diff --git a/packages/astro/test/fixtures/ssr-split-manifest/src/pages/lorem.md b/packages/astro/test/fixtures/ssr-split-manifest/src/pages/lorem.md new file mode 100644 index 000000000000..8a38d58c1963 --- /dev/null +++ b/packages/astro/test/fixtures/ssr-split-manifest/src/pages/lorem.md @@ -0,0 +1 @@ +# Title \ No newline at end of file diff --git a/packages/astro/test/fixtures/ssr-split-manifest/src/pages/zod.astro b/packages/astro/test/fixtures/ssr-split-manifest/src/pages/zod.astro new file mode 100644 index 000000000000..06d949d47f6c --- /dev/null +++ b/packages/astro/test/fixtures/ssr-split-manifest/src/pages/zod.astro @@ -0,0 +1,17 @@ +--- +import { manifest } from 'astro:ssr-manifest'; +--- + + + Testing + + + +

    Testing

    +
    + + \ No newline at end of file diff --git a/packages/astro/test/ssr-split-manifest.test.js b/packages/astro/test/ssr-split-manifest.test.js new file mode 100644 index 000000000000..5005f6279953 --- /dev/null +++ b/packages/astro/test/ssr-split-manifest.test.js @@ -0,0 +1,49 @@ +import { expect } from 'chai'; +import { loadFixture } from './test-utils.js'; +import testAdapter from './test-adapter.js'; +import * as cheerio from 'cheerio'; +import { fileURLToPath } from 'node:url'; +import { existsSync } from 'node:fs'; + +describe('astro:ssr-manifest, split', () => { + /** @type {import('./test-utils').Fixture} */ + let fixture; + let entryPoints; + let currentRoutes; + + before(async () => { + fixture = await loadFixture({ + root: './fixtures/ssr-split-manifest/', + output: 'server', + adapter: testAdapter({ + setEntryPoints(entries) { + entryPoints = entries; + }, + setRoutes(routes) { + currentRoutes = routes; + }, + }), + }); + await fixture.build(); + }); + + it('should be able to render a specific entry point', async () => { + const pagePath = 'src/pages/index.astro'; + const app = await fixture.loadEntryPoint(pagePath, currentRoutes); + const request = new Request('http://example.com/'); + const response = await app.render(request); + const html = await response.text(); + + const $ = cheerio.load(html); + expect($('#assets').text()).to.equal('["/_astro/index.a8a337e4.css"]'); + }); + + it('should give access to entry points that exists on file system', async () => { + // number of the pages inside src/ + expect(entryPoints.size).to.equal(4); + for (const fileUrl in entryPoints.values()) { + let filePath = fileURLToPath(fileUrl); + expect(existsSync(filePath)).to.be.true; + } + }); +}); diff --git a/packages/astro/test/test-adapter.js b/packages/astro/test/test-adapter.js index d74cfaf81a71..af5a7777b8c1 100644 --- a/packages/astro/test/test-adapter.js +++ b/packages/astro/test/test-adapter.js @@ -4,7 +4,11 @@ import { viteID } from '../dist/core/util.js'; * * @returns {import('../src/@types/astro').AstroIntegration} */ -export default function ({ provideAddress = true, extendAdapter } = { provideAddress: true }) { +export default function ( + { provideAddress = true, extendAdapter, setEntryPoints = undefined, setRoutes = undefined } = { + provideAddress: true, + } +) { return { name: 'my-ssr-adapter', hooks: { @@ -70,6 +74,16 @@ export default function ({ provideAddress = true, extendAdapter } = { provideAdd ...extendAdapter, }); }, + 'astro:build:ssr': ({ entryPoints }) => { + if (setEntryPoints) { + setEntryPoints(entryPoints); + } + }, + 'astro:build:done': ({ routes }) => { + if (setRoutes) { + setRoutes(routes); + } + }, }, }; } diff --git a/packages/astro/test/test-utils.js b/packages/astro/test/test-utils.js index b618f8593a42..11b181779bbc 100644 --- a/packages/astro/test/test-utils.js +++ b/packages/astro/test/test-utils.js @@ -13,6 +13,9 @@ import dev from '../dist/core/dev/index.js'; import { nodeLogDestination } from '../dist/core/logger/node.js'; import preview from '../dist/core/preview/index.js'; import { check } from '../dist/cli/check/index.js'; +import { getVirtualModulePageNameFromPath } from '../dist/core/build/plugins/util.js'; +import { RESOLVED_SPLIT_MODULE_ID } from '../dist/core/build/plugins/plugin-ssr.js'; +import { makeSplitEntryPointFileName } from '../dist/core/build/static-build.js'; // polyfill WebAPIs to globalThis for Node v12, Node v14, and Node v16 polyfill(globalThis, { @@ -245,6 +248,15 @@ export async function loadFixture(inlineConfig) { app.manifest = manifest; return app; }, + loadEntryPoint: async (pagePath, routes, streaming) => { + const virtualModule = getVirtualModulePageNameFromPath(RESOLVED_SPLIT_MODULE_ID, pagePath); + const filePath = makeSplitEntryPointFileName(virtualModule, routes); + const url = new URL(`./server/${filePath}?id=${fixtureId}`, config.outDir); + const { createApp, manifest, middleware } = await import(url); + const app = createApp(streaming); + app.manifest = manifest; + return app; + }, editFile: async (filePath, newContentsOrCallback) => { const fileUrl = new URL(filePath.replace(/^\//, ''), config.root); const contents = await fs.promises.readFile(fileUrl, 'utf-8'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 29d581936ece..45c034404385 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3339,6 +3339,12 @@ importers: specifier: ^10.11.0 version: 10.13.2 + packages/astro/test/fixtures/ssr-split-manifest: + dependencies: + astro: + specifier: workspace:* + version: link:../../.. + packages/astro/test/fixtures/static-build: dependencies: '@astrojs/preact': @@ -4421,7 +4427,7 @@ importers: version: 9.2.2 vite: specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + version: 4.3.1(@types/node@14.18.21) packages/integrations/netlify/test/edge-functions/fixtures/dynimport: dependencies: @@ -4945,7 +4951,7 @@ importers: version: 3.0.0(vite@4.3.1)(vue@3.2.47) '@vue/babel-plugin-jsx': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.21.8) + version: 1.1.1 '@vue/compiler-sfc': specifier: ^3.2.39 version: 3.2.39 @@ -9332,6 +9338,23 @@ packages: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: false + /@vue/babel-plugin-jsx@1.1.1: + 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.18.2) + '@babel/template': 7.20.7 + '@babel/traverse': 7.18.2 + '@babel/types': 7.21.5 + '@vue/babel-helper-vue-transform-on': 1.0.2 + camelcase: 6.3.0 + html-tags: 3.3.1 + svg-tags: 1.0.0 + transitivePeerDependencies: + - '@babel/core' + - supports-color + dev: false + /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.21.8): resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: @@ -17663,6 +17686,39 @@ packages: - supports-color dev: false + /vite@4.3.1(@types/node@14.18.21): + resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 14.18.21 + esbuild: 0.17.18 + postcss: 8.4.23 + rollup: 3.21.8 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /vite@4.3.1(@types/node@18.16.3)(sass@1.52.2): resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} engines: {node: ^14.18.0 || >=16.0.0} From 01b1c21c6bf1a0f8f8a753fc31777186e5cb09c0 Mon Sep 17 00:00:00 2001 From: ematipico Date: Wed, 21 Jun 2023 12:35:19 +0000 Subject: [PATCH 34/60] [ci] format --- packages/astro/src/core/app/index.ts | 4 ++-- packages/astro/src/core/build/internal.ts | 2 +- packages/astro/src/core/build/plugins/plugin-pages.ts | 4 ++-- packages/astro/src/core/build/plugins/plugin-ssr.ts | 6 +++--- packages/astro/src/core/build/plugins/util.ts | 2 +- packages/astro/src/core/build/static-build.ts | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts index 00b93cd09cce..ae0c3fb00e78 100644 --- a/packages/astro/src/core/app/index.ts +++ b/packages/astro/src/core/app/index.ts @@ -1,3 +1,4 @@ +import mime from 'mime'; import type { EndpointHandler, ManifestData, @@ -6,8 +7,6 @@ import type { SSRElement, SSRManifest, } from '../../@types/astro'; -import type { RouteInfo } from './types'; -import mime from 'mime'; import type { SinglePageBuiltModule } from '../build/types'; import { attachToResponse, getSetCookiesFromResponse } from '../cookies/index.js'; import { callEndpoint, createAPIContext } from '../endpoint/index.js'; @@ -29,6 +28,7 @@ import { createStylesheetElementSet, } from '../render/ssr-element.js'; import { matchRoute } from '../routing/match.js'; +import type { RouteInfo } from './types'; export { deserializeManifest } from './common.js'; const clientLocalsSymbol = Symbol.for('astro.locals'); diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts index 7a13e4d08a73..8c7da07d4319 100644 --- a/packages/astro/src/core/build/internal.ts +++ b/packages/astro/src/core/build/internal.ts @@ -4,8 +4,8 @@ import type { PageOptions } from '../../vite-plugin-astro/types'; import { prependForwardSlash, removeFileExtension } from '../path.js'; import { viteID } from '../util.js'; import { ASTRO_PAGE_MODULE_ID, getVirtualModulePageIdFromPath } from './plugins/plugin-pages.js'; -import type { PageBuildData, StylesheetAsset, ViteID } from './types'; import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from './plugins/util.js'; +import type { PageBuildData, StylesheetAsset, ViteID } from './types'; export interface BuildInternals { /** diff --git a/packages/astro/src/core/build/plugins/plugin-pages.ts b/packages/astro/src/core/build/plugins/plugin-pages.ts index ca224d851d25..c40449a39e2e 100644 --- a/packages/astro/src/core/build/plugins/plugin-pages.ts +++ b/packages/astro/src/core/build/plugins/plugin-pages.ts @@ -1,4 +1,4 @@ -import { getPathFromVirtualModulePageName, ASTRO_PAGE_EXTENSION_POST_PATTERN } from './util.js'; +import { extname } from 'node:path'; import type { Plugin as VitePlugin } from 'vite'; import { routeIsRedirect } from '../../redirects/index.js'; import { addRollupInput } from '../add-rollup-input.js'; @@ -7,7 +7,7 @@ import type { AstroBuildPlugin } from '../plugin'; import type { StaticBuildOptions } from '../types'; import { MIDDLEWARE_MODULE_ID } from './plugin-middleware.js'; import { RENDERERS_MODULE_ID } from './plugin-renderers.js'; -import { extname } from 'node:path'; +import { ASTRO_PAGE_EXTENSION_POST_PATTERN, getPathFromVirtualModulePageName } from './util.js'; export const ASTRO_PAGE_MODULE_ID = '@astro-page:'; export const ASTRO_PAGE_RESOLVED_MODULE_ID = '\0' + ASTRO_PAGE_MODULE_ID; diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts index f9ba9190922f..486c314340b7 100644 --- a/packages/astro/src/core/build/plugins/plugin-ssr.ts +++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts @@ -1,4 +1,5 @@ import glob from 'fast-glob'; +import { join } from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; import type { Plugin as VitePlugin } from 'vite'; import type { AstroAdapter, AstroConfig } from '../../../@types/astro'; @@ -14,10 +15,9 @@ import { getOutFile, getOutFolder } from '../common.js'; import { cssOrder, mergeInlineCss, type BuildInternals } from '../internal.js'; import type { AstroBuildPlugin } from '../plugin'; import type { OutputChunk, StaticBuildOptions } from '../types'; -import { getPathFromVirtualModulePageName, getVirtualModulePageNameFromPath } from './util.js'; -import { RENDERERS_MODULE_ID } from './plugin-renderers.js'; import { ASTRO_PAGE_MODULE_ID } from './plugin-pages.js'; -import { join } from 'node:path'; +import { RENDERERS_MODULE_ID } from './plugin-renderers.js'; +import { getPathFromVirtualModulePageName, getVirtualModulePageNameFromPath } from './util.js'; export const SSR_VIRTUAL_MODULE_ID = '@astrojs-ssr-virtual-entry'; const RESOLVED_SSR_VIRTUAL_MODULE_ID = '\0' + SSR_VIRTUAL_MODULE_ID; diff --git a/packages/astro/src/core/build/plugins/util.ts b/packages/astro/src/core/build/plugins/util.ts index 1fbf0fcdc133..fa79d72bdf3d 100644 --- a/packages/astro/src/core/build/plugins/util.ts +++ b/packages/astro/src/core/build/plugins/util.ts @@ -1,5 +1,5 @@ -import type { Plugin as VitePlugin } from 'vite'; import { extname } from 'node:path'; +import type { Plugin as VitePlugin } from 'vite'; // eslint-disable-next-line @typescript-eslint/ban-types type OutputOptionsHook = Extract; diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index e783c28b11cb..a7d8354501ce 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -3,9 +3,11 @@ import * as eslexer from 'es-module-lexer'; import glob from 'fast-glob'; import fs from 'fs'; import { bgGreen, bgMagenta, black, dim } from 'kleur/colors'; +import { extname } from 'node:path'; import path from 'path'; import { fileURLToPath } from 'url'; import * as vite from 'vite'; +import type { RouteData } from '../../@types/astro'; import { createBuildInternals, eachPageData, @@ -28,11 +30,9 @@ import { MIDDLEWARE_MODULE_ID } from './plugins/plugin-middleware.js'; import { ASTRO_PAGE_RESOLVED_MODULE_ID } from './plugins/plugin-pages.js'; import { RESOLVED_RENDERERS_MODULE_ID } from './plugins/plugin-renderers.js'; import { RESOLVED_SPLIT_MODULE_ID, SSR_VIRTUAL_MODULE_ID } from './plugins/plugin-ssr.js'; -import type { AllPagesData, PageBuildData, StaticBuildOptions } from './types'; -import { getTimeStat } from './util.js'; import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from './plugins/util.js'; -import { extname } from 'node:path'; -import type { RouteData } from '../../@types/astro'; +import type { PageBuildData, StaticBuildOptions } from './types'; +import { getTimeStat } from './util.js'; export async function viteBuild(opts: StaticBuildOptions) { const { allPages, settings } = opts; From f275d058fcfe564b19bf3536c1a208e6f9cb2159 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Wed, 21 Jun 2023 21:09:49 +0800 Subject: [PATCH 35/60] Update safe dependencies (#7430) --- benchmark/package.json | 4 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 8 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 4 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/ssr/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- package.json | 14 +- packages/astro-prism/package.json | 6 +- packages/astro-rss/package.json | 8 +- .../e2e/fixtures/astro-component/package.json | 2 +- .../e2e/fixtures/astro-envs/package.json | 2 +- .../e2e/fixtures/client-only/package.json | 8 +- .../e2e/fixtures/error-cyclic/package.json | 2 +- .../e2e/fixtures/error-sass/package.json | 2 +- .../astro/e2e/fixtures/errors/package.json | 8 +- .../e2e/fixtures/hydration-race/package.json | 2 +- .../e2e/fixtures/lit-component/package.json | 2 +- .../fixtures/multiple-frameworks/package.json | 10 +- .../namespaced-component/package.json | 2 +- .../fixtures/nested-in-preact/package.json | 8 +- .../e2e/fixtures/nested-in-react/package.json | 8 +- .../e2e/fixtures/nested-in-solid/package.json | 8 +- .../fixtures/nested-in-svelte/package.json | 8 +- .../e2e/fixtures/nested-in-vue/package.json | 8 +- .../fixtures/nested-recursive/package.json | 8 +- .../preact-compat-component/package.json | 2 +- .../fixtures/preact-component/package.json | 4 +- .../e2e/fixtures/solid-circular/package.json | 2 +- .../e2e/fixtures/solid-component/package.json | 2 +- .../e2e/fixtures/solid-recurse/package.json | 2 +- .../fixtures/svelte-component/package.json | 4 +- .../e2e/fixtures/tailwindcss/package.json | 2 +- .../e2e/fixtures/vue-component/package.json | 2 +- packages/astro/package.json | 68 +- .../performance/fixtures/md/package.json | 4 +- .../performance/fixtures/mdoc/package.json | 4 +- .../performance/fixtures/mdx/package.json | 4 +- packages/astro/performance/package.json | 2 +- packages/astro/src/core/errors/errors.ts | 4 +- packages/astro/src/core/errors/utils.ts | 4 +- packages/astro/src/jsx/babel.ts | 6 +- .../astro/test/fixtures/0-css/package.json | 4 +- .../alias-tsconfig-baseurl-only/package.json | 2 +- .../test/fixtures/alias-tsconfig/package.json | 2 +- .../astro/test/fixtures/alias/package.json | 2 +- .../test/fixtures/astro-basic/package.json | 2 +- .../test/fixtures/astro-children/package.json | 6 +- .../fixtures/astro-client-only/package.json | 2 +- .../test/fixtures/astro-dynamic/package.json | 2 +- .../test/fixtures/astro-envs/package.json | 2 +- .../test/fixtures/astro-expr/package.json | 2 +- .../test/fixtures/astro-fallback/package.json | 2 +- .../package.json | 4 +- .../astro-slot-with-client/package.json | 4 +- .../fixtures/astro-slots-nested/package.json | 10 +- .../fixtures/before-hydration/package.json | 2 +- .../test/fixtures/build-assets/package.json | 2 +- .../component-library-shared/package.json | 2 +- .../fixtures/component-library/package.json | 4 +- .../fixtures/entry-file-names/package.json | 2 +- .../astro/test/fixtures/fetch/package.json | 6 +- .../test/fixtures/hydration-race/package.json | 2 +- packages/astro/test/fixtures/jsx/package.json | 8 +- .../test/fixtures/large-array/package.json | 2 +- .../test/fixtures/lit-element/package.json | 2 +- .../astro/test/fixtures/postcss/package.json | 10 +- .../preact-compat-component/package.json | 2 +- .../fixtures/preact-component/package.json | 4 +- .../fixtures/react-and-solid/package.json | 2 +- .../fixtures/react-component/package.json | 2 +- .../package.json | 2 +- .../test/fixtures/slots-preact/package.json | 2 +- .../test/fixtures/slots-solid/package.json | 2 +- .../test/fixtures/slots-svelte/package.json | 2 +- .../test/fixtures/slots-vue/package.json | 2 +- .../deps/solid-jsx-component/package.json | 2 +- .../fixtures/solid-component/package.json | 4 +- .../astro/test/fixtures/ssr-env/package.json | 2 +- .../test/fixtures/ssr-scripts/package.json | 2 +- .../static-build-frameworks/package.json | 2 +- .../test/fixtures/static-build/package.json | 2 +- .../fixtures/svelte-component/package.json | 2 +- .../test/fixtures/tailwindcss-ts/package.json | 4 +- .../test/fixtures/tailwindcss/package.json | 4 +- .../fixtures/third-party-astro/package.json | 2 +- .../test/fixtures/vue-component/package.json | 2 +- .../astro/test/fixtures/vue-jsx/package.json | 2 +- .../vue-with-multi-renderer/package.json | 4 +- packages/create-astro/package.json | 6 +- packages/integrations/cloudflare/package.json | 6 +- .../cloudflare/test/basics.test.js | 6 +- .../cloudflare/test/{cf.js => cf.test.js} | 4 +- .../test/fixtures/with-solid-js/package.json | 4 +- .../cloudflare/test/test-utils.js | 6 +- ...with-solid-js.js => with-solid-js.test.js} | 6 +- packages/integrations/image/package.json | 10 +- packages/integrations/lit/package.json | 8 +- packages/integrations/markdoc/package.json | 12 +- packages/integrations/mdx/package.json | 32 +- .../mdx/src/rehype-optimize-static.ts | 2 + .../mdx-frontmatter-injection/package.json | 6 +- .../fixtures/mdx-infinite-loop/package.json | 4 +- packages/integrations/netlify/package.json | 10 +- packages/integrations/node/package.json | 10 +- packages/integrations/partytown/package.json | 4 +- packages/integrations/preact/package.json | 10 +- packages/integrations/prefetch/package.json | 2 +- packages/integrations/react/package.json | 14 +- packages/integrations/sitemap/package.json | 2 +- packages/integrations/solid/package.json | 4 +- packages/integrations/svelte/package.json | 4 +- packages/integrations/tailwind/package.json | 9 +- packages/integrations/vercel/package.json | 18 +- packages/integrations/vue/package.json | 16 +- packages/markdown/component/package.json | 6 +- .../astro-markdown-plugins/package.json | 2 +- .../test/fixtures/astro-markdown/package.json | 4 +- packages/markdown/remark/package.json | 20 +- packages/telemetry/package.json | 10 +- packages/underscore-redirects/package.json | 6 +- packages/webapi/package.json | 12 +- pnpm-lock.yaml | 4278 ++++++++--------- scripts/package.json | 8 +- 132 files changed, 2300 insertions(+), 2675 deletions(-) rename packages/integrations/cloudflare/test/{cf.js => cf.test.js} (89%) rename packages/integrations/cloudflare/test/{with-solid-js.js => with-solid-js.test.js} (87%) diff --git a/benchmark/package.json b/benchmark/package.json index 0edcbc905082..308ee1276082 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -11,11 +11,11 @@ "@astrojs/node": "workspace:*", "@benchmark/timer": "workspace:*", "astro": "workspace:*", - "autocannon": "^7.10.0", + "autocannon": "^7.11.0", "execa": "^6.1.0", "markdown-table": "^3.0.3", "mri": "^1.2.0", "port-authority": "^2.0.1", - "pretty-bytes": "^6.0.0" + "pretty-bytes": "^6.1.0" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 4eef3a017c33..a5923dfb4ac4 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/alpinejs": "^0.2.2", "@types/alpinejs": "^3.7.1", - "alpinejs": "^3.12.0", + "alpinejs": "^3.12.2", "astro": "^2.6.6" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 01c4c54c3b07..4b5aba252aec 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -14,6 +14,6 @@ "@astrojs/lit": "^2.1.0", "@webcomponents/template-shadowroot": "^0.2.1", "astro": "^2.6.6", - "lit": "^2.7.4" + "lit": "^2.7.5" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 2763c24c6e29..18f93494da03 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -17,11 +17,11 @@ "@astrojs/svelte": "^3.0.0", "@astrojs/vue": "^2.2.1", "astro": "^2.6.6", - "preact": "^10.13.2", + "preact": "^10.15.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "solid-js": "^1.7.4", - "svelte": "^3.58.0", - "vue": "^3.2.47" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 182528d7826c..60b8fac18874 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -14,6 +14,6 @@ "@astrojs/preact": "^2.2.1", "@preact/signals": "^1.1.3", "astro": "^2.6.6", - "preact": "^10.13.2" + "preact": "^10.15.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 607234f8a7a5..a814ecb1c5f2 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@astrojs/react": "^2.2.1", - "@types/react": "^18.2.5", - "@types/react-dom": "^18.2.3", + "@types/react": "^18.2.13", + "@types/react-dom": "^18.2.6", "astro": "^2.6.6", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 8075d608de48..13877113ad9c 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -13,6 +13,6 @@ "dependencies": { "@astrojs/solid-js": "^2.2.0", "astro": "^2.6.6", - "solid-js": "^1.7.4" + "solid-js": "^1.7.6" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index d819be23a4cf..1b23bb98b977 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -13,6 +13,6 @@ "dependencies": { "@astrojs/svelte": "^3.0.0", "astro": "^2.6.6", - "svelte": "^3.58.0" + "svelte": "^3.59.1" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 93fd4a758218..023ae1e4f754 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -13,6 +13,6 @@ "dependencies": { "@astrojs/vue": "^2.2.1", "astro": "^2.6.6", - "vue": "^3.2.47" + "vue": "^3.3.4" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 978eb75d3629..3b978aeb23e1 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -15,6 +15,6 @@ "@astrojs/node": "^5.2.0", "@astrojs/svelte": "^3.0.0", "astro": "^2.6.6", - "svelte": "^3.58.0" + "svelte": "^3.59.1" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index aa34a4bf53b1..64eddd13a8fa 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^0.19.7", "@astrojs/preact": "^2.2.1", "astro": "^2.6.6", - "preact": "^10.13.2" + "preact": "^10.15.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index fe7fd7af86a3..23da2b8cafe9 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -15,6 +15,6 @@ "@nanostores/preact": "^0.4.1", "astro": "^2.6.6", "nanostores": "^0.8.1", - "preact": "^10.13.2" + "preact": "^10.15.1" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index e903d7987835..45e2729afea9 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -17,7 +17,7 @@ "astro": "^2.6.6", "autoprefixer": "^10.4.14", "canvas-confetti": "^1.6.0", - "postcss": "^8.4.23", + "postcss": "^8.4.24", "tailwindcss": "^3.3.2" } } diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 2890429d30de..7b7927ab7131 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -13,6 +13,6 @@ "dependencies": { "astro": "^2.6.6", "vite-plugin-pwa": "0.14.7", - "workbox-window": "^6.5.4" + "workbox-window": "^6.6.0" } } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 1ea7d337cea4..d0bd37a3ed55 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -13,6 +13,6 @@ }, "dependencies": { "astro": "^2.6.6", - "vitest": "^0.31.0" + "vitest": "^0.31.4" } } diff --git a/package.json b/package.json index e41f11a5c177..26a48fc801cd 100644 --- a/package.json +++ b/package.json @@ -77,20 +77,20 @@ "devDependencies": { "@changesets/changelog-github": "^0.4.8", "@changesets/cli": "^2.26.1", - "@types/node": "^18.7.21", - "@typescript-eslint/eslint-plugin": "^5.58.0", - "@typescript-eslint/parser": "^5.58.0", - "esbuild": "^0.17.12", - "eslint": "^8.38.0", + "@types/node": "^18.16.18", + "@typescript-eslint/eslint-plugin": "^5.60.0", + "@typescript-eslint/parser": "^5.60.0", + "esbuild": "^0.17.19", + "eslint": "^8.43.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-no-only-tests": "^2.6.0", "eslint-plugin-prettier": "^4.2.1", "only-allow": "^1.1.1", "organize-imports-cli": "^0.10.0", "prettier": "^2.8.8", - "prettier-plugin-astro": "^0.8.0", + "prettier-plugin-astro": "^0.8.1", "tiny-glob": "^0.2.9", - "turbo": "^1.9.3", + "turbo": "^1.10.3", "typescript": "~5.0.2" } } diff --git a/packages/astro-prism/package.json b/packages/astro-prism/package.json index c658e329385f..4ad55bf7f710 100644 --- a/packages/astro-prism/package.json +++ b/packages/astro-prism/package.json @@ -32,11 +32,11 @@ "astro-component" ], "dependencies": { - "prismjs": "^1.28.0" + "prismjs": "^1.29.0" }, "devDependencies": { - "astro-scripts": "workspace:*", - "@types/prismjs": "1.26.0" + "@types/prismjs": "1.26.0", + "astro-scripts": "workspace:*" }, "engines": { "node": ">=16.12.0" diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json index e9a97157c316..d7c7c64c0017 100644 --- a/packages/astro-rss/package.json +++ b/packages/astro-rss/package.json @@ -27,18 +27,18 @@ "test": "mocha --exit --timeout 20000" }, "devDependencies": { - "@types/chai": "^4.3.1", + "@types/chai": "^4.3.5", "@types/chai-as-promised": "^7.1.5", "@types/mocha": "^9.1.1", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", + "chai": "^4.3.7", "chai-as-promised": "^7.1.1", - "chai-xml": "^0.4.0", + "chai-xml": "^0.4.1", "mocha": "^9.2.2" }, "dependencies": { - "fast-xml-parser": "^4.0.8", + "fast-xml-parser": "^4.2.4", "kleur": "^4.1.5" } } diff --git a/packages/astro/e2e/fixtures/astro-component/package.json b/packages/astro/e2e/fixtures/astro-component/package.json index 165b38931d70..225864913953 100644 --- a/packages/astro/e2e/fixtures/astro-component/package.json +++ b/packages/astro/e2e/fixtures/astro-component/package.json @@ -6,6 +6,6 @@ "@astrojs/preact": "workspace:*", "@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/e2e/fixtures/astro-envs/package.json b/packages/astro/e2e/fixtures/astro-envs/package.json index e115f9c726e1..2fa703b969de 100644 --- a/packages/astro/e2e/fixtures/astro-envs/package.json +++ b/packages/astro/e2e/fixtures/astro-envs/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.2.40" + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/client-only/package.json b/packages/astro/e2e/fixtures/client-only/package.json index 2a1e89ab3630..d072e8bdd801 100644 --- a/packages/astro/e2e/fixtures/client-only/package.json +++ b/packages/astro/e2e/fixtures/client-only/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.37" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/error-cyclic/package.json b/packages/astro/e2e/fixtures/error-cyclic/package.json index a1c170e71090..9a3fbde601cc 100644 --- a/packages/astro/e2e/fixtures/error-cyclic/package.json +++ b/packages/astro/e2e/fixtures/error-cyclic/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/e2e/fixtures/error-sass/package.json b/packages/astro/e2e/fixtures/error-sass/package.json index f52820ad2b35..097bad23e698 100644 --- a/packages/astro/e2e/fixtures/error-sass/package.json +++ b/packages/astro/e2e/fixtures/error-sass/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "astro": "workspace:*", - "sass": "^1.52.2" + "sass": "^1.63.4" } } diff --git a/packages/astro/e2e/fixtures/errors/package.json b/packages/astro/e2e/fixtures/errors/package.json index cbcab17d333a..c535e5001de4 100644 --- a/packages/astro/e2e/fixtures/errors/package.json +++ b/packages/astro/e2e/fixtures/errors/package.json @@ -9,11 +9,11 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.5.6", - "svelte": "^3.50.1", - "vue": "^3.2.39" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/hydration-race/package.json b/packages/astro/e2e/fixtures/hydration-race/package.json index 2d2ca0673de3..f1ab746c3e95 100644 --- a/packages/astro/e2e/fixtures/hydration-race/package.json +++ b/packages/astro/e2e/fixtures/hydration-race/package.json @@ -9,6 +9,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/e2e/fixtures/lit-component/package.json b/packages/astro/e2e/fixtures/lit-component/package.json index 06e374a42cc5..961507fe8333 100644 --- a/packages/astro/e2e/fixtures/lit-component/package.json +++ b/packages/astro/e2e/fixtures/lit-component/package.json @@ -6,6 +6,6 @@ "@astrojs/lit": "workspace:*", "@webcomponents/template-shadowroot": "^0.2.1", "astro": "workspace:*", - "lit": "^2.7.0" + "lit": "^2.7.5" } } diff --git a/packages/astro/e2e/fixtures/multiple-frameworks/package.json b/packages/astro/e2e/fixtures/multiple-frameworks/package.json index 91f95a97a498..1037db0f7249 100644 --- a/packages/astro/e2e/fixtures/multiple-frameworks/package.json +++ b/packages/astro/e2e/fixtures/multiple-frameworks/package.json @@ -13,12 +13,12 @@ }, "dependencies": { "@webcomponents/template-shadowroot": "^0.2.1", - "lit": "^2.7.0", - "preact": "^10.7.3", + "lit": "^2.7.5", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.37" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/namespaced-component/package.json b/packages/astro/e2e/fixtures/namespaced-component/package.json index 96de360e265e..5f4fd82773c1 100644 --- a/packages/astro/e2e/fixtures/namespaced-component/package.json +++ b/packages/astro/e2e/fixtures/namespaced-component/package.json @@ -8,6 +8,6 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3" + "preact": "^10.15.1" } } diff --git a/packages/astro/e2e/fixtures/nested-in-preact/package.json b/packages/astro/e2e/fixtures/nested-in-preact/package.json index 624316f913c8..2b6db13afcfa 100644 --- a/packages/astro/e2e/fixtures/nested-in-preact/package.json +++ b/packages/astro/e2e/fixtures/nested-in-preact/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.37" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/nested-in-react/package.json b/packages/astro/e2e/fixtures/nested-in-react/package.json index 29ee37d2aae5..a1708a0edae4 100644 --- a/packages/astro/e2e/fixtures/nested-in-react/package.json +++ b/packages/astro/e2e/fixtures/nested-in-react/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.37" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/nested-in-solid/package.json b/packages/astro/e2e/fixtures/nested-in-solid/package.json index 9a51cb0093bb..00c6cdaf777d 100644 --- a/packages/astro/e2e/fixtures/nested-in-solid/package.json +++ b/packages/astro/e2e/fixtures/nested-in-solid/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.37" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/nested-in-svelte/package.json b/packages/astro/e2e/fixtures/nested-in-svelte/package.json index ea847e24b521..03a4c3e05bc9 100644 --- a/packages/astro/e2e/fixtures/nested-in-svelte/package.json +++ b/packages/astro/e2e/fixtures/nested-in-svelte/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.37" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/nested-in-vue/package.json b/packages/astro/e2e/fixtures/nested-in-vue/package.json index 30a389574779..5a0d0273bd30 100644 --- a/packages/astro/e2e/fixtures/nested-in-vue/package.json +++ b/packages/astro/e2e/fixtures/nested-in-vue/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.37" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/e2e/fixtures/nested-recursive/package.json b/packages/astro/e2e/fixtures/nested-recursive/package.json index 3376ef59616f..19366d54559f 100644 --- a/packages/astro/e2e/fixtures/nested-recursive/package.json +++ b/packages/astro/e2e/fixtures/nested-recursive/package.json @@ -11,12 +11,12 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.36" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" }, "scripts": { "dev": "astro dev" diff --git a/packages/astro/e2e/fixtures/preact-compat-component/package.json b/packages/astro/e2e/fixtures/preact-compat-component/package.json index d83ad5292a90..c8092f549651 100644 --- a/packages/astro/e2e/fixtures/preact-compat-component/package.json +++ b/packages/astro/e2e/fixtures/preact-compat-component/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.7.3" + "preact": "^10.15.1" } } diff --git a/packages/astro/e2e/fixtures/preact-component/package.json b/packages/astro/e2e/fixtures/preact-component/package.json index 0d9b8402635f..8041f36088cc 100644 --- a/packages/astro/e2e/fixtures/preact-component/package.json +++ b/packages/astro/e2e/fixtures/preact-component/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": true, "dependencies": { - "@astrojs/preact": "workspace:*", "@astrojs/mdx": "workspace:*", + "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.7.3" + "preact": "^10.15.1" } } diff --git a/packages/astro/e2e/fixtures/solid-circular/package.json b/packages/astro/e2e/fixtures/solid-circular/package.json index a354ec9ec165..7cca82635952 100644 --- a/packages/astro/e2e/fixtures/solid-circular/package.json +++ b/packages/astro/e2e/fixtures/solid-circular/package.json @@ -7,6 +7,6 @@ "astro": "workspace:*" }, "devDependencies": { - "solid-js": "^1.4.3" + "solid-js": "^1.7.6" } } diff --git a/packages/astro/e2e/fixtures/solid-component/package.json b/packages/astro/e2e/fixtures/solid-component/package.json index aee1bddab7e9..eaa2e84eb7e1 100644 --- a/packages/astro/e2e/fixtures/solid-component/package.json +++ b/packages/astro/e2e/fixtures/solid-component/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/solid-js": "workspace:*", "astro": "workspace:*", - "solid-js": "^1.5.5" + "solid-js": "^1.7.6" } } diff --git a/packages/astro/e2e/fixtures/solid-recurse/package.json b/packages/astro/e2e/fixtures/solid-recurse/package.json index 61016bf36996..c1f3f1444aad 100644 --- a/packages/astro/e2e/fixtures/solid-recurse/package.json +++ b/packages/astro/e2e/fixtures/solid-recurse/package.json @@ -7,6 +7,6 @@ "astro": "workspace:*" }, "devDependencies": { - "solid-js": "^1.4.3" + "solid-js": "^1.7.6" } } diff --git a/packages/astro/e2e/fixtures/svelte-component/package.json b/packages/astro/e2e/fixtures/svelte-component/package.json index 999a248c70f2..0756f3f1427b 100644 --- a/packages/astro/e2e/fixtures/svelte-component/package.json +++ b/packages/astro/e2e/fixtures/svelte-component/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": true, "dependencies": { + "@astrojs/mdx": "workspace:*", "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "@astrojs/mdx": "workspace:*", - "svelte": "^3.48.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/e2e/fixtures/tailwindcss/package.json b/packages/astro/e2e/fixtures/tailwindcss/package.json index 908c07915c4b..7e61c0d5c3be 100644 --- a/packages/astro/e2e/fixtures/tailwindcss/package.json +++ b/packages/astro/e2e/fixtures/tailwindcss/package.json @@ -6,7 +6,7 @@ "@astrojs/tailwind": "workspace:*", "astro": "workspace:*", "autoprefixer": "^10.4.14", - "postcss": "^8.4.23", + "postcss": "^8.4.24", "tailwindcss": "^3.3.2" } } diff --git a/packages/astro/e2e/fixtures/vue-component/package.json b/packages/astro/e2e/fixtures/vue-component/package.json index 2e0c72a6b88c..81e7997830e3 100644 --- a/packages/astro/e2e/fixtures/vue-component/package.json +++ b/packages/astro/e2e/fixtures/vue-component/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.2.39" + "vue": "^3.3.4" } } diff --git a/packages/astro/package.json b/packages/astro/package.json index a9b4854a7f84..879953f2a454 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -113,35 +113,35 @@ "test:e2e:match": "playwright test -g" }, "dependencies": { - "@astrojs/compiler": "^1.4.0", + "@astrojs/compiler": "^1.5.0", "@astrojs/internal-helpers": "^0.1.0", "@astrojs/language-server": "^1.0.0", "@astrojs/markdown-remark": "^2.2.1", "@astrojs/telemetry": "^2.1.1", "@astrojs/webapi": "^2.2.0", - "@babel/core": "^7.21.8", - "@babel/generator": "^7.18.2", - "@babel/parser": "^7.18.4", - "@babel/plugin-transform-react-jsx": "^7.17.12", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.21.5", - "@types/babel__core": "^7.1.19", + "@babel/core": "^7.22.5", + "@babel/generator": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/plugin-transform-react-jsx": "^7.22.5", + "@babel/traverse": "^7.22.5", + "@babel/types": "^7.22.5", + "@types/babel__core": "^7.20.1", "@types/yargs-parser": "^21.0.0", - "acorn": "^8.8.2", + "acorn": "^8.9.0", "boxen": "^6.2.1", "chokidar": "^3.5.3", - "ci-info": "^3.3.1", + "ci-info": "^3.8.0", "common-ancestor-path": "^1.0.1", "cookie": "^0.5.0", "debug": "^4.3.4", - "deepmerge-ts": "^4.2.2", + "deepmerge-ts": "^4.3.0", "devalue": "^4.3.2", "diff": "^5.1.0", - "es-module-lexer": "^1.1.0", - "esbuild": "^0.17.18", + "es-module-lexer": "^1.3.0", + "esbuild": "^0.17.19", "estree-walker": "3.0.0", "execa": "^6.1.0", - "fast-glob": "^3.2.11", + "fast-glob": "^3.2.12", "github-slugger": "^2.0.0", "gray-matter": "^4.0.3", "html-escaper": "^3.0.3", @@ -149,67 +149,67 @@ "kleur": "^4.1.4", "magic-string": "^0.27.0", "mime": "^3.0.0", - "ora": "^6.1.0", + "ora": "^6.3.1", "p-limit": "^4.0.0", "path-to-regexp": "^6.2.1", "preferred-pm": "^3.0.3", "prompts": "^2.4.2", "rehype": "^12.0.1", - "semver": "^7.3.8", + "semver": "^7.5.2", "server-destroy": "^1.0.1", "shiki": "^0.14.1", "slash": "^4.0.0", "string-width": "^5.1.2", - "strip-ansi": "^7.0.1", + "strip-ansi": "^7.1.0", "supports-esm": "^1.0.0", "tsconfig-resolver": "^3.0.1", "typescript": "*", - "unist-util-visit": "^4.1.0", - "vfile": "^5.3.2", - "vite": "^4.3.1", + "unist-util-visit": "^4.1.2", + "vfile": "^5.3.7", + "vite": "^4.3.9", "vitefu": "^0.2.4", - "yargs-parser": "^21.0.1", + "yargs-parser": "^21.1.1", "zod": "^3.20.6" }, "devDependencies": { "@playwright/test": "^1.29.2", "@types/babel__generator": "^7.6.4", - "@types/babel__traverse": "^7.17.1", - "@types/chai": "^4.3.1", + "@types/babel__traverse": "^7.20.1", + "@types/chai": "^4.3.5", "@types/common-ancestor-path": "^1.0.0", "@types/connect": "^3.4.35", "@types/cookie": "^0.5.1", - "@types/debug": "^4.1.7", - "@types/diff": "^5.0.2", + "@types/debug": "^4.1.8", + "@types/diff": "^5.0.3", "@types/estree": "^0.0.51", "@types/hast": "^2.3.4", "@types/html-escaper": "^3.0.0", "@types/js-yaml": "^4.0.5", "@types/mime": "^2.0.3", "@types/mocha": "^9.1.1", - "@types/prettier": "^2.6.3", - "@types/prompts": "^2.0.14", + "@types/prettier": "^2.7.3", + "@types/prompts": "^2.4.4", "@types/resolve": "^1.20.2", "@types/rimraf": "^3.0.2", "@types/send": "^0.17.1", "@types/server-destroy": "^1.0.1", "@types/unist": "^2.0.6", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "cheerio": "^1.0.0-rc.11", + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", "eol": "^0.9.1", - "memfs": "^3.4.7", + "memfs": "^3.5.3", "mocha": "^9.2.2", - "node-mocks-http": "^1.11.0", + "node-mocks-http": "^1.12.2", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", "rehype-toc": "^3.0.2", "remark-code-titles": "^0.1.2", - "rollup": "^3.9.0", - "sass": "^1.52.2", + "rollup": "^3.25.1", + "sass": "^1.63.4", "sharp": "^0.32.1", "srcset-parse": "^1.1.0", - "undici": "^5.22.0", + "undici": "^5.22.1", "unified": "^10.1.2" }, "peerDependencies": { diff --git a/packages/astro/performance/fixtures/md/package.json b/packages/astro/performance/fixtures/md/package.json index ffc37be1e7ec..a5efef0ef295 100644 --- a/packages/astro/performance/fixtures/md/package.json +++ b/packages/astro/performance/fixtures/md/package.json @@ -16,8 +16,8 @@ "dependencies": { "@astrojs/react": "workspace:*", "@performance/utils": "workspace:*", - "@types/react": "^18.0.21", - "@types/react-dom": "^18.0.6", + "@types/react": "^18.2.13", + "@types/react-dom": "^18.2.6", "astro": "workspace:*", "react": "^18.0.0", "react-dom": "^18.0.0" diff --git a/packages/astro/performance/fixtures/mdoc/package.json b/packages/astro/performance/fixtures/mdoc/package.json index 032396900752..612bd78c2074 100644 --- a/packages/astro/performance/fixtures/mdoc/package.json +++ b/packages/astro/performance/fixtures/mdoc/package.json @@ -17,8 +17,8 @@ "@astrojs/markdoc": "workspace:*", "@astrojs/react": "workspace:*", "@performance/utils": "workspace:*", - "@types/react": "^18.0.21", - "@types/react-dom": "^18.0.6", + "@types/react": "^18.2.13", + "@types/react-dom": "^18.2.6", "astro": "workspace:*", "react": "^18.0.0", "react-dom": "^18.0.0" diff --git a/packages/astro/performance/fixtures/mdx/package.json b/packages/astro/performance/fixtures/mdx/package.json index da2045b9f27d..59d98b27f788 100644 --- a/packages/astro/performance/fixtures/mdx/package.json +++ b/packages/astro/performance/fixtures/mdx/package.json @@ -17,8 +17,8 @@ "@astrojs/mdx": "workspace:*", "@astrojs/react": "workspace:*", "@performance/utils": "workspace:*", - "@types/react": "^18.0.21", - "@types/react-dom": "^18.0.6", + "@types/react": "^18.2.13", + "@types/react-dom": "^18.2.6", "astro": "workspace:*", "react": "^18.0.0", "react-dom": "^18.0.0" diff --git a/packages/astro/performance/package.json b/packages/astro/performance/package.json index 66193df49b4e..e09f291736c2 100644 --- a/packages/astro/performance/package.json +++ b/packages/astro/performance/package.json @@ -15,6 +15,6 @@ "cross-env": "^7.0.3", "kleur": "^4.1.5", "npm-run-all": "^4.1.5", - "yargs-parser": "^21.0.1" + "yargs-parser": "^21.1.1" } } diff --git a/packages/astro/src/core/errors/errors.ts b/packages/astro/src/core/errors/errors.ts index 995f401ef27d..7cb069bbe0be 100644 --- a/packages/astro/src/core/errors/errors.ts +++ b/packages/astro/src/core/errors/errors.ts @@ -1,8 +1,10 @@ -import type { DiagnosticCode } from '@astrojs/compiler/shared/diagnostics.js'; +import type { DiagnosticMessage } from '@astrojs/compiler'; import type { AstroErrorCodes } from './errors-data.js'; import { codeFrame } from './printer.js'; import { getErrorDataByCode } from './utils.js'; +type DiagnosticCode = DiagnosticMessage['code']; + interface ErrorProperties { code: AstroErrorCodes | DiagnosticCode; title?: string; diff --git a/packages/astro/src/core/errors/utils.ts b/packages/astro/src/core/errors/utils.ts index f4408c305947..5fe455a06385 100644 --- a/packages/astro/src/core/errors/utils.ts +++ b/packages/astro/src/core/errors/utils.ts @@ -1,9 +1,11 @@ -import type { DiagnosticCode } from '@astrojs/compiler/shared/diagnostics.js'; +import type { DiagnosticMessage } from '@astrojs/compiler'; import type { YAMLException } from 'js-yaml'; import type { ErrorPayload as ViteErrorPayload } from 'vite'; import type { SSRError } from '../../@types/astro.js'; import { AstroErrorData, type AstroErrorCodes, type ErrorData } from './errors-data.js'; +type DiagnosticCode = DiagnosticMessage['code']; + /** * Get the line and character based on the offset * @param offset The index of the position diff --git a/packages/astro/src/jsx/babel.ts b/packages/astro/src/jsx/babel.ts index 9caf42aaf33a..1ccd05fbc4ca 100644 --- a/packages/astro/src/jsx/babel.ts +++ b/packages/astro/src/jsx/babel.ts @@ -192,7 +192,7 @@ export default function astroJSX(): PluginObj { ) { return; } - const parent = path.findParent((n) => t.isJSXElement(n))!; + const parent = path.findParent((n) => t.isJSXElement(n.node))!; const parentNode = parent.node as t.JSXElement; const tagName = getTagName(parentNode); if (!isComponent(tagName)) return; @@ -249,9 +249,9 @@ export default function astroJSX(): PluginObj { } }, JSXIdentifier(path, state) { - const isAttr = path.findParent((n) => t.isJSXAttribute(n)); + const isAttr = path.findParent((n) => t.isJSXAttribute(n.node)); if (isAttr) return; - const parent = path.findParent((n) => t.isJSXElement(n))!; + const parent = path.findParent((n) => t.isJSXElement(n.node))!; const parentNode = parent.node as t.JSXElement; const tagName = getTagName(parentNode); if (!isComponent(tagName)) return; diff --git a/packages/astro/test/fixtures/0-css/package.json b/packages/astro/test/fixtures/0-css/package.json index bec81c0fb616..4a5d7734367c 100644 --- a/packages/astro/test/fixtures/0-css/package.json +++ b/packages/astro/test/fixtures/0-css/package.json @@ -9,7 +9,7 @@ "astro": "workspace:*", "react": "^18.1.0", "react-dom": "^18.1.0", - "svelte": "^3.48.0", - "vue": "^3.2.39" + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json b/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json index 6fcb9106ce3a..d4113b4fc8ff 100644 --- a/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json +++ b/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^3.48.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/test/fixtures/alias-tsconfig/package.json b/packages/astro/test/fixtures/alias-tsconfig/package.json index dc4b7e7b9ea2..4abb4367fe02 100644 --- a/packages/astro/test/fixtures/alias-tsconfig/package.json +++ b/packages/astro/test/fixtures/alias-tsconfig/package.json @@ -6,6 +6,6 @@ "@astrojs/svelte": "workspace:*", "@test/namespace-package": "workspace:*", "astro": "workspace:*", - "svelte": "^3.48.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/test/fixtures/alias/package.json b/packages/astro/test/fixtures/alias/package.json index c3f6f56d83a3..e543a6967bc9 100644 --- a/packages/astro/test/fixtures/alias/package.json +++ b/packages/astro/test/fixtures/alias/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^3.48.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/test/fixtures/astro-basic/package.json b/packages/astro/test/fixtures/astro-basic/package.json index a6312565805d..c30c850dc7f0 100644 --- a/packages/astro/test/fixtures/astro-basic/package.json +++ b/packages/astro/test/fixtures/astro-basic/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/astro-children/package.json b/packages/astro/test/fixtures/astro-children/package.json index 0ba89d0a9782..1f40029857dd 100644 --- a/packages/astro/test/fixtures/astro-children/package.json +++ b/packages/astro/test/fixtures/astro-children/package.json @@ -7,8 +7,8 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0", - "svelte": "^3.48.0", - "vue": "^3.2.39" + "preact": "^10.15.1", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/astro-client-only/package.json b/packages/astro/test/fixtures/astro-client-only/package.json index 219a1a6a7380..4ac537e042a8 100644 --- a/packages/astro/test/fixtures/astro-client-only/package.json +++ b/packages/astro/test/fixtures/astro-client-only/package.json @@ -9,6 +9,6 @@ "astro": "workspace:*", "react": "^18.1.0", "react-dom": "^18.1.0", - "svelte": "^3.48.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/test/fixtures/astro-dynamic/package.json b/packages/astro/test/fixtures/astro-dynamic/package.json index 844513ebfc42..1499fa7f35fe 100644 --- a/packages/astro/test/fixtures/astro-dynamic/package.json +++ b/packages/astro/test/fixtures/astro-dynamic/package.json @@ -8,6 +8,6 @@ "astro": "workspace:*", "react": "^18.1.0", "react-dom": "^18.1.0", - "svelte": "^3.48.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/test/fixtures/astro-envs/package.json b/packages/astro/test/fixtures/astro-envs/package.json index a90a9c01c0a2..c46f4d6814ac 100644 --- a/packages/astro/test/fixtures/astro-envs/package.json +++ b/packages/astro/test/fixtures/astro-envs/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.2.39" + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/astro-expr/package.json b/packages/astro/test/fixtures/astro-expr/package.json index 31ecdeb13360..b9fc5565ec35 100644 --- a/packages/astro/test/fixtures/astro-expr/package.json +++ b/packages/astro/test/fixtures/astro-expr/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/astro-fallback/package.json b/packages/astro/test/fixtures/astro-fallback/package.json index 31e7941edc4f..52d3f6731576 100644 --- a/packages/astro/test/fixtures/astro-fallback/package.json +++ b/packages/astro/test/fixtures/astro-fallback/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/astro-markdown-frontmatter-injection/package.json b/packages/astro/test/fixtures/astro-markdown-frontmatter-injection/package.json index 1b7fcc25b7a3..fd7f414c2f68 100644 --- a/packages/astro/test/fixtures/astro-markdown-frontmatter-injection/package.json +++ b/packages/astro/test/fixtures/astro-markdown-frontmatter-injection/package.json @@ -4,8 +4,8 @@ "private": true, "dependencies": { "astro": "workspace:*", - "mdast-util-to-string": "^3.1.0", + "mdast-util-to-string": "^3.2.0", "reading-time": "^1.5.0", - "unist-util-visit": "^4.1.0" + "unist-util-visit": "^4.1.2" } } diff --git a/packages/astro/test/fixtures/astro-slot-with-client/package.json b/packages/astro/test/fixtures/astro-slot-with-client/package.json index 141bf165d008..9427f65ab3d4 100644 --- a/packages/astro/test/fixtures/astro-slot-with-client/package.json +++ b/packages/astro/test/fixtures/astro-slot-with-client/package.json @@ -2,8 +2,8 @@ "name": "@test/astro-slot-with-client", "private": true, "dependencies": { - "astro": "workspace:*", "@astrojs/preact": "workspace:*", - "preact": "^10.11.0" + "astro": "workspace:*", + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/astro-slots-nested/package.json b/packages/astro/test/fixtures/astro-slots-nested/package.json index 7e57372ec3bb..e0d74ee802ef 100644 --- a/packages/astro/test/fixtures/astro-slots-nested/package.json +++ b/packages/astro/test/fixtures/astro-slots-nested/package.json @@ -5,15 +5,15 @@ "dependencies": { "@astrojs/preact": "workspace:*", "@astrojs/react": "workspace:*", - "@astrojs/vue": "workspace:*", "@astrojs/solid-js": "workspace:*", "@astrojs/svelte": "workspace:*", + "@astrojs/vue": "workspace:*", "astro": "workspace:*", + "preact": "^10.15.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "solid-js": "^1.7.4", - "svelte": "^3.58.0", - "vue": "^3.2.47", - "preact": "^10.13.2" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/before-hydration/package.json b/packages/astro/test/fixtures/before-hydration/package.json index f04a39ae0944..0eaf3d77ae8f 100644 --- a/packages/astro/test/fixtures/before-hydration/package.json +++ b/packages/astro/test/fixtures/before-hydration/package.json @@ -4,6 +4,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/build-assets/package.json b/packages/astro/test/fixtures/build-assets/package.json index 6dd278c2bcea..feb883935782 100644 --- a/packages/astro/test/fixtures/build-assets/package.json +++ b/packages/astro/test/fixtures/build-assets/package.json @@ -4,6 +4,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/component-library-shared/package.json b/packages/astro/test/fixtures/component-library-shared/package.json index f5c344316685..5d87d1941de6 100644 --- a/packages/astro/test/fixtures/component-library-shared/package.json +++ b/packages/astro/test/fixtures/component-library-shared/package.json @@ -18,7 +18,7 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.11.0", + "preact": "^10.15.1", "react": "^18.2.0" } } diff --git a/packages/astro/test/fixtures/component-library/package.json b/packages/astro/test/fixtures/component-library/package.json index 0a677ced2c1d..90b3cdf47554 100644 --- a/packages/astro/test/fixtures/component-library/package.json +++ b/packages/astro/test/fixtures/component-library/package.json @@ -8,9 +8,9 @@ "@astrojs/svelte": "workspace:*", "@test/component-library-shared": "workspace:*", "astro": "workspace:*", - "preact": "^10.13.2", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "svelte": "^3.58.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/test/fixtures/entry-file-names/package.json b/packages/astro/test/fixtures/entry-file-names/package.json index 392886491d4c..3ba4d666af07 100644 --- a/packages/astro/test/fixtures/entry-file-names/package.json +++ b/packages/astro/test/fixtures/entry-file-names/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/fetch/package.json b/packages/astro/test/fixtures/fetch/package.json index 39d0a4e867c4..43f4ff24c036 100644 --- a/packages/astro/test/fixtures/fetch/package.json +++ b/packages/astro/test/fixtures/fetch/package.json @@ -7,8 +7,8 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0", - "svelte": "^3.48.0", - "vue": "^3.2.39" + "preact": "^10.15.1", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/hydration-race/package.json b/packages/astro/test/fixtures/hydration-race/package.json index 4b97e86f6f1a..2f415a655e08 100644 --- a/packages/astro/test/fixtures/hydration-race/package.json +++ b/packages/astro/test/fixtures/hydration-race/package.json @@ -9,6 +9,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/jsx/package.json b/packages/astro/test/fixtures/jsx/package.json index eb2c75d6931a..1e7001b47ea3 100644 --- a/packages/astro/test/fixtures/jsx/package.json +++ b/packages/astro/test/fixtures/jsx/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.7.3", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.4.3", - "svelte": "^3.48.0", - "vue": "^3.2.36" + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/large-array/package.json b/packages/astro/test/fixtures/large-array/package.json index b5061ebf558b..f2d7f854c1c6 100644 --- a/packages/astro/test/fixtures/large-array/package.json +++ b/packages/astro/test/fixtures/large-array/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/solid-js": "workspace:*", "astro": "workspace:*", - "solid-js": "^1.5.6" + "solid-js": "^1.7.6" } } diff --git a/packages/astro/test/fixtures/lit-element/package.json b/packages/astro/test/fixtures/lit-element/package.json index 2b3b252ac795..487feb01880d 100644 --- a/packages/astro/test/fixtures/lit-element/package.json +++ b/packages/astro/test/fixtures/lit-element/package.json @@ -6,6 +6,6 @@ "@astrojs/lit": "workspace:*", "@webcomponents/template-shadowroot": "^0.2.1", "astro": "workspace:*", - "lit": "^2.7.0" + "lit": "^2.7.5" } } diff --git a/packages/astro/test/fixtures/postcss/package.json b/packages/astro/test/fixtures/postcss/package.json index 7d240362b919..e41429b48e95 100644 --- a/packages/astro/test/fixtures/postcss/package.json +++ b/packages/astro/test/fixtures/postcss/package.json @@ -8,12 +8,12 @@ "@astrojs/vue": "workspace:*", "astro": "workspace:*", "autoprefixer": "^10.4.14", - "postcss": "^8.4.23", - "solid-js": "^1.5.6", - "svelte": "^3.48.0", - "vue": "^3.2.39" + "postcss": "^8.4.24", + "solid-js": "^1.7.6", + "svelte": "^3.59.1", + "vue": "^3.3.4" }, "devDependencies": { - "postcss-preset-env": "^7.7.1" + "postcss-preset-env": "^7.8.3" } } diff --git a/packages/astro/test/fixtures/preact-compat-component/package.json b/packages/astro/test/fixtures/preact-compat-component/package.json index 9cef449cc829..84e29114565a 100644 --- a/packages/astro/test/fixtures/preact-compat-component/package.json +++ b/packages/astro/test/fixtures/preact-compat-component/package.json @@ -6,6 +6,6 @@ "@astrojs/preact": "workspace:*", "@test/react-lib": "workspace:*", "astro": "workspace:*", - "preact": "^10.10.1" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/preact-component/package.json b/packages/astro/test/fixtures/preact-component/package.json index 96bd63693d9c..4898cdd2fdae 100644 --- a/packages/astro/test/fixtures/preact-component/package.json +++ b/packages/astro/test/fixtures/preact-component/package.json @@ -4,8 +4,8 @@ "private": true, "dependencies": { "@astrojs/preact": "workspace:*", + "@preact/signals": "1.1.1", "astro": "workspace:*", - "preact": "^10.11.0", - "@preact/signals": "1.1.1" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/react-and-solid/package.json b/packages/astro/test/fixtures/react-and-solid/package.json index 644e1911c254..fb0f67710365 100644 --- a/packages/astro/test/fixtures/react-and-solid/package.json +++ b/packages/astro/test/fixtures/react-and-solid/package.json @@ -7,6 +7,6 @@ "astro": "workspace:*", "react": "^18.2.0", "react-dom": "^18.1.0", - "solid-js": "^1.5.6" + "solid-js": "^1.7.6" } } diff --git a/packages/astro/test/fixtures/react-component/package.json b/packages/astro/test/fixtures/react-component/package.json index dc9b2fd6f01d..cf7b2b057fce 100644 --- a/packages/astro/test/fixtures/react-component/package.json +++ b/packages/astro/test/fixtures/react-component/package.json @@ -8,6 +8,6 @@ "astro": "workspace:*", "react": "^18.1.0", "react-dom": "^18.1.0", - "vue": "^3.2.37" + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json b/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json index f5b58cbcb8f5..fe687c1021fb 100644 --- a/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json +++ b/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json @@ -4,6 +4,6 @@ "dependencies": { "@astrojs/preact": "workspace:", "astro": "workspace:", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/slots-preact/package.json b/packages/astro/test/fixtures/slots-preact/package.json index d06192b83ae1..b234a5fa4631 100644 --- a/packages/astro/test/fixtures/slots-preact/package.json +++ b/packages/astro/test/fixtures/slots-preact/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/slots-solid/package.json b/packages/astro/test/fixtures/slots-solid/package.json index 82bd822cc0e6..0d8f1e80465f 100644 --- a/packages/astro/test/fixtures/slots-solid/package.json +++ b/packages/astro/test/fixtures/slots-solid/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/solid-js": "workspace:*", "astro": "workspace:*", - "solid-js": "^1.5.6" + "solid-js": "^1.7.6" } } diff --git a/packages/astro/test/fixtures/slots-svelte/package.json b/packages/astro/test/fixtures/slots-svelte/package.json index 28d7022c6c7b..c30158d9c2cc 100644 --- a/packages/astro/test/fixtures/slots-svelte/package.json +++ b/packages/astro/test/fixtures/slots-svelte/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^3.48.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/test/fixtures/slots-vue/package.json b/packages/astro/test/fixtures/slots-vue/package.json index 7992ea47628c..e61cf2bbec64 100644 --- a/packages/astro/test/fixtures/slots-vue/package.json +++ b/packages/astro/test/fixtures/slots-vue/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.2.39" + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/solid-component/deps/solid-jsx-component/package.json b/packages/astro/test/fixtures/solid-component/deps/solid-jsx-component/package.json index 09971c1899f5..3dea01dde783 100644 --- a/packages/astro/test/fixtures/solid-component/deps/solid-jsx-component/package.json +++ b/packages/astro/test/fixtures/solid-component/deps/solid-jsx-component/package.json @@ -10,6 +10,6 @@ } }, "dependencies": { - "solid-js": "^1.5.6" + "solid-js": "^1.7.6" } } diff --git a/packages/astro/test/fixtures/solid-component/package.json b/packages/astro/test/fixtures/solid-component/package.json index abf476952c12..121dc69563e3 100644 --- a/packages/astro/test/fixtures/solid-component/package.json +++ b/packages/astro/test/fixtures/solid-component/package.json @@ -4,9 +4,9 @@ "private": true, "dependencies": { "@astrojs/solid-js": "workspace:*", - "@solidjs/router": "^0.5.0", + "@solidjs/router": "^0.5.1", "@test/solid-jsx-component": "file:./deps/solid-jsx-component", "astro": "workspace:*", - "solid-js": "^1.5.6" + "solid-js": "^1.7.6" } } diff --git a/packages/astro/test/fixtures/ssr-env/package.json b/packages/astro/test/fixtures/ssr-env/package.json index 7bb284752b28..d1ffd55adbed 100644 --- a/packages/astro/test/fixtures/ssr-env/package.json +++ b/packages/astro/test/fixtures/ssr-env/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/ssr-scripts/package.json b/packages/astro/test/fixtures/ssr-scripts/package.json index ac49fda2e510..f5c996ebc077 100644 --- a/packages/astro/test/fixtures/ssr-scripts/package.json +++ b/packages/astro/test/fixtures/ssr-scripts/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/static-build-frameworks/package.json b/packages/astro/test/fixtures/static-build-frameworks/package.json index 89fd24ee454e..17895a034e0a 100644 --- a/packages/astro/test/fixtures/static-build-frameworks/package.json +++ b/packages/astro/test/fixtures/static-build-frameworks/package.json @@ -6,7 +6,7 @@ "@astrojs/preact": "workspace:*", "@astrojs/react": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0", + "preact": "^10.15.1", "react": "^18.1.0", "react-dom": "^18.1.0" } diff --git a/packages/astro/test/fixtures/static-build/package.json b/packages/astro/test/fixtures/static-build/package.json index f4d9ae9a24ce..720e718f4553 100644 --- a/packages/astro/test/fixtures/static-build/package.json +++ b/packages/astro/test/fixtures/static-build/package.json @@ -6,6 +6,6 @@ "@astrojs/preact": "workspace:*", "@test/static-build-pkg": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0" + "preact": "^10.15.1" } } diff --git a/packages/astro/test/fixtures/svelte-component/package.json b/packages/astro/test/fixtures/svelte-component/package.json index 21d01c911ab1..c0de64d05b70 100644 --- a/packages/astro/test/fixtures/svelte-component/package.json +++ b/packages/astro/test/fixtures/svelte-component/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^3.48.0" + "svelte": "^3.59.1" } } diff --git a/packages/astro/test/fixtures/tailwindcss-ts/package.json b/packages/astro/test/fixtures/tailwindcss-ts/package.json index 3ab11a25def1..175841649908 100644 --- a/packages/astro/test/fixtures/tailwindcss-ts/package.json +++ b/packages/astro/test/fixtures/tailwindcss-ts/package.json @@ -5,7 +5,7 @@ "dependencies": { "@astrojs/tailwind": "workspace:*", "astro": "workspace:*", - "tailwindcss": "^3.3.2", - "postcss": "^8.4.23" + "postcss": "^8.4.24", + "tailwindcss": "^3.3.2" } } diff --git a/packages/astro/test/fixtures/tailwindcss/package.json b/packages/astro/test/fixtures/tailwindcss/package.json index 78cfb17cb41f..fae589b2964a 100644 --- a/packages/astro/test/fixtures/tailwindcss/package.json +++ b/packages/astro/test/fixtures/tailwindcss/package.json @@ -3,11 +3,11 @@ "version": "0.0.0", "private": true, "dependencies": { - "@astrojs/tailwind": "workspace:*", "@astrojs/mdx": "workspace:*", + "@astrojs/tailwind": "workspace:*", "astro": "workspace:*", "autoprefixer": "^10.4.14", - "postcss": "^8.4.23", + "postcss": "^8.4.24", "tailwindcss": "^3.3.2" } } diff --git a/packages/astro/test/fixtures/third-party-astro/package.json b/packages/astro/test/fixtures/third-party-astro/package.json index 26e11aefdd6f..c705eac920f0 100644 --- a/packages/astro/test/fixtures/third-party-astro/package.json +++ b/packages/astro/test/fixtures/third-party-astro/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "astro": "workspace:*", - "astro-embed": "^0.1.1" + "astro-embed": "^0.1.3" } } diff --git a/packages/astro/test/fixtures/vue-component/package.json b/packages/astro/test/fixtures/vue-component/package.json index 1096ac057d65..b1f716dd65fc 100644 --- a/packages/astro/test/fixtures/vue-component/package.json +++ b/packages/astro/test/fixtures/vue-component/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.2.39" + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/vue-jsx/package.json b/packages/astro/test/fixtures/vue-jsx/package.json index 8aaa1991b590..e04e8077d66c 100644 --- a/packages/astro/test/fixtures/vue-jsx/package.json +++ b/packages/astro/test/fixtures/vue-jsx/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.2.39" + "vue": "^3.3.4" } } diff --git a/packages/astro/test/fixtures/vue-with-multi-renderer/package.json b/packages/astro/test/fixtures/vue-with-multi-renderer/package.json index 9680471749fc..36f4e9b81acd 100644 --- a/packages/astro/test/fixtures/vue-with-multi-renderer/package.json +++ b/packages/astro/test/fixtures/vue-with-multi-renderer/package.json @@ -6,7 +6,7 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "svelte": "^3.48.0", - "vue": "^3.2.39" + "svelte": "^3.59.1", + "vue": "^3.3.4" } } diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index d63aab0b4fe8..fd975ef49cc0 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -31,8 +31,8 @@ "//a": "MOST PACKAGES SHOULD GO IN DEV_DEPENDENCIES! THEY WILL BE BUNDLED.", "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES", "dependencies": { - "@astrojs/cli-kit": "^0.2.2", - "chai": "^4.3.6", + "@astrojs/cli-kit": "^0.2.3", + "chai": "^4.3.7", "execa": "^6.1.0", "giget": "1.0.0", "mocha": "^9.2.2", @@ -42,7 +42,7 @@ "@types/which-pm-runs": "^1.0.0", "arg": "^5.0.2", "astro-scripts": "workspace:*", - "strip-ansi": "^7.0.1", + "strip-ansi": "^7.1.0", "strip-json-comments": "^5.0.0", "which-pm-runs": "^1.1.0" }, diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 2cffb6dcc1f4..8510189e643a 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -40,7 +40,7 @@ "dependencies": { "@astrojs/underscore-redirects": "^0.1.0", "@cloudflare/workers-types": "^4.20230518.0", - "esbuild": "^0.17.12", + "esbuild": "^0.17.19", "tiny-glob": "^0.2.9" }, "peerDependencies": { @@ -49,8 +49,8 @@ "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "cheerio": "^1.0.0-rc.11", + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", "mocha": "^9.2.2", "slash": "^4.0.0", "wrangler": "^2.0.23" diff --git a/packages/integrations/cloudflare/test/basics.test.js b/packages/integrations/cloudflare/test/basics.test.js index a6229bbb249f..d382a9084e1c 100644 --- a/packages/integrations/cloudflare/test/basics.test.js +++ b/packages/integrations/cloudflare/test/basics.test.js @@ -14,19 +14,19 @@ describe.skip('Basic app', () => { }); it('can render', async () => { - const { ready, stop } = runCLI('./fixtures/basics/', { silent: true }); + const { ready, stop } = runCLI('./fixtures/basics/', { silent: true, port: 8789 }); try { await ready; - let res = await fetch(`http://localhost:8787/`); + let res = await fetch(`http://localhost:8789/`); expect(res.status).to.equal(200); let html = await res.text(); let $ = cheerio.load(html); expect($('h1').text()).to.equal('Testing'); expect($('#env').text()).to.equal('secret'); } finally { - stop(); + await stop(); } }); }); diff --git a/packages/integrations/cloudflare/test/cf.js b/packages/integrations/cloudflare/test/cf.test.js similarity index 89% rename from packages/integrations/cloudflare/test/cf.js rename to packages/integrations/cloudflare/test/cf.test.js index ba4efedef001..cf310f34d000 100644 --- a/packages/integrations/cloudflare/test/cf.js +++ b/packages/integrations/cloudflare/test/cf.test.js @@ -17,7 +17,7 @@ describe('Cf metadata and caches', () => { }); it('Load cf and caches API', async () => { - const { ready, stop } = runCLI('./fixtures/cf/', { silent: false, port: 8788 }); + const { ready, stop } = runCLI('./fixtures/cf/', { silent: true, port: 8788 }); try { await ready; @@ -29,7 +29,7 @@ describe('Cf metadata and caches', () => { expect($('#cf').text()).to.contain('city'); expect($('#hasCache').text()).to.equal('true'); } finally { - stop(); + await stop(); } }); }); diff --git a/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json b/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json index ca1112be81ab..df887a73a18f 100644 --- a/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json +++ b/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json @@ -5,7 +5,7 @@ "dependencies": { "@astrojs/cloudflare": "workspace:*", "@astrojs/solid-js": "workspace:*", - "solid-js": "*", - "astro": "workspace:*" + "astro": "workspace:*", + "solid-js": "^1.7.6" } } diff --git a/packages/integrations/cloudflare/test/test-utils.js b/packages/integrations/cloudflare/test/test-utils.js index 399b978120b6..6216e677c647 100644 --- a/packages/integrations/cloudflare/test/test-utils.js +++ b/packages/integrations/cloudflare/test/test-utils.js @@ -60,7 +60,11 @@ export function runCLI(basePath, { silent, port = 8787 }) { return { ready, stop() { - p.kill(); + return new Promise((resolve, reject) => { + p.on('close', () => resolve()); + p.on('error', (err) => reject(err)); + p.kill(); + }); }, }; } diff --git a/packages/integrations/cloudflare/test/with-solid-js.js b/packages/integrations/cloudflare/test/with-solid-js.test.js similarity index 87% rename from packages/integrations/cloudflare/test/with-solid-js.js rename to packages/integrations/cloudflare/test/with-solid-js.test.js index c393f8d8b6cd..270c387b54db 100644 --- a/packages/integrations/cloudflare/test/with-solid-js.js +++ b/packages/integrations/cloudflare/test/with-solid-js.test.js @@ -14,18 +14,18 @@ describe('With SolidJS', () => { }); it('renders the solid component', async () => { - const { ready, stop } = runCLI('./fixtures/with-solid-js/', { silent: true }); + const { ready, stop } = runCLI('./fixtures/with-solid-js/', { silent: true, port: 8790 }); try { await ready; - let res = await fetch(`http://localhost:8787/`); + let res = await fetch(`http://localhost:8790/`); expect(res.status).to.equal(200); let html = await res.text(); let $ = cheerio.load(html); expect($('.solid').text()).to.equal('Solid Content'); } finally { - stop(); + await stop(); } }); }); diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index 7a9137e466f5..77f1fac46e28 100644 --- a/packages/integrations/image/package.json +++ b/packages/integrations/image/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@altano/tiny-async-pool": "^1.0.2", - "http-cache-semantics": "^4.1.0", + "http-cache-semantics": "^4.1.1", "image-size": "^1.0.2", "kleur": "^4.1.5", "magic-string": "^0.27.0", @@ -53,13 +53,13 @@ "@types/mime": "^2.0.3", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "cheerio": "^1.0.0-rc.11", - "fast-glob": "^3.2.11", + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", + "fast-glob": "^3.2.12", "mocha": "^9.2.2", "rollup-plugin-copy": "^3.4.0", "sharp": "^0.32.1", - "vite": "^4.3.1" + "vite": "^4.3.9" }, "peerDependencies": { "astro": "workspace:^2.6.6", diff --git a/packages/integrations/lit/package.json b/packages/integrations/lit/package.json index 22fe219eb31b..d1c08502830a 100644 --- a/packages/integrations/lit/package.json +++ b/packages/integrations/lit/package.json @@ -42,7 +42,7 @@ "test": "mocha" }, "dependencies": { - "@lit-labs/ssr": "^3.1.3", + "@lit-labs/ssr": "^3.1.4", "@lit-labs/ssr-client": "^1.1.2", "@lit-labs/ssr-dom-shim": "^1.1.1", "parse5": "^7.1.2" @@ -50,11 +50,11 @@ "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "cheerio": "^1.0.0-rc.11", + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", "lit": "^2.7.5", "mocha": "^9.2.2", - "sass": "^1.52.2" + "sass": "^1.63.4" }, "peerDependencies": { "@webcomponents/template-shadowroot": "^0.2.1", diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index fb7c4a13196d..6284c419b7ee 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -65,7 +65,7 @@ "dependencies": { "@astrojs/prism": "^2.1.2", "@markdoc/markdoc": "^0.3.0", - "esbuild": "^0.17.12", + "esbuild": "^0.17.19", "github-slugger": "^2.0.0", "gray-matter": "^4.0.3", "kleur": "^4.1.5", @@ -77,17 +77,17 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^2.2.1", - "@types/chai": "^4.3.1", + "@types/chai": "^4.3.5", "@types/html-escaper": "^3.0.0", "@types/mocha": "^9.1.1", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", + "chai": "^4.3.7", "devalue": "^4.3.2", - "linkedom": "^0.14.12", + "linkedom": "^0.14.26", "mocha": "^9.2.2", - "rollup": "^3.20.1", - "vite": "^4.3.1" + "rollup": "^3.25.1", + "vite": "^4.3.9" }, "engines": { "node": ">=16.12.0" diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 41682a6bd0fe..9de2897364a1 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -37,10 +37,10 @@ "@astrojs/markdown-remark": "^2.2.1", "@astrojs/prism": "^2.1.2", "@mdx-js/mdx": "^2.3.0", - "acorn": "^8.8.0", - "es-module-lexer": "^1.1.1", - "estree-util-visit": "^1.2.0", - "github-slugger": "^1.4.0", + "acorn": "^8.9.0", + "es-module-lexer": "^1.3.0", + "estree-util-visit": "^1.2.1", + "github-slugger": "^1.5.0", "gray-matter": "^4.0.3", "hast-util-to-html": "^8.0.4", "kleur": "^4.1.4", @@ -50,32 +50,32 @@ "remark-smartypants": "^2.0.0", "shiki": "^0.14.1", "source-map": "^0.7.4", - "unist-util-visit": "^4.1.0", - "vfile": "^5.3.2" + "unist-util-visit": "^4.1.2", + "vfile": "^5.3.7" }, "devDependencies": { - "@types/chai": "^4.3.1", - "@types/estree": "^1.0.0", + "@types/chai": "^4.3.5", + "@types/estree": "^1.0.1", "@types/github-slugger": "^1.3.0", - "@types/mdast": "^3.0.10", + "@types/mdast": "^3.0.11", "@types/mocha": "^9.1.1", "@types/yargs-parser": "^21.0.0", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "cheerio": "^1.0.0-rc.11", - "linkedom": "^0.14.12", - "mdast-util-mdx": "^2.0.0", - "mdast-util-to-string": "^3.1.0", + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", + "linkedom": "^0.14.26", + "mdast-util-mdx": "^2.0.1", + "mdast-util-to-string": "^3.2.0", "mocha": "^9.2.2", "reading-time": "^1.5.0", "rehype-mathjax": "^4.0.2", "rehype-pretty-code": "^0.4.0", "remark-math": "^5.1.1", "remark-rehype": "^10.1.0", - "remark-shiki-twoslash": "^3.1.0", + "remark-shiki-twoslash": "^3.1.3", "remark-toc": "^8.0.1", - "vite": "^4.3.1" + "vite": "^4.3.9" }, "engines": { "node": ">=16.12.0" diff --git a/packages/integrations/mdx/src/rehype-optimize-static.ts b/packages/integrations/mdx/src/rehype-optimize-static.ts index c476f7c83163..573af317e99c 100644 --- a/packages/integrations/mdx/src/rehype-optimize-static.ts +++ b/packages/integrations/mdx/src/rehype-optimize-static.ts @@ -64,6 +64,7 @@ export function rehypeOptimizeStatic(options?: OptimizeOptions) { } // For possible subtree root nodes, record them in `elementStack` and // `allPossibleElements` to be used in the "leave" hook below. + // @ts-expect-error MDX types for `.type` is not enhanced because MDX isn't used directly if (node.type === 'element' || node.type === 'mdxJsxFlowElement') { elementStack.push(node); allPossibleElements.add(node); @@ -72,6 +73,7 @@ export function rehypeOptimizeStatic(options?: OptimizeOptions) { leave(node, _, __, parents) { // Do the reverse of the if condition above, popping the `elementStack`, // and consolidating `allPossibleElements` as a subtree root. + // @ts-expect-error MDX types for `.type` is not enhanced because MDX isn't used directly if (node.type === 'element' || node.type === 'mdxJsxFlowElement') { elementStack.pop(); // Many possible elements could be part of a subtree, in order to find diff --git a/packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection/package.json b/packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection/package.json index 8affcbbf622c..d85e995c09ae 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection/package.json @@ -3,10 +3,10 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "workspace:*", "@astrojs/mdx": "workspace:*", - "mdast-util-to-string": "^3.1.0", + "astro": "workspace:*", + "mdast-util-to-string": "^3.2.0", "reading-time": "^1.5.0", - "unist-util-visit": "^4.1.0" + "unist-util-visit": "^4.1.2" } } diff --git a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json index 80b1b2f0c848..130577bcddcc 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json @@ -5,7 +5,7 @@ "dependencies": { "@astrojs/mdx": "workspace:*", "@astrojs/preact": "workspace:*", - "preact": "^10.7.3", - "astro": "workspace:*" + "astro": "workspace:*", + "preact": "^10.15.1" } } diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 1c7b6bc60384..2228d9cc5d52 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -39,7 +39,7 @@ "dependencies": { "@astrojs/underscore-redirects": "^0.1.0", "@astrojs/webapi": "^2.2.0", - "@netlify/functions": "^1.0.0", + "@netlify/functions": "^1.6.0", "esbuild": "^0.15.18" }, "peerDependencies": { @@ -48,13 +48,13 @@ "devDependencies": { "@netlify/edge-functions": "^2.0.0", "@netlify/edge-handler-types": "^0.34.1", - "@types/node": "^14.18.20", + "@types/node": "^14.18.51", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "cheerio": "^1.0.0-rc.11", + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", "mocha": "^9.2.2", - "vite": "^4.3.1" + "vite": "^4.3.9" }, "astro": { "external": true diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 255bb0081fae..58d4fd34539c 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -41,15 +41,15 @@ "astro": "workspace:^2.6.6" }, "devDependencies": { - "@types/node": "^18.7.21", + "@types/node": "^18.16.18", "@types/send": "^0.17.1", "@types/server-destroy": "^1.0.1", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "cheerio": "^1.0.0-rc.11", + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", "mocha": "^9.2.2", - "node-mocks-http": "^1.11.0", - "undici": "^5.22.0" + "node-mocks-http": "^1.12.2", + "undici": "^5.22.1" } } diff --git a/packages/integrations/partytown/package.json b/packages/integrations/partytown/package.json index 40748cf05b3d..d613b02f07d0 100644 --- a/packages/integrations/partytown/package.json +++ b/packages/integrations/partytown/package.json @@ -32,8 +32,8 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "@builder.io/partytown": "^0.7.4", - "mrmime": "^1.0.0" + "@builder.io/partytown": "^0.7.6", + "mrmime": "^1.0.1" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json index cf9d98379ea5..9efc7d2c53f3 100644 --- a/packages/integrations/preact/package.json +++ b/packages/integrations/preact/package.json @@ -35,16 +35,16 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "@babel/core": ">=7.0.0-0 <8.0.0", - "@babel/plugin-transform-react-jsx": "^7.17.12", + "@babel/core": "^7.22.5", + "@babel/plugin-transform-react-jsx": "^7.22.5", + "@preact/signals": "^1.1.3", "babel-plugin-module-resolver": "^5.0.0", - "preact-render-to-string": "^5.2.4", - "@preact/signals": "^1.1.0" + "preact-render-to-string": "^5.2.6" }, "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "preact": "^10.7.3" + "preact": "^10.15.1" }, "peerDependencies": { "preact": "^10.6.5" diff --git a/packages/integrations/prefetch/package.json b/packages/integrations/prefetch/package.json index 899d41d41567..9233b2788eca 100644 --- a/packages/integrations/prefetch/package.json +++ b/packages/integrations/prefetch/package.json @@ -35,7 +35,7 @@ }, "devDependencies": { "@playwright/test": "^1.29.2", - "@types/chai": "^4.3.1", + "@types/chai": "^4.3.5", "@types/chai-as-promised": "^7.1.5", "@types/mocha": "^9.1.1", "astro": "workspace:*", diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json index 27c55bdc20ce..fa68cd5f0bfd 100644 --- a/packages/integrations/react/package.json +++ b/packages/integrations/react/package.json @@ -44,22 +44,22 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "@babel/core": ">=7.0.0-0 <8.0.0", - "@babel/plugin-transform-react-jsx": "^7.17.12" + "@babel/core": "^7.22.5", + "@babel/plugin-transform-react-jsx": "^7.22.5" }, "devDependencies": { - "@types/react": "^17.0.45", - "@types/react-dom": "^17.0.17", + "@types/react": "^17.0.62", + "@types/react-dom": "^17.0.20", "astro": "workspace:*", "astro-scripts": "workspace:*", "react": "^18.1.0", "react-dom": "^18.1.0" }, "peerDependencies": { - "react": "^17.0.2 || ^18.0.0", - "react-dom": "^17.0.2 || ^18.0.0", "@types/react": "^17.0.50 || ^18.0.21", - "@types/react-dom": "^17.0.17 || ^18.0.6" + "@types/react-dom": "^17.0.17 || ^18.0.6", + "react": "^17.0.2 || ^18.0.0", + "react-dom": "^17.0.2 || ^18.0.0" }, "engines": { "node": ">=16.12.0" diff --git a/packages/integrations/sitemap/package.json b/packages/integrations/sitemap/package.json index 1b3bddf5ccc8..e347f30c28c7 100644 --- a/packages/integrations/sitemap/package.json +++ b/packages/integrations/sitemap/package.json @@ -40,7 +40,7 @@ "@astrojs/node": "workspace:*", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", + "chai": "^4.3.7", "mocha": "^9.2.2", "xml2js": "0.5.0" } diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index 305a83b2ca8a..407b0cc73b79 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -35,13 +35,13 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "babel-preset-solid": "^1.4.2", + "babel-preset-solid": "^1.7.4", "vitefu": "^0.2.4" }, "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "solid-js": "^1.5.1" + "solid-js": "^1.7.6" }, "peerDependencies": { "solid-js": "^1.4.3" diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 054a02a6f87e..b8f8a0f8a4fa 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -44,8 +44,8 @@ "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "svelte": "^3.55.0", - "vite": "^4.3.1" + "svelte": "^3.59.1", + "vite": "^4.3.9" }, "peerDependencies": { "astro": "workspace:^2.6.6", diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index bd50d630ce79..461528ebe384 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -40,17 +40,10 @@ "astro": "workspace:*", "astro-scripts": "workspace:*", "tailwindcss": "^3.3.2", - "vite": "^4.3.1" + "vite": "^4.3.9" }, "peerDependencies": { "astro": "workspace:^2.6.6", "tailwindcss": "^3.0.24" - }, - "pnpm": { - "peerDependencyRules": { - "ignoreMissing": [ - "postcss" - ] - } } } diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index d11a2d85d90a..0513f0483dc5 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -52,12 +52,12 @@ "dependencies": { "@astrojs/internal-helpers": "^0.1.0", "@astrojs/webapi": "^2.2.0", - "@vercel/analytics": "^0.1.8", - "@vercel/nft": "^0.22.1", - "esbuild": "^0.17.12", - "fast-glob": "^3.2.11", - "set-cookie-parser": "^2.5.1", - "web-vitals": "^3.1.1" + "@vercel/analytics": "^0.1.11", + "@vercel/nft": "^0.22.6", + "esbuild": "^0.17.19", + "fast-glob": "^3.2.12", + "set-cookie-parser": "^2.6.0", + "web-vitals": "^3.3.2" }, "peerDependencies": { "astro": "workspace:^2.6.6" @@ -66,8 +66,8 @@ "@types/set-cookie-parser": "^2.4.2", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "mocha": "^9.2.2", - "cheerio": "^1.0.0-rc.11" + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", + "mocha": "^9.2.2" } } diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 52b4627dccda..af97bd95c3e7 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -40,20 +40,20 @@ "test": "mocha --timeout 20000" }, "dependencies": { - "@vitejs/plugin-vue": "^4.0.0", - "@vitejs/plugin-vue-jsx": "^3.0.0", + "@vitejs/plugin-vue": "^4.2.3", + "@vitejs/plugin-vue-jsx": "^3.0.1", "@vue/babel-plugin-jsx": "^1.1.1", - "@vue/compiler-sfc": "^3.2.39" + "@vue/compiler-sfc": "^3.3.4" }, "devDependencies": { - "@types/chai": "^4.3.3", + "@types/chai": "^4.3.5", "astro": "workspace:*", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "linkedom": "^0.14.17", + "chai": "^4.3.7", + "linkedom": "^0.14.26", "mocha": "^9.2.2", - "vite": "^4.3.1", - "vue": "^3.2.37" + "vite": "^4.3.9", + "vue": "^3.3.4" }, "peerDependencies": { "astro": "workspace:^2.6.6", diff --git a/packages/markdown/component/package.json b/packages/markdown/component/package.json index a135515baee6..b3c0fca9ac9c 100644 --- a/packages/markdown/component/package.json +++ b/packages/markdown/component/package.json @@ -27,9 +27,9 @@ "devDependencies": { "@types/mocha": "^9.1.1", "astro": "workspace:*", - "chai": "^4.3.6", - "cheerio": "^1.0.0-rc.11", - "github-slugger": "^1.4.0", + "chai": "^4.3.7", + "cheerio": "1.0.0-rc.12", + "github-slugger": "^1.5.0", "mocha": "^9.2.2", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", diff --git a/packages/markdown/component/test/fixtures/astro-markdown-plugins/package.json b/packages/markdown/component/test/fixtures/astro-markdown-plugins/package.json index 62a1cfa98e6f..61cfbc161e02 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-plugins/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-plugins/package.json @@ -7,7 +7,7 @@ "@astrojs/preact": "workspace:*", "astro": "workspace:*", "hast-util-select": "^5.0.2", - "preact": "^10.11.0", + "preact": "^10.15.1", "rehype-slug": "^5.0.1" } } diff --git a/packages/markdown/component/test/fixtures/astro-markdown/package.json b/packages/markdown/component/test/fixtures/astro-markdown/package.json index 307a2910f074..fdabe3a0385e 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown/package.json @@ -7,7 +7,7 @@ "@astrojs/preact": "workspace:*", "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "preact": "^10.11.0", - "svelte": "^3.48.0" + "preact": "^10.15.1", + "svelte": "^3.59.1" } } diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json index 4e40af840953..0c4a353bb647 100644 --- a/packages/markdown/remark/package.json +++ b/packages/markdown/remark/package.json @@ -32,30 +32,30 @@ }, "dependencies": { "@astrojs/prism": "^2.1.2", - "github-slugger": "^1.4.0", - "import-meta-resolve": "^2.1.0", + "github-slugger": "^1.5.0", + "import-meta-resolve": "^2.2.2", "rehype-raw": "^6.1.1", "rehype-stringify": "^9.0.3", "remark-gfm": "^3.0.1", - "remark-parse": "^10.0.1", + "remark-parse": "^10.0.2", "remark-rehype": "^10.1.0", "remark-smartypants": "^2.0.0", "shiki": "^0.14.1", "unified": "^10.1.2", - "unist-util-visit": "^4.1.0", - "vfile": "^5.3.2" + "unist-util-visit": "^4.1.2", + "vfile": "^5.3.7" }, "devDependencies": { - "@types/chai": "^4.3.1", - "@types/estree": "^1.0.0", + "@types/chai": "^4.3.5", + "@types/estree": "^1.0.1", "@types/github-slugger": "^1.3.0", "@types/hast": "^2.3.4", - "@types/mdast": "^3.0.10", + "@types/mdast": "^3.0.11", "@types/mocha": "^9.1.1", "@types/unist": "^2.0.6", "astro-scripts": "workspace:*", - "chai": "^4.3.6", - "mdast-util-mdx-expression": "^1.3.1", + "chai": "^4.3.7", + "mdast-util-mdx-expression": "^1.3.2", "mocha": "^9.2.2" } } diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index c50c89ba354a..be9e88b139c5 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -26,22 +26,22 @@ "dist" ], "dependencies": { - "ci-info": "^3.3.1", + "ci-info": "^3.8.0", "debug": "^4.3.4", "dlv": "^1.1.3", "dset": "^3.1.2", "is-docker": "^3.0.0", "is-wsl": "^2.2.0", - "undici": "^5.22.0", + "undici": "^5.22.1", "which-pm-runs": "^1.1.0" }, "devDependencies": { - "@types/debug": "^4.1.7", + "@types/debug": "^4.1.8", "@types/dlv": "^1.1.2", - "@types/node": "^18.7.21", + "@types/node": "^18.16.18", "@types/which-pm-runs": "^1.0.0", "astro-scripts": "workspace:*", - "chai": "^4.3.6", + "chai": "^4.3.7", "mocha": "^9.2.2" }, "engines": { diff --git a/packages/underscore-redirects/package.json b/packages/underscore-redirects/package.json index 1c9643dde981..3f9e5c511724 100644 --- a/packages/underscore-redirects/package.json +++ b/packages/underscore-redirects/package.json @@ -28,11 +28,11 @@ "test": "mocha --exit --timeout 20000" }, "devDependencies": { + "@types/chai": "^4.3.5", + "@types/mocha": "^9.1.1", "astro": "workspace:*", "astro-scripts": "workspace:*", - "@types/chai": "^4.3.1", - "@types/mocha": "^9.1.1", - "chai": "^4.3.6", + "chai": "^4.3.7", "mocha": "^9.2.2" }, "keywords": [ diff --git a/packages/webapi/package.json b/packages/webapi/package.json index 13f9e34a3c64..730f5efb4a0f 100644 --- a/packages/webapi/package.json +++ b/packages/webapi/package.json @@ -50,23 +50,23 @@ "bugs": "https://github.com/withastro/astro/issues", "homepage": "https://github.com/withastro/astro/tree/main/packages/webapi#readme", "dependencies": { - "undici": "^5.22.0" + "undici": "^5.22.1" }, "devDependencies": { "@rollup/plugin-alias": "^3.1.9", "@rollup/plugin-inject": "^4.0.4", "@rollup/plugin-node-resolve": "^13.3.0", - "@rollup/plugin-typescript": "^8.3.2", - "@types/chai": "^4.3.1", + "@rollup/plugin-typescript": "^8.5.0", + "@types/chai": "^4.3.5", "@types/mocha": "^9.1.1", - "@types/node": "^18.7.21", + "@types/node": "^18.16.18", "@ungap/structured-clone": "^0.3.4", - "chai": "^4.3.6", + "chai": "^4.3.7", "event-target-shim": "^6.0.2", "magic-string": "^0.27.0", "mocha": "^9.2.2", "rollup": "^2.79.1", - "tslib": "^2.5.0", + "tslib": "^2.5.3", "typescript": "~5.0.2", "urlpattern-polyfill": "^1.0.0-rc5" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 45c034404385..739cf8997969 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,29 +27,29 @@ importers: specifier: ^2.26.1 version: 2.26.1 '@types/node': - specifier: ^18.7.21 - version: 18.16.3 + specifier: ^18.16.18 + version: 18.16.18 '@typescript-eslint/eslint-plugin': - specifier: ^5.58.0 - version: 5.58.0(@typescript-eslint/parser@5.58.0)(eslint@8.38.0)(typescript@5.0.2) + specifier: ^5.60.0 + version: 5.60.0(@typescript-eslint/parser@5.60.0)(eslint@8.43.0)(typescript@5.0.2) '@typescript-eslint/parser': - specifier: ^5.58.0 - version: 5.58.0(eslint@8.38.0)(typescript@5.0.2) + specifier: ^5.60.0 + version: 5.60.0(eslint@8.43.0)(typescript@5.0.2) esbuild: - specifier: ^0.17.12 - version: 0.17.12 + specifier: ^0.17.19 + version: 0.17.19 eslint: - specifier: ^8.38.0 - version: 8.38.0 + specifier: ^8.43.0 + version: 8.43.0 eslint-config-prettier: specifier: ^8.8.0 - version: 8.8.0(eslint@8.38.0) + version: 8.8.0(eslint@8.43.0) eslint-plugin-no-only-tests: specifier: ^2.6.0 version: 2.6.0 eslint-plugin-prettier: specifier: ^4.2.1 - version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.38.0)(prettier@2.8.8) + version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.43.0)(prettier@2.8.8) only-allow: specifier: ^1.1.1 version: 1.1.1 @@ -60,14 +60,14 @@ importers: specifier: ^2.8.8 version: 2.8.8 prettier-plugin-astro: - specifier: ^0.8.0 - version: 0.8.0 + specifier: ^0.8.1 + version: 0.8.1 tiny-glob: specifier: ^0.2.9 version: 0.2.9 turbo: - specifier: ^1.9.3 - version: 1.9.3 + specifier: ^1.10.3 + version: 1.10.3 typescript: specifier: ~5.0.2 version: 5.0.2 @@ -87,8 +87,8 @@ importers: specifier: workspace:* version: link:../packages/astro autocannon: - specifier: ^7.10.0 - version: 7.10.0 + specifier: ^7.11.0 + version: 7.11.0 execa: specifier: ^6.1.0 version: 6.1.0 @@ -102,8 +102,8 @@ importers: specifier: ^2.0.1 version: 2.0.1 pretty-bytes: - specifier: ^6.0.0 - version: 6.0.0 + specifier: ^6.1.0 + version: 6.1.0 benchmark/packages/timer: dependencies: @@ -170,8 +170,8 @@ importers: specifier: ^3.7.1 version: 3.7.1 alpinejs: - specifier: ^3.12.0 - version: 3.12.0 + specifier: ^3.12.2 + version: 3.12.2 astro: specifier: ^2.6.6 version: link:../../packages/astro @@ -188,8 +188,8 @@ importers: specifier: ^2.6.6 version: link:../../packages/astro lit: - specifier: ^2.7.4 - version: 2.7.4 + specifier: ^2.7.5 + version: 2.7.5 examples/framework-multiple: dependencies: @@ -212,8 +212,8 @@ importers: specifier: ^2.6.6 version: link:../../packages/astro preact: - specifier: ^10.13.2 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.2.0 version: 18.2.0 @@ -221,14 +221,14 @@ importers: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.7.4 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.58.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.47 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 examples/framework-preact: dependencies: @@ -237,13 +237,13 @@ importers: version: link:../../packages/integrations/preact '@preact/signals': specifier: ^1.1.3 - version: 1.1.3(preact@10.13.2) + version: 1.1.3(preact@10.15.1) astro: specifier: ^2.6.6 version: link:../../packages/astro preact: - specifier: ^10.13.2 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 examples/framework-react: dependencies: @@ -251,11 +251,11 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/react '@types/react': - specifier: ^18.2.5 - version: 18.2.5 + specifier: ^18.2.13 + version: 18.2.13 '@types/react-dom': - specifier: ^18.2.3 - version: 18.2.3 + specifier: ^18.2.6 + version: 18.2.6 astro: specifier: ^2.6.6 version: link:../../packages/astro @@ -275,8 +275,8 @@ importers: specifier: ^2.6.6 version: link:../../packages/astro solid-js: - specifier: ^1.7.4 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 examples/framework-svelte: dependencies: @@ -287,8 +287,8 @@ importers: specifier: ^2.6.6 version: link:../../packages/astro svelte: - specifier: ^3.58.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 examples/framework-vue: dependencies: @@ -299,8 +299,8 @@ importers: specifier: ^2.6.6 version: link:../../packages/astro vue: - specifier: ^3.2.47 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 examples/hackernews: dependencies: @@ -359,8 +359,8 @@ importers: specifier: ^2.6.6 version: link:../../packages/astro svelte: - specifier: ^3.58.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 examples/with-markdoc: dependencies: @@ -413,8 +413,8 @@ importers: specifier: ^2.6.6 version: link:../../packages/astro preact: - specifier: ^10.13.2 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 examples/with-nanostores: dependencies: @@ -423,7 +423,7 @@ importers: version: link:../../packages/integrations/preact '@nanostores/preact': specifier: ^0.4.1 - version: 0.4.1(nanostores@0.8.1)(preact@10.13.2) + version: 0.4.1(nanostores@0.8.1)(preact@10.15.1) astro: specifier: ^2.6.6 version: link:../../packages/astro @@ -431,8 +431,8 @@ importers: specifier: ^0.8.1 version: 0.8.1 preact: - specifier: ^10.13.2 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 examples/with-tailwindcss: dependencies: @@ -450,13 +450,13 @@ importers: version: link:../../packages/astro autoprefixer: specifier: ^10.4.14 - version: 10.4.14(postcss@8.4.23) + version: 10.4.14(postcss@8.4.24) canvas-confetti: specifier: ^1.6.0 version: 1.6.0 postcss: - specifier: ^8.4.23 - version: 8.4.23 + specifier: ^8.4.24 + version: 8.4.24 tailwindcss: specifier: ^3.3.2 version: 3.3.2 @@ -468,10 +468,10 @@ importers: version: link:../../packages/astro vite-plugin-pwa: specifier: 0.14.7 - version: 0.14.7(workbox-window@6.5.4) + version: 0.14.7(workbox-window@6.6.0) workbox-window: - specifier: ^6.5.4 - version: 6.5.4 + specifier: ^6.6.0 + version: 6.6.0 examples/with-vitest: dependencies: @@ -479,14 +479,14 @@ importers: specifier: ^2.6.6 version: link:../../packages/astro vitest: - specifier: ^0.31.0 - version: 0.31.0 + specifier: ^0.31.4 + version: 0.31.4 packages/astro: dependencies: '@astrojs/compiler': - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.5.0 + version: 1.5.0 '@astrojs/internal-helpers': specifier: ^0.1.0 version: link:../internal-helpers @@ -503,32 +503,32 @@ importers: specifier: ^2.2.0 version: link:../webapi '@babel/core': - specifier: ^7.21.8 - version: 7.21.8 + specifier: ^7.22.5 + version: 7.22.5 '@babel/generator': - specifier: ^7.18.2 - version: 7.18.2 + specifier: ^7.22.5 + version: 7.22.5 '@babel/parser': - specifier: ^7.18.4 - version: 7.18.4 + specifier: ^7.22.5 + version: 7.22.5 '@babel/plugin-transform-react-jsx': - specifier: ^7.17.12 - version: 7.17.12(@babel/core@7.21.8) + specifier: ^7.22.5 + version: 7.22.5(@babel/core@7.22.5) '@babel/traverse': - specifier: ^7.18.2 - version: 7.18.2 + specifier: ^7.22.5 + version: 7.22.5 '@babel/types': - specifier: ^7.21.5 - version: 7.21.5 + specifier: ^7.22.5 + version: 7.22.5 '@types/babel__core': - specifier: ^7.1.19 - version: 7.1.19 + specifier: ^7.20.1 + version: 7.20.1 '@types/yargs-parser': specifier: ^21.0.0 version: 21.0.0 acorn: - specifier: ^8.8.2 - version: 8.8.2 + specifier: ^8.9.0 + version: 8.9.0 boxen: specifier: ^6.2.1 version: 6.2.1 @@ -536,8 +536,8 @@ importers: specifier: ^3.5.3 version: 3.5.3 ci-info: - specifier: ^3.3.1 - version: 3.3.1 + specifier: ^3.8.0 + version: 3.8.0 common-ancestor-path: specifier: ^1.0.1 version: 1.0.1 @@ -548,8 +548,8 @@ importers: specifier: ^4.3.4 version: 4.3.4 deepmerge-ts: - specifier: ^4.2.2 - version: 4.2.2 + specifier: ^4.3.0 + version: 4.3.0 devalue: specifier: ^4.3.2 version: 4.3.2 @@ -557,11 +557,11 @@ importers: specifier: ^5.1.0 version: 5.1.0 es-module-lexer: - specifier: ^1.1.0 - version: 1.1.1 + specifier: ^1.3.0 + version: 1.3.0 esbuild: - specifier: ^0.17.18 - version: 0.17.18 + specifier: ^0.17.19 + version: 0.17.19 estree-walker: specifier: 3.0.0 version: 3.0.0 @@ -569,8 +569,8 @@ importers: specifier: ^6.1.0 version: 6.1.0 fast-glob: - specifier: ^3.2.11 - version: 3.2.11 + specifier: ^3.2.12 + version: 3.2.12 github-slugger: specifier: ^2.0.0 version: 2.0.0 @@ -593,8 +593,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ora: - specifier: ^6.1.0 - version: 6.1.0 + specifier: ^6.3.1 + version: 6.3.1 p-limit: specifier: ^4.0.0 version: 4.0.0 @@ -611,8 +611,8 @@ importers: specifier: ^12.0.1 version: 12.0.1 semver: - specifier: ^7.3.8 - version: 7.3.8 + specifier: ^7.5.2 + version: 7.5.2 server-destroy: specifier: ^1.0.1 version: 1.0.1 @@ -626,8 +626,8 @@ importers: specifier: ^5.1.2 version: 5.1.2 strip-ansi: - specifier: ^7.0.1 - version: 7.0.1 + specifier: ^7.1.0 + version: 7.1.0 supports-esm: specifier: ^1.0.0 version: 1.0.0 @@ -638,20 +638,20 @@ importers: specifier: '*' version: 5.0.2 unist-util-visit: - specifier: ^4.1.0 - version: 4.1.0 + specifier: ^4.1.2 + version: 4.1.2 vfile: - specifier: ^5.3.2 - version: 5.3.2 + specifier: ^5.3.7 + version: 5.3.7 vite: - specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + specifier: ^4.3.9 + version: 4.3.9(@types/node@18.16.18)(sass@1.63.4) vitefu: specifier: ^0.2.4 - version: 0.2.4(vite@4.3.1) + version: 0.2.4(vite@4.3.9) yargs-parser: - specifier: ^21.0.1 - version: 21.0.1 + specifier: ^21.1.1 + version: 21.1.1 zod: specifier: ^3.20.6 version: 3.20.6 @@ -663,11 +663,11 @@ importers: specifier: ^7.6.4 version: 7.6.4 '@types/babel__traverse': - specifier: ^7.17.1 - version: 7.17.1 + specifier: ^7.20.1 + version: 7.20.1 '@types/chai': - specifier: ^4.3.1 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 '@types/common-ancestor-path': specifier: ^1.0.0 version: 1.0.0 @@ -678,11 +678,11 @@ importers: specifier: ^0.5.1 version: 0.5.1 '@types/debug': - specifier: ^4.1.7 - version: 4.1.7 + specifier: ^4.1.8 + version: 4.1.8 '@types/diff': - specifier: ^5.0.2 - version: 5.0.2 + specifier: ^5.0.3 + version: 5.0.3 '@types/estree': specifier: ^0.0.51 version: 0.0.51 @@ -702,11 +702,11 @@ importers: specifier: ^9.1.1 version: 9.1.1 '@types/prettier': - specifier: ^2.6.3 - version: 2.6.3 + specifier: ^2.7.3 + version: 2.7.3 '@types/prompts': - specifier: ^2.0.14 - version: 2.0.14 + specifier: ^2.4.4 + version: 2.4.4 '@types/resolve': specifier: ^1.20.2 version: 1.20.2 @@ -726,23 +726,23 @@ importers: specifier: workspace:* version: link:../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 eol: specifier: ^0.9.1 version: 0.9.1 memfs: - specifier: ^3.4.7 - version: 3.4.7 + specifier: ^3.5.3 + version: 3.5.3 mocha: specifier: ^9.2.2 version: 9.2.2 node-mocks-http: - specifier: ^1.11.0 - version: 1.11.0 + specifier: ^1.12.2 + version: 1.12.2 rehype-autolink-headings: specifier: ^6.1.1 version: 6.1.1 @@ -756,11 +756,11 @@ importers: specifier: ^0.1.2 version: 0.1.2 rollup: - specifier: ^3.9.0 - version: 3.20.1 + specifier: ^3.25.1 + version: 3.25.1 sass: - specifier: ^1.52.2 - version: 1.52.2 + specifier: ^1.63.4 + version: 1.63.4 sharp: specifier: ^0.32.1 version: 0.32.1 @@ -768,8 +768,8 @@ importers: specifier: ^1.1.0 version: 1.1.0 undici: - specifier: ^5.22.0 - version: 5.22.0 + specifier: ^5.22.1 + version: 5.22.1 unified: specifier: ^10.1.2 version: 10.1.2 @@ -777,8 +777,8 @@ importers: packages/astro-prism: dependencies: prismjs: - specifier: ^1.28.0 - version: 1.28.0 + specifier: ^1.29.0 + version: 1.29.0 devDependencies: '@types/prismjs': specifier: 1.26.0 @@ -790,15 +790,15 @@ importers: packages/astro-rss: dependencies: fast-xml-parser: - specifier: ^4.0.8 - version: 4.0.8 + specifier: ^4.2.4 + version: 4.2.4 kleur: specifier: ^4.1.5 version: 4.1.5 devDependencies: '@types/chai': - specifier: ^4.3.1 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 '@types/chai-as-promised': specifier: ^7.1.5 version: 7.1.5 @@ -812,14 +812,14 @@ importers: specifier: workspace:* version: link:../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 chai-as-promised: specifier: ^7.1.1 - version: 7.1.1(chai@4.3.6) + version: 7.1.1(chai@4.3.7) chai-xml: - specifier: ^0.4.0 - version: 0.4.0(chai@4.3.6) + specifier: ^0.4.1 + version: 0.4.1(chai@4.3.7) mocha: specifier: ^9.2.2 version: 9.2.2 @@ -842,8 +842,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/e2e/fixtures/astro-envs: dependencies: @@ -854,14 +854,14 @@ importers: specifier: workspace:* version: link:../../.. vue: - specifier: ^3.2.40 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/e2e/fixtures/client-only: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -869,14 +869,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/preact': specifier: workspace:* @@ -933,8 +933,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/e2e/fixtures/error-sass: dependencies: @@ -942,8 +942,8 @@ importers: specifier: workspace:* version: link:../../.. sass: - specifier: ^1.52.2 - version: 1.52.2 + specifier: ^1.63.4 + version: 1.63.4 packages/astro/e2e/fixtures/errors: dependencies: @@ -966,8 +966,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -975,14 +975,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.5.6 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.50.1 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/e2e/fixtures/hydration-race: dependencies: @@ -993,8 +993,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/e2e/fixtures/invalidate-script-deps: devDependencies: @@ -1014,8 +1014,8 @@ importers: specifier: workspace:* version: link:../../.. lit: - specifier: ^2.7.0 - version: 2.7.4 + specifier: ^2.7.5 + version: 2.7.5 packages/astro/e2e/fixtures/multiple-frameworks: dependencies: @@ -1023,11 +1023,11 @@ importers: specifier: ^0.2.1 version: 0.2.1 lit: - specifier: ^2.7.0 - version: 2.7.4 + specifier: ^2.7.5 + version: 2.7.5 preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -1035,14 +1035,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/lit': specifier: workspace:* @@ -1069,8 +1069,8 @@ importers: packages/astro/e2e/fixtures/namespaced-component: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 devDependencies: '@astrojs/mdx': specifier: workspace:* @@ -1085,8 +1085,8 @@ importers: packages/astro/e2e/fixtures/nested-in-preact: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -1094,14 +1094,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/preact': specifier: workspace:* @@ -1125,8 +1125,8 @@ importers: packages/astro/e2e/fixtures/nested-in-react: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -1134,14 +1134,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/preact': specifier: workspace:* @@ -1165,8 +1165,8 @@ importers: packages/astro/e2e/fixtures/nested-in-solid: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -1174,14 +1174,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/preact': specifier: workspace:* @@ -1205,8 +1205,8 @@ importers: packages/astro/e2e/fixtures/nested-in-svelte: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -1214,14 +1214,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/preact': specifier: workspace:* @@ -1245,8 +1245,8 @@ importers: packages/astro/e2e/fixtures/nested-in-vue: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -1254,14 +1254,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/preact': specifier: workspace:* @@ -1285,8 +1285,8 @@ importers: packages/astro/e2e/fixtures/nested-recursive: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -1294,14 +1294,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.36 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/preact': specifier: workspace:* @@ -1353,8 +1353,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/e2e/fixtures/preact-component: dependencies: @@ -1368,8 +1368,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/e2e/fixtures/react-component: dependencies: @@ -1399,8 +1399,8 @@ importers: version: link:../../.. devDependencies: solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/astro/e2e/fixtures/solid-component: dependencies: @@ -1414,8 +1414,8 @@ importers: specifier: workspace:* version: link:../../.. solid-js: - specifier: ^1.5.5 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/astro/e2e/fixtures/solid-recurse: dependencies: @@ -1427,8 +1427,8 @@ importers: version: link:../../.. devDependencies: solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/astro/e2e/fixtures/svelte-component: dependencies: @@ -1442,8 +1442,8 @@ importers: specifier: workspace:* version: link:../../.. svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/e2e/fixtures/tailwindcss: dependencies: @@ -1455,10 +1455,10 @@ importers: version: link:../../.. autoprefixer: specifier: ^10.4.14 - version: 10.4.14(postcss@8.4.23) + version: 10.4.14(postcss@8.4.24) postcss: - specifier: ^8.4.23 - version: 8.4.23 + specifier: ^8.4.24 + version: 8.4.24 tailwindcss: specifier: ^3.3.2 version: 3.3.2 @@ -1490,8 +1490,8 @@ importers: specifier: workspace:* version: link:../../.. vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/performance: devDependencies: @@ -1508,8 +1508,8 @@ importers: specifier: ^4.1.5 version: 4.1.5 yargs-parser: - specifier: ^21.0.1 - version: 21.0.1 + specifier: ^21.1.1 + version: 21.1.1 packages/astro/performance/fixtures/md: dependencies: @@ -1520,11 +1520,11 @@ importers: specifier: workspace:* version: link:../utils '@types/react': - specifier: ^18.0.21 - version: 18.2.5 + specifier: ^18.2.13 + version: 18.2.13 '@types/react-dom': - specifier: ^18.0.6 - version: 18.2.3 + specifier: ^18.2.6 + version: 18.2.6 astro: specifier: workspace:* version: link:../../.. @@ -1547,11 +1547,11 @@ importers: specifier: workspace:* version: link:../utils '@types/react': - specifier: ^18.0.21 - version: 18.2.5 + specifier: ^18.2.13 + version: 18.2.13 '@types/react-dom': - specifier: ^18.0.6 - version: 18.2.3 + specifier: ^18.2.6 + version: 18.2.6 astro: specifier: workspace:* version: link:../../.. @@ -1574,11 +1574,11 @@ importers: specifier: workspace:* version: link:../utils '@types/react': - specifier: ^18.0.21 - version: 18.2.5 + specifier: ^18.2.13 + version: 18.2.13 '@types/react-dom': - specifier: ^18.0.6 - version: 18.2.3 + specifier: ^18.2.6 + version: 18.2.6 astro: specifier: workspace:* version: link:../../.. @@ -1622,11 +1622,11 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/alias: dependencies: @@ -1637,8 +1637,8 @@ importers: specifier: workspace:* version: link:../../.. svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/test/fixtures/alias-tsconfig: dependencies: @@ -1652,8 +1652,8 @@ importers: specifier: workspace:* version: link:../../.. svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/test/fixtures/alias-tsconfig-baseurl-only: dependencies: @@ -1664,8 +1664,8 @@ importers: specifier: workspace:* version: link:../../.. svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/test/fixtures/alias-tsconfig/deps/namespace-package: {} @@ -1732,8 +1732,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/astro-check-errors: dependencies: @@ -1768,14 +1768,14 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/astro-class-list: dependencies: @@ -1804,8 +1804,8 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/test/fixtures/astro-client-only/pkg: {} @@ -1890,8 +1890,8 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/test/fixtures/astro-envs: dependencies: @@ -1902,8 +1902,8 @@ importers: specifier: workspace:* version: link:../../.. vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/astro-expr: dependencies: @@ -1914,8 +1914,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/astro-external-files: dependencies: @@ -1932,8 +1932,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/astro-generator: dependencies: @@ -1986,14 +1986,14 @@ importers: specifier: workspace:* version: link:../../.. mdast-util-to-string: - specifier: ^3.1.0 - version: 3.1.0 + specifier: ^3.2.0 + version: 3.2.0 reading-time: specifier: ^1.5.0 version: 1.5.0 unist-util-visit: - specifier: ^4.1.0 - version: 4.1.0 + specifier: ^4.1.2 + version: 4.1.2 packages/astro/test/fixtures/astro-markdown-plugins: dependencies: @@ -2148,8 +2148,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/astro-slots: dependencies: @@ -2178,8 +2178,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.13.2 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.2.0 version: 18.2.0 @@ -2187,14 +2187,14 @@ importers: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.7.4 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.58.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.47 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/before-hydration: dependencies: @@ -2205,8 +2205,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/build-assets: dependencies: @@ -2217,8 +2217,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/client-address: dependencies: @@ -2250,8 +2250,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.13.2 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -2259,14 +2259,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) svelte: - specifier: ^3.58.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/test/fixtures/component-library-shared: dependencies: preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.2.0 version: 18.2.0 @@ -2579,8 +2579,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/error-bad-js: dependencies: @@ -2615,14 +2615,14 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/fontsource-package: dependencies: @@ -2693,8 +2693,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/import-ts-with-js: dependencies: @@ -2732,8 +2732,8 @@ importers: packages/astro/test/fixtures/jsx: dependencies: preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -2741,14 +2741,14 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.4.3 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.36 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@astrojs/preact': specifier: workspace:* @@ -2778,8 +2778,8 @@ importers: specifier: workspace:* version: link:../../.. solid-js: - specifier: ^1.5.6 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/astro/test/fixtures/lazy-layout: dependencies: @@ -2799,8 +2799,8 @@ importers: specifier: workspace:* version: link:../../.. lit: - specifier: ^2.7.0 - version: 2.7.4 + specifier: ^2.7.5 + version: 2.7.5 packages/astro/test/fixtures/markdown: dependencies: @@ -2900,23 +2900,23 @@ importers: version: link:../../.. autoprefixer: specifier: ^10.4.14 - version: 10.4.14(postcss@8.4.23) + version: 10.4.14(postcss@8.4.24) postcss: - specifier: ^8.4.23 - version: 8.4.23 + specifier: ^8.4.24 + version: 8.4.24 solid-js: - specifier: ^1.5.6 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: postcss-preset-env: - specifier: ^7.7.1 - version: 7.7.1(postcss@8.4.23) + specifier: ^7.8.3 + version: 7.8.3(postcss@8.4.24) packages/astro/test/fixtures/preact-compat-component: dependencies: @@ -2930,8 +2930,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.10.1 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/preact-compat-component/packages/react-lib: dependencies: @@ -2946,13 +2946,13 @@ importers: version: link:../../../../integrations/preact '@preact/signals': specifier: 1.1.1 - version: 1.1.1(preact@10.13.2) + version: 1.1.1(preact@10.15.1) astro: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/public-base-404: dependencies: @@ -2978,8 +2978,8 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) solid-js: - specifier: ^1.5.6 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/astro/test/fixtures/react-component: dependencies: @@ -2999,8 +2999,8 @@ importers: specifier: ^18.1.0 version: 18.2.0(react@18.2.0) vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/react-jsx-export: dependencies: @@ -3027,8 +3027,8 @@ importers: specifier: 'workspace:' version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/remote-css: dependencies: @@ -3078,8 +3078,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/slots-react: dependencies: @@ -3111,8 +3111,8 @@ importers: specifier: workspace:* version: link:../../.. solid-js: - specifier: ^1.5.6 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/astro/test/fixtures/slots-svelte: dependencies: @@ -3126,8 +3126,8 @@ importers: specifier: workspace:* version: link:../../.. svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/test/fixtures/slots-vue: dependencies: @@ -3141,8 +3141,8 @@ importers: specifier: workspace:* version: link:../../.. vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/solid-component: dependencies: @@ -3150,8 +3150,8 @@ importers: specifier: workspace:* version: link:../../../../integrations/solid '@solidjs/router': - specifier: ^0.5.0 - version: 0.5.0(solid-js@1.7.4) + specifier: ^0.5.1 + version: 0.5.1(solid-js@1.7.6) '@test/solid-jsx-component': specifier: file:./deps/solid-jsx-component version: file:packages/astro/test/fixtures/solid-component/deps/solid-jsx-component @@ -3159,14 +3159,14 @@ importers: specifier: workspace:* version: link:../../.. solid-js: - specifier: ^1.5.6 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/astro/test/fixtures/solid-component/deps/solid-jsx-component: dependencies: solid-js: - specifier: ^1.5.6 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/astro/test/fixtures/sourcemap: dependencies: @@ -3243,8 +3243,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/ssr-hoisted-script: dependencies: @@ -3336,8 +3336,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/ssr-split-manifest: dependencies: @@ -3357,8 +3357,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/astro/test/fixtures/static-build-code-component: dependencies: @@ -3384,8 +3384,8 @@ importers: specifier: workspace:* version: link:../../.. preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 react: specifier: ^18.1.0 version: 18.2.0 @@ -3434,8 +3434,8 @@ importers: specifier: workspace:* version: link:../../.. svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/astro/test/fixtures/tailwindcss: dependencies: @@ -3450,10 +3450,10 @@ importers: version: link:../../.. autoprefixer: specifier: ^10.4.14 - version: 10.4.14(postcss@8.4.23) + version: 10.4.14(postcss@8.4.24) postcss: - specifier: ^8.4.23 - version: 8.4.23 + specifier: ^8.4.24 + version: 8.4.24 tailwindcss: specifier: ^3.3.2 version: 3.3.2 @@ -3467,8 +3467,8 @@ importers: specifier: workspace:* version: link:../../.. postcss: - specifier: ^8.4.23 - version: 8.4.23 + specifier: ^8.4.24 + version: 8.4.24 tailwindcss: specifier: ^3.3.2 version: 3.3.2 @@ -3479,8 +3479,8 @@ importers: specifier: workspace:* version: link:../../.. astro-embed: - specifier: ^0.1.1 - version: 0.1.1(astro@packages+astro) + specifier: ^0.1.3 + version: 0.1.3(astro@packages+astro) packages/astro/test/fixtures/type-imports: dependencies: @@ -3509,8 +3509,8 @@ importers: specifier: workspace:* version: link:../../.. vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/vue-jsx: dependencies: @@ -3521,8 +3521,8 @@ importers: specifier: workspace:* version: link:../../.. vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/vue-with-multi-renderer: dependencies: @@ -3536,11 +3536,11 @@ importers: specifier: workspace:* version: link:../../.. svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vue: - specifier: ^3.2.39 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/astro/test/fixtures/with-endpoint-routes: dependencies: @@ -3563,11 +3563,11 @@ importers: packages/create-astro: dependencies: '@astrojs/cli-kit': - specifier: ^0.2.2 - version: 0.2.2 + specifier: ^0.2.3 + version: 0.2.3 chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 execa: specifier: ^6.1.0 version: 6.1.0 @@ -3591,8 +3591,8 @@ importers: specifier: workspace:* version: link:../../scripts strip-ansi: - specifier: ^7.0.1 - version: 7.0.1 + specifier: ^7.1.0 + version: 7.1.0 strip-json-comments: specifier: ^5.0.0 version: 5.0.0 @@ -3620,8 +3620,8 @@ importers: specifier: ^4.20230518.0 version: 4.20230518.0 esbuild: - specifier: ^0.17.12 - version: 0.17.12 + specifier: ^0.17.19 + version: 0.17.19 tiny-glob: specifier: ^0.2.9 version: 0.2.9 @@ -3633,11 +3633,11 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -3696,8 +3696,8 @@ importers: specifier: workspace:* version: link:../../../../../astro solid-js: - specifier: '*' - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/integrations/deno: dependencies: @@ -3748,8 +3748,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 http-cache-semantics: - specifier: ^4.1.0 - version: 4.1.0 + specifier: ^4.1.1 + version: 4.1.1 image-size: specifier: ^1.0.2 version: 1.0.2 @@ -3776,14 +3776,14 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 fast-glob: - specifier: ^3.2.11 - version: 3.2.11 + specifier: ^3.2.12 + version: 3.2.12 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -3794,8 +3794,8 @@ importers: specifier: ^0.32.1 version: 0.32.1 vite: - specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + specifier: ^4.3.9 + version: 4.3.9(@types/node@18.16.18)(sass@1.63.4) packages/integrations/image/test/fixtures/assets-prefix: dependencies: @@ -3941,8 +3941,8 @@ importers: packages/integrations/lit: dependencies: '@lit-labs/ssr': - specifier: ^3.1.3 - version: 3.1.3 + specifier: ^3.1.4 + version: 3.1.4 '@lit-labs/ssr-client': specifier: ^1.1.2 version: 1.1.2 @@ -3960,11 +3960,11 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 lit: specifier: ^2.7.5 version: 2.7.5 @@ -3972,8 +3972,8 @@ importers: specifier: ^9.2.2 version: 9.2.2 sass: - specifier: ^1.52.2 - version: 1.52.2 + specifier: ^1.63.4 + version: 1.63.4 packages/integrations/markdoc: dependencies: @@ -3984,8 +3984,8 @@ importers: specifier: ^0.3.0 version: 0.3.0 esbuild: - specifier: ^0.17.12 - version: 0.17.12 + specifier: ^0.17.19 + version: 0.17.19 github-slugger: specifier: ^2.0.0 version: 2.0.0 @@ -4006,8 +4006,8 @@ importers: specifier: ^2.2.1 version: link:../../markdown/remark '@types/chai': - specifier: ^4.3.1 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 '@types/html-escaper': specifier: ^3.0.0 version: 3.0.0 @@ -4021,23 +4021,23 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 devalue: specifier: ^4.3.2 version: 4.3.2 linkedom: - specifier: ^0.14.12 - version: 0.14.17 + specifier: ^0.14.26 + version: 0.14.26 mocha: specifier: ^9.2.2 version: 9.2.2 rollup: - specifier: ^3.20.1 - version: 3.20.1 + specifier: ^3.25.1 + version: 3.25.1 vite: - specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + specifier: ^4.3.9 + version: 4.3.9(@types/node@18.16.18)(sass@1.63.4) packages/integrations/markdoc/test/fixtures/content-collections: dependencies: @@ -4145,17 +4145,17 @@ importers: specifier: ^2.3.0 version: 2.3.0 acorn: - specifier: ^8.8.0 - version: 8.8.2 + specifier: ^8.9.0 + version: 8.9.0 es-module-lexer: - specifier: ^1.1.1 - version: 1.1.1 + specifier: ^1.3.0 + version: 1.3.0 estree-util-visit: - specifier: ^1.2.0 - version: 1.2.0 + specifier: ^1.2.1 + version: 1.2.1 github-slugger: - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.5.0 + version: 1.5.0 gray-matter: specifier: ^4.0.3 version: 4.0.3 @@ -4184,24 +4184,24 @@ importers: specifier: ^0.7.4 version: 0.7.4 unist-util-visit: - specifier: ^4.1.0 - version: 4.1.0 + specifier: ^4.1.2 + version: 4.1.2 vfile: - specifier: ^5.3.2 - version: 5.3.2 + specifier: ^5.3.7 + version: 5.3.7 devDependencies: '@types/chai': - specifier: ^4.3.1 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 '@types/estree': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 '@types/github-slugger': specifier: ^1.3.0 version: 1.3.0 '@types/mdast': - specifier: ^3.0.10 - version: 3.0.10 + specifier: ^3.0.11 + version: 3.0.11 '@types/mocha': specifier: ^9.1.1 version: 9.1.1 @@ -4215,20 +4215,20 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 linkedom: - specifier: ^0.14.12 - version: 0.14.17 + specifier: ^0.14.26 + version: 0.14.26 mdast-util-mdx: - specifier: ^2.0.0 - version: 2.0.0 + specifier: ^2.0.1 + version: 2.0.1 mdast-util-to-string: - specifier: ^3.1.0 - version: 3.1.0 + specifier: ^3.2.0 + version: 3.2.0 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -4248,14 +4248,14 @@ importers: specifier: ^10.1.0 version: 10.1.0 remark-shiki-twoslash: - specifier: ^3.1.0 - version: 3.1.0 + specifier: ^3.1.3 + version: 3.1.3(typescript@5.0.2) remark-toc: specifier: ^8.0.1 version: 8.0.1 vite: - specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + specifier: ^4.3.9 + version: 4.3.9(@types/node@18.16.18)(sass@1.63.4) packages/integrations/mdx/test/fixtures/css-head-mdx: dependencies: @@ -4278,14 +4278,14 @@ importers: specifier: workspace:* version: link:../../../../../astro mdast-util-to-string: - specifier: ^3.1.0 - version: 3.1.0 + specifier: ^3.2.0 + version: 3.2.0 reading-time: specifier: ^1.5.0 version: 1.5.0 unist-util-visit: - specifier: ^4.1.0 - version: 4.1.0 + specifier: ^4.1.2 + version: 4.1.2 packages/integrations/mdx/test/fixtures/mdx-images: dependencies: @@ -4314,8 +4314,8 @@ importers: specifier: workspace:* version: link:../../../../../astro preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/integrations/mdx/test/fixtures/mdx-namespace: dependencies: @@ -4395,8 +4395,8 @@ importers: specifier: ^2.2.0 version: link:../../webapi '@netlify/functions': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.6.0 + version: 1.6.0 esbuild: specifier: ^0.15.18 version: 0.15.18 @@ -4408,8 +4408,8 @@ importers: specifier: ^0.34.1 version: 0.34.1 '@types/node': - specifier: ^14.18.20 - version: 14.18.21 + specifier: ^14.18.51 + version: 14.18.51 astro: specifier: workspace:* version: link:../../astro @@ -4417,17 +4417,17 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 mocha: specifier: ^9.2.2 version: 9.2.2 vite: - specifier: ^4.3.1 - version: 4.3.1(@types/node@14.18.21) + specifier: ^4.3.9 + version: 4.3.9(@types/node@14.18.51) packages/integrations/netlify/test/edge-functions/fixtures/dynimport: dependencies: @@ -4487,8 +4487,8 @@ importers: version: 1.0.1 devDependencies: '@types/node': - specifier: ^18.7.21 - version: 18.16.3 + specifier: ^18.16.18 + version: 18.16.18 '@types/send': specifier: ^0.17.1 version: 0.17.1 @@ -4502,20 +4502,20 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 mocha: specifier: ^9.2.2 version: 9.2.2 node-mocks-http: - specifier: ^1.11.0 - version: 1.11.0 + specifier: ^1.12.2 + version: 1.12.2 undici: - specifier: ^5.22.0 - version: 5.22.0 + specifier: ^5.22.1 + version: 5.22.1 packages/integrations/node/test/fixtures/api-route: dependencies: @@ -4610,11 +4610,11 @@ importers: packages/integrations/partytown: dependencies: '@builder.io/partytown': - specifier: ^0.7.4 - version: 0.7.4 + specifier: ^0.7.6 + version: 0.7.6 mrmime: - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 devDependencies: astro: specifier: workspace:* @@ -4626,20 +4626,20 @@ importers: packages/integrations/preact: dependencies: '@babel/core': - specifier: '>=7.0.0-0 <8.0.0' - version: 7.18.2 + specifier: ^7.22.5 + version: 7.22.5 '@babel/plugin-transform-react-jsx': - specifier: ^7.17.12 - version: 7.17.12(@babel/core@7.18.2) + specifier: ^7.22.5 + version: 7.22.5(@babel/core@7.22.5) '@preact/signals': - specifier: ^1.1.0 - version: 1.1.1(preact@10.13.2) + specifier: ^1.1.3 + version: 1.1.3(preact@10.15.1) 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.13.2) + specifier: ^5.2.6 + version: 5.2.6(preact@10.15.1) devDependencies: astro: specifier: workspace:* @@ -4648,8 +4648,8 @@ importers: specifier: workspace:* version: link:../../../scripts preact: - specifier: ^10.7.3 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 packages/integrations/prefetch: dependencies: @@ -4661,8 +4661,8 @@ importers: specifier: ^1.29.2 version: 1.29.2 '@types/chai': - specifier: ^4.3.1 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 '@types/chai-as-promised': specifier: ^7.1.5 version: 7.1.5 @@ -4700,18 +4700,18 @@ importers: packages/integrations/react: dependencies: '@babel/core': - specifier: '>=7.0.0-0 <8.0.0' - version: 7.18.2 + specifier: ^7.22.5 + version: 7.22.5 '@babel/plugin-transform-react-jsx': - specifier: ^7.17.12 - version: 7.17.12(@babel/core@7.18.2) + specifier: ^7.22.5 + version: 7.22.5(@babel/core@7.22.5) devDependencies: '@types/react': - specifier: ^17.0.45 - version: 17.0.45 + specifier: ^17.0.62 + version: 17.0.62 '@types/react-dom': - specifier: ^17.0.17 - version: 17.0.17 + specifier: ^17.0.20 + version: 17.0.20 astro: specifier: workspace:* version: link:../../astro @@ -4744,8 +4744,8 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -4783,11 +4783,11 @@ importers: packages/integrations/solid: dependencies: babel-preset-solid: - specifier: ^1.4.2 - version: 1.4.2 + specifier: ^1.7.4 + version: 1.7.4 vitefu: specifier: ^0.2.4 - version: 0.2.4(vite@4.3.1) + version: 0.2.4(vite@4.3.9) devDependencies: astro: specifier: workspace:* @@ -4796,17 +4796,17 @@ importers: specifier: workspace:* version: link:../../../scripts solid-js: - specifier: ^1.5.1 - version: 1.7.4 + specifier: ^1.7.6 + version: 1.7.6 packages/integrations/svelte: dependencies: '@sveltejs/vite-plugin-svelte': specifier: ^2.4.1 - version: 2.4.1(svelte@3.58.0)(vite@4.3.1) + version: 2.4.1(svelte@3.59.1)(vite@4.3.9) svelte2tsx: specifier: ^0.6.15 - version: 0.6.15(svelte@3.58.0)(typescript@5.0.2) + version: 0.6.15(svelte@3.59.1)(typescript@5.0.2) devDependencies: astro: specifier: workspace:* @@ -4815,11 +4815,11 @@ importers: specifier: workspace:* version: link:../../../scripts svelte: - specifier: ^3.55.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 vite: - specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + specifier: ^4.3.9 + version: 4.3.9(@types/node@18.16.18)(sass@1.63.4) packages/integrations/tailwind: dependencies: @@ -4843,8 +4843,8 @@ importers: specifier: ^3.3.2 version: 3.3.2 vite: - specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + specifier: ^4.3.9 + version: 4.3.9(@types/node@18.16.18)(sass@1.63.4) packages/integrations/turbolinks: dependencies: @@ -4868,23 +4868,23 @@ importers: specifier: ^2.2.0 version: link:../../webapi '@vercel/analytics': - specifier: ^0.1.8 - version: 0.1.8 + specifier: ^0.1.11 + version: 0.1.11 '@vercel/nft': - specifier: ^0.22.1 - version: 0.22.1 + specifier: ^0.22.6 + version: 0.22.6 esbuild: - specifier: ^0.17.12 - version: 0.17.12 + specifier: ^0.17.19 + version: 0.17.19 fast-glob: - specifier: ^3.2.11 - version: 3.2.11 + specifier: ^3.2.12 + version: 3.2.12 set-cookie-parser: - specifier: ^2.5.1 - version: 2.5.1 + specifier: ^2.6.0 + version: 2.6.0 web-vitals: - specifier: ^3.1.1 - version: 3.1.1 + specifier: ^3.3.2 + version: 3.3.2 devDependencies: '@types/set-cookie-parser': specifier: ^2.4.2 @@ -4896,11 +4896,11 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -4944,21 +4944,21 @@ importers: packages/integrations/vue: dependencies: '@vitejs/plugin-vue': - specifier: ^4.0.0 - version: 4.0.0(vite@4.3.1)(vue@3.2.47) + specifier: ^4.2.3 + version: 4.2.3(vite@4.3.9)(vue@3.3.4) '@vitejs/plugin-vue-jsx': - specifier: ^3.0.0 - version: 3.0.0(vite@4.3.1)(vue@3.2.47) + specifier: ^3.0.1 + version: 3.0.1(vite@4.3.9)(vue@3.3.4) '@vue/babel-plugin-jsx': specifier: ^1.1.1 - version: 1.1.1 + version: 1.1.1(@babel/core@7.22.5) '@vue/compiler-sfc': - specifier: ^3.2.39 - version: 3.2.39 + specifier: ^3.3.4 + version: 3.3.4 devDependencies: '@types/chai': - specifier: ^4.3.3 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 astro: specifier: workspace:* version: link:../../astro @@ -4966,20 +4966,20 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 linkedom: - specifier: ^0.14.17 - version: 0.14.17 + specifier: ^0.14.26 + version: 0.14.26 mocha: specifier: ^9.2.2 version: 9.2.2 vite: - specifier: ^4.3.1 - version: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + specifier: ^4.3.9 + version: 4.3.9(@types/node@18.16.18)(sass@1.63.4) vue: - specifier: ^3.2.37 - version: 3.2.47 + specifier: ^3.3.4 + version: 3.3.4 packages/integrations/vue/test/fixtures/app-entrypoint: dependencies: @@ -5005,14 +5005,14 @@ importers: specifier: workspace:* version: link:../../astro chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 cheerio: - specifier: ^1.0.0-rc.11 - version: 1.0.0-rc.11 + specifier: 1.0.0-rc.12 + version: 1.0.0-rc.12 github-slugger: - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.5.0 + version: 1.5.0 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -5044,11 +5044,11 @@ importers: specifier: workspace:* version: link:../../../../../astro preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 packages/markdown/component/test/fixtures/astro-markdown-plugins: dependencies: @@ -5065,8 +5065,8 @@ importers: specifier: ^5.0.2 version: 5.0.5 preact: - specifier: ^10.11.0 - version: 10.13.2 + specifier: ^10.15.1 + version: 10.15.1 rehype-slug: specifier: ^5.0.1 version: 5.1.0 @@ -5149,11 +5149,11 @@ importers: specifier: ^2.1.2 version: link:../../astro-prism github-slugger: - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.5.0 + version: 1.5.0 import-meta-resolve: - specifier: ^2.1.0 - version: 2.1.0 + specifier: ^2.2.2 + version: 2.2.2 rehype-raw: specifier: ^6.1.1 version: 6.1.1 @@ -5164,8 +5164,8 @@ importers: specifier: ^3.0.1 version: 3.0.1 remark-parse: - specifier: ^10.0.1 - version: 10.0.1 + specifier: ^10.0.2 + version: 10.0.2 remark-rehype: specifier: ^10.1.0 version: 10.1.0 @@ -5179,18 +5179,18 @@ importers: specifier: ^10.1.2 version: 10.1.2 unist-util-visit: - specifier: ^4.1.0 - version: 4.1.0 + specifier: ^4.1.2 + version: 4.1.2 vfile: - specifier: ^5.3.2 - version: 5.3.2 + specifier: ^5.3.7 + version: 5.3.7 devDependencies: '@types/chai': - specifier: ^4.3.1 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 '@types/estree': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 '@types/github-slugger': specifier: ^1.3.0 version: 1.3.0 @@ -5198,8 +5198,8 @@ importers: specifier: ^2.3.4 version: 2.3.4 '@types/mdast': - specifier: ^3.0.10 - version: 3.0.10 + specifier: ^3.0.11 + version: 3.0.11 '@types/mocha': specifier: ^9.1.1 version: 9.1.1 @@ -5210,11 +5210,11 @@ importers: specifier: workspace:* version: link:../../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 mdast-util-mdx-expression: - specifier: ^1.3.1 - version: 1.3.1 + specifier: ^1.3.2 + version: 1.3.2 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -5222,8 +5222,8 @@ importers: packages/telemetry: dependencies: ci-info: - specifier: ^3.3.1 - version: 3.3.1 + specifier: ^3.8.0 + version: 3.8.0 debug: specifier: ^4.3.4 version: 4.3.4 @@ -5240,21 +5240,21 @@ importers: specifier: ^2.2.0 version: 2.2.0 undici: - specifier: ^5.22.0 - version: 5.22.0 + specifier: ^5.22.1 + version: 5.22.1 which-pm-runs: specifier: ^1.1.0 version: 1.1.0 devDependencies: '@types/debug': - specifier: ^4.1.7 - version: 4.1.7 + specifier: ^4.1.8 + version: 4.1.8 '@types/dlv': specifier: ^1.1.2 version: 1.1.2 '@types/node': - specifier: ^18.7.21 - version: 18.16.3 + specifier: ^18.16.18 + version: 18.16.18 '@types/which-pm-runs': specifier: ^1.0.0 version: 1.0.0 @@ -5262,8 +5262,8 @@ importers: specifier: workspace:* version: link:../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -5271,8 +5271,8 @@ importers: packages/underscore-redirects: devDependencies: '@types/chai': - specifier: ^4.3.1 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 '@types/mocha': specifier: ^9.1.1 version: 9.1.1 @@ -5283,8 +5283,8 @@ importers: specifier: workspace:* version: link:../../scripts chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 mocha: specifier: ^9.2.2 version: 9.2.2 @@ -5292,8 +5292,8 @@ importers: packages/webapi: dependencies: undici: - specifier: ^5.22.0 - version: 5.22.0 + specifier: ^5.22.1 + version: 5.22.1 devDependencies: '@rollup/plugin-alias': specifier: ^3.1.9 @@ -5305,23 +5305,23 @@ importers: specifier: ^13.3.0 version: 13.3.0(rollup@2.79.1) '@rollup/plugin-typescript': - specifier: ^8.3.2 - version: 8.3.2(rollup@2.79.1)(tslib@2.5.0)(typescript@5.0.2) + specifier: ^8.5.0 + version: 8.5.0(rollup@2.79.1)(tslib@2.5.3)(typescript@5.0.2) '@types/chai': - specifier: ^4.3.1 - version: 4.3.3 + specifier: ^4.3.5 + version: 4.3.5 '@types/mocha': specifier: ^9.1.1 version: 9.1.1 '@types/node': - specifier: ^18.7.21 - version: 18.16.3 + specifier: ^18.16.18 + version: 18.16.18 '@ungap/structured-clone': specifier: ^0.3.4 version: 0.3.4 chai: - specifier: ^4.3.6 - version: 4.3.6 + specifier: ^4.3.7 + version: 4.3.7 event-target-shim: specifier: ^6.0.2 version: 6.0.2 @@ -5335,8 +5335,8 @@ importers: specifier: ^2.79.1 version: 2.79.1 tslib: - specifier: ^2.5.0 - version: 2.5.0 + specifier: ^2.5.3 + version: 2.5.3 typescript: specifier: ~5.0.2 version: 5.0.2 @@ -5353,8 +5353,8 @@ importers: specifier: ^5.0.2 version: 5.0.2 esbuild: - specifier: ^0.17.12 - version: 0.17.12 + specifier: ^0.17.19 + version: 0.17.19 globby: specifier: ^12.2.0 version: 12.2.0 @@ -5365,11 +5365,11 @@ importers: specifier: ^4.0.0 version: 4.0.0 svelte: - specifier: ^3.48.0 - version: 3.58.0 + specifier: ^3.59.1 + version: 3.59.1 tar: - specifier: ^6.1.11 - version: 6.1.11 + specifier: ^6.1.15 + version: 6.1.15 devDependencies: '@octokit/action': specifier: ^3.18.1 @@ -5378,8 +5378,8 @@ importers: specifier: ^7.0.0 version: 7.0.0 esbuild-plugin-copy: - specifier: ^2.0.2 - version: 2.0.2(esbuild@0.17.12) + specifier: ^2.1.1 + version: 2.1.1(esbuild@0.17.19) execa: specifier: ^6.1.0 version: 6.1.0 @@ -5455,15 +5455,6 @@ packages: lite-vimeo-embed: 0.1.0 dev: false - /@astro-community/astro-embed-youtube@0.1.2(astro@packages+astro): - resolution: {integrity: sha512-NYk9d8NG7/Qnvedr6uLUL2KCVZh9S428cxJHHOMWIQnoT8pE1eUSqCwCudPuKNdCV/mZUD/XTc5iopHz37ixCA==} - peerDependencies: - astro: '*' - dependencies: - astro: link:packages/astro - lite-youtube-embed: 0.2.0 - dev: false - /@astro-community/astro-embed-youtube@0.2.2(astro@packages+astro): resolution: {integrity: sha512-eGBVujUNOv6x2x/iXS7D/XWmlx69frLQKyYBW0zTFzzgDCeOuXkJ4TPMOdQHsttp2ZCvbqii8f27GoaTKHIa7g==} peerDependencies: @@ -5473,26 +5464,22 @@ packages: lite-youtube-embed: 0.2.0 dev: false - /@astrojs/cli-kit@0.2.2: - resolution: {integrity: sha512-9AniGN+jib2QMRAg4J8WYQxNhDld0zegrb7lig5oNkh1ReDa7rBxaKF9Tor31sjhnGISqavPkKKcQrEm53mzWg==} + /@astrojs/cli-kit@0.2.3: + resolution: {integrity: sha512-MjB42mpIG/F2rFtdp4f3NylFCILuFSib2yITSq65fRaDFn8+UC8EMh6T7Jr3YqHAbUY5r8V8QWNgH4keOEO2BA==} dependencies: chalk: 5.2.0 log-update: 5.0.1 sisteransi: 1.0.5 dev: false - /@astrojs/compiler@1.4.0: - resolution: {integrity: sha512-Vav3a32Ct+omowV9X9kDM2ghWAvFdjZkv5BdvBjZCKYbFVT6//IZApDIVbHI1UPuLuD2sKyLWx2T+E7clqUJdg==} - dev: false - - /@astrojs/compiler@1.4.2: - resolution: {integrity: sha512-xoRp7JpiMZPK/beUcZEM5kM44Z/h20wwwQcl54duPqQMyySG9vZ5xMM6dYiQmn7b3XzpZs0cT6TRDoJJ5gwHAQ==} + /@astrojs/compiler@1.5.0: + resolution: {integrity: sha512-k04X/7nlMklU0HQUScxbCTf5n8/Vr+0U0bawb9QWulWxd6qJf3FmBrNATgTYiltjB4pc5HBqmmttAfFi7m4lLg==} /@astrojs/language-server@1.0.0: resolution: {integrity: sha512-oEw7AwJmzjgy6HC9f5IdrphZ1GVgfV/+7xQuyf52cpTiRWd/tJISK3MsKP0cDkVlfodmNABNFnAaAWuLZEiiiA==} hasBin: true dependencies: - '@astrojs/compiler': 1.4.2 + '@astrojs/compiler': 1.5.0 '@jridgewell/trace-mapping': 0.3.18 '@vscode/emmet-helper': 2.8.8 events: 3.3.0 @@ -5508,54 +5495,36 @@ packages: vscode-uri: 3.0.7 dev: false - /@babel/code-frame@7.21.4: - resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==} + /@babel/code-frame@7.22.5: + resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.18.6 + '@babel/highlight': 7.22.5 /@babel/compat-data@7.21.7: resolution: {integrity: sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==} engines: {node: '>=6.9.0'} dev: false - /@babel/core@7.18.2: - resolution: {integrity: sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==} + /@babel/compat-data@7.22.5: + resolution: {integrity: sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==} engines: {node: '>=6.9.0'} - dependencies: - '@ampproject/remapping': 2.2.1 - '@babel/code-frame': 7.21.4 - '@babel/generator': 7.18.2 - '@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 - '@babel/types': 7.21.5 - convert-source-map: 1.9.0 - debug: 4.3.4 - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.0 - transitivePeerDependencies: - - supports-color dev: false - /@babel/core@7.21.8: - resolution: {integrity: sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==} + /@babel/core@7.22.5: + resolution: {integrity: sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 - '@babel/code-frame': 7.21.4 - '@babel/generator': 7.21.9 - '@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.9 - '@babel/template': 7.20.7 - '@babel/traverse': 7.21.5 - '@babel/types': 7.21.5 + '@babel/code-frame': 7.22.5 + '@babel/generator': 7.22.5 + '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) + '@babel/helper-module-transforms': 7.22.5 + '@babel/helpers': 7.22.5 + '@babel/parser': 7.22.5 + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.5 + '@babel/types': 7.22.5 convert-source-map: 1.9.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -5565,58 +5534,32 @@ packages: - supports-color dev: false - /@babel/generator@7.18.2: - resolution: {integrity: sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.21.5 - '@jridgewell/gen-mapping': 0.3.3 - jsesc: 2.5.2 - dev: false - - /@babel/generator@7.21.9: - resolution: {integrity: sha512-F3fZga2uv09wFdEjEQIJxXALXfz0+JaOb7SabvVMmjHxeVTuGW8wgE8Vp1Hd7O+zMTYtcfEISGRzPkeiaPPsvg==} + /@babel/generator@7.22.5: + resolution: {integrity: sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.18 jsesc: 2.5.2 dev: false - /@babel/helper-annotate-as-pure@7.18.6: - resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==} + /@babel/helper-annotate-as-pure@7.22.5: + resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 dev: false /@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/types': 7.21.5 - dev: false - - /@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 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/compat-data': 7.21.7 - '@babel/core': 7.18.2 - '@babel/helper-validator-option': 7.21.0 - browserslist: 4.21.5 - lru-cache: 5.1.1 - semver: 6.3.0 + '@babel/types': 7.22.5 dev: false - /@babel/helper-compilation-targets@7.21.5(@babel/core@7.21.8): - resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==} + /@babel/helper-compilation-targets@7.22.5(@babel/core@7.22.5): + resolution: {integrity: sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -5624,15 +5567,15 @@ packages: '@babel/core': optional: true dependencies: - '@babel/compat-data': 7.21.7 - '@babel/core': 7.21.8 - '@babel/helper-validator-option': 7.21.0 + '@babel/compat-data': 7.22.5 + '@babel/core': 7.22.5 + '@babel/helper-validator-option': 7.22.5 browserslist: 4.21.5 lru-cache: 5.1.1 semver: 6.3.0 dev: false - /@babel/helper-create-class-features-plugin@7.21.8(@babel/core@7.21.8): + /@babel/helper-create-class-features-plugin@7.21.8(@babel/core@7.22.5): resolution: {integrity: sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5641,21 +5584,21 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-environment-visitor': 7.21.5 - '@babel/helper-function-name': 7.21.0 + '@babel/core': 7.22.5 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-function-name': 7.22.5 '@babel/helper-member-expression-to-functions': 7.21.5 '@babel/helper-optimise-call-expression': 7.18.6 '@babel/helper-replace-supers': 7.21.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 - '@babel/helper-split-export-declaration': 7.18.6 + '@babel/helper-split-export-declaration': 7.22.5 semver: 6.3.0 transitivePeerDependencies: - supports-color dev: false - /@babel/helper-create-regexp-features-plugin@7.21.8(@babel/core@7.21.8): + /@babel/helper-create-regexp-features-plugin@7.21.8(@babel/core@7.22.5): resolution: {integrity: sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5664,13 +5607,13 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 + '@babel/core': 7.22.5 + '@babel/helper-annotate-as-pure': 7.22.5 regexpu-core: 5.3.2 semver: 6.3.0 dev: false - /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.21.8): + /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.22.5): resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==} peerDependencies: '@babel/core': ^7.4.0-0 @@ -5678,9 +5621,9 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 debug: 4.3.4 lodash.debounce: 4.0.8 resolve: 1.22.2 @@ -5689,59 +5632,66 @@ packages: - supports-color dev: false - /@babel/helper-environment-visitor@7.21.5: - resolution: {integrity: sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==} + /@babel/helper-environment-visitor@7.22.5: + resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==} engines: {node: '>=6.9.0'} dev: false - /@babel/helper-function-name@7.21.0: - resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==} + /@babel/helper-function-name@7.22.5: + resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.20.7 - '@babel/types': 7.21.5 + '@babel/template': 7.22.5 + '@babel/types': 7.22.5 dev: false - /@babel/helper-hoist-variables@7.18.6: - resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==} + /@babel/helper-hoist-variables@7.22.5: + resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 dev: false /@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.5 + '@babel/types': 7.22.5 dev: false - /@babel/helper-module-imports@7.16.0: - resolution: {integrity: sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==} + /@babel/helper-module-imports@7.18.6: + resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 dev: false /@babel/helper-module-imports@7.21.4: resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 dev: false - /@babel/helper-module-transforms@7.21.5: - resolution: {integrity: sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==} + /@babel/helper-module-imports@7.22.5: + resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-environment-visitor': 7.21.5 - '@babel/helper-module-imports': 7.21.4 - '@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.5 - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 + dev: false + + /@babel/helper-module-transforms@7.22.5: + resolution: {integrity: sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-simple-access': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.5 + '@babel/helper-validator-identifier': 7.22.5 + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.5 + '@babel/types': 7.22.5 transitivePeerDependencies: - supports-color dev: false @@ -5750,15 +5700,15 @@ packages: resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 dev: false - /@babel/helper-plugin-utils@7.21.5: - resolution: {integrity: sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==} + /@babel/helper-plugin-utils@7.22.5: + resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} engines: {node: '>=6.9.0'} dev: false - /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.21.8): + /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.22.5): resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5767,11 +5717,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-environment-visitor': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-wrap-function': 7.20.5 - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 transitivePeerDependencies: - supports-color dev: false @@ -5780,43 +5730,43 @@ packages: resolution: {integrity: sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-environment-visitor': 7.21.5 + '@babel/helper-environment-visitor': 7.22.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.5 - '@babel/types': 7.21.5 + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.5 + '@babel/types': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/helper-simple-access@7.21.5: - resolution: {integrity: sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==} + /@babel/helper-simple-access@7.22.5: + resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.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.5 + '@babel/types': 7.22.5 dev: false - /@babel/helper-split-export-declaration@7.18.6: - resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==} + /@babel/helper-split-export-declaration@7.22.5: + resolution: {integrity: sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 dev: false - /@babel/helper-string-parser@7.21.5: - resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==} + /@babel/helper-string-parser@7.22.5: + resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} engines: {node: '>=6.9.0'} - /@babel/helper-validator-identifier@7.19.1: - resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==} + /@babel/helper-validator-identifier@7.22.5: + resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==} engines: {node: '>=6.9.0'} /@babel/helper-validator-option@7.21.0: @@ -5824,53 +5774,50 @@ packages: engines: {node: '>=6.9.0'} dev: false + /@babel/helper-validator-option@7.22.5: + resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==} + engines: {node: '>=6.9.0'} + dev: false + /@babel/helper-wrap-function@7.20.5: resolution: {integrity: sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-function-name': 7.21.0 - '@babel/template': 7.20.7 - '@babel/traverse': 7.21.5 - '@babel/types': 7.21.5 + '@babel/helper-function-name': 7.22.5 + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.5 + '@babel/types': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/helpers@7.21.5: - resolution: {integrity: sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==} + /@babel/helpers@7.22.5: + resolution: {integrity: sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.20.7 - '@babel/traverse': 7.21.5 - '@babel/types': 7.21.5 + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.5 + '@babel/types': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/highlight@7.18.6: - resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==} + /@babel/highlight@7.22.5: + resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.19.1 + '@babel/helper-validator-identifier': 7.22.5 chalk: 2.4.2 js-tokens: 4.0.0 - /@babel/parser@7.18.4: - resolution: {integrity: sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==} + /@babel/parser@7.22.5: + resolution: {integrity: sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.21.5 - dev: false - - /@babel/parser@7.21.9: - resolution: {integrity: sha512-q5PNg/Bi1OpGgx5jYlvWZwAorZepEudDMCLtj967aeS7WMont7dUZI46M2XwcIQqvUlMxWfdLFu4S/qSxeUu5g==} - engines: {node: '>=6.0.0'} - hasBin: true - dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 - /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.18.6(@babel/core@7.21.8): + /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5879,11 +5826,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.20.7(@babel/core@7.21.8): + /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.20.7(@babel/core@7.22.5): resolution: {integrity: sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5892,13 +5839,13 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 - '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8) + '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.21.8): + /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.22.5): resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5907,16 +5854,16 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@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.21.8) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.22.5) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.5) transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.21.8): + /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5925,14 +5872,14 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-proposal-class-static-block@7.21.0(@babel/core@7.21.8): + /@babel/plugin-proposal-class-static-block@7.21.0(@babel/core@7.22.5): resolution: {integrity: sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5941,15 +5888,15 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.5) transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-proposal-dynamic-import@7.18.6(@babel/core@7.21.8): + /@babel/plugin-proposal-dynamic-import@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5958,12 +5905,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.21.8): + /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.22.5): resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5972,12 +5919,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.21.8): + /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -5986,12 +5933,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.21.8): + /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.22.5): resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6000,12 +5947,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.21.8): + /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6014,12 +5961,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.21.8): + /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6028,12 +5975,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.21.8): + /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.22.5): resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6042,15 +5989,15 @@ packages: '@babel/core': optional: true dependencies: - '@babel/compat-data': 7.21.7 - '@babel/core': 7.21.8 - '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.8) - '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.21.8) + '@babel/compat-data': 7.22.5 + '@babel/core': 7.22.5 + '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.5) + '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.21.8): + /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6059,12 +6006,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.21.8): + /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.22.5): resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6073,13 +6020,13 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.8) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.5) dev: false - /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.21.8): + /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6088,14 +6035,14 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-proposal-private-property-in-object@7.21.0(@babel/core@7.21.8): + /@babel/plugin-proposal-private-property-in-object@7.21.0(@babel/core@7.22.5): resolution: {integrity: sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6104,16 +6051,16 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.5) transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.21.8): + /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==} engines: {node: '>=4'} peerDependencies: @@ -6122,12 +6069,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.8): + /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.5): resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6135,11 +6082,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.21.8): + /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.5): resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6147,11 +6094,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.21.8): + /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.22.5): resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6160,11 +6107,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.21.8): + /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6172,11 +6119,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.21.8): + /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6184,11 +6131,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.21.8): + /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.22.5): resolution: {integrity: sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6197,11 +6144,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.21.8): + /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.5): resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6209,11 +6156,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.21.8): + /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6221,11 +6168,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-jsx@7.21.4(@babel/core@7.18.2): + /@babel/plugin-syntax-jsx@7.21.4(@babel/core@7.22.5): resolution: {integrity: sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6234,12 +6181,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.18.2 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-jsx@7.21.4(@babel/core@7.21.8): - resolution: {integrity: sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==} + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.5): + resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6247,11 +6194,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.21.8): + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.5): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6259,11 +6206,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.21.8): + /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6271,11 +6218,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.21.8): + /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.5): resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6283,11 +6230,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.21.8): + /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6295,11 +6242,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.8): + /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6307,11 +6254,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.21.8): + /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6319,11 +6266,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.21.8): + /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.22.5): resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6332,11 +6279,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.21.8): + /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.5): resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6345,11 +6292,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.21.8): + /@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.22.5): resolution: {integrity: sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6358,11 +6305,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-arrow-functions@7.21.5(@babel/core@7.21.8): + /@babel/plugin-transform-arrow-functions@7.21.5(@babel/core@7.22.5): resolution: {integrity: sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6371,11 +6318,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.21.8): + /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.22.5): resolution: {integrity: sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6384,15 +6331,15 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-module-imports': 7.21.4 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.22.5) transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6401,11 +6348,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-block-scoping@7.21.0(@babel/core@7.21.8): + /@babel/plugin-transform-block-scoping@7.21.0(@babel/core@7.22.5): resolution: {integrity: sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6414,11 +6361,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-classes@7.21.0(@babel/core@7.21.8): + /@babel/plugin-transform-classes@7.21.0(@babel/core@7.22.5): resolution: {integrity: sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6427,21 +6374,21 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) - '@babel/helper-environment-visitor': 7.21.5 - '@babel/helper-function-name': 7.21.0 + '@babel/core': 7.22.5 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-function-name': 7.22.5 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-replace-supers': 7.21.5 - '@babel/helper-split-export-declaration': 7.18.6 + '@babel/helper-split-export-declaration': 7.22.5 globals: 11.12.0 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-computed-properties@7.21.5(@babel/core@7.21.8): + /@babel/plugin-transform-computed-properties@7.21.5(@babel/core@7.22.5): resolution: {integrity: sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6450,12 +6397,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/template': 7.20.7 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/template': 7.22.5 dev: false - /@babel/plugin-transform-destructuring@7.21.3(@babel/core@7.21.8): + /@babel/plugin-transform-destructuring@7.21.3(@babel/core@7.22.5): resolution: {integrity: sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6464,11 +6411,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6477,12 +6424,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-duplicate-keys@7.18.9(@babel/core@7.21.8): + /@babel/plugin-transform-duplicate-keys@7.18.9(@babel/core@7.22.5): resolution: {integrity: sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6491,11 +6438,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6504,12 +6451,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 + '@babel/core': 7.22.5 '@babel/helper-builder-binary-assignment-operator-visitor': 7.21.5 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-for-of@7.21.5(@babel/core@7.21.8): + /@babel/plugin-transform-for-of@7.21.5(@babel/core@7.22.5): resolution: {integrity: sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6518,11 +6465,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.21.8): + /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.22.5): resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6531,13 +6478,13 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) - '@babel/helper-function-name': 7.21.0 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) + '@babel/helper-function-name': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-literals@7.18.9(@babel/core@7.21.8): + /@babel/plugin-transform-literals@7.18.9(@babel/core@7.22.5): resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6546,11 +6493,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6559,11 +6506,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-modules-amd@7.20.11(@babel/core@7.21.8): + /@babel/plugin-transform-modules-amd@7.20.11(@babel/core@7.22.5): resolution: {integrity: sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6572,14 +6519,14 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-module-transforms': 7.21.5 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-module-transforms': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.21.8): + /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.22.5): resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6588,15 +6535,15 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-module-transforms': 7.21.5 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/helper-simple-access': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-module-transforms': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-simple-access': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-modules-systemjs@7.20.11(@babel/core@7.21.8): + /@babel/plugin-transform-modules-systemjs@7.20.11(@babel/core@7.22.5): resolution: {integrity: sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6605,16 +6552,16 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-hoist-variables': 7.18.6 - '@babel/helper-module-transforms': 7.21.5 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/helper-validator-identifier': 7.19.1 + '@babel/core': 7.22.5 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-module-transforms': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-validator-identifier': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-modules-umd@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-modules-umd@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6623,14 +6570,14 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-module-transforms': 7.21.5 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-module-transforms': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-named-capturing-groups-regex@7.20.5(@babel/core@7.21.8): + /@babel/plugin-transform-named-capturing-groups-regex@7.20.5(@babel/core@7.22.5): resolution: {integrity: sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6639,12 +6586,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-new-target@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-new-target@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6653,11 +6600,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6666,14 +6613,14 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-replace-supers': 7.21.5 transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-parameters@7.21.3(@babel/core@7.21.8): + /@babel/plugin-transform-parameters@7.21.3(@babel/core@7.22.5): resolution: {integrity: sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6682,11 +6629,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6695,29 +6642,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - dev: false - - /@babel/plugin-transform-react-jsx@7.17.12(@babel/core@7.18.2): - resolution: {integrity: sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@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.21.5 - '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.18.2) - '@babel/types': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-react-jsx@7.17.12(@babel/core@7.21.8): - resolution: {integrity: sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==} + /@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.22.5): + resolution: {integrity: sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6725,15 +6655,15 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-module-imports': 7.21.4 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.8) - '@babel/types': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.5) + '@babel/types': 7.22.5 dev: false - /@babel/plugin-transform-regenerator@7.21.5(@babel/core@7.21.8): + /@babel/plugin-transform-regenerator@7.21.5(@babel/core@7.22.5): resolution: {integrity: sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6742,12 +6672,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 regenerator-transform: 0.15.1 dev: false - /@babel/plugin-transform-reserved-words@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-reserved-words@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6756,11 +6686,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6769,11 +6699,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-spread@7.20.7(@babel/core@7.21.8): + /@babel/plugin-transform-spread@7.20.7(@babel/core@7.22.5): resolution: {integrity: sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6782,12 +6712,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 dev: false - /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6796,11 +6726,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.21.8): + /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.22.5): resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6809,11 +6739,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-typeof-symbol@7.18.9(@babel/core@7.21.8): + /@babel/plugin-transform-typeof-symbol@7.18.9(@babel/core@7.22.5): resolution: {integrity: sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6822,11 +6752,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-typescript@7.21.3(@babel/core@7.21.8): + /@babel/plugin-transform-typescript@7.21.3(@babel/core@7.22.5): resolution: {integrity: sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6835,16 +6765,16 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 - '@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) + '@babel/core': 7.22.5 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.22.5) transitivePeerDependencies: - supports-color dev: false - /@babel/plugin-transform-unicode-escapes@7.21.5(@babel/core@7.21.8): + /@babel/plugin-transform-unicode-escapes@7.21.5(@babel/core@7.22.5): resolution: {integrity: sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6853,11 +6783,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6866,12 +6796,12 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/preset-env@7.21.5(@babel/core@7.21.8): + /@babel/preset-env@7.21.5(@babel/core@7.22.5): resolution: {integrity: sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==} engines: {node: '>=6.9.0'} peerDependencies: @@ -6881,87 +6811,87 @@ packages: optional: true dependencies: '@babel/compat-data': 7.21.7 - '@babel/core': 7.21.8 - '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) + '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-option': 7.21.0 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.20.7(@babel/core@7.21.8) - '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.21.8) - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-proposal-class-static-block': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-proposal-dynamic-import': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-proposal-export-namespace-from': 7.18.9(@babel/core@7.21.8) - '@babel/plugin-proposal-json-strings': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-proposal-logical-assignment-operators': 7.20.7(@babel/core@7.21.8) - '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.21.8) - '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-proposal-private-property-in-object': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.8) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.8) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.21.8) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.8) - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.21.8) - '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.21.8) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.21.8) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.8) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.8) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.8) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.8) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.8) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.8) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.8) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.21.8) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.8) - '@babel/plugin-transform-arrow-functions': 7.21.5(@babel/core@7.21.8) - '@babel/plugin-transform-async-to-generator': 7.20.7(@babel/core@7.21.8) - '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-transform-classes': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-transform-computed-properties': 7.21.5(@babel/core@7.21.8) - '@babel/plugin-transform-destructuring': 7.21.3(@babel/core@7.21.8) - '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-duplicate-keys': 7.18.9(@babel/core@7.21.8) - '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-for-of': 7.21.5(@babel/core@7.21.8) - '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.21.8) - '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.21.8) - '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-modules-amd': 7.20.11(@babel/core@7.21.8) - '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.21.8) - '@babel/plugin-transform-modules-systemjs': 7.20.11(@babel/core@7.21.8) - '@babel/plugin-transform-modules-umd': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-named-capturing-groups-regex': 7.20.5(@babel/core@7.21.8) - '@babel/plugin-transform-new-target': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.21.8) - '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-regenerator': 7.21.5(@babel/core@7.21.8) - '@babel/plugin-transform-reserved-words': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-spread': 7.20.7(@babel/core@7.21.8) - '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.21.8) - '@babel/plugin-transform-typeof-symbol': 7.18.9(@babel/core@7.21.8) - '@babel/plugin-transform-unicode-escapes': 7.21.5(@babel/core@7.21.8) - '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.21.8) - '@babel/preset-modules': 0.1.5(@babel/core@7.21.8) - '@babel/types': 7.21.5 - babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.21.8) - babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.21.8) - babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.21.8) + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.20.7(@babel/core@7.22.5) + '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.22.5) + '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-proposal-class-static-block': 7.21.0(@babel/core@7.22.5) + '@babel/plugin-proposal-dynamic-import': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-proposal-export-namespace-from': 7.18.9(@babel/core@7.22.5) + '@babel/plugin-proposal-json-strings': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-proposal-logical-assignment-operators': 7.20.7(@babel/core@7.22.5) + '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.22.5) + '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.22.5) + '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-proposal-private-property-in-object': 7.21.0(@babel/core@7.22.5) + '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.5) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.5) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.5) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.5) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.5) + '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.22.5) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.5) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.5) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.5) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.5) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.5) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.5) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.5) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.5) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.5) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.5) + '@babel/plugin-transform-arrow-functions': 7.21.5(@babel/core@7.22.5) + '@babel/plugin-transform-async-to-generator': 7.20.7(@babel/core@7.22.5) + '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.22.5) + '@babel/plugin-transform-classes': 7.21.0(@babel/core@7.22.5) + '@babel/plugin-transform-computed-properties': 7.21.5(@babel/core@7.22.5) + '@babel/plugin-transform-destructuring': 7.21.3(@babel/core@7.22.5) + '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-duplicate-keys': 7.18.9(@babel/core@7.22.5) + '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-for-of': 7.21.5(@babel/core@7.22.5) + '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.22.5) + '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.22.5) + '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-modules-amd': 7.20.11(@babel/core@7.22.5) + '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.22.5) + '@babel/plugin-transform-modules-systemjs': 7.20.11(@babel/core@7.22.5) + '@babel/plugin-transform-modules-umd': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-named-capturing-groups-regex': 7.20.5(@babel/core@7.22.5) + '@babel/plugin-transform-new-target': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.22.5) + '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-regenerator': 7.21.5(@babel/core@7.22.5) + '@babel/plugin-transform-reserved-words': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-spread': 7.20.7(@babel/core@7.22.5) + '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.22.5) + '@babel/plugin-transform-typeof-symbol': 7.18.9(@babel/core@7.22.5) + '@babel/plugin-transform-unicode-escapes': 7.21.5(@babel/core@7.22.5) + '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.22.5) + '@babel/preset-modules': 0.1.5(@babel/core@7.22.5) + '@babel/types': 7.22.5 + babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.22.5) + babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.22.5) + babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.22.5) core-js-compat: 3.30.2 semver: 6.3.0 transitivePeerDependencies: - supports-color dev: false - /@babel/preset-modules@0.1.5(@babel/core@7.21.8): + /@babel/preset-modules@0.1.5(@babel/core@7.22.5): resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -6969,11 +6899,11 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.21.5 - '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.21.8) - '@babel/types': 7.21.5 + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.22.5) + '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.22.5) + '@babel/types': 7.22.5 esutils: 2.0.3 dev: false @@ -6991,57 +6921,48 @@ packages: resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.21.4 - '@babel/parser': 7.21.9 - '@babel/types': 7.21.5 + '@babel/code-frame': 7.22.5 + '@babel/parser': 7.22.5 + '@babel/types': 7.22.5 dev: false - /@babel/traverse@7.18.2: - resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==} + /@babel/template@7.22.5: + resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.21.4 - '@babel/generator': 7.18.2 - '@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.18.4 - '@babel/types': 7.21.5 - debug: 4.3.4 - globals: 11.12.0 - transitivePeerDependencies: - - supports-color + '@babel/code-frame': 7.22.5 + '@babel/parser': 7.22.5 + '@babel/types': 7.22.5 dev: false - /@babel/traverse@7.21.5: - resolution: {integrity: sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==} + /@babel/traverse@7.22.5: + resolution: {integrity: sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.21.4 - '@babel/generator': 7.21.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 - '@babel/parser': 7.21.9 - '@babel/types': 7.21.5 + '@babel/code-frame': 7.22.5 + '@babel/generator': 7.22.5 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-function-name': 7.22.5 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.5 + '@babel/parser': 7.22.5 + '@babel/types': 7.22.5 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color dev: false - /@babel/types@7.21.5: - resolution: {integrity: sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==} + /@babel/types@7.22.5: + resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-string-parser': 7.21.5 - '@babel/helper-validator-identifier': 7.19.1 + '@babel/helper-string-parser': 7.22.5 + '@babel/helper-validator-identifier': 7.22.5 to-fast-properties: 2.0.0 - /@builder.io/partytown@0.7.4: - resolution: {integrity: sha512-dcZBPNQiHbMhvDGmdWRFNe75Z/XYmeZ2bubYmC5BeQpF09ObbPcbSqIP2NaNOFonKlWLfsE6u1790o9ZmlfpIw==} + /@builder.io/partytown@0.7.6: + resolution: {integrity: sha512-snXIGNiZpqjno3XYQN2lbBB+05hsQR/LSttbtIW1c0gmZ7Kh/DIo0YrxlDxCDulAMFPFM8J+4voLwvYepSj3sw==} hasBin: true dev: false @@ -7265,128 +7186,148 @@ packages: dev: false optional: true - /@csstools/postcss-cascade-layers@1.1.1(postcss@8.4.23): + /@csstools/postcss-cascade-layers@1.1.1(postcss@8.4.24): resolution: {integrity: sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.13) - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /@csstools/postcss-color-function@1.1.1(postcss@8.4.23): + /@csstools/postcss-color-function@1.1.1(postcss@8.4.24): resolution: {integrity: sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) - postcss: 8.4.23 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.24) + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-font-format-keywords@1.0.1(postcss@8.4.23): + /@csstools/postcss-font-format-keywords@1.0.1(postcss@8.4.24): resolution: {integrity: sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-hwb-function@1.0.2(postcss@8.4.23): + /@csstools/postcss-hwb-function@1.0.2(postcss@8.4.24): resolution: {integrity: sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-ic-unit@1.0.1(postcss@8.4.23): + /@csstools/postcss-ic-unit@1.0.1(postcss@8.4.24): resolution: {integrity: sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) - postcss: 8.4.23 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.24) + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-is-pseudo-class@2.0.7(postcss@8.4.23): + /@csstools/postcss-is-pseudo-class@2.0.7(postcss@8.4.24): resolution: {integrity: sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.13) - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /@csstools/postcss-normalize-display-values@1.0.1(postcss@8.4.23): + /@csstools/postcss-nested-calc@1.0.0(postcss@8.4.24): + resolution: {integrity: sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.2 + dependencies: + postcss: 8.4.24 + postcss-value-parser: 4.2.0 + dev: true + + /@csstools/postcss-normalize-display-values@1.0.1(postcss@8.4.24): resolution: {integrity: sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-oklab-function@1.1.1(postcss@8.4.23): + /@csstools/postcss-oklab-function@1.1.1(postcss@8.4.24): resolution: {integrity: sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) - postcss: 8.4.23 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.24) + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-progressive-custom-properties@1.3.0(postcss@8.4.23): + /@csstools/postcss-progressive-custom-properties@1.3.0(postcss@8.4.24): resolution: {integrity: sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.3 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-stepped-value-functions@1.0.1(postcss@8.4.23): + /@csstools/postcss-stepped-value-functions@1.0.1(postcss@8.4.24): resolution: {integrity: sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-trigonometric-functions@1.0.2(postcss@8.4.23): + /@csstools/postcss-text-decoration-shorthand@1.0.0(postcss@8.4.24): + resolution: {integrity: sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.2 + dependencies: + postcss: 8.4.24 + postcss-value-parser: 4.2.0 + dev: true + + /@csstools/postcss-trigonometric-functions@1.0.2(postcss@8.4.24): resolution: {integrity: sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==} engines: {node: ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-unset-value@1.0.2(postcss@8.4.23): + /@csstools/postcss-unset-value@1.0.2(postcss@8.4.24): resolution: {integrity: sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true /@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.0.13): @@ -7443,16 +7384,8 @@ packages: rollup-plugin-node-polyfills: 0.2.1 dev: true - /@esbuild/android-arm64@0.17.12: - resolution: {integrity: sha512-WQ9p5oiXXYJ33F2EkE3r0FRDFVpEdcDiwNX3u7Xaibxfx6vQE0Sb8ytrfQsA5WO6kDn6mDfKLh6KrPBjvkk7xA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - optional: true - - /@esbuild/android-arm64@0.17.18: - resolution: {integrity: sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw==} + /@esbuild/android-arm64@0.17.19: + resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -7468,144 +7401,72 @@ packages: dev: false optional: true - /@esbuild/android-arm@0.17.12: - resolution: {integrity: sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - optional: true - - /@esbuild/android-arm@0.17.18: - resolution: {integrity: sha512-EmwL+vUBZJ7mhFCs5lA4ZimpUH3WMAoqvOIYhVQwdIgSpHC8ImHdsRyhHAVxpDYUSm0lWvd63z0XH1IlImS2Qw==} + /@esbuild/android-arm@0.17.19: + resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==} engines: {node: '>=12'} cpu: [arm] os: [android] requiresBuild: true optional: true - /@esbuild/android-x64@0.17.12: - resolution: {integrity: sha512-m4OsaCr5gT+se25rFPHKQXARMyAehHTQAz4XX1Vk3d27VtqiX0ALMBPoXZsGaB6JYryCLfgGwUslMqTfqeLU0w==} + /@esbuild/android-x64@0.17.19: + resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} engines: {node: '>=12'} cpu: [x64] os: [android] requiresBuild: true optional: true - /@esbuild/android-x64@0.17.18: - resolution: {integrity: sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - optional: true - - /@esbuild/darwin-arm64@0.17.12: - resolution: {integrity: sha512-O3GCZghRIx+RAN0NDPhyyhRgwa19MoKlzGonIb5hgTj78krqp9XZbYCvFr9N1eUxg0ZQEpiiZ4QvsOQwBpP+lg==} + /@esbuild/darwin-arm64@0.17.19: + resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@esbuild/darwin-arm64@0.17.18: - resolution: {integrity: sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - optional: true - - /@esbuild/darwin-x64@0.17.12: - resolution: {integrity: sha512-5D48jM3tW27h1qjaD9UNRuN+4v0zvksqZSPZqeSWggfMlsVdAhH3pwSfQIFJwcs9QJ9BRibPS4ViZgs3d2wsCA==} + /@esbuild/darwin-x64@0.17.19: + resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} engines: {node: '>=12'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@esbuild/darwin-x64@0.17.18: - resolution: {integrity: sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - optional: true - - /@esbuild/freebsd-arm64@0.17.12: - resolution: {integrity: sha512-OWvHzmLNTdF1erSvrfoEBGlN94IE6vCEaGEkEH29uo/VoONqPnoDFfShi41Ew+yKimx4vrmmAJEGNoyyP+OgOQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - optional: true - - /@esbuild/freebsd-arm64@0.17.18: - resolution: {integrity: sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA==} + /@esbuild/freebsd-arm64@0.17.19: + resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] requiresBuild: true optional: true - /@esbuild/freebsd-x64@0.17.12: - resolution: {integrity: sha512-A0Xg5CZv8MU9xh4a+7NUpi5VHBKh1RaGJKqjxe4KG87X+mTjDE6ZvlJqpWoeJxgfXHT7IMP9tDFu7IZ03OtJAw==} + /@esbuild/freebsd-x64@0.17.19: + resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] requiresBuild: true optional: true - /@esbuild/freebsd-x64@0.17.18: - resolution: {integrity: sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - optional: true - - /@esbuild/linux-arm64@0.17.12: - resolution: {integrity: sha512-cK3AjkEc+8v8YG02hYLQIQlOznW+v9N+OI9BAFuyqkfQFR+DnDLhEM5N8QRxAUz99cJTo1rLNXqRrvY15gbQUg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/linux-arm64@0.17.18: - resolution: {integrity: sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ==} + /@esbuild/linux-arm64@0.17.19: + resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} engines: {node: '>=12'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@esbuild/linux-arm@0.17.12: - resolution: {integrity: sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==} + /@esbuild/linux-arm@0.17.19: + resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} engines: {node: '>=12'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@esbuild/linux-arm@0.17.18: - resolution: {integrity: sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/linux-ia32@0.17.12: - resolution: {integrity: sha512-jdOBXJqcgHlah/nYHnj3Hrnl9l63RjtQ4vn9+bohjQPI2QafASB5MtHAoEv0JQHVb/xYQTFOeuHnNYE1zF7tYw==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/linux-ia32@0.17.18: - resolution: {integrity: sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ==} + /@esbuild/linux-ia32@0.17.19: + resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -7621,205 +7482,109 @@ packages: dev: false optional: true - /@esbuild/linux-loong64@0.17.12: - resolution: {integrity: sha512-GTOEtj8h9qPKXCyiBBnHconSCV9LwFyx/gv3Phw0pa25qPYjVuuGZ4Dk14bGCfGX3qKF0+ceeQvwmtI+aYBbVA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/linux-loong64@0.17.18: - resolution: {integrity: sha512-bvPG+MyFs5ZlwYclCG1D744oHk1Pv7j8psF5TfYx7otCVmcJsEXgFEhQkbhNW8otDHL1a2KDINW20cfCgnzgMQ==} + /@esbuild/linux-loong64@0.17.19: + resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==} engines: {node: '>=12'} cpu: [loong64] os: [linux] requiresBuild: true optional: true - /@esbuild/linux-mips64el@0.17.12: - resolution: {integrity: sha512-o8CIhfBwKcxmEENOH9RwmUejs5jFiNoDw7YgS0EJTF6kgPgcqLFjgoc5kDey5cMHRVCIWc6kK2ShUePOcc7RbA==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/linux-mips64el@0.17.18: - resolution: {integrity: sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA==} + /@esbuild/linux-mips64el@0.17.19: + resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] requiresBuild: true optional: true - /@esbuild/linux-ppc64@0.17.12: - resolution: {integrity: sha512-biMLH6NR/GR4z+ap0oJYb877LdBpGac8KfZoEnDiBKd7MD/xt8eaw1SFfYRUeMVx519kVkAOL2GExdFmYnZx3A==} + /@esbuild/linux-ppc64@0.17.19: + resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] requiresBuild: true optional: true - /@esbuild/linux-ppc64@0.17.18: - resolution: {integrity: sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/linux-riscv64@0.17.12: - resolution: {integrity: sha512-jkphYUiO38wZGeWlfIBMB72auOllNA2sLfiZPGDtOBb1ELN8lmqBrlMiucgL8awBw1zBXN69PmZM6g4yTX84TA==} + /@esbuild/linux-riscv64@0.17.19: + resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] requiresBuild: true optional: true - /@esbuild/linux-riscv64@0.17.18: - resolution: {integrity: sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/linux-s390x@0.17.12: - resolution: {integrity: sha512-j3ucLdeY9HBcvODhCY4b+Ds3hWGO8t+SAidtmWu/ukfLLG/oYDMaA+dnugTVAg5fnUOGNbIYL9TOjhWgQB8W5g==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/linux-s390x@0.17.18: - resolution: {integrity: sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw==} + /@esbuild/linux-s390x@0.17.19: + resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} engines: {node: '>=12'} cpu: [s390x] os: [linux] requiresBuild: true optional: true - /@esbuild/linux-x64@0.17.12: - resolution: {integrity: sha512-uo5JL3cgaEGotaqSaJdRfFNSCUJOIliKLnDGWaVCgIKkHxwhYMm95pfMbWZ9l7GeW9kDg0tSxcy9NYdEtjwwmA==} + /@esbuild/linux-x64@0.17.19: + resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} engines: {node: '>=12'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@esbuild/linux-x64@0.17.18: - resolution: {integrity: sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - optional: true - - /@esbuild/netbsd-x64@0.17.12: - resolution: {integrity: sha512-DNdoRg8JX+gGsbqt2gPgkgb00mqOgOO27KnrWZtdABl6yWTST30aibGJ6geBq3WM2TIeW6COs5AScnC7GwtGPg==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - optional: true - - /@esbuild/netbsd-x64@0.17.18: - resolution: {integrity: sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg==} + /@esbuild/netbsd-x64@0.17.19: + resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] requiresBuild: true optional: true - /@esbuild/openbsd-x64@0.17.12: - resolution: {integrity: sha512-aVsENlr7B64w8I1lhHShND5o8cW6sB9n9MUtLumFlPhG3elhNWtE7M1TFpj3m7lT3sKQUMkGFjTQBrvDDO1YWA==} + /@esbuild/openbsd-x64@0.17.19: + resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] requiresBuild: true optional: true - /@esbuild/openbsd-x64@0.17.18: - resolution: {integrity: sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - optional: true - - /@esbuild/sunos-x64@0.17.12: - resolution: {integrity: sha512-qbHGVQdKSwi0JQJuZznS4SyY27tYXYF0mrgthbxXrZI3AHKuRvU+Eqbg/F0rmLDpW/jkIZBlCO1XfHUBMNJ1pg==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - optional: true - - /@esbuild/sunos-x64@0.17.18: - resolution: {integrity: sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg==} + /@esbuild/sunos-x64@0.17.19: + resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} engines: {node: '>=12'} cpu: [x64] os: [sunos] requiresBuild: true optional: true - /@esbuild/win32-arm64@0.17.12: - resolution: {integrity: sha512-zsCp8Ql+96xXTVTmm6ffvoTSZSV2B/LzzkUXAY33F/76EajNw1m+jZ9zPfNJlJ3Rh4EzOszNDHsmG/fZOhtqDg==} + /@esbuild/win32-arm64@0.17.19: + resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} engines: {node: '>=12'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@esbuild/win32-arm64@0.17.18: - resolution: {integrity: sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - optional: true - - /@esbuild/win32-ia32@0.17.12: - resolution: {integrity: sha512-FfrFjR4id7wcFYOdqbDfDET3tjxCozUgbqdkOABsSFzoZGFC92UK7mg4JKRc/B3NNEf1s2WHxJ7VfTdVDPN3ng==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - optional: true - - /@esbuild/win32-ia32@0.17.18: - resolution: {integrity: sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw==} + /@esbuild/win32-ia32@0.17.19: + resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} engines: {node: '>=12'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@esbuild/win32-x64@0.17.12: - resolution: {integrity: sha512-JOOxw49BVZx2/5tW3FqkdjSD/5gXYeVGPDcB0lvap0gLQshkh1Nyel1QazC+wNxus3xPlsYAgqU1BUmrmCvWtw==} + /@esbuild/win32-x64@0.17.19: + resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} engines: {node: '>=12'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@esbuild/win32-x64@0.17.18: - resolution: {integrity: sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - optional: true - - /@eslint-community/eslint-utils@4.4.0(eslint@8.38.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.43.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.38.0 + eslint: 8.43.0 eslint-visitor-keys: 3.4.1 dev: true @@ -7845,8 +7610,8 @@ packages: - supports-color dev: true - /@eslint/js@8.38.0: - resolution: {integrity: sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==} + /@eslint/js@8.43.0: + resolution: {integrity: sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -7858,8 +7623,8 @@ packages: resolution: {integrity: sha512-XAYZmprnZDVSLIeEiB3evVG2JD+yoR9aT+I6LCOcwZFQ6ro9UPpopDncqoqwv+j5M0/UjyAP6ov70+L/fmP8Gg==} dev: false - /@humanwhocodes/config-array@0.11.8: - resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==} + /@humanwhocodes/config-array@0.11.10: + resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==} engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 @@ -7932,8 +7697,8 @@ packages: /@lit-labs/ssr-dom-shim@1.1.1: resolution: {integrity: sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ==} - /@lit-labs/ssr@3.1.3: - resolution: {integrity: sha512-2iyV2X0uSfbBxPIggrud8imVfsSnLnssB/WsTJ2NhIlu70KO2W/BG0yZW02vqG0O4dVT1YEfxjNq5VCF0BAVlQ==} + /@lit-labs/ssr@3.1.4: + resolution: {integrity: sha512-oxIEjm42Hzl47FFZU/yr8OPYECwfx+Zl6pGXomZhM1byqIVtGEFzVHd/4kLkKhCiHP4Fz786x8j2Qq5ZA2LTBQ==} engines: {node: '>=13.9.0'} dependencies: '@lit-labs/ssr-client': 1.1.2 @@ -7989,8 +7754,8 @@ packages: nopt: 5.0.0 npmlog: 5.0.1 rimraf: 3.0.2 - semver: 7.5.1 - tar: 6.1.14 + semver: 7.5.2 + tar: 6.1.15 transitivePeerDependencies: - encoding - supports-color @@ -8029,8 +7794,8 @@ packages: unified: 10.1.2 unist-util-position-from-estree: 1.1.2 unist-util-stringify-position: 3.0.3 - unist-util-visit: 4.1.0 - vfile: 5.3.2 + unist-util-visit: 4.1.2 + vfile: 5.3.7 transitivePeerDependencies: - supports-color dev: false @@ -8041,7 +7806,7 @@ packages: dependencies: '@miniflare/core': 2.14.0 '@miniflare/shared': 2.14.0 - http-cache-semantics: 4.1.0 + http-cache-semantics: 4.1.1 undici: 5.20.0 dev: true @@ -8064,7 +7829,7 @@ packages: busboy: 1.6.0 dotenv: 10.0.0 kleur: 4.1.5 - set-cookie-parser: 2.5.1 + set-cookie-parser: 2.6.0 undici: 5.20.0 urlpattern-polyfill: 4.0.3 dev: true @@ -8207,7 +7972,7 @@ packages: - utf-8-validate dev: true - /@nanostores/preact@0.4.1(nanostores@0.8.1)(preact@10.13.2): + /@nanostores/preact@0.4.1(nanostores@0.8.1)(preact@10.15.1): resolution: {integrity: sha512-a5nUVjoGuPqdMBUINOFbQKPfabD1mVLcuspefmtdKZqhvXeDkw9Vg8S6xINIjfWnu/eZgpA+Hb1Pkl/Sx1l/vw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -8215,7 +7980,7 @@ packages: preact: '>=10.0.0' dependencies: nanostores: 0.8.1 - preact: 10.13.2 + preact: 10.15.1 dev: false /@netlify/edge-functions@2.0.0: @@ -8231,9 +7996,9 @@ packages: web-streams-polyfill: 3.2.1 dev: true - /@netlify/functions@1.0.0: - resolution: {integrity: sha512-7fnJv3vr8uyyyOYPChwoec6MjzsCw1CoRUO2DhQ1BD6bOyJRlD4DUaOOGlMILB2LCT8P24p5LexEGx8AJb7xdA==} - engines: {node: '>=8.3.0'} + /@netlify/functions@1.6.0: + resolution: {integrity: sha512-6G92AlcpFrQG72XU8YH8pg94eDnq7+Q0YJhb8x4qNpdGsvuzvrfHWBmqFGp/Yshmv4wex9lpsTRZOocdrA2erQ==} + engines: {node: '>=14.0.0'} dependencies: is-promise: 4.0.0 dev: false @@ -8397,7 +8162,7 @@ packages: is-glob: 4.0.3 open: 9.1.0 picocolors: 1.0.0 - tslib: 2.5.0 + tslib: 2.5.3 /@playwright/test@1.29.2: resolution: {integrity: sha512-+3/GPwOgcoF0xLz/opTnahel1/y42PdcgZ4hs+BZGIUjtmEFSXGg+nFoaH3NSmuc7a6GSFwXDJ5L7VXpqzigNg==} @@ -8412,22 +8177,22 @@ packages: resolution: {integrity: sha512-M+M3ZOtd1dtV/uasyk4SZu1vbfEJ4NeENv0F7F12nijZYedB5wSgbtZcuACyssnTznhF4ctUyrR0dZHuHfyWKA==} dev: false - /@preact/signals@1.1.1(preact@10.13.2): + /@preact/signals@1.1.1(preact@10.15.1): resolution: {integrity: sha512-I1DhYo2d1t9qDkEq1jYDVTQdBGmo4NlqatNEtulsS/87kVdwhZluP6TTDS4/5sc2h86TlBF6UA6LO+tDpIt/Gw==} peerDependencies: preact: 10.x dependencies: '@preact/signals-core': 1.3.0 - preact: 10.13.2 + preact: 10.15.1 dev: false - /@preact/signals@1.1.3(preact@10.13.2): + /@preact/signals@1.1.3(preact@10.15.1): resolution: {integrity: sha512-N09DuAVvc90bBZVRwD+aFhtGyHAmJLhS3IFoawO/bYJRcil4k83nBOchpCEoS0s5+BXBpahgp0Mjf+IOqP57Og==} peerDependencies: preact: 10.x dependencies: '@preact/signals-core': 1.3.0 - preact: 10.13.2 + preact: 10.15.1 dev: false /@rollup/plugin-alias@3.1.9(rollup@2.79.1): @@ -8443,7 +8208,7 @@ packages: slash: 3.0.0 dev: true - /@rollup/plugin-babel@5.3.1(@babel/core@7.21.8)(rollup@2.79.1): + /@rollup/plugin-babel@5.3.1(@babel/core@7.22.5)(rollup@2.79.1): resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==} engines: {node: '>= 10.0.0'} peerDependencies: @@ -8458,8 +8223,8 @@ packages: rollup: optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-module-imports': 7.21.4 + '@babel/core': 7.22.5 + '@babel/helper-module-imports': 7.22.5 '@rollup/pluginutils': 3.1.0(rollup@2.79.1) rollup: 2.79.1 dev: false @@ -8541,8 +8306,8 @@ packages: rollup: 3.20.1 dev: false - /@rollup/plugin-typescript@8.3.2(rollup@2.79.1)(tslib@2.5.0)(typescript@5.0.2): - resolution: {integrity: sha512-MtgyR5LNHZr3GyN0tM7gNO9D0CS+Y+vflS4v/PHmrX17JCkHUYKvQ5jN5o3cz1YKllM3duXUqu3yOHwMPUxhDg==} + /@rollup/plugin-typescript@8.5.0(rollup@2.79.1)(tslib@2.5.3)(typescript@5.0.2): + resolution: {integrity: sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==} engines: {node: '>=8.0.0'} peerDependencies: rollup: ^2.14.0 @@ -8551,11 +8316,13 @@ packages: peerDependenciesMeta: rollup: optional: true + tslib: + optional: true dependencies: '@rollup/pluginutils': 3.1.0(rollup@2.79.1) resolve: 1.22.2 rollup: 2.79.1 - tslib: 2.5.0 + tslib: 2.5.3 typescript: 5.0.2 dev: true @@ -8573,6 +8340,14 @@ packages: picomatch: 2.3.1 rollup: 2.79.1 + /@rollup/pluginutils@4.2.1: + resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} + engines: {node: '>= 8.0.0'} + dependencies: + estree-walker: 2.0.2 + picomatch: 2.3.1 + dev: false + /@rollup/pluginutils@5.0.2(rollup@3.20.1): resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} engines: {node: '>=14.0.0'} @@ -8582,18 +8357,18 @@ packages: rollup: optional: true dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 rollup: 3.20.1 dev: false - /@solidjs/router@0.5.0(solid-js@1.7.4): - resolution: {integrity: sha512-rNR07l21tWWDVmCbaapggB89rEX7jlM2XChpTLqEGEnj46LzVZ8zgvjcF6NNKScByAlLpoQUkVIjB2KHpcMi+w==} + /@solidjs/router@0.5.1(solid-js@1.7.6): + resolution: {integrity: sha512-igyrwUqm/9T26Lb6l7oXwpc4lLUVqbhbN92wOL3NgLoLVmkQlUNTZciuAe+Su8XeJXlrWjl6oxDJDLt+6pws/g==} peerDependencies: solid-js: ^1.5.3 dependencies: - solid-js: 1.7.4 + solid-js: 1.7.6 dev: false /@surma/rollup-plugin-off-main-thread@2.2.3: @@ -8605,7 +8380,7 @@ packages: string.prototype.matchall: 4.0.8 dev: false - /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.58.0)(vite@4.3.1): + /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.59.1)(vite@4.3.9): resolution: {integrity: sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -8616,15 +8391,15 @@ packages: vite: optional: true dependencies: - '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.58.0)(vite@4.3.1) + '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.59.1)(vite@4.3.9) debug: 4.3.4 - svelte: 3.58.0 - vite: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + svelte: 3.59.1 + vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) transitivePeerDependencies: - supports-color dev: false - /@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.58.0)(vite@4.3.1): + /@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.59.1)(vite@4.3.9): resolution: {integrity: sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -8634,15 +8409,15 @@ packages: vite: optional: true dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.58.0)(vite@4.3.1) + '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.59.1)(vite@4.3.9) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.0 - svelte: 3.58.0 - svelte-hmr: 0.15.1(svelte@3.58.0) - vite: 4.3.1(@types/node@18.16.3)(sass@1.52.2) - vitefu: 0.2.4(vite@4.3.1) + svelte: 3.59.1 + svelte-hmr: 0.15.1(svelte@3.59.1) + vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) + vitefu: 0.2.4(vite@4.3.9) transitivePeerDependencies: - supports-color dev: false @@ -8669,7 +8444,7 @@ packages: /@types/acorn@4.0.6: resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==} dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 dev: false /@types/alpinejs@3.7.1: @@ -8678,37 +8453,37 @@ packages: '@vue/reactivity': 3.3.2 dev: false - /@types/babel__core@7.1.19: - resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==} + /@types/babel__core@7.20.1: + resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==} dependencies: - '@babel/parser': 7.21.9 - '@babel/types': 7.21.5 + '@babel/parser': 7.22.5 + '@babel/types': 7.22.5 '@types/babel__generator': 7.6.4 '@types/babel__template': 7.4.1 - '@types/babel__traverse': 7.17.1 + '@types/babel__traverse': 7.20.1 dev: false /@types/babel__generator@7.6.4: resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 /@types/babel__template@7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.21.9 - '@babel/types': 7.21.5 + '@babel/parser': 7.22.5 + '@babel/types': 7.22.5 dev: false - /@types/babel__traverse@7.17.1: - resolution: {integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==} + /@types/babel__traverse@7.20.1: + resolution: {integrity: sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==} dependencies: - '@babel/types': 7.21.5 + '@babel/types': 7.22.5 /@types/better-sqlite3@7.6.4: resolution: {integrity: sha512-dzrRZCYPXIXfSR1/surNbJ/grU3scTaygS0OMzjlGf71i9sc2fGyHPXXiXmEvNIoE0cGwsanEFMVJxPXmco9Eg==} dependencies: - '@types/node': 18.16.3 + '@types/node': 18.16.18 dev: true /@types/canvas-confetti@1.6.0: @@ -8718,7 +8493,7 @@ packages: /@types/chai-as-promised@7.1.5: resolution: {integrity: sha512-jStwss93SITGBwt/niYrkf2C+/1KTeZCZl1LaeezTlqppAKeoQC7jxyqYuP72sxBGKCIbw7oHgbYssIRzT5FCQ==} dependencies: - '@types/chai': 4.3.3 + '@types/chai': 4.3.5 dev: true /@types/chai-subset@1.3.3: @@ -8727,13 +8502,8 @@ packages: '@types/chai': 4.3.5 dev: false - /@types/chai@4.3.3: - resolution: {integrity: sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==} - dev: true - /@types/chai@4.3.5: resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==} - dev: false /@types/common-ancestor-path@1.0.0: resolution: {integrity: sha512-RuLE14U0ewtlGo81hOjQtzXl3RsVlTkbHqfpsbl9V1hIhAxF30L5ru1Q6C1x7L7d7zs434HbMBeFrdd7fWVQ2Q==} @@ -8749,13 +8519,13 @@ packages: resolution: {integrity: sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==} dev: true - /@types/debug@4.1.7: - resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==} + /@types/debug@4.1.8: + resolution: {integrity: sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==} dependencies: '@types/ms': 0.7.31 - /@types/diff@5.0.2: - resolution: {integrity: sha512-uw8eYMIReOwstQ0QKF0sICefSy8cNO/v7gOTiIy9SbwuHyEecJUm7qlgueOO5S1udZ5I/irVydHVwMchgzbKTg==} + /@types/diff@5.0.3: + resolution: {integrity: sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==} dev: true /@types/dlv@1.1.2: @@ -8765,7 +8535,7 @@ packages: /@types/estree-jsx@1.0.0: resolution: {integrity: sha512-3qvGd0z8F2ENTGr/GG1yViqfiKmRfrXVx5sJyHGFu3z7m5g5utCQtGp/g29JnjflhtQJBv1WDQukHiT58xPcYQ==} dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 /@types/estree@0.0.39: resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} @@ -8774,8 +8544,8 @@ packages: resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==} dev: true - /@types/estree@1.0.0: - resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==} + /@types/estree@1.0.1: + resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==} /@types/extend@3.0.1: resolution: {integrity: sha512-R1g/VyKFFI2HLC1QGAeTtCBWCo6n75l41OnsVYNbmKG+kempOESaodf6BeJyUM3Q0rKa/NQcTHbB2+66lNnxLw==} @@ -8784,7 +8554,7 @@ packages: /@types/fs-extra@8.1.2: resolution: {integrity: sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==} dependencies: - '@types/node': 18.16.3 + '@types/node': 18.16.18 dev: true /@types/github-slugger@1.3.0: @@ -8795,14 +8565,14 @@ packages: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 18.16.3 + '@types/node': 18.16.18 dev: true /@types/glob@8.1.0: resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 18.16.3 + '@types/node': 18.16.18 dev: true /@types/hast@2.3.4: @@ -8821,7 +8591,7 @@ packages: /@types/is-ci@3.0.0: resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==} dependencies: - ci-info: 3.3.1 + ci-info: 3.8.0 dev: true /@types/js-yaml@4.0.5: @@ -8857,8 +8627,8 @@ packages: resolution: {integrity: sha512-y0WSZBtBNQwcYipTU/BhgeFu1EZNlFvUNCmkMXV9kBQZq7/o5z82dNVyH3yy2Xv5zzeNeQoHSL4Xm06+EQiH+g==} dev: true - /@types/mdast@3.0.10: - resolution: {integrity: sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==} + /@types/mdast@3.0.11: + resolution: {integrity: sha512-Y/uImid8aAwrEA24/1tcRZwpxX3pIFTSilcNDKSPn+Y2iDywSEachzRuvgAYYLR3wpGXAsMbv5lvKLDZLeYPAw==} dependencies: '@types/unist': 2.0.6 @@ -8904,8 +8674,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@14.18.21: - resolution: {integrity: sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==} + /@types/node@14.18.51: + resolution: {integrity: sha512-P9bsdGFPpVtofEKlhWMVS2qqx1A/rt9QBfihWlklfHHpUpjtYse5AzFz6j4DWrARLYh6gRnw9+5+DJcrq3KvBA==} dev: true /@types/node@16.18.30: @@ -8916,8 +8686,12 @@ packages: resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} dev: false + /@types/node@18.16.18: + resolution: {integrity: sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==} + /@types/node@18.16.3: resolution: {integrity: sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==} + dev: true /@types/normalize-package-data@2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -8927,45 +8701,46 @@ packages: resolution: {integrity: sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==} dev: false - /@types/prettier@2.6.3: - resolution: {integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==} + /@types/prettier@2.7.3: + resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} dev: true /@types/prismjs@1.26.0: resolution: {integrity: sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==} dev: true - /@types/prompts@2.0.14: - resolution: {integrity: sha512-HZBd99fKxRWpYCErtm2/yxUZv6/PBI9J7N4TNFffl5JbrYMHBwF25DjQGTW3b3jmXq+9P6/8fCIb2ee57BFfYA==} + /@types/prompts@2.4.4: + resolution: {integrity: sha512-p5N9uoTH76lLvSAaYSZtBCdEXzpOOufsRjnhjVSrZGXikVGHX9+cc9ERtHRV4hvBKHyZb1bg4K+56Bd2TqUn4A==} dependencies: - '@types/node': 18.16.3 + '@types/node': 18.16.18 + kleur: 3.0.3 dev: true /@types/prop-types@15.7.5: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} - /@types/react-dom@17.0.17: - resolution: {integrity: sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==} + /@types/react-dom@17.0.20: + resolution: {integrity: sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==} dependencies: - '@types/react': 17.0.45 + '@types/react': 17.0.62 dev: true - /@types/react-dom@18.2.3: - resolution: {integrity: sha512-hxXEXWxFJXbY0LMj/T69mznqOZJXNtQMqVxIiirVAZnnpeYiD4zt+lPsgcr/cfWg2VLsxZ1y26vigG03prYB+Q==} + /@types/react-dom@18.2.6: + resolution: {integrity: sha512-2et4PDvg6PVCyS7fuTc4gPoksV58bW0RwSxWKcPRcHZf0PRUGq03TKcD/rUHe3azfV6/5/biUBJw+HhCQjaP0A==} dependencies: - '@types/react': 18.2.5 + '@types/react': 18.2.13 dev: false - /@types/react@17.0.45: - resolution: {integrity: sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==} + /@types/react@17.0.62: + resolution: {integrity: sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.3 csstype: 3.1.2 dev: true - /@types/react@18.2.5: - resolution: {integrity: sha512-RuoMedzJ5AOh23Dvws13LU9jpZHIc/k90AgmK7CecAYeWmSr3553L4u5rk4sWAPBuQosfT7HmTfG4Rg5o4nGEA==} + /@types/react@18.2.13: + resolution: {integrity: sha512-vJ+zElvi/Zn9cVXB5slX2xL8PZodPCwPRDpittQdw43JR2AJ5k3vKdgJJyneV/cYgIbLQUwXa9JVDvUZXGba+Q==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.3 @@ -8975,7 +8750,7 @@ packages: /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 18.16.3 + '@types/node': 18.16.18 /@types/resolve@1.20.2: resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} @@ -8990,7 +8765,7 @@ packages: /@types/sax@1.2.4: resolution: {integrity: sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==} dependencies: - '@types/node': 18.16.3 + '@types/node': 18.16.18 dev: false /@types/scheduler@0.16.3: @@ -9020,7 +8795,7 @@ packages: /@types/set-cookie-parser@2.4.2: resolution: {integrity: sha512-fBZgytwhYAUkj/jC/FAV4RQ5EerRup1YQsXQCh8rZfiHkc4UahC192oH0smGwsXol3cL3A5oETuAHeQHmhXM4w==} dependencies: - '@types/node': 18.16.3 + '@types/node': 18.16.18 dev: true /@types/stack-trace@0.0.29: @@ -9052,8 +8827,8 @@ packages: /@types/yargs-parser@21.0.0: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} - /@typescript-eslint/eslint-plugin@5.58.0(@typescript-eslint/parser@5.58.0)(eslint@8.38.0)(typescript@5.0.2): - resolution: {integrity: sha512-vxHvLhH0qgBd3/tW6/VccptSfc8FxPQIkmNTVLWcCOVqSBvqpnKkBTYrhcGlXfSnd78azwe+PsjYFj0X34/njA==} + /@typescript-eslint/eslint-plugin@5.60.0(@typescript-eslint/parser@5.60.0)(eslint@8.43.0)(typescript@5.0.2): + resolution: {integrity: sha512-78B+anHLF1TI8Jn/cD0Q00TBYdMgjdOn980JfAVa9yw5sop8nyTfVOQAv6LWywkOGLclDBtv5z3oxN4w7jxyNg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -9064,24 +8839,24 @@ packages: optional: true dependencies: '@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) - '@typescript-eslint/utils': 5.58.0(eslint@8.38.0)(typescript@5.0.2) + '@typescript-eslint/parser': 5.60.0(eslint@8.43.0)(typescript@5.0.2) + '@typescript-eslint/scope-manager': 5.60.0 + '@typescript-eslint/type-utils': 5.60.0(eslint@8.43.0)(typescript@5.0.2) + '@typescript-eslint/utils': 5.60.0(eslint@8.43.0)(typescript@5.0.2) debug: 4.3.4 - eslint: 8.38.0 + eslint: 8.43.0 grapheme-splitter: 1.0.4 ignore: 5.2.4 natural-compare-lite: 1.4.0 - semver: 7.3.8 + semver: 7.5.2 tsutils: 3.21.0(typescript@5.0.2) typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.58.0(eslint@8.38.0)(typescript@5.0.2): - resolution: {integrity: sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==} + /@typescript-eslint/parser@5.60.0(eslint@8.43.0)(typescript@5.0.2): + resolution: {integrity: sha512-jBONcBsDJ9UoTWrARkRRCgDz6wUggmH5RpQVlt7BimSwaTkTjwypGzKORXbR4/2Hqjk9hgwlon2rVQAjWNpkyQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -9090,26 +8865,26 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.58.0 - '@typescript-eslint/types': 5.58.0 - '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.2) + '@typescript-eslint/scope-manager': 5.60.0 + '@typescript-eslint/types': 5.60.0 + '@typescript-eslint/typescript-estree': 5.60.0(typescript@5.0.2) debug: 4.3.4 - eslint: 8.38.0 + eslint: 8.43.0 typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/scope-manager@5.58.0: - resolution: {integrity: sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==} + /@typescript-eslint/scope-manager@5.60.0: + resolution: {integrity: sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.58.0 - '@typescript-eslint/visitor-keys': 5.58.0 + '@typescript-eslint/types': 5.60.0 + '@typescript-eslint/visitor-keys': 5.60.0 dev: true - /@typescript-eslint/type-utils@5.58.0(eslint@8.38.0)(typescript@5.0.2): - resolution: {integrity: sha512-FF5vP/SKAFJ+LmR9PENql7fQVVgGDOS+dq3j+cKl9iW/9VuZC/8CFmzIP0DLKXfWKpRHawJiG70rVH+xZZbp8w==} + /@typescript-eslint/type-utils@5.60.0(eslint@8.43.0)(typescript@5.0.2): + resolution: {integrity: sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -9118,23 +8893,23 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.2) - '@typescript-eslint/utils': 5.58.0(eslint@8.38.0)(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 5.60.0(typescript@5.0.2) + '@typescript-eslint/utils': 5.60.0(eslint@8.43.0)(typescript@5.0.2) debug: 4.3.4 - eslint: 8.38.0 + eslint: 8.43.0 tsutils: 3.21.0(typescript@5.0.2) typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/types@5.58.0: - resolution: {integrity: sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==} + /@typescript-eslint/types@5.60.0: + resolution: {integrity: sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@5.58.0(typescript@5.0.2): - resolution: {integrity: sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==} + /@typescript-eslint/typescript-estree@5.60.0(typescript@5.0.2): + resolution: {integrity: sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -9142,43 +8917,43 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.58.0 - '@typescript-eslint/visitor-keys': 5.58.0 + '@typescript-eslint/types': 5.60.0 + '@typescript-eslint/visitor-keys': 5.60.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.3.8 + semver: 7.5.2 tsutils: 3.21.0(typescript@5.0.2) typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.58.0(eslint@8.38.0)(typescript@5.0.2): - resolution: {integrity: sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ==} + /@typescript-eslint/utils@5.60.0(eslint@8.43.0)(typescript@5.0.2): + resolution: {integrity: sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.38.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.43.0) '@types/json-schema': 7.0.11 '@types/semver': 7.5.0 - '@typescript-eslint/scope-manager': 5.58.0 - '@typescript-eslint/types': 5.58.0 - '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.2) - eslint: 8.38.0 + '@typescript-eslint/scope-manager': 5.60.0 + '@typescript-eslint/types': 5.60.0 + '@typescript-eslint/typescript-estree': 5.60.0(typescript@5.0.2) + eslint: 8.43.0 eslint-scope: 5.1.1 - semver: 7.3.8 + semver: 7.5.2 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/visitor-keys@5.58.0: - resolution: {integrity: sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==} + /@typescript-eslint/visitor-keys@5.60.0: + resolution: {integrity: sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.58.0 + '@typescript-eslint/types': 5.60.0 eslint-visitor-keys: 3.4.1 dev: true @@ -9215,8 +8990,8 @@ packages: resolution: {integrity: sha512-TSVh8CpnwNAsPC5wXcIyh92Bv1gq6E9cNDeeLu7Z4h8V4/qWtXJp7y42qljRkqcpmsve1iozwv1wr+3BNdILCg==} dev: true - /@vercel/analytics@0.1.8: - resolution: {integrity: sha512-PQrOI8BJ9qUiVJuQfnKiJd15eDjDJH9TBKsNeMrtelT4NAk7d9mBVz1CoZkvoFnHQ0OW7Xnqmr1F2nScfAnznQ==} + /@vercel/analytics@0.1.11: + resolution: {integrity: sha512-mj5CPR02y0BRs1tN3oZcBNAX9a8NxsIUl9vElDPcqxnMfP0RbRc9fI9Ud7+QDg/1Izvt5uMumsr+6YsmVHcyuw==} peerDependencies: react: ^16.8||^17||^18 peerDependenciesMeta: @@ -9224,12 +8999,14 @@ packages: optional: true dev: false - /@vercel/nft@0.22.1: - resolution: {integrity: sha512-lYYZIoxRurqDOSoVIdBicGnpUIpfyaS5qVjdPq+EfI285WqtZK3NK/dyCkiyBul+X2U2OEhRyeMdXPCHGJbohw==} + /@vercel/nft@0.22.6: + resolution: {integrity: sha512-gTsFnnT4mGxodr4AUlW3/urY+8JKKB452LwF3m477RFUJTAaDmcz2JqFuInzvdybYIeyIv1sSONEJxsxnbQ5JQ==} + engines: {node: '>=14'} hasBin: true dependencies: '@mapbox/node-pre-gyp': 1.0.10 - acorn: 8.8.2 + '@rollup/pluginutils': 4.2.1 + acorn: 8.9.0 async-sema: 3.1.1 bindings: 1.5.0 estree-walker: 2.0.2 @@ -9238,14 +9015,13 @@ packages: micromatch: 4.0.5 node-gyp-build: 4.6.0 resolve-from: 5.0.0 - rollup-pluginutils: 2.8.2 transitivePeerDependencies: - encoding - supports-color dev: false - /@vitejs/plugin-vue-jsx@3.0.0(vite@4.3.1)(vue@3.2.47): - resolution: {integrity: sha512-vurkuzgac5SYuxd2HUZqAFAWGTF10diKBwJNbCvnWijNZfXd+7jMtqjPFbGt7idOJUn584fP1Ar9j/GN2jQ3Ew==} + /@vitejs/plugin-vue-jsx@3.0.1(vite@4.3.9)(vue@3.3.4): + resolution: {integrity: sha512-+Jb7ggL48FSPS1uhPnJbJwWa9Sr90vQ+d0InW+AhBM22n+cfuYqJZDckBc+W3QSHe1WDvewMZfa4wZOtk5pRgw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.0.0 @@ -9254,17 +9030,17 @@ packages: vite: optional: true dependencies: - '@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.16.3)(sass@1.52.2) - vue: 3.2.47 + '@babel/core': 7.22.5 + '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.22.5) + '@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.22.5) + vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) + vue: 3.3.4 transitivePeerDependencies: - supports-color dev: false - /@vitejs/plugin-vue@4.0.0(vite@4.3.1)(vue@3.2.47): - resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==} + /@vitejs/plugin-vue@4.2.3(vite@4.3.9)(vue@3.3.4): + resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.0.0 @@ -9273,43 +9049,43 @@ packages: vite: optional: true dependencies: - vite: 4.3.1(@types/node@18.16.3)(sass@1.52.2) - vue: 3.2.47 + vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) + vue: 3.3.4 dev: false - /@vitest/expect@0.31.0: - resolution: {integrity: sha512-Jlm8ZTyp6vMY9iz9Ny9a0BHnCG4fqBa8neCF6Pk/c/6vkUk49Ls6UBlgGAU82QnzzoaUs9E/mUhq/eq9uMOv/g==} + /@vitest/expect@0.31.4: + resolution: {integrity: sha512-tibyx8o7GUyGHZGyPgzwiaPaLDQ9MMuCOrc03BYT0nryUuhLbL7NV2r/q98iv5STlwMgaKuFJkgBW/8iPKwlSg==} dependencies: - '@vitest/spy': 0.31.0 - '@vitest/utils': 0.31.0 + '@vitest/spy': 0.31.4 + '@vitest/utils': 0.31.4 chai: 4.3.7 dev: false - /@vitest/runner@0.31.0: - resolution: {integrity: sha512-H1OE+Ly7JFeBwnpHTrKyCNm/oZgr+16N4qIlzzqSG/YRQDATBYmJb/KUn3GrZaiQQyL7GwpNHVZxSQd6juLCgw==} + /@vitest/runner@0.31.4: + resolution: {integrity: sha512-Wgm6UER+gwq6zkyrm5/wbpXGF+g+UBB78asJlFkIOwyse0pz8lZoiC6SW5i4gPnls/zUcPLWS7Zog0LVepXnpg==} dependencies: - '@vitest/utils': 0.31.0 + '@vitest/utils': 0.31.4 concordance: 5.0.4 p-limit: 4.0.0 pathe: 1.1.0 dev: false - /@vitest/snapshot@0.31.0: - resolution: {integrity: sha512-5dTXhbHnyUMTMOujZPB0wjFjQ6q5x9c8TvAsSPUNKjp1tVU7i9pbqcKPqntyu2oXtmVxKbuHCqrOd+Ft60r4tg==} + /@vitest/snapshot@0.31.4: + resolution: {integrity: sha512-LemvNumL3NdWSmfVAMpXILGyaXPkZbG5tyl6+RQSdcHnTj6hvA49UAI8jzez9oQyE/FWLKRSNqTGzsHuk89LRA==} dependencies: magic-string: 0.30.0 pathe: 1.1.0 pretty-format: 27.5.1 dev: false - /@vitest/spy@0.31.0: - resolution: {integrity: sha512-IzCEQ85RN26GqjQNkYahgVLLkULOxOm5H/t364LG0JYb3Apg0PsYCHLBYGA006+SVRMWhQvHlBBCyuByAMFmkg==} + /@vitest/spy@0.31.4: + resolution: {integrity: sha512-3ei5ZH1s3aqbEyftPAzSuunGICRuhE+IXOmpURFdkm5ybUADk+viyQfejNk6q8M5QGX8/EVKw+QWMEP3DTJDag==} dependencies: tinyspy: 2.1.0 dev: false - /@vitest/utils@0.31.0: - resolution: {integrity: sha512-kahaRyLX7GS1urekRXN2752X4gIgOGVX4Wo8eDUGUkTWlGpXzf5ZS6N9RUUS+Re3XEE8nVGqNyxkSxF5HXlGhQ==} + /@vitest/utils@0.31.4: + resolution: {integrity: sha512-DobZbHacWznoGUfYU8XDPY78UubJxXfMNY1+SUdOp1NsI34eopSA6aZMeaGu10waSOeYwE8lxrd/pLfT0RMxjQ==} dependencies: concordance: 5.0.4 loupe: 2.3.6 @@ -9334,35 +9110,18 @@ packages: resolution: {integrity: sha512-/yrv59IEnmh655z1oeDnGcvMYwnEzNzHLgeYcQCkhYX0xBvYWrAuefoiLcPBUkMpJsb46bqQ6Yv4pwTTQ4d3Qg==} 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: - 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.18.2) - '@babel/template': 7.20.7 - '@babel/traverse': 7.18.2 - '@babel/types': 7.21.5 - '@vue/babel-helper-vue-transform-on': 1.0.2 - camelcase: 6.3.0 - html-tags: 3.3.1 - svg-tags: 1.0.0 - transitivePeerDependencies: - - '@babel/core' - - supports-color + /@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.8): + /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.22.5): 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.8) + '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.22.5) '@babel/template': 7.20.7 - '@babel/traverse': 7.18.2 - '@babel/types': 7.21.5 + '@babel/traverse': 7.22.5 + '@babel/types': 7.22.5 '@vue/babel-helper-vue-transform-on': 1.0.2 camelcase: 6.3.0 html-tags: 3.3.1 @@ -9372,96 +9131,48 @@ packages: - supports-color dev: false - /@vue/compiler-core@3.2.39: - resolution: {integrity: sha512-mf/36OWXqWn0wsC40nwRRGheR/qoID+lZXbIuLnr4/AngM0ov8Xvv8GHunC0rKRIkh60bTqydlqTeBo49rlbqw==} - dependencies: - '@babel/parser': 7.18.4 - '@vue/shared': 3.2.39 - estree-walker: 2.0.2 - source-map: 0.6.1 - dev: false - - /@vue/compiler-core@3.2.47: - resolution: {integrity: sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==} + /@vue/compiler-core@3.3.4: + resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} dependencies: - '@babel/parser': 7.21.9 - '@vue/shared': 3.2.47 + '@babel/parser': 7.22.5 + '@vue/shared': 3.3.4 estree-walker: 2.0.2 - source-map: 0.6.1 - - /@vue/compiler-dom@3.2.39: - resolution: {integrity: sha512-HMFI25Be1C8vLEEv1hgEO1dWwG9QQ8LTTPmCkblVJY/O3OvWx6r1+zsox5mKPMGvqYEZa6l8j+xgOfUspgo7hw==} - dependencies: - '@vue/compiler-core': 3.2.39 - '@vue/shared': 3.2.39 - dev: false - - /@vue/compiler-dom@3.2.47: - resolution: {integrity: sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==} - dependencies: - '@vue/compiler-core': 3.2.47 - '@vue/shared': 3.2.47 + source-map-js: 1.0.2 - /@vue/compiler-sfc@3.2.39: - resolution: {integrity: sha512-fqAQgFs1/BxTUZkd0Vakn3teKUt//J3c420BgnYgEOoVdTwYpBTSXCMJ88GOBCylmUBbtquGPli9tVs7LzsWIA==} + /@vue/compiler-dom@3.3.4: + resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==} dependencies: - '@babel/parser': 7.18.4 - '@vue/compiler-core': 3.2.39 - '@vue/compiler-dom': 3.2.39 - '@vue/compiler-ssr': 3.2.39 - '@vue/reactivity-transform': 3.2.39 - '@vue/shared': 3.2.39 - estree-walker: 2.0.2 - magic-string: 0.25.9 - postcss: 8.4.24 - source-map: 0.6.1 - dev: false + '@vue/compiler-core': 3.3.4 + '@vue/shared': 3.3.4 - /@vue/compiler-sfc@3.2.47: - resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==} + /@vue/compiler-sfc@3.3.4: + resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==} dependencies: - '@babel/parser': 7.21.9 - '@vue/compiler-core': 3.2.47 - '@vue/compiler-dom': 3.2.47 - '@vue/compiler-ssr': 3.2.47 - '@vue/reactivity-transform': 3.2.47 - '@vue/shared': 3.2.47 + '@babel/parser': 7.22.5 + '@vue/compiler-core': 3.3.4 + '@vue/compiler-dom': 3.3.4 + '@vue/compiler-ssr': 3.3.4 + '@vue/reactivity-transform': 3.3.4 + '@vue/shared': 3.3.4 estree-walker: 2.0.2 - magic-string: 0.25.9 + magic-string: 0.30.0 postcss: 8.4.24 - source-map: 0.6.1 - - /@vue/compiler-ssr@3.2.39: - resolution: {integrity: sha512-EoGCJ6lincKOZGW+0Ky4WOKsSmqL7hp1ZYgen8M7u/mlvvEQUaO9tKKOy7K43M9U2aA3tPv0TuYYQFrEbK2eFQ==} - dependencies: - '@vue/compiler-dom': 3.2.39 - '@vue/shared': 3.2.39 - dev: false - - /@vue/compiler-ssr@3.2.47: - resolution: {integrity: sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==} - dependencies: - '@vue/compiler-dom': 3.2.47 - '@vue/shared': 3.2.47 + source-map-js: 1.0.2 - /@vue/reactivity-transform@3.2.39: - resolution: {integrity: sha512-HGuWu864zStiWs9wBC6JYOP1E00UjMdDWIG5W+FpUx28hV3uz9ODOKVNm/vdOy/Pvzg8+OcANxAVC85WFBbl3A==} + /@vue/compiler-ssr@3.3.4: + resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==} dependencies: - '@babel/parser': 7.18.4 - '@vue/compiler-core': 3.2.39 - '@vue/shared': 3.2.39 - estree-walker: 2.0.2 - magic-string: 0.25.9 - dev: false + '@vue/compiler-dom': 3.3.4 + '@vue/shared': 3.3.4 - /@vue/reactivity-transform@3.2.47: - resolution: {integrity: sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==} + /@vue/reactivity-transform@3.3.4: + resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==} dependencies: - '@babel/parser': 7.21.9 - '@vue/compiler-core': 3.2.47 - '@vue/shared': 3.2.47 + '@babel/parser': 7.22.5 + '@vue/compiler-core': 3.3.4 + '@vue/shared': 3.3.4 estree-walker: 2.0.2 - magic-string: 0.25.9 + magic-string: 0.30.0 /@vue/reactivity@3.1.5: resolution: {integrity: sha512-1tdfLmNjWG6t/CsPldh+foumYFo3cpyCHgBYQ34ylaMsJ+SNHQ1kApMIa8jN+i593zQuaw3AdWH0nJTARzCFhg==} @@ -9469,54 +9180,50 @@ packages: '@vue/shared': 3.1.5 dev: false - /@vue/reactivity@3.2.47: - resolution: {integrity: sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==} - dependencies: - '@vue/shared': 3.2.47 - /@vue/reactivity@3.3.2: resolution: {integrity: sha512-yX8C4uTgg2Tdj+512EEMnMKbLveoITl7YdQX35AYgx8vBvQGszKiiCN46g4RY6/deeo/5DLbeUUGxCq1qWMf5g==} dependencies: '@vue/shared': 3.3.2 dev: false - /@vue/runtime-core@3.2.47: - resolution: {integrity: sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==} + /@vue/reactivity@3.3.4: + resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==} + dependencies: + '@vue/shared': 3.3.4 + + /@vue/runtime-core@3.3.4: + resolution: {integrity: sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==} dependencies: - '@vue/reactivity': 3.2.47 - '@vue/shared': 3.2.47 + '@vue/reactivity': 3.3.4 + '@vue/shared': 3.3.4 - /@vue/runtime-dom@3.2.47: - resolution: {integrity: sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==} + /@vue/runtime-dom@3.3.4: + resolution: {integrity: sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==} dependencies: - '@vue/runtime-core': 3.2.47 - '@vue/shared': 3.2.47 - csstype: 2.6.21 + '@vue/runtime-core': 3.3.4 + '@vue/shared': 3.3.4 + csstype: 3.1.2 - /@vue/server-renderer@3.2.47(vue@3.2.47): - resolution: {integrity: sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==} + /@vue/server-renderer@3.3.4(vue@3.3.4): + resolution: {integrity: sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==} peerDependencies: - vue: 3.2.47 + vue: 3.3.4 dependencies: - '@vue/compiler-ssr': 3.2.47 - '@vue/shared': 3.2.47 - vue: 3.2.47 + '@vue/compiler-ssr': 3.3.4 + '@vue/shared': 3.3.4 + vue: 3.3.4 /@vue/shared@3.1.5: resolution: {integrity: sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA==} dev: false - /@vue/shared@3.2.39: - resolution: {integrity: sha512-D3dl2ZB9qE6mTuWPk9RlhDeP1dgNRUKC3NJxji74A4yL8M2MwlhLKUC/49WHjrNzSPug58fWx/yFbaTzGAQSBw==} - dev: false - - /@vue/shared@3.2.47: - resolution: {integrity: sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==} - /@vue/shared@3.3.2: resolution: {integrity: sha512-0rFu3h8JbclbnvvKrs7Fe5FNGV9/5X2rPD7KmOzhLSUAiQH5//Hq437Gv0fR5Mev3u/nbtvmLl8XgwCU20/ZfQ==} dev: false + /@vue/shared@3.3.4: + resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} + /@webcomponents/template-shadowroot@0.2.1: resolution: {integrity: sha512-fXL/vIUakyZL62hyvUh+EMwbVoTc0hksublmRz6ai6et8znHkJa6gtqMUZo1oc7dIz46exHSIImml9QTdknMHg==} dev: false @@ -9544,12 +9251,12 @@ packages: acorn-walk: 7.2.0 dev: true - /acorn-jsx@5.3.2(acorn@8.8.2): + /acorn-jsx@5.3.2(acorn@8.9.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.8.2 + acorn: 8.9.0 /acorn-walk@7.2.0: resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==} @@ -9566,8 +9273,8 @@ packages: hasBin: true dev: true - /acorn@8.8.2: - resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} + /acorn@8.9.0: + resolution: {integrity: sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==} engines: {node: '>=0.4.0'} hasBin: true @@ -9605,8 +9312,8 @@ packages: uri-js: 4.4.1 dev: false - /alpinejs@3.12.0: - resolution: {integrity: sha512-YENcRBA9dlwR8PsZNFMTHbmdlTNwd1BkCeivPvOzzCKHas6AfwNRsDK9UEFmE5dXTMEZjnnpCTxV8vkdpWiOCw==} + /alpinejs@3.12.2: + resolution: {integrity: sha512-wrUZULm9w6DYwWcUtB/anFLgRaF4riSuPgIJ3gcPUS8st9luAJnAxoIgro/Al97d2McSSz/JypWg/NlmKFIJJA==} dependencies: '@vue/reactivity': 3.1.5 dev: false @@ -9740,7 +9447,7 @@ packages: resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==} engines: {node: '>=4'} dependencies: - tslib: 2.5.0 + tslib: 2.5.3 dev: true /astring@1.8.4: @@ -9748,14 +9455,15 @@ packages: hasBin: true dev: false - /astro-embed@0.1.1(astro@packages+astro): - resolution: {integrity: sha512-NBnLDB0PygbahCBFeGDPzmW4/PJSrieWgjN7mN8vmStUACM+cdTz1vhLDSWt4LlbWxozq0x9G1dTnoVbHyYKLA==} + /astro-embed@0.1.3(astro@packages+astro): + resolution: {integrity: sha512-ztKlhFdUqlSlE5frybHLHQILsgBLnlcN2PejtkYEaIZHvysteiniT6Rg1o08z7+0FIt/KVE+8L/Y5g3ufFWdPg==} peerDependencies: astro: '*' dependencies: '@astro-community/astro-embed-integration': 0.1.2(astro@packages+astro) '@astro-community/astro-embed-twitter': 0.1.3(astro@packages+astro) - '@astro-community/astro-embed-youtube': 0.1.2(astro@packages+astro) + '@astro-community/astro-embed-vimeo': 0.1.2(astro@packages+astro) + '@astro-community/astro-embed-youtube': 0.2.2(astro@packages+astro) astro: link:packages/astro dev: false @@ -9783,8 +9491,8 @@ packages: engines: {node: '>= 4.0.0'} dev: false - /autocannon@7.10.0: - resolution: {integrity: sha512-PY1UrXL4NHE7J0hA6GGN2r8xjiAePS/bii3Hz7NOvp4JO3xDNBgRftDjfAxj1t6FDWXiXEOuKF/pdDiisIS8ZA==} + /autocannon@7.11.0: + resolution: {integrity: sha512-17farET7ImAZjOCGSxiG3TcEbc6b+zWWQ61CpKC8D6UIjq+U3c1foRDSMk8Rgl4VJ01Hbbbx6UhdXhye9yTEZg==} hasBin: true dependencies: chalk: 4.1.2 @@ -9807,26 +9515,11 @@ packages: progress: 2.0.3 reinterval: 1.1.0 retimer: 3.0.0 - semver: 7.3.8 + semver: 7.5.2 subarg: 1.0.0 timestring: 6.0.0 dev: false - /autoprefixer@10.4.14(postcss@8.4.23): - resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==} - engines: {node: ^10 || ^12 || >=14} - hasBin: true - peerDependencies: - postcss: ^8.1.0 - dependencies: - browserslist: 4.21.5 - caniuse-lite: 1.0.30001487 - fraction.js: 4.2.0 - normalize-range: 0.1.2 - picocolors: 1.0.0 - postcss: 8.4.23 - postcss-value-parser: 4.2.0 - /autoprefixer@10.4.14(postcss@8.4.24): resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==} engines: {node: ^10 || ^12 || >=14} @@ -9841,24 +9534,24 @@ packages: picocolors: 1.0.0 postcss: 8.4.24 postcss-value-parser: 4.2.0 - dev: false /available-typed-arrays@1.0.5: resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} engines: {node: '>= 0.4'} - /babel-plugin-jsx-dom-expressions@0.33.14: - resolution: {integrity: sha512-91T8uEz6Wb42bUm5vxRBawY05fBHiwUxah/xWBimuWpH3nf7E0KJ0Wm/s8R7lxRIZzwGCILv1IBlUCqA50WOVw==} + /babel-plugin-jsx-dom-expressions@0.36.10: + resolution: {integrity: sha512-QA2k/14WGw+RgcGGnEuLWwnu4em6CGhjeXtjvgOYyFHYS2a+CzPeaVQHDOlfuiBcjq/3hWMspHMIMnPEOIzdBg==} peerDependencies: - '@babel/core': ^7.0.0 + '@babel/core': ^7.20.12 peerDependenciesMeta: '@babel/core': optional: true dependencies: - '@babel/helper-module-imports': 7.16.0 - '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.18.2) - '@babel/types': 7.21.5 - html-entities: 2.3.2 + '@babel/helper-module-imports': 7.18.6 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.5) + '@babel/types': 7.22.5 + html-entities: 2.3.3 + validate-html-nesting: 1.2.2 dev: false /babel-plugin-module-resolver@5.0.0: @@ -9872,7 +9565,7 @@ packages: resolve: 1.22.2 dev: false - /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.21.8): + /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.22.5): resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -9880,15 +9573,15 @@ packages: '@babel/core': optional: true dependencies: - '@babel/compat-data': 7.21.7 - '@babel/core': 7.21.8 - '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8) + '@babel/compat-data': 7.22.5 + '@babel/core': 7.22.5 + '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.22.5) semver: 6.3.0 transitivePeerDependencies: - supports-color dev: false - /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.21.8): + /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.22.5): resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -9896,14 +9589,14 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.22.5) core-js-compat: 3.30.2 transitivePeerDependencies: - supports-color dev: false - /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.21.8): + /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.22.5): resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==} peerDependencies: '@babel/core': ^7.0.0-0 @@ -9911,18 +9604,21 @@ packages: '@babel/core': optional: true dependencies: - '@babel/core': 7.21.8 - '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.22.5) transitivePeerDependencies: - supports-color dev: false - /babel-preset-solid@1.4.2: - resolution: {integrity: sha512-dDAYTT4UcBvUjdnlf1SOBNTospI/L1wWyzrMxEie3B4Auofo0lSFaCc95Pn5AZY8sdAew13Rp4a1ImByIsZlsQ==} + /babel-preset-solid@1.7.4: + resolution: {integrity: sha512-0mbHNYkbOVYhH6L95VlHVkBEVQjOXSzUqLDiFxUcsg/tU4yTM/qx7FI8C+kmos9LHckQBSm3wtwoe1BZLNJR1w==} + peerDependencies: + '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: - babel-plugin-jsx-dom-expressions: 0.33.14 - transitivePeerDependencies: - - '@babel/core' + babel-plugin-jsx-dom-expressions: 0.36.10 dev: false /bail@2.0.2: @@ -10086,7 +9782,7 @@ packages: /builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} dependencies: - semver: 7.5.1 + semver: 7.5.2 dev: true /bundle-name@3.0.0: @@ -10161,37 +9857,25 @@ packages: /ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} - /chai-as-promised@7.1.1(chai@4.3.6): + /chai-as-promised@7.1.1(chai@4.3.7): resolution: {integrity: sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==} peerDependencies: chai: '>= 2.1.2 < 5' dependencies: - chai: 4.3.6 + chai: 4.3.7 check-error: 1.0.2 dev: true - /chai-xml@0.4.0(chai@4.3.6): - resolution: {integrity: sha512-VjFPW64Hcp9CuuZbAC26cBWi+DPhyWOW8yxNpfQX3W+jQLPJxN/sm5FAaW+FOKTzsNeIFQpt5yhGbZA5s/pEyg==} + /chai-xml@0.4.1(chai@4.3.7): + resolution: {integrity: sha512-VUf5Ol4ifOAsgz+lN4tfWENgQtrKxHPWsmpL5wdbqQdkpblZkcDlaT2aFvsPQH219Yvl8vc4064yFErgBIn9bw==} engines: {node: '>= 0.8.0'} peerDependencies: chai: '>=1.10.0 ' dependencies: - chai: 4.3.6 - xml2js: 0.4.23 + chai: 4.3.7 + xml2js: 0.5.0 dev: true - /chai@4.3.6: - resolution: {integrity: sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==} - engines: {node: '>=4'} - dependencies: - assertion-error: 1.1.0 - check-error: 1.0.2 - deep-eql: 3.0.1 - get-func-name: 2.0.0 - loupe: 2.3.6 - pathval: 1.1.1 - type-detect: 4.0.8 - /chai@4.3.7: resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==} engines: {node: '>=4'} @@ -10203,7 +9887,6 @@ packages: loupe: 2.3.6 pathval: 1.1.1 type-detect: 4.0.8 - dev: false /chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -10267,8 +9950,8 @@ packages: domutils: 3.1.0 dev: true - /cheerio@1.0.0-rc.11: - resolution: {integrity: sha512-bQwNaDIBKID5ts/DsdhxrjqFXYfLw4ste+wMKqWA8DyKcS4qwsPP4Bk8ZNaTJjvpiX/qW3BT4sU7d6Bh5i+dag==} + /cheerio@1.0.0-rc.12: + resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==} engines: {node: '>= 6'} dependencies: cheerio-select: 2.1.0 @@ -10278,7 +9961,6 @@ packages: htmlparser2: 8.0.2 parse5: 7.1.2 parse5-htmlparser2-tree-adapter: 7.0.0 - tslib: 2.5.0 dev: true /chokidar@3.5.3: @@ -10303,8 +9985,9 @@ packages: engines: {node: '>=10'} dev: false - /ci-info@3.3.1: - resolution: {integrity: sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==} + /ci-info@3.8.0: + resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} + engines: {node: '>=8'} /clean-css@4.2.4: resolution: {integrity: sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==} @@ -10474,7 +10157,7 @@ packages: js-string-escape: 1.0.1 lodash: 4.17.21 md5-hex: 3.0.1 - semver: 7.3.8 + semver: 7.5.2 well-known-symbols: 2.0.0 dev: false @@ -10561,36 +10244,36 @@ packages: engines: {node: '>=8'} dev: false - /css-blank-pseudo@3.0.3(postcss@8.4.23): + /css-blank-pseudo@3.0.3(postcss@8.4.24): resolution: {integrity: sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==} engines: {node: ^12 || ^14 || >=16} hasBin: true peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /css-has-pseudo@3.0.4(postcss@8.4.23): + /css-has-pseudo@3.0.4(postcss@8.4.24): resolution: {integrity: sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==} engines: {node: ^12 || ^14 || >=16} hasBin: true peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /css-prefers-color-scheme@6.0.3(postcss@8.4.23): + /css-prefers-color-scheme@6.0.3(postcss@8.4.24): resolution: {integrity: sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==} engines: {node: ^12 || ^14 || >=16} hasBin: true peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true /css-select@5.1.0: @@ -10612,8 +10295,8 @@ packages: engines: {node: '>= 6'} dev: true - /cssdb@6.6.3: - resolution: {integrity: sha512-7GDvDSmE+20+WcSMhP17Q1EVWUrLlbxxpMDqG731n8P99JhnQZHR9YvtjPvEHfjFUjvQJvdpKCjlKOX+xe4UVA==} + /cssdb@7.6.0: + resolution: {integrity: sha512-Nna7rph8V0jC6+JBY4Vk4ndErUmfJfV6NJCaZdurL0omggabiy+QB2HCQtu5c/ACLZ0I7REv7A4QyPIoYzZx0w==} dev: true /cssesc@3.0.0: @@ -10636,9 +10319,6 @@ packages: cssom: 0.3.8 dev: true - /csstype@2.6.21: - resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==} - /csstype@3.1.2: resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} @@ -10764,18 +10444,11 @@ packages: resolution: {integrity: sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==} dev: false - /deep-eql@3.0.1: - resolution: {integrity: sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==} - engines: {node: '>=0.12'} - dependencies: - type-detect: 4.0.8 - /deep-eql@4.1.3: resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==} engines: {node: '>=6'} dependencies: type-detect: 4.0.8 - dev: false /deep-extend@0.6.0: resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} @@ -10785,8 +10458,8 @@ packages: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} dev: true - /deepmerge-ts@4.2.2: - resolution: {integrity: sha512-Ka3Kb21tiWjvQvS9U+1Dx+aqFAHsdTnMdYptLTmC2VAmDFMugWMY1e15aTODstipmCun8iNuqeSfcx6rsUUk0Q==} + /deepmerge-ts@4.3.0: + resolution: {integrity: sha512-if3ZYdkD2dClhnXR5reKtG98cwyaRT1NeugQoAPTTfsOpV9kqyeiBF9Qa5RHjemb3KzD5ulqygv6ED3t5j9eJw==} engines: {node: '>=12.4.0'} dev: false @@ -11098,8 +10771,8 @@ packages: unbox-primitive: 1.0.2 which-typed-array: 1.1.9 - /es-module-lexer@1.1.1: - resolution: {integrity: sha512-n3ruqU8Te7I5prBd6d0darM8ajFuVNhLWvgo04hN7goWSaSrxe7ENOZitac7akN0A2o+8fMomBDsNPvW/eE3CQ==} + /es-module-lexer@1.3.0: + resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==} dev: false /es-set-tostringtag@2.0.1: @@ -11412,13 +11085,14 @@ packages: dev: false optional: true - /esbuild-plugin-copy@2.0.2(esbuild@0.17.12): - resolution: {integrity: sha512-HlDgkHXagBCwaoB8tlQFeH08/i5a2ey6Pc26annV1YcG5CkAHzzRzmCwp3wdi5KHI//HVUgipS+Zsy2tQmn9gQ==} + /esbuild-plugin-copy@2.1.1(esbuild@0.17.19): + resolution: {integrity: sha512-Bk66jpevTcV8KMFzZI1P7MZKZ+uDcrZm2G2egZ2jNIvVnivDpodZI+/KnpL3Jnap0PBdIHU7HwFGB8r+vV5CVw==} peerDependencies: esbuild: '>= 0.14.0' dependencies: chalk: 4.1.2 - esbuild: 0.17.12 + chokidar: 3.5.3 + esbuild: 0.17.19 fs-extra: 10.1.0 globby: 11.1.0 dev: true @@ -11553,63 +11227,34 @@ packages: esbuild-windows-arm64: 0.15.18 dev: false - /esbuild@0.17.12: - resolution: {integrity: sha512-bX/zHl7Gn2CpQwcMtRogTTBf9l1nl+H6R8nUbjk+RuKqAE3+8FDulLA+pHvX7aA7Xe07Iwa+CWvy9I8Y2qqPKQ==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.17.12 - '@esbuild/android-arm64': 0.17.12 - '@esbuild/android-x64': 0.17.12 - '@esbuild/darwin-arm64': 0.17.12 - '@esbuild/darwin-x64': 0.17.12 - '@esbuild/freebsd-arm64': 0.17.12 - '@esbuild/freebsd-x64': 0.17.12 - '@esbuild/linux-arm': 0.17.12 - '@esbuild/linux-arm64': 0.17.12 - '@esbuild/linux-ia32': 0.17.12 - '@esbuild/linux-loong64': 0.17.12 - '@esbuild/linux-mips64el': 0.17.12 - '@esbuild/linux-ppc64': 0.17.12 - '@esbuild/linux-riscv64': 0.17.12 - '@esbuild/linux-s390x': 0.17.12 - '@esbuild/linux-x64': 0.17.12 - '@esbuild/netbsd-x64': 0.17.12 - '@esbuild/openbsd-x64': 0.17.12 - '@esbuild/sunos-x64': 0.17.12 - '@esbuild/win32-arm64': 0.17.12 - '@esbuild/win32-ia32': 0.17.12 - '@esbuild/win32-x64': 0.17.12 - - /esbuild@0.17.18: - resolution: {integrity: sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==} + /esbuild@0.17.19: + resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.17.18 - '@esbuild/android-arm64': 0.17.18 - '@esbuild/android-x64': 0.17.18 - '@esbuild/darwin-arm64': 0.17.18 - '@esbuild/darwin-x64': 0.17.18 - '@esbuild/freebsd-arm64': 0.17.18 - '@esbuild/freebsd-x64': 0.17.18 - '@esbuild/linux-arm': 0.17.18 - '@esbuild/linux-arm64': 0.17.18 - '@esbuild/linux-ia32': 0.17.18 - '@esbuild/linux-loong64': 0.17.18 - '@esbuild/linux-mips64el': 0.17.18 - '@esbuild/linux-ppc64': 0.17.18 - '@esbuild/linux-riscv64': 0.17.18 - '@esbuild/linux-s390x': 0.17.18 - '@esbuild/linux-x64': 0.17.18 - '@esbuild/netbsd-x64': 0.17.18 - '@esbuild/openbsd-x64': 0.17.18 - '@esbuild/sunos-x64': 0.17.18 - '@esbuild/win32-arm64': 0.17.18 - '@esbuild/win32-ia32': 0.17.18 - '@esbuild/win32-x64': 0.17.18 + '@esbuild/android-arm': 0.17.19 + '@esbuild/android-arm64': 0.17.19 + '@esbuild/android-x64': 0.17.19 + '@esbuild/darwin-arm64': 0.17.19 + '@esbuild/darwin-x64': 0.17.19 + '@esbuild/freebsd-arm64': 0.17.19 + '@esbuild/freebsd-x64': 0.17.19 + '@esbuild/linux-arm': 0.17.19 + '@esbuild/linux-arm64': 0.17.19 + '@esbuild/linux-ia32': 0.17.19 + '@esbuild/linux-loong64': 0.17.19 + '@esbuild/linux-mips64el': 0.17.19 + '@esbuild/linux-ppc64': 0.17.19 + '@esbuild/linux-riscv64': 0.17.19 + '@esbuild/linux-s390x': 0.17.19 + '@esbuild/linux-x64': 0.17.19 + '@esbuild/netbsd-x64': 0.17.19 + '@esbuild/openbsd-x64': 0.17.19 + '@esbuild/sunos-x64': 0.17.19 + '@esbuild/win32-arm64': 0.17.19 + '@esbuild/win32-ia32': 0.17.19 + '@esbuild/win32-x64': 0.17.19 /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -11657,13 +11302,13 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-prettier@8.8.0(eslint@8.38.0): + /eslint-config-prettier@8.8.0(eslint@8.43.0): resolution: {integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.38.0 + eslint: 8.43.0 dev: true /eslint-plugin-no-only-tests@2.6.0: @@ -11671,7 +11316,7 @@ packages: engines: {node: '>=4.0.0'} dev: true - /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.38.0)(prettier@2.8.8): + /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.43.0)(prettier@2.8.8): resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -11682,8 +11327,8 @@ packages: eslint-config-prettier: optional: true dependencies: - eslint: 8.38.0 - eslint-config-prettier: 8.8.0(eslint@8.38.0) + eslint: 8.43.0 + eslint-config-prettier: 8.8.0(eslint@8.43.0) prettier: 2.8.8 prettier-linter-helpers: 1.0.0 dev: true @@ -11709,16 +11354,16 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.38.0: - resolution: {integrity: sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==} + /eslint@8.43.0: + resolution: {integrity: sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.38.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.43.0) '@eslint-community/regexpp': 4.5.1 '@eslint/eslintrc': 2.0.3 - '@eslint/js': 8.38.0 - '@humanwhocodes/config-array': 0.11.8 + '@eslint/js': 8.43.0 + '@humanwhocodes/config-array': 0.11.10 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 ajv: 6.12.6 @@ -11737,13 +11382,12 @@ packages: find-up: 5.0.0 glob-parent: 6.0.2 globals: 13.20.0 - grapheme-splitter: 1.0.4 + graphemer: 1.4.0 ignore: 5.2.4 import-fresh: 3.3.0 imurmurhash: 0.1.4 is-glob: 4.0.3 is-path-inside: 3.0.3 - js-sdsl: 4.4.0 js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 @@ -11767,8 +11411,8 @@ packages: resolution: {integrity: sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.8.2 - acorn-jsx: 5.3.2(acorn@8.8.2) + acorn: 8.9.0 + acorn-jsx: 5.3.2(acorn@8.9.0) eslint-visitor-keys: 3.4.1 dev: true @@ -11804,7 +11448,7 @@ packages: /estree-util-attach-comments@2.1.1: resolution: {integrity: sha512-+5Ba/xGGS6mnwFbXIuQiDPTbuTxuMCooq3arVv7gPZtYpjp+VXH/NkHAP35OOefPhNG/UGqU3vt/LTABwcHX0w==} dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 dev: false /estree-util-build-jsx@2.2.2: @@ -11827,8 +11471,8 @@ packages: source-map: 0.7.4 dev: false - /estree-util-visit@1.2.0: - resolution: {integrity: sha512-wdsoqhWueuJKsh5hqLw3j8lwFqNStm92VcwtAOAny8g/KS/l5Y8RISjR4k5W6skCj3Nirag/WUCMS0Nfy3sgsg==} + /estree-util-visit@1.2.1: + resolution: {integrity: sha512-xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw==} dependencies: '@types/estree-jsx': 1.0.0 '@types/unist': 2.0.6 @@ -11836,6 +11480,7 @@ packages: /estree-walker@0.6.1: resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==} + dev: true /estree-walker@1.0.1: resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==} @@ -11941,16 +11586,6 @@ packages: /fast-diff@1.2.0: resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==} - /fast-glob@3.2.11: - resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==} - engines: {node: '>=8.6.0'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.5 - /fast-glob@3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} engines: {node: '>=8.6.0'} @@ -11968,8 +11603,8 @@ packages: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} dev: true - /fast-xml-parser@4.0.8: - resolution: {integrity: sha512-N4XqZaRMuHMvOFwFlqeBTlvrnXU+QN8wvCl2g9fHzMx2BnLoIYRDwy6XwI8FxogHMFI9OfGQBCddgckvSLTnvg==} + /fast-xml-parser@4.2.4: + resolution: {integrity: sha512-fbfMDvgBNIdDJLdLOwacjFAPYt67tr31H9ZhWSm45CDAxvd0I6WTlSOUo7K2P/K5sA5JgMKG64PI3DMcaFdWpQ==} hasBin: true dependencies: strnum: 1.0.5 @@ -12157,8 +11792,8 @@ packages: minipass: 3.3.6 dev: false - /fs-monkey@1.0.3: - resolution: {integrity: sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==} + /fs-monkey@1.0.4: + resolution: {integrity: sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==} dev: true /fs.realpath@1.0.0: @@ -12276,8 +11911,8 @@ packages: /github-from-package@0.0.0: resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==} - /github-slugger@1.4.0: - resolution: {integrity: sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==} + /github-slugger@1.5.0: + resolution: {integrity: sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==} /github-slugger@2.0.0: resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==} @@ -12388,7 +12023,7 @@ packages: dependencies: array-union: 3.0.1 dir-glob: 3.0.1 - fast-glob: 3.2.11 + fast-glob: 3.2.12 ignore: 5.2.4 merge2: 1.4.1 slash: 4.0.0 @@ -12399,7 +12034,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: dir-glob: 3.0.1 - fast-glob: 3.2.11 + fast-glob: 3.2.12 ignore: 5.2.4 merge2: 1.4.1 slash: 4.0.0 @@ -12420,6 +12055,10 @@ packages: resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} dev: true + /graphemer@1.4.0: + resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} + dev: true + /gray-matter@4.0.3: resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} engines: {node: '>=6.0'} @@ -12503,7 +12142,7 @@ packages: '@types/unist': 2.0.6 hastscript: 7.2.0 property-information: 6.2.0 - vfile: 5.3.2 + vfile: 5.3.7 vfile-location: 4.1.0 web-namespaces: 2.0.1 dev: false @@ -12537,8 +12176,8 @@ packages: html-void-elements: 2.0.1 parse5: 6.0.1 unist-util-position: 4.0.4 - unist-util-visit: 4.1.0 - vfile: 5.3.2 + unist-util-visit: 4.1.2 + vfile: 5.3.7 web-namespaces: 2.0.1 zwitch: 2.0.4 dev: false @@ -12566,7 +12205,7 @@ packages: /hast-util-to-estree@2.3.2: resolution: {integrity: sha512-YYDwATNdnvZi3Qi84iatPIl1lWpXba1MeNrNbDfJfVzEBZL8uUmtR7mt7bxKBC8kuAuvb0bkojXYZzsNHyHCLg==} dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 '@types/estree-jsx': 1.0.0 '@types/hast': 2.3.4 '@types/unist': 2.0.6 @@ -12574,7 +12213,7 @@ packages: estree-util-attach-comments: 2.1.1 estree-util-is-identifier-name: 2.1.0 hast-util-whitespace: 2.0.1 - mdast-util-mdx-expression: 1.3.1 + mdast-util-mdx-expression: 1.3.2 mdast-util-mdxjs-esm: 1.3.1 property-information: 6.2.0 space-separated-tokens: 2.0.2 @@ -12667,8 +12306,8 @@ packages: whatwg-encoding: 2.0.0 dev: true - /html-entities@2.3.2: - resolution: {integrity: sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==} + /html-entities@2.3.3: + resolution: {integrity: sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==} dev: false /html-escaper@3.0.3: @@ -12710,8 +12349,8 @@ packages: entities: 4.5.0 dev: true - /http-cache-semantics@4.1.0: - resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==} + /http-cache-semantics@4.1.1: + resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==} /http-errors@2.0.0: resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} @@ -12825,8 +12464,8 @@ packages: resolve-from: 4.0.0 dev: true - /import-meta-resolve@2.1.0: - resolution: {integrity: sha512-yG9pxkWJVTy4cmRsNWE3ztFdtFuYIV8G4N+cbCkO8b+qngkLyIUhxQFuZ0qJm67+0nUOxjMPT7nfksPKza1v2g==} + /import-meta-resolve@2.2.2: + resolution: {integrity: sha512-f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA==} dev: false /imurmurhash@0.1.4: @@ -12936,7 +12575,7 @@ packages: resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==} hasBin: true dependencies: - ci-info: 3.3.1 + ci-info: 3.8.0 dev: true /is-core-module@2.12.0: @@ -13073,7 +12712,7 @@ packages: /is-reference@3.0.1: resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==} dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 dev: false /is-regex@1.1.4: @@ -13177,7 +12816,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.16.3 + '@types/node': 18.16.18 merge-stream: 2.0.0 supports-color: 7.2.0 dev: false @@ -13186,10 +12825,6 @@ packages: resolution: {integrity: sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==} hasBin: true - /js-sdsl@4.4.0: - resolution: {integrity: sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==} - dev: true - /js-string-escape@1.0.1: resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==} engines: {node: '>= 0.8'} @@ -13221,7 +12856,7 @@ packages: optional: true dependencies: abab: 2.0.6 - acorn: 8.8.2 + acorn: 8.9.0 acorn-globals: 6.0.0 cssom: 0.5.0 cssstyle: 2.3.0 @@ -13332,7 +12967,6 @@ packages: /kleur@3.0.3: resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} engines: {node: '>=6'} - dev: false /kleur@4.1.5: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} @@ -13366,14 +13000,14 @@ packages: /lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - /linkedom@0.14.17: - resolution: {integrity: sha512-PD6GQKvZ4s6Ai4/WkpyHc8MhiZdCz4hWmMOWJk+MO3/kl1QvPUbo4nQWS9+VHO7lRBk1ucIa9ONS9qzCUcBAmQ==} + /linkedom@0.14.26: + resolution: {integrity: sha512-mK6TrydfFA7phrnp+1j57ycBwFI5bGSW6YXlw9acHoqF+mP/y+FooEYYyniOt5Ot57FSKB3iwmnuQ1UUyNLm5A==} dependencies: css-select: 5.1.0 cssom: 0.5.0 html-escaper: 3.0.3 htmlparser2: 8.0.2 - uhyphen: 0.1.0 + uhyphen: 0.2.0 dev: true /lit-element@3.3.2: @@ -13388,14 +13022,6 @@ packages: dependencies: '@types/trusted-types': 2.0.3 - /lit@2.7.4: - resolution: {integrity: sha512-cgD7xrZoYr21mbrkZIuIrj98YTMw/snJPg52deWVV4A8icLyNHI3bF70xsJeAgwTuiq5Kkd+ZR8gybSJDCPB7g==} - dependencies: - '@lit/reactive-element': 1.6.1 - lit-element: 3.3.2 - lit-html: 2.7.4 - dev: false - /lit@2.7.5: resolution: {integrity: sha512-i/cH7Ye6nBDUASMnfwcictBnsTN91+aBjXoTHF2xARghXScKxpD4F4WYI+VLXg9lqbMinDfvoI7VnZXjyHgdfQ==} dependencies: @@ -13509,7 +13135,7 @@ packages: ansi-escapes: 5.0.0 cli-cursor: 4.0.0 slice-ansi: 5.0.0 - strip-ansi: 7.0.1 + strip-ansi: 7.1.0 wrap-ansi: 8.1.0 dev: false @@ -13534,7 +13160,7 @@ packages: /lower-case@2.0.2: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} dependencies: - tslib: 2.5.0 + tslib: 2.5.3 dev: false /lru-cache@4.1.5: @@ -13576,7 +13202,6 @@ packages: engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 - dev: false /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} @@ -13633,14 +13258,14 @@ packages: /mdast-util-definitions@5.1.2: resolution: {integrity: sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 '@types/unist': 2.0.6 - unist-util-visit: 4.1.0 + unist-util-visit: 4.1.2 /mdast-util-find-and-replace@2.2.2: resolution: {integrity: sha512-MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 escape-string-regexp: 5.0.0 unist-util-is: 5.2.1 unist-util-visit-parents: 5.1.3 @@ -13649,10 +13274,10 @@ packages: /mdast-util-from-markdown@1.3.0: resolution: {integrity: sha512-HN3W1gRIuN/ZW295c7zi7g9lVBllMgZE40RxCX37wrTPWXCWtpvOZdfnuK+1WNpvZje6XuJeI3Wnb4TJEUem+g==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 '@types/unist': 2.0.6 decode-named-character-reference: 1.0.2 - mdast-util-to-string: 3.1.0 + mdast-util-to-string: 3.2.0 micromark: 3.1.0 micromark-util-decode-numeric-character-reference: 1.0.0 micromark-util-decode-string: 1.0.2 @@ -13667,7 +13292,7 @@ packages: /mdast-util-frontmatter@1.0.1: resolution: {integrity: sha512-JjA2OjxRqAa8wEG8hloD0uTU0kdn8kbtOWpPP94NBkfAlbxn4S8gCGf/9DwFtEeGPXrDcNXdiDjVaRdUFqYokw==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-to-markdown: 1.5.0 micromark-extension-frontmatter: 1.1.0 dev: false @@ -13675,7 +13300,7 @@ packages: /mdast-util-gfm-autolink-literal@1.0.3: resolution: {integrity: sha512-My8KJ57FYEy2W2LyNom4n3E7hKTuQk/0SES0u16tjA9Z3oFkF4RrC/hPAPgjlSpezsOvI8ObcXcElo92wn5IGA==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 ccount: 2.0.1 mdast-util-find-and-replace: 2.2.2 micromark-util-character: 1.1.0 @@ -13684,7 +13309,7 @@ packages: /mdast-util-gfm-footnote@1.0.2: resolution: {integrity: sha512-56D19KOGbE00uKVj3sgIykpwKL179QsVFwx/DCW0u/0+URsryacI4MAdNJl0dh+u2PSsD9FtxPFbHCzJ78qJFQ==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-to-markdown: 1.5.0 micromark-util-normalize-identifier: 1.0.0 dev: false @@ -13692,14 +13317,14 @@ packages: /mdast-util-gfm-strikethrough@1.0.3: resolution: {integrity: sha512-DAPhYzTYrRcXdMjUtUjKvW9z/FNAMTdU0ORyMcbmkwYNbKocDpdk+PX1L1dQgOID/+vVs1uBQ7ElrBQfZ0cuiQ==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-to-markdown: 1.5.0 dev: false /mdast-util-gfm-table@1.0.7: resolution: {integrity: sha512-jjcpmNnQvrmN5Vx7y7lEc2iIOEytYv7rTvu+MeyAsSHTASGCCRA79Igg2uKssgOs1i1po8s3plW0sTu1wkkLGg==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 markdown-table: 3.0.3 mdast-util-from-markdown: 1.3.0 mdast-util-to-markdown: 1.5.0 @@ -13710,7 +13335,7 @@ packages: /mdast-util-gfm-task-list-item@1.0.2: resolution: {integrity: sha512-PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-to-markdown: 1.5.0 dev: false @@ -13731,17 +13356,17 @@ packages: /mdast-util-math@2.0.2: resolution: {integrity: sha512-8gmkKVp9v6+Tgjtq6SYx9kGPpTf6FVYRa53/DLh479aldR9AyP48qeVOgNZ5X7QUK7nOy4yw7vg6mbiGcs9jWQ==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 longest-streak: 3.1.0 mdast-util-to-markdown: 1.5.0 dev: true - /mdast-util-mdx-expression@1.3.1: - resolution: {integrity: sha512-TTb6cKyTA1RD+1su1iStZ5PAv3rFfOUKcoU5EstUpv/IZo63uDX03R8+jXjMEhcobXnNOiG6/ccekvVl4eV1zQ==} + /mdast-util-mdx-expression@1.3.2: + resolution: {integrity: sha512-xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA==} dependencies: '@types/estree-jsx': 1.0.0 '@types/hast': 2.3.4 - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-from-markdown: 1.3.0 mdast-util-to-markdown: 1.5.0 transitivePeerDependencies: @@ -13752,7 +13377,7 @@ packages: dependencies: '@types/estree-jsx': 1.0.0 '@types/hast': 2.3.4 - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 '@types/unist': 2.0.6 ccount: 2.0.1 mdast-util-from-markdown: 1.3.0 @@ -13765,12 +13390,14 @@ packages: transitivePeerDependencies: - supports-color - /mdast-util-mdx@2.0.0: - resolution: {integrity: sha512-M09lW0CcBT1VrJUaF/PYxemxxHa7SLDHdSn94Q9FhxjCQfuW7nMAWKWimTmA3OyDMSTH981NN1csW1X+HPSluw==} + /mdast-util-mdx@2.0.1: + resolution: {integrity: sha512-38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw==} dependencies: - mdast-util-mdx-expression: 1.3.1 + mdast-util-from-markdown: 1.3.0 + mdast-util-mdx-expression: 1.3.2 mdast-util-mdx-jsx: 2.1.3 mdast-util-mdxjs-esm: 1.3.1 + mdast-util-to-markdown: 1.5.0 transitivePeerDependencies: - supports-color @@ -13779,7 +13406,7 @@ packages: dependencies: '@types/estree-jsx': 1.0.0 '@types/hast': 2.3.4 - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-from-markdown: 1.3.0 mdast-util-to-markdown: 1.5.0 transitivePeerDependencies: @@ -13788,46 +13415,48 @@ packages: /mdast-util-phrasing@3.0.1: resolution: {integrity: sha512-WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 unist-util-is: 5.2.1 /mdast-util-to-hast@12.3.0: resolution: {integrity: sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==} dependencies: '@types/hast': 2.3.4 - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-definitions: 5.1.2 micromark-util-sanitize-uri: 1.1.0 trim-lines: 3.0.1 unist-util-generated: 2.0.1 unist-util-position: 4.0.4 - unist-util-visit: 4.1.0 + unist-util-visit: 4.1.2 /mdast-util-to-markdown@1.5.0: resolution: {integrity: sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 '@types/unist': 2.0.6 longest-streak: 3.1.0 mdast-util-phrasing: 3.0.1 - mdast-util-to-string: 3.1.0 + mdast-util-to-string: 3.2.0 micromark-util-decode-string: 1.0.2 - unist-util-visit: 4.1.0 + unist-util-visit: 4.1.2 zwitch: 2.0.4 - /mdast-util-to-string@3.1.0: - resolution: {integrity: sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==} + /mdast-util-to-string@3.2.0: + resolution: {integrity: sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==} + dependencies: + '@types/mdast': 3.0.11 /mdast-util-toc@6.1.1: resolution: {integrity: sha512-Er21728Kow8hehecK2GZtb7Ny3omcoPUVrmObiSUwmoRYVZaXLR751QROEFjR8W/vAQdHMLj49Lz20J55XaNpw==} dependencies: '@types/extend': 3.0.1 - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 extend: 3.0.2 github-slugger: 2.0.0 - mdast-util-to-string: 3.1.0 + mdast-util-to-string: 3.2.0 unist-util-is: 5.2.1 - unist-util-visit: 4.1.0 + unist-util-visit: 4.1.2 dev: true /media-typer@0.3.0: @@ -13835,11 +13464,11 @@ packages: engines: {node: '>= 0.6'} dev: true - /memfs@3.4.7: - resolution: {integrity: sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==} + /memfs@3.5.3: + resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==} engines: {node: '>= 4.0.0'} dependencies: - fs-monkey: 1.0.3 + fs-monkey: 1.0.4 dev: true /memorystream@0.3.1: @@ -14045,8 +13674,8 @@ packages: /micromark-extension-mdxjs@1.0.1: resolution: {integrity: sha512-7YA7hF6i5eKOfFUzZ+0z6avRG52GpWR8DL+kN47y3f2KhxbBZMhmxe7auOeaTBrW2DenbbZTf1ea9tA2hDpC2Q==} dependencies: - acorn: 8.8.2 - acorn-jsx: 5.3.2(acorn@8.8.2) + acorn: 8.9.0 + acorn-jsx: 5.3.2(acorn@8.9.0) micromark-extension-mdx-expression: 1.0.5 micromark-extension-mdx-jsx: 1.0.4 micromark-extension-mdx-md: 1.0.1 @@ -14073,7 +13702,7 @@ packages: /micromark-factory-mdx-expression@1.0.8: resolution: {integrity: sha512-/GWj6h6bDFCDCkxOCb/xXpgKGonhBXEqMnhTThVo0nlIN/i8z6L6YrmRq+N91oerxY97fEz7vHSCSIcW7fGFhQ==} dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 micromark-util-character: 1.1.0 micromark-util-events-to-acorn: 1.2.3 micromark-util-symbol: 1.0.1 @@ -14150,9 +13779,9 @@ packages: resolution: {integrity: sha512-ij4X7Wuc4fED6UoLWkmo0xJQhsktfNh1J0m8g4PbIMPlx+ek/4YdW5mvbye8z/aZvAPUoxgXHrwVlXAPKMRp1w==} dependencies: '@types/acorn': 4.0.6 - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 '@types/unist': 2.0.6 - estree-util-visit: 1.2.0 + estree-util-visit: 1.2.1 micromark-util-symbol: 1.0.1 micromark-util-types: 1.0.2 uvu: 0.5.6 @@ -14196,7 +13825,7 @@ packages: /micromark@3.1.0: resolution: {integrity: sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==} dependencies: - '@types/debug': 4.1.7 + '@types/debug': 4.1.8 debug: 4.3.4 decode-named-character-reference: 1.0.2 micromark-core-commonmark: 1.0.6 @@ -14371,7 +14000,7 @@ packages: /mlly@1.2.1: resolution: {integrity: sha512-1aMEByaWgBPEbWV2BOPEMySRrzl7rIHXmQxam4DM8jVjalTQDjpN2ZKOLUrwyhfZQO7IXHml2StcHMhooDeEEQ==} dependencies: - acorn: 8.8.2 + acorn: 8.9.0 pathe: 1.1.0 pkg-types: 1.0.3 ufo: 1.1.2 @@ -14411,8 +14040,8 @@ packages: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} - /mrmime@1.0.0: - resolution: {integrity: sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==} + /mrmime@1.0.1: + resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==} engines: {node: '>=10'} dev: false @@ -14494,14 +14123,14 @@ packages: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} dependencies: lower-case: 2.0.2 - tslib: 2.5.0 + tslib: 2.5.3 dev: false /node-abi@3.40.0: resolution: {integrity: sha512-zNy02qivjjRosswoYmPi8hIKJRr8MpQyeKT6qlcq/OnOgA3Rhoae+IYOqsM9V5+JnHWmxKnWOT2GxvtqdtOCXA==} engines: {node: '>=10'} dependencies: - semver: 7.5.1 + semver: 7.5.2 /node-addon-api@6.1.0: resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==} @@ -14545,8 +14174,8 @@ packages: hasBin: true dev: false - /node-mocks-http@1.11.0: - resolution: {integrity: sha512-jS/WzSOcKbOeGrcgKbenZeNhxUNnP36Yw11+hL4TTxQXErGfqYZ+MaYNNvhaTiGIJlzNSqgQkk9j8dSu1YWSuw==} + /node-mocks-http@1.12.2: + resolution: {integrity: sha512-xhWwC0dh35R9rf0j3bRZXuISXdHxxtMx0ywZQBwjrg3yl7KpRETzogfeCamUIjltpn0Fxvs/ZhGJul1vPLrdJQ==} engines: {node: '>=0.6'} dependencies: accepts: 1.3.8 @@ -14635,7 +14264,7 @@ packages: dependencies: execa: 6.1.0 parse-package-name: 1.0.0 - semver: 7.5.1 + semver: 7.5.2 validate-npm-package-name: 4.0.0 dev: true @@ -14742,18 +14371,18 @@ packages: word-wrap: 1.2.3 dev: true - /ora@6.1.0: - resolution: {integrity: sha512-CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw==} + /ora@6.3.1: + resolution: {integrity: sha512-ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: - bl: 5.1.0 chalk: 5.2.0 cli-cursor: 4.0.0 cli-spinners: 2.9.0 is-interactive: 2.0.0 is-unicode-supported: 1.3.0 log-symbols: 5.1.0 - strip-ansi: 7.0.1 + stdin-discarder: 0.1.0 + strip-ansi: 7.1.0 wcwidth: 1.0.1 dev: false @@ -14904,7 +14533,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.21.4 + '@babel/code-frame': 7.22.5 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -14950,7 +14579,7 @@ packages: resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==} dependencies: no-case: 3.0.4 - tslib: 2.5.0 + tslib: 2.5.3 dev: false /path-browserify@1.0.1: @@ -15010,7 +14639,7 @@ packages: /periscopic@3.1.0: resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==} dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 estree-walker: 3.0.0 is-reference: 3.0.1 dev: false @@ -15085,219 +14714,203 @@ packages: resolution: {integrity: sha512-Hz/WvSNt5+7x+Rq1Cn6DetJOZxKtLDehJ1mLCYge6ju4QvSF/PHvRgy94e1SKJVI96AJTcqEdNwkkaAFad+TXQ==} dev: false - /postcss-attribute-case-insensitive@5.0.2(postcss@8.4.23): + /postcss-attribute-case-insensitive@5.0.2(postcss@8.4.24): resolution: {integrity: sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /postcss-clamp@4.1.0(postcss@8.4.23): + /postcss-clamp@4.1.0(postcss@8.4.24): resolution: {integrity: sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==} engines: {node: '>=7.6.0'} peerDependencies: postcss: ^8.4.6 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-color-functional-notation@4.2.4(postcss@8.4.23): + /postcss-color-functional-notation@4.2.4(postcss@8.4.24): resolution: {integrity: sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-color-hex-alpha@8.0.4(postcss@8.4.23): + /postcss-color-hex-alpha@8.0.4(postcss@8.4.24): resolution: {integrity: sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-color-rebeccapurple@7.1.1(postcss@8.4.23): + /postcss-color-rebeccapurple@7.1.1(postcss@8.4.24): resolution: {integrity: sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-custom-media@8.0.2(postcss@8.4.23): + /postcss-custom-media@8.0.2(postcss@8.4.24): resolution: {integrity: sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.3 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-custom-properties@12.1.11(postcss@8.4.23): + /postcss-custom-properties@12.1.11(postcss@8.4.24): resolution: {integrity: sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-custom-selectors@6.0.3(postcss@8.4.23): + /postcss-custom-selectors@6.0.3(postcss@8.4.24): resolution: {integrity: sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.3 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /postcss-dir-pseudo-class@6.0.5(postcss@8.4.23): + /postcss-dir-pseudo-class@6.0.5(postcss@8.4.24): resolution: {integrity: sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /postcss-double-position-gradients@3.1.2(postcss@8.4.23): + /postcss-double-position-gradients@3.1.2(postcss@8.4.24): resolution: {integrity: sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) - postcss: 8.4.23 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.24) + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-env-function@4.0.6(postcss@8.4.23): + /postcss-env-function@4.0.6(postcss@8.4.24): resolution: {integrity: sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-focus-visible@6.0.4(postcss@8.4.23): + /postcss-focus-visible@6.0.4(postcss@8.4.24): resolution: {integrity: sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /postcss-focus-within@5.0.4(postcss@8.4.23): + /postcss-focus-within@5.0.4(postcss@8.4.24): resolution: {integrity: sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /postcss-font-variant@5.0.0(postcss@8.4.23): + /postcss-font-variant@5.0.0(postcss@8.4.24): resolution: {integrity: sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true - /postcss-gap-properties@3.0.5(postcss@8.4.23): + /postcss-gap-properties@3.0.5(postcss@8.4.24): resolution: {integrity: sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true - /postcss-image-set-function@4.0.7(postcss@8.4.23): + /postcss-image-set-function@4.0.7(postcss@8.4.24): resolution: {integrity: sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-import@15.1.0(postcss@8.4.23): + /postcss-import@15.1.0(postcss@8.4.24): resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==} engines: {node: '>=14.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.2 - /postcss-initial@4.0.1(postcss@8.4.23): + /postcss-initial@4.0.1(postcss@8.4.24): resolution: {integrity: sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true - /postcss-js@4.0.1(postcss@8.4.23): + /postcss-js@4.0.1(postcss@8.4.24): resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} engines: {node: ^12 || ^14 || >= 16} peerDependencies: postcss: ^8.4.21 dependencies: camelcase-css: 2.0.1 - postcss: 8.4.23 + postcss: 8.4.24 - /postcss-lab-function@4.2.1(postcss@8.4.23): + /postcss-lab-function@4.2.1(postcss@8.4.24): resolution: {integrity: sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) - postcss: 8.4.23 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.24) + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-load-config@4.0.1(postcss@8.4.23): - resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} - engines: {node: '>= 14'} - peerDependencies: - postcss: '>=8.0.9' - ts-node: '>=9.0.0' - peerDependenciesMeta: - postcss: - optional: true - ts-node: - optional: true - dependencies: - lilconfig: 2.1.0 - postcss: 8.4.23 - yaml: 2.2.2 - /postcss-load-config@4.0.1(postcss@8.4.24): resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} @@ -15313,164 +14926,165 @@ packages: lilconfig: 2.1.0 postcss: 8.4.24 yaml: 2.2.2 - dev: false - /postcss-logical@5.0.4(postcss@8.4.23): + /postcss-logical@5.0.4(postcss@8.4.24): resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true - /postcss-media-minmax@5.0.0(postcss@8.4.23): + /postcss-media-minmax@5.0.0(postcss@8.4.24): resolution: {integrity: sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==} engines: {node: '>=10.0.0'} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true - /postcss-nested@6.0.1(postcss@8.4.23): + /postcss-nested@6.0.1(postcss@8.4.24): resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.2.14 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 - /postcss-nesting@10.2.0(postcss@8.4.23): + /postcss-nesting@10.2.0(postcss@8.4.24): resolution: {integrity: sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.13) - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /postcss-opacity-percentage@1.1.3(postcss@8.4.23): + /postcss-opacity-percentage@1.1.3(postcss@8.4.24): resolution: {integrity: sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true - /postcss-overflow-shorthand@3.0.4(postcss@8.4.23): + /postcss-overflow-shorthand@3.0.4(postcss@8.4.24): resolution: {integrity: sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-page-break@3.0.4(postcss@8.4.23): + /postcss-page-break@3.0.4(postcss@8.4.24): resolution: {integrity: sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==} peerDependencies: postcss: ^8 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true - /postcss-place@7.0.5(postcss@8.4.23): + /postcss-place@7.0.5(postcss@8.4.24): resolution: {integrity: sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-value-parser: 4.2.0 dev: true - /postcss-preset-env@7.7.1(postcss@8.4.23): - resolution: {integrity: sha512-1sx6+Nl1wMVJzaYLVaz4OAR6JodIN/Z1upmVqLwSPCLT6XyxrEoePgNMHPH08kseLe3z06i9Vfkt/32BYEKDeA==} + /postcss-preset-env@7.8.3(postcss@8.4.24): + resolution: {integrity: sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==} engines: {node: ^12 || ^14 || >=16} peerDependencies: - postcss: ^8.4 + postcss: ^8.2 dependencies: - '@csstools/postcss-cascade-layers': 1.1.1(postcss@8.4.23) - '@csstools/postcss-color-function': 1.1.1(postcss@8.4.23) - '@csstools/postcss-font-format-keywords': 1.0.1(postcss@8.4.23) - '@csstools/postcss-hwb-function': 1.0.2(postcss@8.4.23) - '@csstools/postcss-ic-unit': 1.0.1(postcss@8.4.23) - '@csstools/postcss-is-pseudo-class': 2.0.7(postcss@8.4.23) - '@csstools/postcss-normalize-display-values': 1.0.1(postcss@8.4.23) - '@csstools/postcss-oklab-function': 1.1.1(postcss@8.4.23) - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) - '@csstools/postcss-stepped-value-functions': 1.0.1(postcss@8.4.23) - '@csstools/postcss-trigonometric-functions': 1.0.2(postcss@8.4.23) - '@csstools/postcss-unset-value': 1.0.2(postcss@8.4.23) - autoprefixer: 10.4.14(postcss@8.4.23) + '@csstools/postcss-cascade-layers': 1.1.1(postcss@8.4.24) + '@csstools/postcss-color-function': 1.1.1(postcss@8.4.24) + '@csstools/postcss-font-format-keywords': 1.0.1(postcss@8.4.24) + '@csstools/postcss-hwb-function': 1.0.2(postcss@8.4.24) + '@csstools/postcss-ic-unit': 1.0.1(postcss@8.4.24) + '@csstools/postcss-is-pseudo-class': 2.0.7(postcss@8.4.24) + '@csstools/postcss-nested-calc': 1.0.0(postcss@8.4.24) + '@csstools/postcss-normalize-display-values': 1.0.1(postcss@8.4.24) + '@csstools/postcss-oklab-function': 1.1.1(postcss@8.4.24) + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.24) + '@csstools/postcss-stepped-value-functions': 1.0.1(postcss@8.4.24) + '@csstools/postcss-text-decoration-shorthand': 1.0.0(postcss@8.4.24) + '@csstools/postcss-trigonometric-functions': 1.0.2(postcss@8.4.24) + '@csstools/postcss-unset-value': 1.0.2(postcss@8.4.24) + autoprefixer: 10.4.14(postcss@8.4.24) browserslist: 4.21.5 - css-blank-pseudo: 3.0.3(postcss@8.4.23) - css-has-pseudo: 3.0.4(postcss@8.4.23) - css-prefers-color-scheme: 6.0.3(postcss@8.4.23) - cssdb: 6.6.3 - postcss: 8.4.23 - postcss-attribute-case-insensitive: 5.0.2(postcss@8.4.23) - postcss-clamp: 4.1.0(postcss@8.4.23) - postcss-color-functional-notation: 4.2.4(postcss@8.4.23) - postcss-color-hex-alpha: 8.0.4(postcss@8.4.23) - postcss-color-rebeccapurple: 7.1.1(postcss@8.4.23) - postcss-custom-media: 8.0.2(postcss@8.4.23) - postcss-custom-properties: 12.1.11(postcss@8.4.23) - postcss-custom-selectors: 6.0.3(postcss@8.4.23) - postcss-dir-pseudo-class: 6.0.5(postcss@8.4.23) - postcss-double-position-gradients: 3.1.2(postcss@8.4.23) - postcss-env-function: 4.0.6(postcss@8.4.23) - postcss-focus-visible: 6.0.4(postcss@8.4.23) - postcss-focus-within: 5.0.4(postcss@8.4.23) - postcss-font-variant: 5.0.0(postcss@8.4.23) - postcss-gap-properties: 3.0.5(postcss@8.4.23) - postcss-image-set-function: 4.0.7(postcss@8.4.23) - postcss-initial: 4.0.1(postcss@8.4.23) - postcss-lab-function: 4.2.1(postcss@8.4.23) - postcss-logical: 5.0.4(postcss@8.4.23) - postcss-media-minmax: 5.0.0(postcss@8.4.23) - postcss-nesting: 10.2.0(postcss@8.4.23) - postcss-opacity-percentage: 1.1.3(postcss@8.4.23) - postcss-overflow-shorthand: 3.0.4(postcss@8.4.23) - postcss-page-break: 3.0.4(postcss@8.4.23) - postcss-place: 7.0.5(postcss@8.4.23) - postcss-pseudo-class-any-link: 7.1.6(postcss@8.4.23) - postcss-replace-overflow-wrap: 4.0.0(postcss@8.4.23) - postcss-selector-not: 6.0.1(postcss@8.4.23) + css-blank-pseudo: 3.0.3(postcss@8.4.24) + css-has-pseudo: 3.0.4(postcss@8.4.24) + css-prefers-color-scheme: 6.0.3(postcss@8.4.24) + cssdb: 7.6.0 + postcss: 8.4.24 + postcss-attribute-case-insensitive: 5.0.2(postcss@8.4.24) + postcss-clamp: 4.1.0(postcss@8.4.24) + postcss-color-functional-notation: 4.2.4(postcss@8.4.24) + postcss-color-hex-alpha: 8.0.4(postcss@8.4.24) + postcss-color-rebeccapurple: 7.1.1(postcss@8.4.24) + postcss-custom-media: 8.0.2(postcss@8.4.24) + postcss-custom-properties: 12.1.11(postcss@8.4.24) + postcss-custom-selectors: 6.0.3(postcss@8.4.24) + postcss-dir-pseudo-class: 6.0.5(postcss@8.4.24) + postcss-double-position-gradients: 3.1.2(postcss@8.4.24) + postcss-env-function: 4.0.6(postcss@8.4.24) + postcss-focus-visible: 6.0.4(postcss@8.4.24) + postcss-focus-within: 5.0.4(postcss@8.4.24) + postcss-font-variant: 5.0.0(postcss@8.4.24) + postcss-gap-properties: 3.0.5(postcss@8.4.24) + postcss-image-set-function: 4.0.7(postcss@8.4.24) + postcss-initial: 4.0.1(postcss@8.4.24) + postcss-lab-function: 4.2.1(postcss@8.4.24) + postcss-logical: 5.0.4(postcss@8.4.24) + postcss-media-minmax: 5.0.0(postcss@8.4.24) + postcss-nesting: 10.2.0(postcss@8.4.24) + postcss-opacity-percentage: 1.1.3(postcss@8.4.24) + postcss-overflow-shorthand: 3.0.4(postcss@8.4.24) + postcss-page-break: 3.0.4(postcss@8.4.24) + postcss-place: 7.0.5(postcss@8.4.24) + postcss-pseudo-class-any-link: 7.1.6(postcss@8.4.24) + postcss-replace-overflow-wrap: 4.0.0(postcss@8.4.24) + postcss-selector-not: 6.0.1(postcss@8.4.24) postcss-value-parser: 4.2.0 dev: true - /postcss-pseudo-class-any-link@7.1.6(postcss@8.4.23): + /postcss-pseudo-class-any-link@7.1.6(postcss@8.4.24): resolution: {integrity: sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true - /postcss-replace-overflow-wrap@4.0.0(postcss@8.4.23): + /postcss-replace-overflow-wrap@4.0.0(postcss@8.4.24): resolution: {integrity: sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==} peerDependencies: postcss: ^8.0.3 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 dev: true - /postcss-selector-not@6.0.1(postcss@8.4.23): + /postcss-selector-not@6.0.1(postcss@8.4.24): resolution: {integrity: sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.23 + postcss: 8.4.24 postcss-selector-parser: 6.0.13 dev: true @@ -15484,14 +15098,6 @@ packages: /postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - /postcss@8.4.23: - resolution: {integrity: sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.6 - picocolors: 1.0.0 - source-map-js: 1.0.2 - /postcss@8.4.24: resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==} engines: {node: ^10 || ^12 || >=14} @@ -15500,17 +15106,17 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 - /preact-render-to-string@5.2.4(preact@10.13.2): - resolution: {integrity: sha512-iIPHb3BXUQ3Za6KNhkjN/waq11Oh+QWWtAgN3id3LrL+cszH3DYh8TxJPNQ6Aogsbu4JsqdJLBZltwPFpG6N6w==} + /preact-render-to-string@5.2.6(preact@10.15.1): + resolution: {integrity: sha512-JyhErpYOvBV1hEPwIxc/fHWXPfnEGdRKxc8gFdAZ7XV4tlzyzG847XAyEZqoDnynP88akM4eaHcSOzNcLWFguw==} peerDependencies: preact: '>=10' dependencies: - preact: 10.13.2 + preact: 10.15.1 pretty-format: 3.8.0 dev: false - /preact@10.13.2: - resolution: {integrity: sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw==} + /preact@10.15.1: + resolution: {integrity: sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g==} /prebuild-install@7.1.1: resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} @@ -15556,25 +15162,14 @@ packages: fast-diff: 1.2.0 dev: true - /prettier-plugin-astro@0.8.0: - resolution: {integrity: sha512-kt9wk33J7HvFGwFaHb8piwy4zbUmabC8Nu+qCw493jhe96YkpjscqGBPy4nJ9TPy9pd7+kEx1zM81rp+MIdrXg==} - engines: {node: ^14.15.0 || >=16.0.0, pnpm: '>=7.14.0'} - dependencies: - '@astrojs/compiler': 1.4.2 - prettier: 2.8.8 - sass-formatter: 0.7.6 - synckit: 0.8.5 - dev: true - /prettier-plugin-astro@0.8.1: resolution: {integrity: sha512-lJ/mG/Lz/ccSwNtwqpFS126mtMVzFVyYv0ddTF9wqwrEG4seECjKDAyw/oGv915rAcJi8jr89990nqfpmG+qdg==} engines: {node: ^14.15.0 || >=16.0.0, pnpm: '>=7.14.0'} dependencies: - '@astrojs/compiler': 1.4.2 + '@astrojs/compiler': 1.5.0 prettier: 2.8.8 sass-formatter: 0.7.6 synckit: 0.8.5 - dev: false /prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} @@ -15586,8 +15181,8 @@ packages: engines: {node: '>=6'} dev: false - /pretty-bytes@6.0.0: - resolution: {integrity: sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==} + /pretty-bytes@6.1.0: + resolution: {integrity: sha512-Rk753HI8f4uivXi4ZCIYdhmG1V+WKzvRMg/X+M42a6t7D07RcmopXJMDNk6N++7Bl75URRGsb40ruvg7Hcp2wQ==} engines: {node: ^14.13.1 || >=16.0.0} dev: false @@ -15604,8 +15199,8 @@ packages: resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==} dev: false - /prismjs@1.28.0: - resolution: {integrity: sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==} + /prismjs@1.29.0: + resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==} engines: {node: '>=6'} dev: false @@ -15877,7 +15472,7 @@ packages: jsdom: 18.1.1 mathjax-full: 3.2.2 unified: 10.1.2 - unist-util-visit: 4.1.0 + unist-util-visit: 4.1.2 transitivePeerDependencies: - bufferutil - canvas @@ -15963,7 +15558,7 @@ packages: /remark-frontmatter@4.0.1: resolution: {integrity: sha512-38fJrB0KnmD3E33a5jZC/5+gGAC2WKNiPw1/fdXJvijBlhA7RCsvJklrYJakS0HedninvaCYW8lQGf9C918GfA==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-frontmatter: 1.0.1 micromark-extension-frontmatter: 1.1.0 unified: 10.1.2 @@ -15972,7 +15567,7 @@ packages: /remark-gfm@3.0.1: resolution: {integrity: sha512-lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-gfm: 2.0.2 micromark-extension-gfm: 2.0.2 unified: 10.1.2 @@ -15983,7 +15578,7 @@ packages: /remark-math@5.1.1: resolution: {integrity: sha512-cE5T2R/xLVtfFI4cCePtiRn+e6jKMtFDR3P8V3qpv8wpKjwvHoBA4eJzvX+nVrnlNy0911bdGmuspCSwetfYHw==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-math: 2.0.2 micromark-extension-math: 2.1.1 unified: 10.1.2 @@ -15992,7 +15587,7 @@ packages: /remark-mdx@2.3.0: resolution: {integrity: sha512-g53hMkpM0I98MU266IzDFMrTD980gNF3BJnkyFcmN+dD873mQeD5rdMO3Y2X+x8umQfbSE0PcoEDl7ledSA+2g==} dependencies: - mdast-util-mdx: 2.0.0 + mdast-util-mdx: 2.0.1 micromark-extension-mdxjs: 1.0.1 transitivePeerDependencies: - supports-color @@ -16001,7 +15596,17 @@ packages: /remark-parse@10.0.1: resolution: {integrity: sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 + mdast-util-from-markdown: 1.3.0 + unified: 10.1.2 + transitivePeerDependencies: + - supports-color + dev: false + + /remark-parse@10.0.2: + resolution: {integrity: sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==} + dependencies: + '@types/mdast': 3.0.11 mdast-util-from-markdown: 1.3.0 unified: 10.1.2 transitivePeerDependencies: @@ -16012,19 +15617,22 @@ packages: resolution: {integrity: sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==} dependencies: '@types/hast': 2.3.4 - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-to-hast: 12.3.0 unified: 10.1.2 - /remark-shiki-twoslash@3.1.0: - resolution: {integrity: sha512-6LqSqVtHQR4S0DKfdQ2/ePn9loTKUtpyopYvwk8johjDTeUW5MkaLQuZHlWNkkST/4aMbz6aTkstIcwfwcHpXg==} + /remark-shiki-twoslash@3.1.3(typescript@5.0.2): + resolution: {integrity: sha512-4e8OH3ySOCw5wUbDcPszokOKjKuebOqlP2WlySvC7ITBOq27BiGsFlq+FNWhxppZ+JzhTWah4gQrnMjX3KDbAQ==} + peerDependencies: + typescript: '>3' dependencies: + '@types/unist': 2.0.6 '@typescript/twoslash': 3.1.0 '@typescript/vfs': 1.3.4 fenceparser: 1.1.1 regenerator-runtime: 0.13.11 shiki: 0.10.1 - shiki-twoslash: 3.1.0 + shiki-twoslash: 3.1.2(typescript@5.0.2) tslib: 2.1.0 typescript: 5.0.2 unist-util-visit: 2.0.3 @@ -16038,13 +15646,13 @@ packages: dependencies: retext: 8.1.0 retext-smartypants: 5.2.0 - unist-util-visit: 4.1.0 + unist-util-visit: 4.1.2 dev: false /remark-toc@8.0.1: resolution: {integrity: sha512-7he2VOm/cy13zilnOTZcyAoyoolV26ULlon6XyCFU+vG54Z/LWJnwphj/xKIDLOt66QmJUgTyUvLVHi2aAElyg==} dependencies: - '@types/mdast': 3.0.10 + '@types/mdast': 3.0.11 mdast-util-toc: 6.1.1 unified: 10.1.2 dev: true @@ -16110,7 +15718,7 @@ packages: '@types/nlcst': 1.0.0 nlcst-to-string: 3.1.1 unified: 10.1.2 - unist-util-visit: 4.1.0 + unist-util-visit: 4.1.2 dev: false /retext-stringify@3.1.0: @@ -16179,7 +15787,7 @@ packages: rollup: optional: true dependencies: - '@babel/code-frame': 7.21.4 + '@babel/code-frame': 7.22.5 jest-worker: 26.6.2 rollup: 2.79.1 serialize-javascript: 4.0.0 @@ -16190,6 +15798,7 @@ packages: resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==} dependencies: estree-walker: 0.6.1 + dev: true /rollup@2.79.1: resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} @@ -16204,9 +15813,10 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 + dev: false - /rollup@3.21.8: - resolution: {integrity: sha512-SSFV2T2fWtQ/vvBip85u2Nr0GNKireabH9d7nXswBg+XSH+jbVDSYptRAEbCEsquhs503rpPA9POYAp0/Jhasw==} + /rollup@3.25.1: + resolution: {integrity: sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -16251,9 +15861,9 @@ packages: dependencies: suf-log: 2.5.3 - /sass@1.52.2: - resolution: {integrity: sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ==} - engines: {node: '>=12.0.0'} + /sass@1.63.4: + resolution: {integrity: sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==} + engines: {node: '>=14.0.0'} hasBin: true dependencies: chokidar: 3.5.3 @@ -16305,15 +15915,8 @@ packages: hasBin: true dev: false - /semver@7.3.8: - resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==} - engines: {node: '>=10'} - hasBin: true - dependencies: - lru-cache: 6.0.0 - - /semver@7.5.1: - resolution: {integrity: sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==} + /semver@7.5.2: + resolution: {integrity: sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==} engines: {node: '>=10'} hasBin: true dependencies: @@ -16362,8 +15965,8 @@ packages: /set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} - /set-cookie-parser@2.5.1: - resolution: {integrity: sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==} + /set-cookie-parser@2.6.0: + resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==} /setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} @@ -16377,7 +15980,7 @@ packages: detect-libc: 2.0.1 node-addon-api: 6.1.0 prebuild-install: 7.1.1 - semver: 7.5.1 + semver: 7.5.2 simple-get: 4.0.1 tar-fs: 2.1.1 tunnel-agent: 0.6.0 @@ -16408,11 +16011,14 @@ packages: resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} dev: true - /shiki-twoslash@3.1.0: - resolution: {integrity: sha512-uDqrTutOIZzyHbo103GsK7Vvc10saK1XCCivnOQ1NHJzgp3FBilEpftGeVzVSMOJs+JyhI7whkvhXV7kXQ5zCg==} + /shiki-twoslash@3.1.2(typescript@5.0.2): + resolution: {integrity: sha512-JBcRIIizi+exIA/OUhYkV6jtyeZco0ykCkIRd5sgwIt1Pm4pz+maoaRZpm6SkhPwvif4fCA7xOtJOykhpIV64Q==} + peerDependencies: + typescript: '>3' dependencies: '@typescript/twoslash': 3.1.0 '@typescript/vfs': 1.3.4 + fenceparser: 1.1.1 shiki: 0.10.1 typescript: 5.0.2 transitivePeerDependencies: @@ -16537,8 +16143,8 @@ packages: smart-buffer: 4.2.0 dev: true - /solid-js@1.7.4: - resolution: {integrity: sha512-hD/bzIpaa7DL/LGRRTLFvejQuxQaoXyH+DBgPputJW7zvFigCewQIoDvbwDR4VHTsa8VsMDPzV8BT0F9OqsS1Q==} + /solid-js@1.7.6: + resolution: {integrity: sha512-DXVOTjUh/bIAhE0fIqu3ezGLyQaez7v8EOw3uPLIi87DmLjg+hsuCAgKyNIZ+o4jUetOk3ZORccvJmE1yZUk8g==} dependencies: csstype: 3.1.2 seroval: 0.5.1 @@ -16637,6 +16243,13 @@ packages: resolution: {integrity: sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==} dev: false + /stdin-discarder@0.1.0: + resolution: {integrity: sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + bl: 5.1.0 + dev: false + /stream-transform@2.1.3: resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==} dependencies: @@ -16661,7 +16274,7 @@ packages: dependencies: eastasianwidth: 0.2.0 emoji-regex: 9.2.2 - strip-ansi: 7.0.1 + strip-ansi: 7.1.0 dev: false /string.prototype.matchall@4.0.8: @@ -16738,8 +16351,8 @@ packages: dependencies: ansi-regex: 5.0.1 - /strip-ansi@7.0.1: - resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==} + /strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} dependencies: ansi-regex: 6.0.1 @@ -16793,7 +16406,7 @@ packages: /strip-literal@1.0.1: resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==} dependencies: - acorn: 8.8.2 + acorn: 8.9.0 dev: false /strnum@1.0.5: @@ -16858,16 +16471,16 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - /svelte-hmr@0.15.1(svelte@3.58.0): + /svelte-hmr@0.15.1(svelte@3.59.1): resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: '>=3.19.0' dependencies: - svelte: 3.58.0 + svelte: 3.59.1 dev: false - /svelte2tsx@0.6.15(svelte@3.58.0)(typescript@5.0.2): + /svelte2tsx@0.6.15(svelte@3.59.1)(typescript@5.0.2): resolution: {integrity: sha512-+j6RmA3g5pPs1DHa/rdzJjjhZuCfWx0IbNPaR99A2bvOSPPY6BlVkBGU0urI+DGcWHhYEG28Flo942KqlAkpEQ==} peerDependencies: svelte: ^3.55 || ^4.0 @@ -16878,12 +16491,12 @@ packages: dependencies: dedent-js: 1.0.1 pascal-case: 3.1.2 - svelte: 3.58.0 + svelte: 3.59.1 typescript: 5.0.2 dev: false - /svelte@3.58.0: - resolution: {integrity: sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A==} + /svelte@3.59.1: + resolution: {integrity: sha512-pKj8fEBmqf6mq3/NfrB9SLtcJcUvjYSWyePlfCqN9gujLB25RitWK8PvFzlwim6hD/We35KbPlRteuA6rnPGcQ==} engines: {node: '>= 8'} /svg-tags@1.0.0: @@ -16899,7 +16512,7 @@ packages: engines: {node: ^14.18.0 || >=16.0.0} dependencies: '@pkgr/utils': 2.4.0 - tslib: 2.5.0 + tslib: 2.5.3 /tailwindcss@3.3.2: resolution: {integrity: sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==} @@ -16920,11 +16533,11 @@ packages: normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.0.0 - postcss: 8.4.23 - postcss-import: 15.1.0(postcss@8.4.23) - 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: 8.4.24 + postcss-import: 15.1.0(postcss@8.4.24) + postcss-js: 4.0.1(postcss@8.4.24) + postcss-load-config: 4.0.1(postcss@8.4.24) + postcss-nested: 6.0.1(postcss@8.4.24) postcss-selector-parser: 6.0.13 postcss-value-parser: 4.2.0 resolve: 1.22.2 @@ -16955,20 +16568,20 @@ packages: inherits: 2.0.4 readable-stream: 3.6.2 - /tar@6.1.11: - resolution: {integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==} - engines: {node: '>= 10'} + /tar@6.1.14: + resolution: {integrity: sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==} + engines: {node: '>=10'} dependencies: chownr: 2.0.0 fs-minipass: 2.1.0 - minipass: 3.3.6 + minipass: 5.0.0 minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0 dev: false - /tar@6.1.14: - resolution: {integrity: sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==} + /tar@6.1.15: + resolution: {integrity: sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==} engines: {node: '>=10'} dependencies: chownr: 2.0.0 @@ -17005,7 +16618,7 @@ packages: hasBin: true dependencies: '@jridgewell/source-map': 0.3.3 - acorn: 8.8.2 + acorn: 8.9.0 commander: 2.20.3 source-map-support: 0.5.21 dev: false @@ -17159,8 +16772,8 @@ packages: resolution: {integrity: sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==} dev: true - /tslib@2.5.0: - resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} + /tslib@2.5.3: + resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==} /tsutils@3.21.0(typescript@5.0.2): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} @@ -17191,65 +16804,65 @@ packages: dependencies: safe-buffer: 5.2.1 - /turbo-darwin-64@1.9.3: - resolution: {integrity: sha512-0dFc2cWXl82kRE4Z+QqPHhbEFEpUZho1msHXHWbz5+PqLxn8FY0lEVOHkq5tgKNNEd5KnGyj33gC/bHhpZOk5g==} + /turbo-darwin-64@1.10.3: + resolution: {integrity: sha512-IIB9IomJGyD3EdpSscm7Ip1xVWtYb7D0x7oH3vad3gjFcjHJzDz9xZ/iw/qItFEW+wGFcLSRPd+1BNnuLM8AsA==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.9.3: - resolution: {integrity: sha512-1cYbjqLBA2zYE1nbf/qVnEkrHa4PkJJbLo7hnuMuGM0bPzh4+AnTNe98gELhqI1mkTWBu/XAEeF5u6dgz0jLNA==} + /turbo-darwin-arm64@1.10.3: + resolution: {integrity: sha512-SBNmOZU9YEB0eyNIxeeQ+Wi0Ufd+nprEVp41rgUSRXEIpXjsDjyBnKnF+sQQj3+FLb4yyi/yZQckB+55qXWEsw==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.9.3: - resolution: {integrity: sha512-UuBPFefawEwpuxh5pM9Jqq3q4C8M0vYxVYlB3qea/nHQ80pxYq7ZcaLGEpb10SGnr3oMUUs1zZvkXWDNKCJb8Q==} + /turbo-linux-64@1.10.3: + resolution: {integrity: sha512-kvAisGKE7xHJdyMxZLvg53zvHxjqPK1UVj4757PQqtx9dnjYHSc8epmivE6niPgDHon5YqImzArCjVZJYpIGHQ==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.9.3: - resolution: {integrity: sha512-vUrNGa3hyDtRh9W0MkO+l1dzP8Co2gKnOVmlJQW0hdpOlWlIh22nHNGGlICg+xFa2f9j4PbQlWTsc22c019s8Q==} + /turbo-linux-arm64@1.10.3: + resolution: {integrity: sha512-Qgaqln0IYRgyL0SowJOi+PNxejv1I2xhzXOI+D+z4YHbgSx87ox1IsALYBlK8VRVYY8VCXl+PN12r1ioV09j7A==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.9.3: - resolution: {integrity: sha512-0BZ7YaHs6r+K4ksqWus1GKK3W45DuDqlmfjm/yuUbTEVc8szmMCs12vugU2Zi5GdrdJSYfoKfEJ/PeegSLIQGQ==} + /turbo-windows-64@1.10.3: + resolution: {integrity: sha512-rbH9wManURNN8mBnN/ZdkpUuTvyVVEMiUwFUX4GVE5qmV15iHtZfDLUSGGCP2UFBazHcpNHG1OJzgc55GFFrUw==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.9.3: - resolution: {integrity: sha512-QJUYLSsxdXOsR1TquiOmLdAgtYcQ/RuSRpScGvnZb1hY0oLc7JWU0llkYB81wVtWs469y8H9O0cxbKwCZGR4RQ==} + /turbo-windows-arm64@1.10.3: + resolution: {integrity: sha512-ThlkqxhcGZX39CaTjsHqJnqVe+WImjX13pmjnpChz6q5HHbeRxaJSFzgrHIOt0sUUVx90W/WrNRyoIt/aafniw==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.9.3: - resolution: {integrity: sha512-ID7mxmaLUPKG/hVkp+h0VuucB1U99RPCJD9cEuSEOdIPoSIuomcIClEJtKamUsdPLhLCud+BvapBNnhgh58Nzw==} + /turbo@1.10.3: + resolution: {integrity: sha512-U4gKCWcKgLcCjQd4Pl8KJdfEKumpyWbzRu75A6FCj6Ctea1PIm58W6Ltw1QXKqHrl2pF9e1raAskf/h6dlrPCA==} hasBin: true requiresBuild: true optionalDependencies: - turbo-darwin-64: 1.9.3 - turbo-darwin-arm64: 1.9.3 - turbo-linux-64: 1.9.3 - turbo-linux-arm64: 1.9.3 - turbo-windows-64: 1.9.3 - turbo-windows-arm64: 1.9.3 + turbo-darwin-64: 1.10.3 + turbo-darwin-arm64: 1.10.3 + turbo-linux-64: 1.10.3 + turbo-linux-arm64: 1.10.3 + turbo-windows-64: 1.10.3 + turbo-windows-arm64: 1.10.3 dev: true /turbolinks@5.2.0: @@ -17343,8 +16956,8 @@ packages: hasBin: true dev: false - /uhyphen@0.1.0: - resolution: {integrity: sha512-o0QVGuFg24FK765Qdd5kk0zU/U4dEsCtN/GSiwNI9i8xsSVtjIAOdTaVhLwZ1nrbWxFVMxNDDl+9fednsOMsBw==} + /uhyphen@0.2.0: + resolution: {integrity: sha512-qz3o9CHXmJJPGBdqzab7qAYuW8kQGKNEuoHFYrBwV6hWIMcpAmxDLXojcHfFr9US1Pe6zUswEIJIbLI610fuqA==} dev: true /ultrahtml@0.1.3: @@ -17366,8 +16979,8 @@ packages: busboy: 1.6.0 dev: true - /undici@5.22.0: - resolution: {integrity: sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==} + /undici@5.22.1: + resolution: {integrity: sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==} engines: {node: '>=14.0'} dependencies: busboy: 1.6.0 @@ -17408,7 +17021,7 @@ packages: is-buffer: 2.0.5 is-plain-obj: 4.1.0 trough: 2.1.0 - vfile: 5.3.2 + vfile: 5.3.7 /unique-string@2.0.0: resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==} @@ -17461,7 +17074,7 @@ packages: resolution: {integrity: sha512-TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ==} dependencies: '@types/unist': 2.0.6 - unist-util-visit: 4.1.0 + unist-util-visit: 4.1.2 /unist-util-select@4.0.3: resolution: {integrity: sha512-1074+K9VyR3NyUz3lgNtHKm7ln+jSZXtLJM4E22uVuoFn88a/Go2pX8dusrt/W+KWH1ncn8jcd8uCQuvXb/fXA==} @@ -17521,6 +17134,13 @@ packages: unist-util-is: 5.2.1 unist-util-visit-parents: 5.1.3 + /unist-util-visit@4.1.2: + resolution: {integrity: sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==} + dependencies: + '@types/unist': 2.0.6 + unist-util-is: 5.2.1 + unist-util-visit-parents: 5.1.3 + /universal-user-agent@6.0.0: resolution: {integrity: sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==} dev: true @@ -17609,6 +17229,10 @@ packages: kleur: 4.1.5 sade: 1.8.1 + /validate-html-nesting@1.2.2: + resolution: {integrity: sha512-hGdgQozCsQJMyfK5urgFcWEqsSSrK63Awe0t/IMR0bZ0QMtnuaiHzThW81guu3qx9abLi99NEuiaN6P9gVYsNg==} + dev: false + /validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} dependencies: @@ -17627,7 +17251,7 @@ packages: resolution: {integrity: sha512-YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw==} dependencies: '@types/unist': 2.0.6 - vfile: 5.3.2 + vfile: 5.3.7 dev: false /vfile-message@3.1.4: @@ -17636,16 +17260,16 @@ packages: '@types/unist': 2.0.6 unist-util-stringify-position: 3.0.3 - /vfile@5.3.2: - resolution: {integrity: sha512-w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA==} + /vfile@5.3.7: + resolution: {integrity: sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==} dependencies: '@types/unist': 2.0.6 is-buffer: 2.0.5 unist-util-stringify-position: 3.0.3 vfile-message: 3.1.4 - /vite-node@0.31.0(@types/node@18.16.3): - resolution: {integrity: sha512-8x1x1LNuPvE2vIvkSB7c1mApX5oqlgsxzHQesYF7l5n1gKrEmrClIiZuOFbFDQcjLsmcWSwwmrWrcGWm9Fxc/g==} + /vite-node@0.31.4(@types/node@18.16.18): + resolution: {integrity: sha512-uzL377GjJtTbuc5KQxVbDu2xfU/x0wVjUtXQR2ihS21q/NK6ROr4oG0rsSkBBddZUVCwzfx22in76/0ZZHXgkQ==} engines: {node: '>=v14.18.0'} hasBin: true dependencies: @@ -17654,7 +17278,7 @@ packages: mlly: 1.2.1 pathe: 1.1.0 picocolors: 1.0.0 - vite: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) transitivePeerDependencies: - '@types/node' - less @@ -17665,7 +17289,7 @@ packages: - terser dev: false - /vite-plugin-pwa@0.14.7(workbox-window@6.5.4): + /vite-plugin-pwa@0.14.7(workbox-window@6.6.0): resolution: {integrity: sha512-dNJaf0fYOWncmjxv9HiSa2xrSjipjff7IkYE5oIUJ2x5HKu3cXgA8LRgzOwTc5MhwyFYRSU0xyN0Phbx3NsQYw==} peerDependencies: vite: ^3.1.0 || ^4.0.0 @@ -17677,17 +17301,17 @@ packages: '@rollup/plugin-replace': 5.0.2(rollup@3.20.1) debug: 4.3.4 fast-glob: 3.2.12 - pretty-bytes: 6.0.0 + pretty-bytes: 6.1.0 rollup: 3.20.1 workbox-build: 6.5.4 - workbox-window: 6.5.4 + workbox-window: 6.6.0 transitivePeerDependencies: - '@types/babel__core' - supports-color dev: false - /vite@4.3.1(@types/node@14.18.21): - resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} + /vite@4.3.9(@types/node@14.18.51): + resolution: {integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -17711,16 +17335,16 @@ packages: terser: optional: true dependencies: - '@types/node': 14.18.21 - esbuild: 0.17.18 - postcss: 8.4.23 - rollup: 3.21.8 + '@types/node': 14.18.51 + esbuild: 0.17.19 + postcss: 8.4.24 + rollup: 3.25.1 optionalDependencies: fsevents: 2.3.2 dev: true - /vite@4.3.1(@types/node@18.16.3)(sass@1.52.2): - resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} + /vite@4.3.9(@types/node@18.16.18)(sass@1.63.4): + resolution: {integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -17744,15 +17368,15 @@ packages: terser: optional: true dependencies: - '@types/node': 18.16.3 - esbuild: 0.17.18 - postcss: 8.4.23 - rollup: 3.21.8 - sass: 1.52.2 + '@types/node': 18.16.18 + esbuild: 0.17.19 + postcss: 8.4.24 + rollup: 3.25.1 + sass: 1.63.4 optionalDependencies: fsevents: 2.3.2 - /vitefu@0.2.4(vite@4.3.1): + /vitefu@0.2.4(vite@4.3.9): resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} peerDependencies: vite: ^3.0.0 || ^4.0.0 @@ -17760,11 +17384,11 @@ packages: vite: optional: true dependencies: - vite: 4.3.1(@types/node@18.16.3)(sass@1.52.2) + vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) dev: false - /vitest@0.31.0: - resolution: {integrity: sha512-JwWJS9p3GU9GxkG7eBSmr4Q4x4bvVBSswaCFf1PBNHiPx00obfhHRJfgHcnI0ffn+NMlIh9QGvG75FlaIBdKGA==} + /vitest@0.31.4: + resolution: {integrity: sha512-GoV0VQPmWrUFOZSg3RpQAPN+LPmHg2/gxlMNJlyxJihkz6qReHDV6b0pPDcqFLNEPya4tWJ1pgwUNP9MLmUfvQ==} engines: {node: '>=v14.18.0'} hasBin: true peerDependencies: @@ -17796,13 +17420,13 @@ packages: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 18.16.3 - '@vitest/expect': 0.31.0 - '@vitest/runner': 0.31.0 - '@vitest/snapshot': 0.31.0 - '@vitest/spy': 0.31.0 - '@vitest/utils': 0.31.0 - acorn: 8.8.2 + '@types/node': 18.16.18 + '@vitest/expect': 0.31.4 + '@vitest/runner': 0.31.4 + '@vitest/snapshot': 0.31.4 + '@vitest/spy': 0.31.4 + '@vitest/utils': 0.31.4 + acorn: 8.9.0 acorn-walk: 8.2.0 cac: 6.7.14 chai: 4.3.7 @@ -17816,8 +17440,8 @@ packages: strip-literal: 1.0.1 tinybench: 2.5.0 tinypool: 0.5.0 - vite: 4.3.1(@types/node@18.16.3)(sass@1.52.2) - vite-node: 0.31.0(@types/node@18.16.3) + vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) + vite-node: 0.31.4(@types/node@18.16.18) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -17833,7 +17457,7 @@ packages: engines: {node: '>=6.0'} hasBin: true dependencies: - acorn: 8.8.2 + acorn: 8.9.0 acorn-walk: 8.2.0 dev: true @@ -17900,14 +17524,14 @@ packages: resolution: {integrity: sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==} dev: false - /vue@3.2.47: - resolution: {integrity: sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==} + /vue@3.3.4: + resolution: {integrity: sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==} dependencies: - '@vue/compiler-dom': 3.2.47 - '@vue/compiler-sfc': 3.2.47 - '@vue/runtime-dom': 3.2.47 - '@vue/server-renderer': 3.2.47(vue@3.2.47) - '@vue/shared': 3.2.47 + '@vue/compiler-dom': 3.3.4 + '@vue/compiler-sfc': 3.3.4 + '@vue/runtime-dom': 3.3.4 + '@vue/server-renderer': 3.3.4(vue@3.3.4) + '@vue/shared': 3.3.4 /w3c-hr-time@1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} @@ -17935,8 +17559,8 @@ packages: resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==} engines: {node: '>= 8'} - /web-vitals@3.1.1: - resolution: {integrity: sha512-qvllU+ZeQChqzBhZ1oyXmWsjJ8a2jHYpH8AMaVuf29yscOPZfTQTjQFRX6+eADTdsDE8IanOZ0cetweHMs8/2A==} + /web-vitals@3.3.2: + resolution: {integrity: sha512-qRkpmSeKfEWAzNhtX541xA8gCJ+pqCqBmUlDVkVDSCSYUvfvNqF+k9g8I+uyreRcDBdfiJrd0/aLbTy5ydo49Q==} dev: false /webidl-conversions@3.0.1: @@ -18103,10 +17727,10 @@ packages: engines: {node: '>=10.0.0'} dependencies: '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0) - '@babel/core': 7.21.8 - '@babel/preset-env': 7.21.5(@babel/core@7.21.8) + '@babel/core': 7.22.5 + '@babel/preset-env': 7.21.5(@babel/core@7.22.5) '@babel/runtime': 7.21.5 - '@rollup/plugin-babel': 5.3.1(@babel/core@7.21.8)(rollup@2.79.1) + '@rollup/plugin-babel': 5.3.1(@babel/core@7.22.5)(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) '@surma/rollup-plugin-off-main-thread': 2.2.3 @@ -18154,6 +17778,10 @@ packages: resolution: {integrity: sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q==} dev: false + /workbox-core@6.6.0: + resolution: {integrity: sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ==} + dev: false + /workbox-expiration@6.5.4: resolution: {integrity: sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==} dependencies: @@ -18231,6 +17859,13 @@ packages: workbox-core: 6.5.4 dev: false + /workbox-window@6.6.0: + resolution: {integrity: sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==} + dependencies: + '@types/trusted-types': 2.0.3 + workbox-core: 6.6.0 + dev: false + /workerpool@6.2.0: resolution: {integrity: sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==} @@ -18283,7 +17918,7 @@ packages: dependencies: ansi-styles: 6.2.1 string-width: 5.1.2 - strip-ansi: 7.0.1 + strip-ansi: 7.1.0 dev: false /wrappy@1.0.2: @@ -18307,14 +17942,6 @@ packages: engines: {node: '>=12'} dev: true - /xml2js@0.4.23: - resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==} - engines: {node: '>=4.0.0'} - dependencies: - sax: 1.2.4 - xmlbuilder: 11.0.1 - dev: true - /xml2js@0.5.0: resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==} engines: {node: '>=4.0.0'} @@ -18379,14 +18006,9 @@ packages: resolution: {integrity: sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==} engines: {node: '>=10'} - /yargs-parser@21.0.1: - resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==} - engines: {node: '>=12'} - /yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} - dev: true /yargs-unparser@2.0.0: resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==} @@ -18492,5 +18114,5 @@ packages: name: '@test/solid-jsx-component' version: 0.0.0 dependencies: - solid-js: 1.7.4 + solid-js: 1.7.6 dev: false diff --git a/scripts/package.json b/scripts/package.json index 5322af1682f5..1bb5177506f9 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -10,17 +10,17 @@ "dependencies": { "@astrojs/webapi": "workspace:*", "arg": "^5.0.2", - "esbuild": "^0.17.12", + "esbuild": "^0.17.19", "globby": "^12.2.0", "kleur": "^4.1.4", "p-limit": "^4.0.0", - "svelte": "^3.48.0", - "tar": "^6.1.11" + "svelte": "^3.59.1", + "tar": "^6.1.15" }, "devDependencies": { "@octokit/action": "^3.18.1", "del": "^7.0.0", - "esbuild-plugin-copy": "^2.0.2", + "esbuild-plugin-copy": "^2.1.1", "execa": "^6.1.0", "tsconfig-resolver": "^3.0.1" } From 30bb363713e3d2c50d0d4816d970aa93b836a3b0 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Wed, 21 Jun 2023 21:56:25 +0800 Subject: [PATCH 36/60] Fix `astro:build:setup` hook `updateConfig` utility (#7438) Co-authored-by: Emanuele Stoppa --- .changeset/cyan-vans-clap.md | 5 ++++ packages/astro/src/core/build/static-build.ts | 4 +-- packages/astro/src/integrations/index.ts | 8 +++-- .../astro/test/units/integrations/api.test.js | 30 +++++++++++++++++++ 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 .changeset/cyan-vans-clap.md create mode 100644 packages/astro/test/units/integrations/api.test.js diff --git a/.changeset/cyan-vans-clap.md b/.changeset/cyan-vans-clap.md new file mode 100644 index 000000000000..e23c138968cd --- /dev/null +++ b/.changeset/cyan-vans-clap.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix `astro:build:setup` hook `updateConfig` utility, where the configuration wasn't correctly updated when the hook was fired. diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index a7d8354501ce..7d6004c0dd89 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -207,7 +207,7 @@ async function ssrBuild( base: settings.config.base, }; - await runHookBuildSetup({ + const updatedViteBuildConfig = await runHookBuildSetup({ config: settings.config, pages: internals.pagesByComponent, vite: viteBuildConfig, @@ -215,7 +215,7 @@ async function ssrBuild( logging: opts.logging, }); - return await vite.build(viteBuildConfig); + return await vite.build(updatedViteBuildConfig); } async function clientBuild( diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts index ae1ff97618d1..6e27920eb89b 100644 --- a/packages/astro/src/integrations/index.ts +++ b/packages/astro/src/integrations/index.ts @@ -286,7 +286,9 @@ export async function runHookBuildSetup({ pages: Map; target: 'server' | 'client'; logging: LogOptions; -}) { +}): Promise { + let updatedConfig = vite; + for (const integration of config.integrations) { if (integration?.hooks?.['astro:build:setup']) { await withTakingALongTimeMsg({ @@ -296,13 +298,15 @@ export async function runHookBuildSetup({ pages, target, updateConfig: (newConfig) => { - mergeConfig(vite, newConfig); + updatedConfig = mergeConfig(updatedConfig, newConfig); }, }), logging, }); } } + + return updatedConfig; } export async function runHookBuildSsr({ diff --git a/packages/astro/test/units/integrations/api.test.js b/packages/astro/test/units/integrations/api.test.js new file mode 100644 index 000000000000..919628da2901 --- /dev/null +++ b/packages/astro/test/units/integrations/api.test.js @@ -0,0 +1,30 @@ +import { expect } from 'chai'; +import { runHookBuildSetup } from '../../../dist/integrations/index.js'; + +describe('Integration API', () => { + it('runHookBuildSetup should work', async () => { + const updatedViteConfig = await runHookBuildSetup({ + config: { + integrations: [ + { + name: 'test', + hooks: { + 'astro:build:setup'({ updateConfig }) { + updateConfig({ + define: { + foo: 'bar', + }, + }); + }, + }, + }, + ], + }, + vite: {}, + logging: {}, + pages: new Map(), + target: 'server', + }); + expect(updatedViteConfig).to.haveOwnProperty('define'); + }); +}); From 3f9f5c117e4e9e4a0c0a648cb6db9a3073cd5727 Mon Sep 17 00:00:00 2001 From: Ben Holmes Date: Wed, 21 Jun 2023 16:02:20 -0400 Subject: [PATCH 37/60] fix: `pnpm` failure on `create-astro` (#7435) * fix: use which-pm-runs instead of preferred-pm * deps: remove preferred-pm * chore: move which-pm-runs to regular deps * chore: changeset --- .changeset/clever-rings-draw.md | 5 +++++ packages/create-astro/package.json | 5 ++--- packages/create-astro/src/messages.ts | 4 ++-- pnpm-lock.yaml | 9 +++------ 4 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 .changeset/clever-rings-draw.md diff --git a/.changeset/clever-rings-draw.md b/.changeset/clever-rings-draw.md new file mode 100644 index 000000000000..e6a474f917f3 --- /dev/null +++ b/.changeset/clever-rings-draw.md @@ -0,0 +1,5 @@ +--- +'create-astro': patch +--- + +Fix registry failures using unexpected package managers when running create-astro diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index fd975ef49cc0..8737baeec712 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -36,15 +36,14 @@ "execa": "^6.1.0", "giget": "1.0.0", "mocha": "^9.2.2", - "preferred-pm": "^3.0.3" + "which-pm-runs": "^1.1.0" }, "devDependencies": { "@types/which-pm-runs": "^1.0.0", "arg": "^5.0.2", "astro-scripts": "workspace:*", "strip-ansi": "^7.1.0", - "strip-json-comments": "^5.0.0", - "which-pm-runs": "^1.1.0" + "strip-json-comments": "^5.0.0" }, "engines": { "node": ">=16.12.0" diff --git a/packages/create-astro/src/messages.ts b/packages/create-astro/src/messages.ts index cea1f0bdc406..2f8ca960bb94 100644 --- a/packages/create-astro/src/messages.ts +++ b/packages/create-astro/src/messages.ts @@ -4,15 +4,15 @@ import { align, sleep } from '@astrojs/cli-kit/utils'; import { execa } from 'execa'; import { exec } from 'node:child_process'; import { get } from 'node:https'; -import preferredPM from 'preferred-pm'; import stripAnsi from 'strip-ansi'; +import detectPackageManager from 'which-pm-runs'; // Users might lack access to the global npm registry, this function // checks the user's project type and will return the proper npm registry // // A copy of this function also exists in the astro package async function getRegistry(): Promise { - const packageManager = (await preferredPM(process.cwd()))?.name || 'npm'; + const packageManager = detectPackageManager()?.name || 'npm'; const { stdout } = await execa(packageManager, ['config', 'get', 'registry']); return stdout || 'https://registry.npmjs.org'; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 739cf8997969..3e3539ef7a2f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3577,9 +3577,9 @@ importers: mocha: specifier: ^9.2.2 version: 9.2.2 - preferred-pm: - specifier: ^3.0.3 - version: 3.0.3 + which-pm-runs: + specifier: ^1.1.0 + version: 1.1.0 devDependencies: '@types/which-pm-runs': specifier: ^1.0.0 @@ -3596,9 +3596,6 @@ importers: strip-json-comments: specifier: ^5.0.0 version: 5.0.0 - which-pm-runs: - specifier: ^1.1.0 - version: 1.1.0 packages/create-astro/test/fixtures/not-empty: {} From 76fcdb84dd828ac373b2dc739e57fadf650820fd Mon Sep 17 00:00:00 2001 From: Ben Holmes Date: Wed, 21 Jun 2023 19:51:15 -0400 Subject: [PATCH 38/60] Chore: remove legacy mdx content collections handler (#7353) * chore: remove legacy mdx mapping * chore: changeset * chore: remove dead mdxEntryType * nit: comments on mdx pkg name Co-authored-by: Emanuele Stoppa * smol smol smol nit: and vs or --------- Co-authored-by: Emanuele Stoppa --- .changeset/six-keys-cheat.md | 5 ++++ packages/astro/src/integrations/index.ts | 10 ------- .../content-entry-type.ts | 29 ------------------- 3 files changed, 5 insertions(+), 39 deletions(-) create mode 100644 .changeset/six-keys-cheat.md diff --git a/.changeset/six-keys-cheat.md b/.changeset/six-keys-cheat.md new file mode 100644 index 000000000000..cf0c9bae5609 --- /dev/null +++ b/.changeset/six-keys-cheat.md @@ -0,0 +1,5 @@ +--- +'astro': minor +--- + +Remove legacy handling for MDX content collections. Ensure you are using `@astrojs/mdx` v0.18 or above. diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts index 6e27920eb89b..f0abd1576263 100644 --- a/packages/astro/src/integrations/index.ts +++ b/packages/astro/src/integrations/index.ts @@ -19,7 +19,6 @@ import { buildClientDirectiveEntrypoint } from '../core/client-directive/index.j import { mergeConfig } from '../core/config/config.js'; import { info, type LogOptions } from '../core/logger/core.js'; import { isServerLikeOutput } from '../prerender/utils.js'; -import { mdxContentEntryType } from '../vite-plugin-markdown/content-entry-type.js'; async function withTakingALongTimeMsg({ name, @@ -150,15 +149,6 @@ export async function runHookConfigSetup({ logging, }); - // Add MDX content entry type to support older `@astrojs/mdx` versions - // TODO: remove in next Astro minor release - if ( - integration.name === '@astrojs/mdx' && - !updatedSettings.contentEntryTypes.find((c) => c.extensions.includes('.mdx')) - ) { - addContentEntryType(mdxContentEntryType); - } - // Add custom client directives to settings, waiting for compiled code by esbuild for (const [name, compiled] of addedClientDirectives) { updatedSettings.clientDirectives.set(name, await compiled); diff --git a/packages/astro/src/vite-plugin-markdown/content-entry-type.ts b/packages/astro/src/vite-plugin-markdown/content-entry-type.ts index a3489c940132..92bb118d43a7 100644 --- a/packages/astro/src/vite-plugin-markdown/content-entry-type.ts +++ b/packages/astro/src/vite-plugin-markdown/content-entry-type.ts @@ -16,32 +16,3 @@ export const markdownContentEntryType: ContentEntryType = { // We need to handle propagation for Markdown because they support layouts which will bring in styles. handlePropagation: true, }; - -/** - * MDX content type for compatibility with older `@astrojs/mdx` versions - * TODO: remove in next Astro minor release - */ -export const mdxContentEntryType: ContentEntryType = { - extensions: ['.mdx'], - async getEntryInfo({ fileUrl, contents }: { fileUrl: URL; contents: string }) { - const parsed = parseFrontmatter(contents, fileURLToPath(fileUrl)); - return { - data: parsed.data, - body: parsed.content, - slug: parsed.data.slug, - rawData: parsed.matter, - }; - }, - // MDX can import scripts and styles, - // so wrap all MDX files with script / style propagation checks - handlePropagation: true, - contentModuleTypes: `declare module 'astro:content' { - interface Render { - '.mdx': Promise<{ - Content: import('astro').MarkdownInstance<{}>['Content']; - headings: import('astro').MarkdownHeading[]; - remarkPluginFrontmatter: Record; - }>; - } -}`, -}; From 33cdc8622a56c8e5465b7a50f627ecc568870c6b Mon Sep 17 00:00:00 2001 From: Benjamin MENANT Date: Thu, 22 Jun 2023 09:20:35 +0200 Subject: [PATCH 39/60] fix(astro:assets): inject /_image endpoint with prerendered=false on serverLikeOutput (#7423) --- .changeset/honest-flies-care.md | 5 +++++ packages/astro/src/@types/astro.ts | 1 + packages/astro/src/core/config/settings.ts | 2 +- packages/astro/src/core/routing/manifest/create.ts | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .changeset/honest-flies-care.md diff --git a/.changeset/honest-flies-care.md b/.changeset/honest-flies-care.md new file mode 100644 index 000000000000..fac5de21e4b8 --- /dev/null +++ b/.changeset/honest-flies-care.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Ensure injected `/_image` endpoint for image optimization is not prerendered on hybrid output. diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 1a5679f03e9c..43069aa1795d 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -1293,6 +1293,7 @@ export type InjectedScriptStage = 'before-hydration' | 'head-inline' | 'page' | export interface InjectedRoute { pattern: string; entryPoint: string; + prerender?: boolean; } export interface AstroConfig extends z.output { // Public: diff --git a/packages/astro/src/core/config/settings.ts b/packages/astro/src/core/config/settings.ts index 1494a5eddeb2..c5e9def8ce43 100644 --- a/packages/astro/src/core/config/settings.ts +++ b/packages/astro/src/core/config/settings.ts @@ -24,7 +24,7 @@ export function createBaseSettings(config: AstroConfig): AstroSettings { adapter: undefined, injectedRoutes: config.experimental.assets && isServerLikeOutput(config) - ? [{ pattern: '/_image', entryPoint: 'astro/assets/image-endpoint' }] + ? [{ pattern: '/_image', entryPoint: 'astro/assets/image-endpoint', prerender: false }] : [], pageExtensions: ['.astro', '.html', ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS], contentEntryTypes: [markdownContentEntryType], diff --git a/packages/astro/src/core/routing/manifest/create.ts b/packages/astro/src/core/routing/manifest/create.ts index 4a998fee930c..90c134f40145 100644 --- a/packages/astro/src/core/routing/manifest/create.ts +++ b/packages/astro/src/core/routing/manifest/create.ts @@ -387,7 +387,7 @@ export function createRouteManifest( comparator(injectedRouteToItem({ config, cwd }, a), injectedRouteToItem({ config, cwd }, b)) ) .reverse() // prepend to the routes array from lowest to highest priority - .forEach(({ pattern: name, entryPoint }) => { + .forEach(({ pattern: name, entryPoint, prerender: prerenderInjected }) => { let resolved: string; try { resolved = require.resolve(entryPoint, { paths: [cwd || fileURLToPath(config.root)] }); @@ -440,7 +440,7 @@ export function createRouteManifest( component, generate, pathname: pathname || void 0, - prerender, + prerender: prerenderInjected ?? prerender, }); }); From 9739adc91f967a59f50dd8c2862e7e4b2bcf74b4 Mon Sep 17 00:00:00 2001 From: Wooseop Kim Date: Thu, 22 Jun 2023 16:56:41 +0900 Subject: [PATCH 40/60] fix: encode spaces when generating `srcset` (#7340) --- .changeset/late-steaks-perform.md | 5 +++++ packages/integrations/image/package.json | 1 + packages/integrations/image/src/lib/get-picture.ts | 2 +- packages/integrations/image/test/picture-ssg.test.js | 12 ++++++++++++ pnpm-lock.yaml | 3 +++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .changeset/late-steaks-perform.md diff --git a/.changeset/late-steaks-perform.md b/.changeset/late-steaks-perform.md new file mode 100644 index 000000000000..f63b32235bb3 --- /dev/null +++ b/.changeset/late-steaks-perform.md @@ -0,0 +1,5 @@ +--- +'@astrojs/image': patch +--- + +Fix problem where filenames with spaces produce invalid srcset attributes diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index 77f1fac46e28..d71b28655991 100644 --- a/packages/integrations/image/package.json +++ b/packages/integrations/image/package.json @@ -59,6 +59,7 @@ "mocha": "^9.2.2", "rollup-plugin-copy": "^3.4.0", "sharp": "^0.32.1", + "srcset-parse": "^1.1.0", "vite": "^4.3.9" }, "peerDependencies": { diff --git a/packages/integrations/image/src/lib/get-picture.ts b/packages/integrations/image/src/lib/get-picture.ts index 594cb3dc225a..53b9aea8ab69 100644 --- a/packages/integrations/image/src/lib/get-picture.ts +++ b/packages/integrations/image/src/lib/get-picture.ts @@ -85,7 +85,7 @@ export async function getPicture(params: GetPictureParams): Promise @@ -96,6 +99,11 @@ describe('SSG pictures - dev', function () { const sources = picture.children('source'); expect(sources.length).to.equal(3); + sources.each((_, el) => { + const srcset = $(el).attr('srcset'); + expect(matchSrcset(srcset).length).to.equal(2); + }); + const src = image.attr('src'); const [route, params] = src.split('?'); @@ -293,6 +301,8 @@ describe('SSG pictures - build', function () { const source = $(el); const srcset = source.attr('srcset'); + expect(matchSrcset(srcset).length).to.equal(2); + for (const src of srcset.split(',')) { const segments = src.split(' '); @@ -400,6 +410,8 @@ describe('SSG pictures with subpath - build', function () { const source = $(el); const srcset = source.attr('srcset'); + expect(matchSrcset(srcset).length).to.equal(2); + for (const src of srcset.split(',')) { const [pathname, width] = src.split(' '); const widthNum = parseInt(width.substring(0, width.length - 1)); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3e3539ef7a2f..6bad3e9933aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3790,6 +3790,9 @@ importers: sharp: specifier: ^0.32.1 version: 0.32.1 + srcset-parse: + specifier: ^1.1.0 + version: 1.1.0 vite: specifier: ^4.3.9 version: 4.3.9(@types/node@18.16.18)(sass@1.63.4) From 03b7d17b99a7af2ff2d9de171455df7778fca368 Mon Sep 17 00:00:00 2001 From: Chris Swithinbank Date: Thu, 22 Jun 2023 12:10:59 +0200 Subject: [PATCH 41/60] Fix two errors for use in docs (#7445) --- packages/astro/src/core/errors/errors-data.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts index b8babd91a06d..7d811faff6fd 100644 --- a/packages/astro/src/core/errors/errors-data.ts +++ b/packages/astro/src/core/errors/errors-data.ts @@ -547,9 +547,7 @@ See https://docs.astro.build/en/guides/server-side-rendering/ for more informati title: 'Prerendered dynamic endpoint has path collision.', code: 3026, message: (pathname: string) => - `Could not render \`${pathname}\` with an \`undefined\` param as the generated path will collide during prerendering. ` + - `Prevent passing \`undefined\` as \`params\` for the endpoint's \`getStaticPaths()\` function, ` + - `or add an additional extension to the endpoint's filename.`, + `Could not render \`${pathname}\` with an \`undefined\` param as the generated path will collide during prerendering. Prevent passing \`undefined\` as \`params\` for the endpoint's \`getStaticPaths()\` function, or add an additional extension to the endpoint's filename.`, hint: (filename: string) => `Rename \`${filename}\` to \`${filename.replace(/\.(js|ts)/, (m) => `.json` + m)}\``, }, @@ -694,7 +692,7 @@ See https://docs.astro.build/en/guides/server-side-rendering/ for more informati '`locals` can only be assigned to an object. Other values like numbers, strings, etc. are not accepted.', hint: 'If you tried to remove some information from the `locals` object, try to use `delete` or set the property to `undefined`.', }, - /* + /** * @docs * @see * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/) From 38b104049a4d3f25ff01baeecf3698515ab9a07b Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:06:15 -0700 Subject: [PATCH 42/60] [ci] release (#7434) Co-authored-by: github-actions[bot] --- .changeset/clever-rings-draw.md | 5 -- .changeset/cyan-vans-clap.md | 5 -- .changeset/five-ghosts-sit.md | 5 -- .changeset/fluffy-pandas-breathe.md | 5 -- .changeset/great-crabs-march.md | 5 -- .changeset/honest-flies-care.md | 5 -- .changeset/late-steaks-perform.md | 5 -- .changeset/six-keys-cheat.md | 5 -- .changeset/smooth-jokes-watch.md | 6 -- .changeset/wet-readers-join.md | 31 ---------- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/deno/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 4 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 4 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 4 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 48 +++++++++++++++ packages/astro/package.json | 2 +- packages/create-astro/CHANGELOG.md | 6 ++ packages/create-astro/package.json | 2 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/image/CHANGELOG.md | 9 +++ packages/integrations/image/package.json | 4 +- packages/integrations/markdoc/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/node/CHANGELOG.md | 11 ++++ packages/integrations/node/package.json | 4 +- packages/integrations/svelte/package.json | 2 +- packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/package.json | 2 +- packages/integrations/vue/package.json | 2 +- pnpm-lock.yaml | 60 +++++++++---------- 54 files changed, 148 insertions(+), 151 deletions(-) delete mode 100644 .changeset/clever-rings-draw.md delete mode 100644 .changeset/cyan-vans-clap.md delete mode 100644 .changeset/five-ghosts-sit.md delete mode 100644 .changeset/fluffy-pandas-breathe.md delete mode 100644 .changeset/great-crabs-march.md delete mode 100644 .changeset/honest-flies-care.md delete mode 100644 .changeset/late-steaks-perform.md delete mode 100644 .changeset/six-keys-cheat.md delete mode 100644 .changeset/smooth-jokes-watch.md delete mode 100644 .changeset/wet-readers-join.md diff --git a/.changeset/clever-rings-draw.md b/.changeset/clever-rings-draw.md deleted file mode 100644 index e6a474f917f3..000000000000 --- a/.changeset/clever-rings-draw.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'create-astro': patch ---- - -Fix registry failures using unexpected package managers when running create-astro diff --git a/.changeset/cyan-vans-clap.md b/.changeset/cyan-vans-clap.md deleted file mode 100644 index e23c138968cd..000000000000 --- a/.changeset/cyan-vans-clap.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix `astro:build:setup` hook `updateConfig` utility, where the configuration wasn't correctly updated when the hook was fired. diff --git a/.changeset/five-ghosts-sit.md b/.changeset/five-ghosts-sit.md deleted file mode 100644 index 3b23736a3ac0..000000000000 --- a/.changeset/five-ghosts-sit.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix an issue related to the documentation. Destructure the argument of the function to customize the Astro dev server based on the command run. diff --git a/.changeset/fluffy-pandas-breathe.md b/.changeset/fluffy-pandas-breathe.md deleted file mode 100644 index f3d1fdffbda0..000000000000 --- a/.changeset/fluffy-pandas-breathe.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Update internal types for more stable builds for Astro maintainers. diff --git a/.changeset/great-crabs-march.md b/.changeset/great-crabs-march.md deleted file mode 100644 index 5f58b2bb4111..000000000000 --- a/.changeset/great-crabs-march.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Correctly emit the middleware code during the build phase. The file emitted is now `dist/middleware.mjs` diff --git a/.changeset/honest-flies-care.md b/.changeset/honest-flies-care.md deleted file mode 100644 index fac5de21e4b8..000000000000 --- a/.changeset/honest-flies-care.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Ensure injected `/_image` endpoint for image optimization is not prerendered on hybrid output. diff --git a/.changeset/late-steaks-perform.md b/.changeset/late-steaks-perform.md deleted file mode 100644 index f63b32235bb3..000000000000 --- a/.changeset/late-steaks-perform.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/image': patch ---- - -Fix problem where filenames with spaces produce invalid srcset attributes diff --git a/.changeset/six-keys-cheat.md b/.changeset/six-keys-cheat.md deleted file mode 100644 index cf0c9bae5609..000000000000 --- a/.changeset/six-keys-cheat.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': minor ---- - -Remove legacy handling for MDX content collections. Ensure you are using `@astrojs/mdx` v0.18 or above. diff --git a/.changeset/smooth-jokes-watch.md b/.changeset/smooth-jokes-watch.md deleted file mode 100644 index c28c51d2b4f8..000000000000 --- a/.changeset/smooth-jokes-watch.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'astro': minor -'@astrojs/node': minor ---- - -`Astro.locals` is now exposed to the adapter API. Node Adapter can now pass in a `locals` object in the SSR handler middleware. diff --git a/.changeset/wet-readers-join.md b/.changeset/wet-readers-join.md deleted file mode 100644 index abf77e6c97ca..000000000000 --- a/.changeset/wet-readers-join.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -'astro': minor ---- - -Shipped a new SSR build configuration mode: `split`. -When enabled, Astro will "split" the single `entry.mjs` file and instead emit a separate file to render each individual page during the build process. - -These files will be emitted inside `dist/pages`, mirroring the directory structure of your page files in `src/pages/`, for example: - -``` -├── pages -│ ├── blog -│ │ ├── entry._slug_.astro.mjs -│ │ └── entry.about.astro.mjs -│ └── entry.index.astro.mjs -``` - -To enable, set `build.split: true` in your Astro config: - -```js -// src/astro.config.mjs -export default defineConfig({ - output: "server", - adapter: node({ - mode: "standalone" - }), - build: { - split: true - } -}) -``` \ No newline at end of file diff --git a/examples/basics/package.json b/examples/basics/package.json index 2a225c60d39f..eafcb6ef697e 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.6" + "astro": "^2.7.0" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 1c1693142a60..eb63d7e79bd8 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^0.19.7", "@astrojs/rss": "^2.4.3", "@astrojs/sitemap": "^1.3.3", - "astro": "^2.6.6" + "astro": "^2.7.0" } } diff --git a/examples/component/package.json b/examples/component/package.json index 6d65d622c82b..d9aba504476d 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.6.6" + "astro": "^2.7.0" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index d043e219d1e8..573260eaf0a4 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.6" + "astro": "^2.7.0" }, "devDependencies": { "@astrojs/deno": "^4.2.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index a5923dfb4ac4..4e7b41a72430 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.2.2", "@types/alpinejs": "^3.7.1", "alpinejs": "^3.12.2", - "astro": "^2.6.6" + "astro": "^2.7.0" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 4b5aba252aec..e9a705e78e05 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^2.1.0", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^2.6.6", + "astro": "^2.7.0", "lit": "^2.7.5" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 18f93494da03..dcb8e76b6273 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^2.2.0", "@astrojs/svelte": "^3.0.0", "@astrojs/vue": "^2.2.1", - "astro": "^2.6.6", + "astro": "^2.7.0", "preact": "^10.15.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 60b8fac18874..5a512e043630 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^2.2.1", "@preact/signals": "^1.1.3", - "astro": "^2.6.6", + "astro": "^2.7.0", "preact": "^10.15.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index a814ecb1c5f2..a45551b6ec46 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^2.2.1", "@types/react": "^18.2.13", "@types/react-dom": "^18.2.6", - "astro": "^2.6.6", + "astro": "^2.7.0", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 13877113ad9c..d08d534bf818 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^2.2.0", - "astro": "^2.6.6", + "astro": "^2.7.0", "solid-js": "^1.7.6" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 1b23bb98b977..2d23e527aec5 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^3.0.0", - "astro": "^2.6.6", + "astro": "^2.7.0", "svelte": "^3.59.1" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 023ae1e4f754..4cb61f3c3599 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^2.2.1", - "astro": "^2.6.6", + "astro": "^2.7.0", "vue": "^3.3.4" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 930367a046a9..27775a5f7c0c 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "@astrojs/node": "^5.2.0", - "astro": "^2.6.6" + "@astrojs/node": "^5.3.0", + "astro": "^2.7.0" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 421c461e8a41..cd69a5f00309 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.6.6" + "astro": "^2.7.0" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 80b064770e74..24c1ad69fe83 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -12,8 +12,8 @@ "server": "node dist/server/entry.mjs" }, "dependencies": { - "@astrojs/node": "^5.2.0", - "astro": "^2.6.6", + "@astrojs/node": "^5.3.0", + "astro": "^2.7.0", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index ce905e255680..ebb75fdc3ea5 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.6" + "astro": "^2.7.0" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 7af4c6d4b9cd..5980d6ee747c 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.6" + "astro": "^2.7.0" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 39d76d5fff1c..2294a88a47dc 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.6" + "astro": "^2.7.0" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 3b978aeb23e1..61406b4c9bc2 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -12,9 +12,9 @@ "server": "node dist/server/entry.mjs" }, "dependencies": { - "@astrojs/node": "^5.2.0", + "@astrojs/node": "^5.3.0", "@astrojs/svelte": "^3.0.0", - "astro": "^2.6.6", + "astro": "^2.7.0", "svelte": "^3.59.1" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index c56ad11db706..ca45b0f247a5 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.3.3", - "astro": "^2.6.6" + "astro": "^2.7.0" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 915f4f4fe671..3fcb9e09a78c 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^2.2.1", - "astro": "^2.6.6", + "astro": "^2.7.0", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 67450111a441..11adc9386ced 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.6" + "astro": "^2.7.0" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 64eddd13a8fa..d3aefd99f5e1 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^0.19.7", "@astrojs/preact": "^2.2.1", - "astro": "^2.6.6", + "astro": "^2.7.0", "preact": "^10.15.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 23da2b8cafe9..aa127b5e4297 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^2.2.1", "@nanostores/preact": "^0.4.1", - "astro": "^2.6.6", + "astro": "^2.7.0", "nanostores": "^0.8.1", "preact": "^10.15.1" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 45e2729afea9..a08f28c6ee1f 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^0.19.7", "@astrojs/tailwind": "^4.0.0", "@types/canvas-confetti": "^1.6.0", - "astro": "^2.6.6", + "astro": "^2.7.0", "autoprefixer": "^10.4.14", "canvas-confetti": "^1.6.0", "postcss": "^8.4.24", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 7b7927ab7131..d1a0b5f4db3d 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.6.6", + "astro": "^2.7.0", "vite-plugin-pwa": "0.14.7", "workbox-window": "^6.6.0" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index d0bd37a3ed55..7eff098f6512 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^2.6.6", + "astro": "^2.7.0", "vitest": "^0.31.4" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index edce05e0e136..917271ba12c4 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,53 @@ # astro +## 2.7.0 + +### Minor Changes + +- [#7353](https://github.com/withastro/astro/pull/7353) [`76fcdb84d`](https://github.com/withastro/astro/commit/76fcdb84dd828ac373b2dc739e57fadf650820fd) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Remove legacy handling for MDX content collections. Ensure you are using `@astrojs/mdx` v0.18 or above. + +- [#7385](https://github.com/withastro/astro/pull/7385) [`8e2923cc6`](https://github.com/withastro/astro/commit/8e2923cc6219eda01ca2c749f5c7fa2fe4319455) Thanks [@ematipico](https://github.com/ematipico)! - `Astro.locals` is now exposed to the adapter API. Node Adapter can now pass in a `locals` object in the SSR handler middleware. + +- [#7220](https://github.com/withastro/astro/pull/7220) [`459b5bd05`](https://github.com/withastro/astro/commit/459b5bd05f562238f7250520efe3cf0fa156bb45) Thanks [@ematipico](https://github.com/ematipico)! - Shipped a new SSR build configuration mode: `split`. + When enabled, Astro will "split" the single `entry.mjs` file and instead emit a separate file to render each individual page during the build process. + + These files will be emitted inside `dist/pages`, mirroring the directory structure of your page files in `src/pages/`, for example: + + ``` + ├── pages + │ ├── blog + │ │ ├── entry._slug_.astro.mjs + │ │ └── entry.about.astro.mjs + │ └── entry.index.astro.mjs + ``` + + To enable, set `build.split: true` in your Astro config: + + ```js + // src/astro.config.mjs + export default defineConfig({ + output: 'server', + adapter: node({ + mode: 'standalone', + }), + build: { + split: true, + }, + }); + ``` + +### Patch Changes + +- [#7438](https://github.com/withastro/astro/pull/7438) [`30bb36371`](https://github.com/withastro/astro/commit/30bb363713e3d2c50d0d4816d970aa93b836a3b0) Thanks [@bluwy](https://github.com/bluwy)! - Fix `astro:build:setup` hook `updateConfig` utility, where the configuration wasn't correctly updated when the hook was fired. + +- [#7436](https://github.com/withastro/astro/pull/7436) [`3943fa390`](https://github.com/withastro/astro/commit/3943fa390a0bd41317a673d0f841e0461c7499cd) Thanks [@kossidts](https://github.com/kossidts)! - Fix an issue related to the documentation. Destructure the argument of the function to customize the Astro dev server based on the command run. + +- [#7424](https://github.com/withastro/astro/pull/7424) [`7877a06d8`](https://github.com/withastro/astro/commit/7877a06d829305eed356fbb8bfd1ef578cd5466e) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Update internal types for more stable builds for Astro maintainers. + +- [#7427](https://github.com/withastro/astro/pull/7427) [`e314a04bf`](https://github.com/withastro/astro/commit/e314a04bfbf0526838b7c9aac452251b27d69719) Thanks [@ematipico](https://github.com/ematipico)! - Correctly emit the middleware code during the build phase. The file emitted is now `dist/middleware.mjs` + +- [#7423](https://github.com/withastro/astro/pull/7423) [`33cdc8622`](https://github.com/withastro/astro/commit/33cdc8622a56c8e5465b7a50f627ecc568870c6b) Thanks [@bmenant](https://github.com/bmenant)! - Ensure injected `/_image` endpoint for image optimization is not prerendered on hybrid output. + ## 2.6.6 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 879953f2a454..82fb50bf78c1 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "2.6.6", + "version": "2.7.0", "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/create-astro/CHANGELOG.md b/packages/create-astro/CHANGELOG.md index d1e06d4cb55d..471f90329e5c 100644 --- a/packages/create-astro/CHANGELOG.md +++ b/packages/create-astro/CHANGELOG.md @@ -1,5 +1,11 @@ # create-astro +## 3.1.8 + +### Patch Changes + +- [#7435](https://github.com/withastro/astro/pull/7435) [`3f9f5c117`](https://github.com/withastro/astro/commit/3f9f5c117e4e9e4a0c0a648cb6db9a3073cd5727) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix registry failures using unexpected package managers when running create-astro + ## 3.1.7 ### Patch Changes diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index 8737baeec712..a3f1d6052c21 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -1,6 +1,6 @@ { "name": "create-astro", - "version": "3.1.7", + "version": "3.1.8", "type": "module", "author": "withastro", "license": "MIT", diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 8510189e643a..b63d3a02a6ae 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -44,7 +44,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^2.6.6" + "astro": "workspace:^2.7.0" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 01e8b0062007..a72eb095a05d 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.6.6" + "astro": "workspace:^2.7.0" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/image/CHANGELOG.md b/packages/integrations/image/CHANGELOG.md index 5975b6cc756e..408844b331aa 100644 --- a/packages/integrations/image/CHANGELOG.md +++ b/packages/integrations/image/CHANGELOG.md @@ -1,5 +1,14 @@ # @astrojs/image +## 0.17.1 + +### Patch Changes + +- [#7340](https://github.com/withastro/astro/pull/7340) [`9739adc91`](https://github.com/withastro/astro/commit/9739adc91f967a59f50dd8c2862e7e4b2bcf74b4) Thanks [@wooseopkim](https://github.com/wooseopkim)! - Fix problem where filenames with spaces produce invalid srcset attributes + +- Updated dependencies [[`30bb36371`](https://github.com/withastro/astro/commit/30bb363713e3d2c50d0d4816d970aa93b836a3b0), [`3943fa390`](https://github.com/withastro/astro/commit/3943fa390a0bd41317a673d0f841e0461c7499cd), [`7877a06d8`](https://github.com/withastro/astro/commit/7877a06d829305eed356fbb8bfd1ef578cd5466e), [`e314a04bf`](https://github.com/withastro/astro/commit/e314a04bfbf0526838b7c9aac452251b27d69719), [`33cdc8622`](https://github.com/withastro/astro/commit/33cdc8622a56c8e5465b7a50f627ecc568870c6b), [`76fcdb84d`](https://github.com/withastro/astro/commit/76fcdb84dd828ac373b2dc739e57fadf650820fd), [`8e2923cc6`](https://github.com/withastro/astro/commit/8e2923cc6219eda01ca2c749f5c7fa2fe4319455), [`459b5bd05`](https://github.com/withastro/astro/commit/459b5bd05f562238f7250520efe3cf0fa156bb45)]: + - astro@2.7.0 + ## 0.17.0 ### Minor Changes diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index d71b28655991..ca62750afdb8 100644 --- a/packages/integrations/image/package.json +++ b/packages/integrations/image/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/image", "description": "Load and transform images in your Astro site", - "version": "0.17.0", + "version": "0.17.1", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -63,7 +63,7 @@ "vite": "^4.3.9" }, "peerDependencies": { - "astro": "workspace:^2.6.6", + "astro": "workspace:^2.7.0", "sharp": ">=0.31.0" }, "peerDependenciesMeta": { diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 6284c419b7ee..8604bda5ad36 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -73,7 +73,7 @@ "zod": "^3.17.3" }, "peerDependencies": { - "astro": "workspace:^2.6.6" + "astro": "workspace:^2.7.0" }, "devDependencies": { "@astrojs/markdown-remark": "^2.2.1", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 2228d9cc5d52..79bae32e0d8d 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.6.6" + "astro": "workspace:^2.7.0" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md index ddf29bcb614d..ae8e8cfdb5b6 100644 --- a/packages/integrations/node/CHANGELOG.md +++ b/packages/integrations/node/CHANGELOG.md @@ -1,5 +1,16 @@ # @astrojs/node +## 5.3.0 + +### Minor Changes + +- [#7385](https://github.com/withastro/astro/pull/7385) [`8e2923cc6`](https://github.com/withastro/astro/commit/8e2923cc6219eda01ca2c749f5c7fa2fe4319455) Thanks [@ematipico](https://github.com/ematipico)! - `Astro.locals` is now exposed to the adapter API. Node Adapter can now pass in a `locals` object in the SSR handler middleware. + +### Patch Changes + +- Updated dependencies [[`30bb36371`](https://github.com/withastro/astro/commit/30bb363713e3d2c50d0d4816d970aa93b836a3b0), [`3943fa390`](https://github.com/withastro/astro/commit/3943fa390a0bd41317a673d0f841e0461c7499cd), [`7877a06d8`](https://github.com/withastro/astro/commit/7877a06d829305eed356fbb8bfd1ef578cd5466e), [`e314a04bf`](https://github.com/withastro/astro/commit/e314a04bfbf0526838b7c9aac452251b27d69719), [`33cdc8622`](https://github.com/withastro/astro/commit/33cdc8622a56c8e5465b7a50f627ecc568870c6b), [`76fcdb84d`](https://github.com/withastro/astro/commit/76fcdb84dd828ac373b2dc739e57fadf650820fd), [`8e2923cc6`](https://github.com/withastro/astro/commit/8e2923cc6219eda01ca2c749f5c7fa2fe4319455), [`459b5bd05`](https://github.com/withastro/astro/commit/459b5bd05f562238f7250520efe3cf0fa156bb45)]: + - astro@2.7.0 + ## 5.2.0 ### Minor Changes diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 58d4fd34539c..6236435fbafa 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/node", "description": "Deploy your site to a Node.js server", - "version": "5.2.0", + "version": "5.3.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -38,7 +38,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^2.6.6" + "astro": "workspace:^2.7.0" }, "devDependencies": { "@types/node": "^18.16.18", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index b8f8a0f8a4fa..7daafa213539 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -48,7 +48,7 @@ "vite": "^4.3.9" }, "peerDependencies": { - "astro": "workspace:^2.6.6", + "astro": "workspace:^2.7.0", "svelte": "^3.55.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 461528ebe384..d72b98462422 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -43,7 +43,7 @@ "vite": "^4.3.9" }, "peerDependencies": { - "astro": "workspace:^2.6.6", + "astro": "workspace:^2.7.0", "tailwindcss": "^3.0.24" } } diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 0513f0483dc5..acc20f655c4f 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -60,7 +60,7 @@ "web-vitals": "^3.3.2" }, "peerDependencies": { - "astro": "workspace:^2.6.6" + "astro": "workspace:^2.7.0" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.2", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index af97bd95c3e7..08a51267235a 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.3.4" }, "peerDependencies": { - "astro": "workspace:^2.6.6", + "astro": "workspace:^2.7.0", "vue": "^3.2.30" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6bad3e9933aa..b454bceffd14 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -127,7 +127,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/blog: @@ -142,19 +142,19 @@ importers: specifier: ^1.3.3 version: link:../../packages/integrations/sitemap astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -173,7 +173,7 @@ importers: specifier: ^3.12.2 version: 3.12.2 astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/framework-lit: @@ -185,7 +185,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro lit: specifier: ^2.7.5 @@ -209,7 +209,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro preact: specifier: ^10.15.1 @@ -239,7 +239,7 @@ importers: specifier: ^1.1.3 version: 1.1.3(preact@10.15.1) astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro preact: specifier: ^10.15.1 @@ -257,7 +257,7 @@ importers: specifier: ^18.2.6 version: 18.2.6 astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -272,7 +272,7 @@ importers: specifier: ^2.2.0 version: link:../../packages/integrations/solid astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro solid-js: specifier: ^1.7.6 @@ -284,7 +284,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/svelte astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro svelte: specifier: ^3.59.1 @@ -296,7 +296,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro vue: specifier: ^3.3.4 @@ -305,25 +305,25 @@ importers: examples/hackernews: dependencies: '@astrojs/node': - specifier: ^5.2.0 + specifier: ^5.3.0 version: link:../../packages/integrations/node astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/middleware: dependencies: '@astrojs/node': - specifier: ^5.2.0 + specifier: ^5.3.0 version: link:../../packages/integrations/node astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -332,31 +332,31 @@ importers: examples/minimal: dependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/ssr: dependencies: '@astrojs/node': - specifier: ^5.2.0 + specifier: ^5.3.0 version: link:../../packages/integrations/node '@astrojs/svelte': specifier: ^3.0.0 version: link:../../packages/integrations/svelte astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro svelte: specifier: ^3.59.1 @@ -368,7 +368,7 @@ importers: specifier: ^0.3.3 version: link:../../packages/integrations/markdoc astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/with-markdown-plugins: @@ -377,7 +377,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/markdown/remark astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -398,7 +398,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro examples/with-mdx: @@ -410,7 +410,7 @@ importers: specifier: ^2.2.1 version: link:../../packages/integrations/preact astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro preact: specifier: ^10.15.1 @@ -425,7 +425,7 @@ importers: specifier: ^0.4.1 version: 0.4.1(nanostores@0.8.1)(preact@10.15.1) astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro nanostores: specifier: ^0.8.1 @@ -446,7 +446,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro autoprefixer: specifier: ^10.4.14 @@ -464,7 +464,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.14.7 @@ -476,7 +476,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^2.6.6 + specifier: ^2.7.0 version: link:../../packages/astro vitest: specifier: ^0.31.4 From 32bde967f4b21648b1e11dbfa7964bf7f348f7b9 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Thu, 22 Jun 2023 23:40:08 +0800 Subject: [PATCH 43/60] Fix vercel redirects with trailingSlash always (#7447) --- .changeset/nervous-paws-knock.md | 5 +++++ packages/integrations/vercel/src/lib/redirects.ts | 2 +- .../fixtures/redirects/src/pages/subpage.astro | 0 .../integrations/vercel/test/redirects.test.js | 15 ++++++++++++++- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 .changeset/nervous-paws-knock.md create mode 100644 packages/integrations/vercel/test/fixtures/redirects/src/pages/subpage.astro diff --git a/.changeset/nervous-paws-knock.md b/.changeset/nervous-paws-knock.md new file mode 100644 index 000000000000..4051bd8c2c1d --- /dev/null +++ b/.changeset/nervous-paws-knock.md @@ -0,0 +1,5 @@ +--- +'@astrojs/vercel': patch +--- + +Fix redirects for root page when using `trailingSlash: "always"` diff --git a/packages/integrations/vercel/src/lib/redirects.ts b/packages/integrations/vercel/src/lib/redirects.ts index 5c6bb605b57c..8613be2ed72d 100644 --- a/packages/integrations/vercel/src/lib/redirects.ts +++ b/packages/integrations/vercel/src/lib/redirects.ts @@ -87,7 +87,7 @@ export function getRedirects(routes: RouteData[], config: AstroConfig): VercelRo headers: { Location: getRedirectLocation(route, config) }, status: getRedirectStatus(route), }); - } else if (route.type === 'page') { + } else if (route.type === 'page' && route.route !== '/') { if (config.trailingSlash === 'always') { redirects.push({ src: config.base + getMatchPattern(route.segments), diff --git a/packages/integrations/vercel/test/fixtures/redirects/src/pages/subpage.astro b/packages/integrations/vercel/test/fixtures/redirects/src/pages/subpage.astro new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/packages/integrations/vercel/test/redirects.test.js b/packages/integrations/vercel/test/redirects.test.js index 16d845b044f8..35bbfcd519a2 100644 --- a/packages/integrations/vercel/test/redirects.test.js +++ b/packages/integrations/vercel/test/redirects.test.js @@ -1,5 +1,4 @@ import { expect } from 'chai'; -import * as cheerio from 'cheerio'; import { loadFixture } from './test-utils.js'; describe('Redirects', () => { @@ -18,6 +17,7 @@ describe('Redirects', () => { }, '/blog/[...slug]': '/team/articles/[...slug]', }, + trailingSlash: 'always', experimental: { redirects: true, }, @@ -56,4 +56,17 @@ describe('Redirects', () => { expect(blogRoute.headers.Location.startsWith('/team/articles')).to.equal(true); expect(blogRoute.status).to.equal(301); }); + + it('define trailingSlash redirect for sub pages', async () => { + const config = await getConfig(); + + const subpathRoute = config.routes.find((r) => r.src === '/\\/subpage'); + expect(subpathRoute).to.not.be.undefined; + expect(subpathRoute.headers.Location).to.equal('/subpage/'); + }); + + it('does not define trailingSlash redirect for root page', async () => { + const config = await getConfig(); + expect(config.routes.find((r) => r.src === '/')).to.be.undefined; + }); }); From f359d77b1844335ceeb103b9d3753eb2f440ed5f Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Thu, 22 Jun 2023 14:36:35 -0400 Subject: [PATCH 44/60] Prevent accidental CSS inclusion in dev (#7381) * Prevent accidental CSS inclusion in dev * Use ssrTransformResult.deps instead * Fix types * Get dynamic deps too * Handle virtual module deps * Fix test on windows --- .changeset/tiny-lemons-sit.md | 5 ++ .../astro/src/core/module-loader/loader.ts | 4 ++ packages/astro/src/core/render/dev/vite.ts | 19 +++++- packages/astro/test/units/dev/styles.test.js | 63 +++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 .changeset/tiny-lemons-sit.md create mode 100644 packages/astro/test/units/dev/styles.test.js diff --git a/.changeset/tiny-lemons-sit.md b/.changeset/tiny-lemons-sit.md new file mode 100644 index 000000000000..8e43429f7f42 --- /dev/null +++ b/.changeset/tiny-lemons-sit.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Prevent accidental inclusion of page CSS in dev mode diff --git a/packages/astro/src/core/module-loader/loader.ts b/packages/astro/src/core/module-loader/loader.ts index 84bb862d0fa4..39c24253ed26 100644 --- a/packages/astro/src/core/module-loader/loader.ts +++ b/packages/astro/src/core/module-loader/loader.ts @@ -42,6 +42,10 @@ export interface ModuleNode { id: string | null; url: string; ssrModule: Record | null; + ssrTransformResult: { + deps?: string[]; + dynamicDeps?: string[]; + } | null; ssrError: Error | null; importedModules: Set; } diff --git a/packages/astro/src/core/render/dev/vite.ts b/packages/astro/src/core/render/dev/vite.ts index fe4d3f7916b2..5cfea6e49fd9 100644 --- a/packages/astro/src/core/render/dev/vite.ts +++ b/packages/astro/src/core/render/dev/vite.ts @@ -41,6 +41,7 @@ export async function* crawlGraph( continue; } if (id === entry.id) { + const urlDeps = getDepsFromEntry(entry); scanned.add(id); const entryIsStyle = isCSSRequest(id); @@ -82,7 +83,7 @@ export async function* crawlGraph( } } } - if (!isPropagationStoppingPoint) { + if (urlDeps.includes(urlId(importedModule.url)) && !isPropagationStoppingPoint) { importedModules.add(importedModule); } } @@ -100,3 +101,19 @@ export async function* crawlGraph( yield* crawlGraph(loader, importedModule.id, false, scanned); } } + +// Virtual modules URL should start with /@id/ but do not +function urlId(url: string) { + if (url.startsWith('astro:scripts')) { + return '/@id/' + url; + } + return url; +} + +function getDepsFromEntry(entry: ModuleNode) { + let deps = entry.ssrTransformResult?.deps ?? []; + if(entry.ssrTransformResult?.dynamicDeps) { + return deps.concat(entry.ssrTransformResult.dynamicDeps); + } + return deps; +} diff --git a/packages/astro/test/units/dev/styles.test.js b/packages/astro/test/units/dev/styles.test.js new file mode 100644 index 000000000000..44dbc3be5fde --- /dev/null +++ b/packages/astro/test/units/dev/styles.test.js @@ -0,0 +1,63 @@ +import { expect } from 'chai'; +import { fileURLToPath } from 'url'; + +import { + getStylesForURL +} from '../../../dist/core/render/dev/css.js'; +import { viteID } from '../../../dist/core/util.js'; + +const root = new URL('../../fixtures/alias/', import.meta.url); + +class TestLoader { + constructor(modules) { + this.modules = new Map(modules.map(m => [m.id, m])) + } + getModuleById(id) { + return this.modules.get(id); + } + getModulesByFile(id) { + return this.modules.has(id) ? [this.modules.get(id)] : []; + } +} + +describe('Crawling graph for CSS', () => { + let loader; + before(() => { + const indexId = viteID(new URL('./src/pages/index.astro', root)); + const aboutId = viteID(new URL('./src/pages/about.astro', root)); + loader = new TestLoader([ + { + id: indexId, + importedModules: [{ + id: aboutId, + url: aboutId, + }, { + id: indexId + '?astro&style.css', + url: indexId + '?astro&style.css', + ssrModule: {} + }], + ssrTransformResult: { + deps: [indexId + '?astro&style.css'] + } + }, + { + id: aboutId, + importedModules: [{ + id: aboutId + '?astro&style.css', + url: aboutId + '?astro&style.css', + ssrModule: {} + }], + ssrTransformResult: { + deps: [aboutId + '?astro&style.css'] + } + } + ]); + }) + + it('importedModules is checked against the child\'s importers', async () => { + // In dev mode, HMR modules tracked are added to importedModules. We use `importers` + // to verify that they are true importers. + const res = await getStylesForURL(new URL('./src/pages/index.astro', root), loader, 'development') + expect(res.urls.size).to.equal(1); + }) +}) From 56d04e41009e85e3b3b58430378e47db62739aa5 Mon Sep 17 00:00:00 2001 From: matthewp Date: Thu, 22 Jun 2023 18:39:21 +0000 Subject: [PATCH 45/60] [ci] format --- packages/astro/src/core/render/dev/vite.ts | 2 +- packages/astro/test/units/dev/styles.test.js | 61 +++++++++++--------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/packages/astro/src/core/render/dev/vite.ts b/packages/astro/src/core/render/dev/vite.ts index 5cfea6e49fd9..b3efb34bb49d 100644 --- a/packages/astro/src/core/render/dev/vite.ts +++ b/packages/astro/src/core/render/dev/vite.ts @@ -112,7 +112,7 @@ function urlId(url: string) { function getDepsFromEntry(entry: ModuleNode) { let deps = entry.ssrTransformResult?.deps ?? []; - if(entry.ssrTransformResult?.dynamicDeps) { + if (entry.ssrTransformResult?.dynamicDeps) { return deps.concat(entry.ssrTransformResult.dynamicDeps); } return deps; diff --git a/packages/astro/test/units/dev/styles.test.js b/packages/astro/test/units/dev/styles.test.js index 44dbc3be5fde..76af929beb08 100644 --- a/packages/astro/test/units/dev/styles.test.js +++ b/packages/astro/test/units/dev/styles.test.js @@ -1,16 +1,14 @@ import { expect } from 'chai'; import { fileURLToPath } from 'url'; -import { - getStylesForURL -} from '../../../dist/core/render/dev/css.js'; +import { getStylesForURL } from '../../../dist/core/render/dev/css.js'; import { viteID } from '../../../dist/core/util.js'; const root = new URL('../../fixtures/alias/', import.meta.url); class TestLoader { constructor(modules) { - this.modules = new Map(modules.map(m => [m.id, m])) + this.modules = new Map(modules.map((m) => [m.id, m])); } getModuleById(id) { return this.modules.get(id); @@ -28,36 +26,45 @@ describe('Crawling graph for CSS', () => { loader = new TestLoader([ { id: indexId, - importedModules: [{ - id: aboutId, - url: aboutId, - }, { - id: indexId + '?astro&style.css', - url: indexId + '?astro&style.css', - ssrModule: {} - }], + importedModules: [ + { + id: aboutId, + url: aboutId, + }, + { + id: indexId + '?astro&style.css', + url: indexId + '?astro&style.css', + ssrModule: {}, + }, + ], ssrTransformResult: { - deps: [indexId + '?astro&style.css'] - } + deps: [indexId + '?astro&style.css'], + }, }, { id: aboutId, - importedModules: [{ - id: aboutId + '?astro&style.css', - url: aboutId + '?astro&style.css', - ssrModule: {} - }], + importedModules: [ + { + id: aboutId + '?astro&style.css', + url: aboutId + '?astro&style.css', + ssrModule: {}, + }, + ], ssrTransformResult: { - deps: [aboutId + '?astro&style.css'] - } - } + deps: [aboutId + '?astro&style.css'], + }, + }, ]); - }) + }); - it('importedModules is checked against the child\'s importers', async () => { + it("importedModules is checked against the child's importers", async () => { // In dev mode, HMR modules tracked are added to importedModules. We use `importers` // to verify that they are true importers. - const res = await getStylesForURL(new URL('./src/pages/index.astro', root), loader, 'development') + const res = await getStylesForURL( + new URL('./src/pages/index.astro', root), + loader, + 'development' + ); expect(res.urls.size).to.equal(1); - }) -}) + }); +}); From 864291212036819df9c3e5ad2dee5d921c1bdec8 Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Thu, 22 Jun 2023 15:42:17 -0500 Subject: [PATCH 46/60] Cleanup GitHub Actions (#7451) * chore(ci): cleanup GitHub Actions * Update .github/workflows/format.yml --- .github/workflows/format.yml | 36 +++-------------- .github/workflows/issue.yml | 34 ---------------- .github/workflows/main.yml | 23 ++++------- .github/workflows/nightly.yml | 75 ++--------------------------------- 4 files changed, 17 insertions(+), 151 deletions(-) delete mode 100644 .github/workflows/issue.yml diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 3291ce16e6a4..6b1b0e4ad8bf 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -1,4 +1,4 @@ -name: "Format Code" +name: Format on: workflow_dispatch: @@ -7,33 +7,9 @@ on: - main jobs: - format: + prettier: if: github.repository_owner == 'withastro' - runs-on: ubuntu-latest - env: - NODE_OPTIONS: "--max_old_space_size=4096" - steps: - - name: Check out code using Git - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref }} - # Needs access to push to main - token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }} - - name: Setup PNPM - uses: pnpm/action-setup@v2 - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: 16 - cache: "pnpm" - - name: Install dependencies - run: pnpm install - - name: Format code - run: pnpm run format:ci - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: "[ci] format" - branch: ${{ github.head_ref }} - commit_user_name: fredkbot - commit_user_email: fred+astrobot@astro.build + uses: withastro/automation/.github/workflows/format.yml@main + with: + command: "format:ci" + secrets: inherit diff --git a/.github/workflows/issue.yml b/.github/workflows/issue.yml deleted file mode 100644 index cc370ea07ebf..000000000000 --- a/.github/workflows/issue.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Auto Assign Issues to Project - -on: - issues: - types: [opened] - -env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - -jobs: - auto_assign_issues: - runs-on: ubuntu-latest - name: Auto-assign new issues to projects - steps: - - name: Assign Bugs to the Bug Tracker - uses: srggrs/assign-one-project-github-action@1.3.1 - if: github.event.action == 'opened' && startsWith(github.event.issue.title, '🐛 BUG:') - with: - project: 'https://github.com/withastro/astro/projects/2' - column_name: 'Needs Triage' - - - name: Assign RFCs to the RFC Tracker - uses: srggrs/assign-one-project-github-action@1.3.1 - if: github.event.action == 'opened' && startsWith(github.event.issue.title, '💡 RFC:') - with: - project: 'https://github.com/withastro/astro/projects/3' - column_name: 'Discussing' - - - name: Assign RFCs to the Docs Tracker - uses: srggrs/assign-one-project-github-action@1.3.1 - if: github.event.action == 'opened' && startsWith(github.event.issue.title, '📘 DOC:') - with: - project: 'https://github.com/withastro/astro/projects/5' - column_name: 'TODO' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f686c577411..0c348f7c9494 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,21 +18,14 @@ jobs: congrats: name: congratsbot if: ${{ github.repository_owner == 'withastro' }} - runs-on: ubuntu-latest - steps: - - id: setup - env: - MESSAGE: ${{ github.event.commits[0].message }} - run: | - TRIMMED=$(echo "$MESSAGE" | sed '1!d;q') - echo "::set-output name=COMMIT_MSG::${TRIMMED}" - - name: Send a Discord notification when a PR is merged - env: - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }} - # DISCORD_AVATAR: ${{ github.event.pull_request.user.avatar_url }} - uses: Ilshidur/action-discord@0.3.2 - with: - args: "**Merged!** ${{ github.event.commits[0].author.name }}: [`${{ steps.setup.outputs.COMMIT_MSG }}`]()" + uses: withastro/automation/.github/workflows/congratsbot.yml@main + with: + GITHUB_REPO: ${{ github.repository }} + COMMIT_AUTHOR: ${{ github.event.commits[0].author.name }} + COMMIT_MESSAGE: ${{ github.event.commits[0].message }} + COMMIT_ID: ${{ github.event.commits[0].id }} + secrets: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }} check_for_update: name: Check for Updates diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 027533ef6905..2a3bfd1948b7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,4 +1,4 @@ -name: "Nightly" +name: Nightly on: schedule: @@ -7,76 +7,7 @@ on: workflow_dispatch: jobs: - stat: - # Temporarily disable since stat collection hasn't work for a while - if: false - runs-on: ubuntu-latest - steps: - - name: Check out code using Git - uses: actions/checkout@v3 - - - name: Setup PNPM - uses: pnpm/action-setup@v2 - - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: 16 - cache: "pnpm" - - - name: Install dependencies - run: pnpm install - - - name: Collect stats - run: node scripts/stats/index.js - env: - # Needs access to collect stats from the GitHub API - GITHUB_TOKEN: ${{ secrets.FREDKBOT_GITHUB_TOKEN }} - - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: "[ci] collect stats" - branch: ${{ github.head_ref }} - # Needs access to push to main - token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }} - lockfile: if: github.repository_owner == 'withastro' - runs-on: ubuntu-latest - steps: - - name: Check out code using Git - uses: actions/checkout@v3 - - - name: Setup PNPM - uses: pnpm/action-setup@v2 - - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: 16 - cache: "pnpm" - - - name: Delete the existing pnpm-lock.yaml file - run: rm pnpm-lock.yaml - - # https://github.com/pnpm/pnpm/issues/6463 - - name: Update .npmrc to update packages to latest - run: echo "resolution-mode=highest" >> .npmrc - - - name: Create a fresh pnpm lockfile (no install) - run: pnpm install --lockfile-only - - - name: Create Pull Request - id: createpr - uses: peter-evans/create-pull-request@v5 - with: - branch: ci/lockfile - # Access token is needed to trigger CI on this PR - token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }} - commit-message: "[ci] update lockfile" - add-paths: pnpm-lock.yaml - title: "[ci] update lockfile" - body: > - This PR is auto-generated by a nightly GitHub action. - It should automatically be merged if tests pass. + uses: withastro/automation/.github/workflows/lockfile.yml@main + secrets: inherit From 2b75399520bebfc537cca8204e483f0df3373904 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Fri, 23 Jun 2023 16:48:05 +0800 Subject: [PATCH 47/60] Remove slash package (#7440) --- .changeset/early-students-taste.md | 5 ++++ .changeset/rich-pumpkins-change.md | 5 ++++ packages/astro/package.json | 2 -- packages/astro/src/assets/utils/emitAsset.ts | 6 ++--- packages/astro/src/core/render/ssr-element.ts | 7 +++--- .../astro/src/core/routing/manifest/create.ts | 3 +-- packages/astro/src/core/util.ts | 5 ++-- .../src/vite-plugin-load-fallback/index.ts | 4 +-- .../content-collections/frontmatter.test.js | 5 ++-- packages/integrations/cloudflare/package.json | 1 - .../cloudflare/test/prerender.test.js | 5 ++-- packages/internal-helpers/src/path.ts | 4 +++ pnpm-lock.yaml | 25 ------------------- 13 files changed, 29 insertions(+), 48 deletions(-) create mode 100644 .changeset/early-students-taste.md create mode 100644 .changeset/rich-pumpkins-change.md diff --git a/.changeset/early-students-taste.md b/.changeset/early-students-taste.md new file mode 100644 index 000000000000..3f068a0d250c --- /dev/null +++ b/.changeset/early-students-taste.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Remove `slash` package diff --git a/.changeset/rich-pumpkins-change.md b/.changeset/rich-pumpkins-change.md new file mode 100644 index 000000000000..1637bd11c2ff --- /dev/null +++ b/.changeset/rich-pumpkins-change.md @@ -0,0 +1,5 @@ +--- +'@astrojs/internal-helpers': patch +--- + +Add `slash` path utility diff --git a/packages/astro/package.json b/packages/astro/package.json index 82fb50bf78c1..16ab32525d0e 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -158,10 +158,8 @@ "semver": "^7.5.2", "server-destroy": "^1.0.1", "shiki": "^0.14.1", - "slash": "^4.0.0", "string-width": "^5.1.2", "strip-ansi": "^7.1.0", - "supports-esm": "^1.0.0", "tsconfig-resolver": "^3.0.1", "typescript": "*", "unist-util-visit": "^4.1.2", diff --git a/packages/astro/src/assets/utils/emitAsset.ts b/packages/astro/src/assets/utils/emitAsset.ts index 9b8d6fc08b3c..b1e01b3e4e22 100644 --- a/packages/astro/src/assets/utils/emitAsset.ts +++ b/packages/astro/src/assets/utils/emitAsset.ts @@ -1,8 +1,7 @@ import fs from 'node:fs'; import path from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; -import slash from 'slash'; -import { prependForwardSlash } from '../../core/path.js'; +import { prependForwardSlash, slash } from '../../core/path.js'; import { imageMetadata, type Metadata } from './metadata.js'; export async function emitESMImage( @@ -46,7 +45,6 @@ export async function emitESMImage( } function fileURLToNormalizedPath(filePath: URL): string { - // Uses `slash` package instead of Vite's `normalizePath` - // to avoid CJS bundling issues. + // Uses `slash` instead of Vite's `normalizePath` to avoid CJS bundling issues. return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, '/'); } diff --git a/packages/astro/src/core/render/ssr-element.ts b/packages/astro/src/core/render/ssr-element.ts index 84b0ab531293..2d9bf9ae8d59 100644 --- a/packages/astro/src/core/render/ssr-element.ts +++ b/packages/astro/src/core/render/ssr-element.ts @@ -1,13 +1,12 @@ -import slashify from 'slash'; import type { SSRElement } from '../../@types/astro'; -import { joinPaths, prependForwardSlash } from '../../core/path.js'; +import { joinPaths, prependForwardSlash, slash } from '../../core/path.js'; import type { StylesheetAsset } from '../app/types'; export function createAssetLink(href: string, base?: string, assetsPrefix?: string): string { if (assetsPrefix) { - return joinPaths(assetsPrefix, slashify(href)); + return joinPaths(assetsPrefix, slash(href)); } else if (base) { - return prependForwardSlash(joinPaths(base, slashify(href))); + return prependForwardSlash(joinPaths(base, slash(href))); } else { return href; } diff --git a/packages/astro/src/core/routing/manifest/create.ts b/packages/astro/src/core/routing/manifest/create.ts index 90c134f40145..b5a6831643a5 100644 --- a/packages/astro/src/core/routing/manifest/create.ts +++ b/packages/astro/src/core/routing/manifest/create.ts @@ -11,12 +11,11 @@ import type { LogOptions } from '../../logger/core'; import nodeFs from 'fs'; import { createRequire } from 'module'; import path from 'path'; -import slash from 'slash'; import { fileURLToPath } from 'url'; import { getPrerenderDefault } from '../../../prerender/utils.js'; import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from '../../constants.js'; import { warn } from '../../logger/core.js'; -import { removeLeadingForwardSlash } from '../../path.js'; +import { removeLeadingForwardSlash, slash } from '../../path.js'; import { resolvePages } from '../../util.js'; import { getRouteGenerator } from './generator.js'; const require = createRequire(import.meta.url); diff --git a/packages/astro/src/core/util.ts b/packages/astro/src/core/util.ts index 403d41527626..122bf739698e 100644 --- a/packages/astro/src/core/util.ts +++ b/packages/astro/src/core/util.ts @@ -1,13 +1,12 @@ import fs from 'fs'; import path from 'path'; -import slash from 'slash'; import { fileURLToPath } from 'url'; import { normalizePath } from 'vite'; import type { AstroConfig, AstroSettings, RouteType } from '../@types/astro'; import { isServerLikeOutput } from '../prerender/utils.js'; import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './constants.js'; import type { ModuleLoader } from './module-loader'; -import { prependForwardSlash, removeTrailingForwardSlash } from './path.js'; +import { prependForwardSlash, removeTrailingForwardSlash, slash } from './path.js'; /** Returns true if argument is an object of any prototype/class (but not null). */ export function isObject(value: unknown): value is Record { @@ -90,7 +89,7 @@ export function parseNpmName( * Windows: C:/Users/astro/code/my-project/src/pages/index.astro */ export function viteID(filePath: URL): string { - return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, '/'); + return slash(fileURLToPath(filePath) + filePath.search); } export const VALID_ID_PREFIX = `/@id/`; diff --git a/packages/astro/src/vite-plugin-load-fallback/index.ts b/packages/astro/src/vite-plugin-load-fallback/index.ts index 7c853245be34..084cb885f7ef 100644 --- a/packages/astro/src/vite-plugin-load-fallback/index.ts +++ b/packages/astro/src/vite-plugin-load-fallback/index.ts @@ -1,7 +1,7 @@ import nodeFs from 'fs'; import npath from 'path'; -import slashify from 'slash'; import type * as vite from 'vite'; +import { slash } from '../core/path.js'; type NodeFileSystemModule = typeof nodeFs; @@ -47,7 +47,7 @@ export default function loadFallbackPlugin({ async resolveId(id, parent) { // See if this can be loaded from our fs if (parent) { - const candidateId = npath.posix.join(npath.posix.dirname(slashify(parent)), id); + const candidateId = npath.posix.join(npath.posix.dirname(slash(parent)), id); try { // Check to see if this file exists and is not a directory. const stats = await fs.promises.stat(candidateId); diff --git a/packages/astro/test/units/content-collections/frontmatter.test.js b/packages/astro/test/units/content-collections/frontmatter.test.js index f264f994a5cc..d35a6df33668 100644 --- a/packages/astro/test/units/content-collections/frontmatter.test.js +++ b/packages/astro/test/units/content-collections/frontmatter.test.js @@ -1,7 +1,6 @@ import { fileURLToPath } from 'node:url'; import nodeFS from 'node:fs'; import path from 'node:path'; -import slash from 'slash'; import { runInContainer } from '../../../dist/core/dev/index.js'; import { attachContentServerListeners } from '../../../dist/content/index.js'; @@ -11,7 +10,9 @@ const root = new URL('../../fixtures/alias/', import.meta.url); function getTypesDts() { const typesdtsURL = new URL('../../../content-types.template.d.ts', import.meta.url); - const relpath = slash(path.relative(fileURLToPath(root), fileURLToPath(typesdtsURL))); + const relpath = path + .relative(fileURLToPath(root), fileURLToPath(typesdtsURL)) + .replace(/\\/g, '/'); return { [relpath]: nodeFS.readFileSync(typesdtsURL, 'utf-8'), }; diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index b63d3a02a6ae..ca2f2ea473ac 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -52,7 +52,6 @@ "chai": "^4.3.7", "cheerio": "1.0.0-rc.12", "mocha": "^9.2.2", - "slash": "^4.0.0", "wrangler": "^2.0.23" } } diff --git a/packages/integrations/cloudflare/test/prerender.test.js b/packages/integrations/cloudflare/test/prerender.test.js index 526f8a4ac5e0..847bd950a0f1 100644 --- a/packages/integrations/cloudflare/test/prerender.test.js +++ b/packages/integrations/cloudflare/test/prerender.test.js @@ -1,6 +1,5 @@ import { loadFixture } from './test-utils.js'; import { expect } from 'chai'; -import slash from 'slash'; describe('Prerendering', () => { /** @type {import('./test-utils').Fixture} */ @@ -21,7 +20,7 @@ describe('Prerendering', () => { it('includes prerendered routes in the routes.json config', async () => { const foundRoutes = JSON.parse(await fixture.readFile('/_routes.json')).exclude.map((r) => - slash(r) + r.replace(/\\/g, '/') ); const expectedExcludedRoutes = ['/_worker.js', '/one/index.html', '/one/']; @@ -48,7 +47,7 @@ describe('Hybrid rendering', () => { it('includes prerendered routes in the routes.json config', async () => { const foundRoutes = JSON.parse(await fixture.readFile('/_routes.json')).exclude.map((r) => - slash(r) + r.replace(/\\/g, '/') ); const expectedExcludedRoutes = ['/_worker.js', '/index.html', '/']; diff --git a/packages/internal-helpers/src/path.ts b/packages/internal-helpers/src/path.ts index 2f2a974c43f6..50166554265f 100644 --- a/packages/internal-helpers/src/path.ts +++ b/packages/internal-helpers/src/path.ts @@ -84,3 +84,7 @@ export function removeQueryString(path: string) { export function isRemotePath(src: string) { return /^(http|ftp|https|ws):?\/\//.test(src) || src.startsWith('data:'); } + +export function slash(path: string) { + return path.replace(/\\/g, '/'); +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b454bceffd14..b9f479ae3025 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -619,18 +619,12 @@ importers: shiki: specifier: ^0.14.1 version: 0.14.1 - slash: - specifier: ^4.0.0 - version: 4.0.0 string-width: specifier: ^5.1.2 version: 5.1.2 strip-ansi: specifier: ^7.1.0 version: 7.1.0 - supports-esm: - specifier: ^1.0.0 - version: 1.0.0 tsconfig-resolver: specifier: ^3.0.1 version: 3.0.1 @@ -3638,9 +3632,6 @@ importers: mocha: specifier: ^9.2.2 version: 9.2.2 - slash: - specifier: ^4.0.0 - version: 4.0.0 wrangler: specifier: ^2.0.23 version: 2.0.23 @@ -7719,10 +7710,6 @@ packages: dependencies: '@lit-labs/ssr-dom-shim': 1.1.1 - /@ljharb/has-package-exports-patterns@0.0.2: - resolution: {integrity: sha512-4/RWEeXDO6bocPONheFe6gX/oQdP/bEpv0oL4HqjPP5DCenBSt0mHgahppY49N0CpsaqffdwPq+TlX9CYOq2Dw==} - dev: false - /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: @@ -12093,12 +12080,6 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - /has-package-exports@1.3.0: - resolution: {integrity: sha512-e9OeXPQnmPhYoJ63lXC4wWe34TxEGZDZ3OQX9XRqp2VwsfLl3bQBy7VehLnd34g3ef8CmYlBLGqEMKXuz8YazQ==} - dependencies: - '@ljharb/has-package-exports-patterns': 0.0.2 - dev: false - /has-property-descriptors@1.0.0: resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} dependencies: @@ -16461,12 +16442,6 @@ packages: dependencies: has-flag: 4.0.0 - /supports-esm@1.0.0: - resolution: {integrity: sha512-96Am8CDqUaC0I2+C/swJ0yEvM8ZnGn4unoers/LSdE4umhX7mELzqyLzx3HnZAluq5PXIsGMKqa7NkqaeHMPcg==} - dependencies: - has-package-exports: 1.3.0 - dev: false - /supports-preserve-symlinks-flag@1.0.0: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} From dfa70357d3ce936995e0dfaf4336a2bc1e9b8136 Mon Sep 17 00:00:00 2001 From: Chris Swithinbank Date: Fri, 23 Jun 2023 11:32:48 +0200 Subject: [PATCH 48/60] Update congrats workflow for latest version (#7457) --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c348f7c9494..2aa663727425 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,10 +20,7 @@ jobs: if: ${{ github.repository_owner == 'withastro' }} uses: withastro/automation/.github/workflows/congratsbot.yml@main with: - GITHUB_REPO: ${{ github.repository }} - COMMIT_AUTHOR: ${{ github.event.commits[0].author.name }} - COMMIT_MESSAGE: ${{ github.event.commits[0].message }} - COMMIT_ID: ${{ github.event.commits[0].id }} + EMOJIS: '🎉,🎊,🧑‍🚀,🥳,🙌,🚀,👏,<:houston_golden:1068575433647456447>,<:astrocoin:894990669515489301>,<:astro_pride:1085944201587458169>' secrets: DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }} From 869197aafd9802d059dd8db1ef23794fdd938a91 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Sat, 24 Jun 2023 05:00:19 +0800 Subject: [PATCH 49/60] Fix markdoc test fail in main (#7459) * Early out if `importedModule` has no `id` We can do this as line 97 also has this guard for each `importedModules` * Simplify `isPropagationStoppingPoint` * Fix actual bug * chore: changeset --------- Co-authored-by: bholmesdev --- .changeset/cool-birds-prove.md | 5 ++ packages/astro/src/core/render/dev/vite.ts | 77 ++++++++++------------ packages/astro/src/core/util.ts | 9 ++- 3 files changed, 46 insertions(+), 45 deletions(-) create mode 100644 .changeset/cool-birds-prove.md diff --git a/.changeset/cool-birds-prove.md b/.changeset/cool-birds-prove.md new file mode 100644 index 000000000000..70c190b89273 --- /dev/null +++ b/.changeset/cool-birds-prove.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix missing styles for Markdoc files in development diff --git a/packages/astro/src/core/render/dev/vite.ts b/packages/astro/src/core/render/dev/vite.ts index b3efb34bb49d..39df7d269c93 100644 --- a/packages/astro/src/core/render/dev/vite.ts +++ b/packages/astro/src/core/render/dev/vite.ts @@ -46,44 +46,45 @@ export async function* crawlGraph( const entryIsStyle = isCSSRequest(id); for (const importedModule of entry.importedModules) { - // A propagation stopping point is a module with the ?astroPropagatedAssets flag. - // When we encounter one of these modules we don't want to continue traversing. - let isPropagationStoppingPoint = false; + if (!importedModule.id) continue; + // some dynamically imported modules are *not* server rendered in time // to only SSR modules that we can safely transform, we check against // a list of file extensions based on our built-in vite plugins - if (importedModule.id) { - // Strip special query params like "?content". - // NOTE: Cannot use `new URL()` here because not all IDs will be valid paths. - // For example, `virtual:image-loader` if you don't have the plugin installed. - const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, ''); - // If the entry is a style, skip any modules that are not also styles. - // Tools like Tailwind might add HMR dependencies as `importedModules` - // but we should skip them--they aren't really imported. Without this, - // every hoisted script in the project is added to every page! - if (entryIsStyle && !isCSSRequest(importedModulePathname)) { - continue; - } - const isFileTypeNeedingSSR = fileExtensionsToSSR.has( - npath.extname(importedModulePathname) - ); - isPropagationStoppingPoint = ASTRO_PROPAGATED_ASSET_REGEX.test(importedModule.id); - if ( - isFileTypeNeedingSSR && - // Should not SSR a module with ?astroPropagatedAssets - !isPropagationStoppingPoint - ) { - const mod = loader.getModuleById(importedModule.id); - if (!mod?.ssrModule) { - try { - await loader.import(importedModule.id); - } catch { - /** Likely an out-of-date module entry! Silently continue. */ - } + + // Strip special query params like "?content". + // NOTE: Cannot use `new URL()` here because not all IDs will be valid paths. + // For example, `virtual:image-loader` if you don't have the plugin installed. + const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, ''); + // If the entry is a style, skip any modules that are not also styles. + // Tools like Tailwind might add HMR dependencies as `importedModules` + // but we should skip them--they aren't really imported. Without this, + // every hoisted script in the project is added to every page! + if (entryIsStyle && !isCSSRequest(importedModulePathname)) { + continue; + } + + const isFileTypeNeedingSSR = fileExtensionsToSSR.has(npath.extname(importedModulePathname)); + // A propagation stopping point is a module with the ?astroPropagatedAssets flag. + // When we encounter one of these modules we don't want to continue traversing. + const isPropagationStoppingPoint = ASTRO_PROPAGATED_ASSET_REGEX.test(importedModule.id); + if ( + isFileTypeNeedingSSR && + // Should not SSR a module with ?astroPropagatedAssets + !isPropagationStoppingPoint + ) { + const mod = loader.getModuleById(importedModule.id); + if (!mod?.ssrModule) { + try { + await loader.import(importedModule.id); + } catch { + /** Likely an out-of-date module entry! Silently continue. */ } } } - if (urlDeps.includes(urlId(importedModule.url)) && !isPropagationStoppingPoint) { + + // Make sure the `importedModule` traversed is explicitly imported by the user, and not by HMR + if (urlDeps.includes(importedModule.url) && !isPropagationStoppingPoint) { importedModules.add(importedModule); } } @@ -102,18 +103,10 @@ export async function* crawlGraph( } } -// Virtual modules URL should start with /@id/ but do not -function urlId(url: string) { - if (url.startsWith('astro:scripts')) { - return '/@id/' + url; - } - return url; -} - function getDepsFromEntry(entry: ModuleNode) { let deps = entry.ssrTransformResult?.deps ?? []; if (entry.ssrTransformResult?.dynamicDeps) { - return deps.concat(entry.ssrTransformResult.dynamicDeps); + deps = deps.concat(entry.ssrTransformResult.dynamicDeps); } - return deps; + return deps.map((dep) => unwrapId(dep)); } diff --git a/packages/astro/src/core/util.ts b/packages/astro/src/core/util.ts index 122bf739698e..2529e89c2439 100644 --- a/packages/astro/src/core/util.ts +++ b/packages/astro/src/core/util.ts @@ -93,11 +93,14 @@ export function viteID(filePath: URL): string { } export const VALID_ID_PREFIX = `/@id/`; +export const NULL_BYTE_PLACEHOLDER = `__x00__`; -// Strip valid id prefix. This is prepended to resolved Ids that are -// not valid browser import specifiers by the importAnalysis plugin. +// Strip valid id prefix and replace null byte placeholder. Both are prepended to resolved ids +// as they are not valid browser import specifiers (by the Vite's importAnalysis plugin) export function unwrapId(id: string): string { - return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length) : id; + return id.startsWith(VALID_ID_PREFIX) + ? id.slice(VALID_ID_PREFIX.length).replace(NULL_BYTE_PLACEHOLDER, '\0') + : id; } export function resolvePages(config: AstroConfig) { From 6e7f38dd794354fbb582ec0c47e36df750f2bafc Mon Sep 17 00:00:00 2001 From: "Willow (GHOST)" Date: Sun, 25 Jun 2023 15:33:00 +0100 Subject: [PATCH 50/60] Svelte Four (#7454) --- .changeset/flat-houses-brush.md | 5 ++++ packages/integrations/svelte/package.json | 4 ++-- pnpm-lock.yaml | 28 +++++++++++------------ 3 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 .changeset/flat-houses-brush.md diff --git a/.changeset/flat-houses-brush.md b/.changeset/flat-houses-brush.md new file mode 100644 index 000000000000..4dfd4198aa3b --- /dev/null +++ b/.changeset/flat-houses-brush.md @@ -0,0 +1,5 @@ +--- +'@astrojs/svelte': minor +--- + +feat: support svelte 4 diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 7daafa213539..91726584ee3e 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -38,7 +38,7 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "@sveltejs/vite-plugin-svelte": "^2.4.1", + "@sveltejs/vite-plugin-svelte": "^2.4.2", "svelte2tsx": "^0.6.15" }, "devDependencies": { @@ -49,7 +49,7 @@ }, "peerDependencies": { "astro": "workspace:^2.7.0", - "svelte": "^3.55.0" + "svelte": "^3.55.0 || ^4.0.0" }, "engines": { "node": ">=16.12.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b9f479ae3025..e16f768f2c44 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4793,8 +4793,8 @@ importers: packages/integrations/svelte: dependencies: '@sveltejs/vite-plugin-svelte': - specifier: ^2.4.1 - version: 2.4.1(svelte@3.59.1)(vite@4.3.9) + specifier: ^2.4.2 + version: 2.4.2(svelte@3.59.1)(vite@4.3.9) svelte2tsx: specifier: ^0.6.15 version: 0.6.15(svelte@3.59.1)(typescript@5.0.2) @@ -8367,18 +8367,18 @@ packages: string.prototype.matchall: 4.0.8 dev: false - /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.59.1)(vite@4.3.9): - resolution: {integrity: sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==} + /@sveltejs/vite-plugin-svelte-inspector@1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@3.59.1)(vite@4.3.9): + resolution: {integrity: sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA==} engines: {node: ^14.18.0 || >= 16} peerDependencies: '@sveltejs/vite-plugin-svelte': ^2.2.0 - svelte: ^3.54.0 || ^4.0.0-next.0 + svelte: ^3.54.0 || ^4.0.0 vite: ^4.0.0 peerDependenciesMeta: vite: optional: true dependencies: - '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.59.1)(vite@4.3.9) + '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@3.59.1)(vite@4.3.9) debug: 4.3.4 svelte: 3.59.1 vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) @@ -8386,23 +8386,23 @@ packages: - supports-color dev: false - /@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.59.1)(vite@4.3.9): - resolution: {integrity: sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==} + /@sveltejs/vite-plugin-svelte@2.4.2(svelte@3.59.1)(vite@4.3.9): + resolution: {integrity: sha512-ePfcC48ftMKhkT0OFGdOyycYKnnkT6i/buzey+vHRTR/JpQvuPzzhf1PtKqCDQfJRgoPSN2vscXs6gLigx/zGw==} engines: {node: ^14.18.0 || >= 16} peerDependencies: - svelte: ^3.54.0 || ^4.0.0-next.0 + svelte: ^3.54.0 || ^4.0.0 vite: ^4.0.0 peerDependenciesMeta: vite: optional: true dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.59.1)(vite@4.3.9) + '@sveltejs/vite-plugin-svelte-inspector': 1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@3.59.1)(vite@4.3.9) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.0 svelte: 3.59.1 - svelte-hmr: 0.15.1(svelte@3.59.1) + svelte-hmr: 0.15.2(svelte@3.59.1) vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4) vitefu: 0.2.4(vite@4.3.9) transitivePeerDependencies: @@ -16446,11 +16446,11 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - /svelte-hmr@0.15.1(svelte@3.59.1): - resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==} + /svelte-hmr@0.15.2(svelte@3.59.1): + resolution: {integrity: sha512-q/bAruCvFLwvNbeE1x3n37TYFb3mTBJ6TrCq6p2CoFbSTNhDE9oAtEfpy+wmc9So8AG0Tja+X0/mJzX9tSfvIg==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: - svelte: '>=3.19.0' + svelte: ^3.19.0 || ^4.0.0-next.0 dependencies: svelte: 3.59.1 dev: false From 8e3cb20b5c37c9539412b659943b6191086ccf52 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 26 Jun 2023 11:34:13 +0800 Subject: [PATCH 51/60] Format markdown files (#7439) Co-authored-by: Chris Swithinbank --- .prettierignore | 3 - README.md | 25 ++-- examples/basics/README.md | 1 - examples/blog/README.md | 1 - examples/blog/src/content/blog/first-post.md | 8 +- .../src/content/blog/markdown-style-guide.md | 8 +- examples/blog/src/content/blog/second-post.md | 8 +- examples/blog/src/content/blog/third-post.md | 8 +- examples/component/README.md | 10 +- examples/deno/README.md | 1 - examples/framework-alpine/README.md | 1 - examples/framework-lit/README.md | 2 +- examples/framework-vue/README.md | 1 - examples/integration/README.md | 10 +- examples/portfolio/README.md | 1 - package.json | 2 +- packages/astro-prism/README.md | 9 +- packages/astro-rss/README.md | 66 ++++----- packages/astro/README.md | 9 +- .../astro/src/core/build/plugins/README.md | 37 ++--- packages/astro/src/core/errors/README.md | 38 +++-- .../src/vite-plugin-config-alias/README.md | 6 +- packages/create-astro/README.md | 21 +-- packages/integrations/alpinejs/README.md | 2 +- packages/integrations/cloudflare/README.md | 19 ++- packages/integrations/deno/README.md | 41 +++--- packages/integrations/image/README.md | 131 ++++++++++++------ packages/integrations/lit/README.md | 22 +-- packages/integrations/markdoc/README.md | 56 ++++---- packages/integrations/mdx/README.md | 47 ++++--- packages/integrations/mdx/src/README.md | 20 +-- packages/integrations/netlify/README.md | 48 +++---- packages/integrations/node/README.md | 72 +++++----- packages/integrations/partytown/README.md | 80 ++++++----- packages/integrations/preact/README.md | 12 +- packages/integrations/prefetch/README.md | 45 +++--- packages/integrations/react/README.md | 4 +- packages/integrations/sitemap/README.md | 117 ++++++++-------- packages/integrations/solid/README.md | 8 +- packages/integrations/svelte/README.md | 12 +- packages/integrations/tailwind/README.md | 59 ++++---- packages/integrations/turbolinks/README.md | 3 +- packages/integrations/vercel/README.md | 95 +++++++------ packages/integrations/vue/README.md | 50 +++---- packages/markdown/component/readme.md | 7 +- packages/webapi/README.md | 34 +++-- pnpm-lock.yaml | 39 +++++- 47 files changed, 703 insertions(+), 596 deletions(-) diff --git a/.prettierignore b/.prettierignore index e6c627f0c5f5..71dca9c3c4a5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -12,14 +12,11 @@ packages/markdown/component/Markdown.astro **/fixtures **/vendor **/.vercel -examples/docs/**/*.md -examples/blog/**/*.md # Directories .github .changeset # Files -README.md packages/webapi/mod.d.ts pnpm-lock.yaml diff --git a/README.md b/README.md index 934bceb9828e..31341cdd6ab6 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@

    - ## Install The **recommended** way to install the latest version of Astro is by running the command below: @@ -23,9 +22,10 @@ You can also install Astro **manually** by running this command instead: npm install --save-dev astro ``` -Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide. +Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide. Looking for quick examples? [Open a starter project](https://astro.new/) right in your browser. + ## Documentation Visit our [official documentation](https://docs.astro.build/). @@ -33,9 +33,10 @@ Visit our [official documentation](https://docs.astro.build/). ## Support Having trouble? Get help in the official [Astro Discord](https://astro.build/chat). + ## Contributing -**New contributors welcome!** Check out our [Contributors Guide](CONTRIBUTING.md) for help getting started. +**New contributors welcome!** Check out our [Contributors Guide](CONTRIBUTING.md) for help getting started. Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll help you get your first contribution in no time! @@ -47,23 +48,23 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll | [create-astro](packages/create-astro) | [![create-astro version](https://img.shields.io/npm/v/create-astro.svg?label=%20)](packages/create-astro/CHANGELOG.md) | | [@astrojs/react](packages/integrations/react) | [![astro version](https://img.shields.io/npm/v/@astrojs/react.svg?label=%20)](packages/integrations/react/CHANGELOG.md) | | [@astrojs/preact](packages/integrations/preact) | [![astro version](https://img.shields.io/npm/v/@astrojs/preact.svg?label=%20)](packages/integrations/preact/CHANGELOG.md) | -| [@astrojs/solid-js](packages/integrations/solid) | [![astro version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid/CHANGELOG.md) | +| [@astrojs/solid-js](packages/integrations/solid) | [![astro version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid/CHANGELOG.md) | | [@astrojs/svelte](packages/integrations/svelte) | [![astro version](https://img.shields.io/npm/v/@astrojs/svelte.svg?label=%20)](packages/integrations/svelte/CHANGELOG.md) | | [@astrojs/vue](packages/integrations/vue) | [![astro version](https://img.shields.io/npm/v/@astrojs/vue.svg?label=%20)](packages/integrations/vue/CHANGELOG.md) | | [@astrojs/lit](packages/integrations/lit) | [![astro version](https://img.shields.io/npm/v/@astrojs/lit.svg?label=%20)](packages/integrations/lit/CHANGELOG.md) | | [@astrojs/deno](packages/integrations/deno) | [![astro version](https://img.shields.io/npm/v/@astrojs/deno.svg?label=%20)](packages/integrations/deno/CHANGELOG.md) | | [@astrojs/netlify](packages/integrations/netlify) | [![astro version](https://img.shields.io/npm/v/@astrojs/netlify.svg?label=%20)](packages/integrations/netlify/CHANGELOG.md) | -| [@astrojs/node](packages/integrations/node) | [![astro version](https://img.shields.io/npm/v/@astrojs/node.svg?label=%20)](packages/integrations/node/CHANGELOG.md) | +| [@astrojs/node](packages/integrations/node) | [![astro version](https://img.shields.io/npm/v/@astrojs/node.svg?label=%20)](packages/integrations/node/CHANGELOG.md) | | [@astrojs/vercel](packages/integrations/vercel) | [![astro version](https://img.shields.io/npm/v/@astrojs/vercel.svg?label=%20)](packages/integrations/vercel/CHANGELOG.md) | | [@astrojs/cloudflare](packages/integrations/cloudflare) | [![astro version](https://img.shields.io/npm/v/@astrojs/cloudflare.svg?label=%20)](packages/integrations/cloudflare/CHANGELOG.md) | | [@astrojs/partytown](packages/integrations/partytown) | [![astro version](https://img.shields.io/npm/v/@astrojs/partytown.svg?label=%20)](packages/integrations/partytown/CHANGELOG.md) | | [@astrojs/sitemap](packages/integrations/sitemap) | [![astro version](https://img.shields.io/npm/v/@astrojs/sitemap.svg?label=%20)](packages/integrations/sitemap/CHANGELOG.md) | | [@astrojs/tailwind](packages/integrations/tailwind) | [![astro version](https://img.shields.io/npm/v/@astrojs/tailwind.svg?label=%20)](packages/integrations/tailwind/CHANGELOG.md) | | [@astrojs/turbolinks](packages/integrations/turbolinks) | [![astro version](https://img.shields.io/npm/v/@astrojs/turbolinks.svg?label=%20)](packages/integrations/turbolinks/CHANGELOG.md) | -| [@astrojs/alpinejs](packages/integrations/alpinejs) | [![astro version](https://img.shields.io/npm/v/@astrojs/alpinejs.svg?label=%20)](packages/integrations/alpinejs/CHANGELOG.md) | -| [@astrojs/image](packages/integrations/image) | [![astro version](https://img.shields.io/npm/v/@astrojs/image.svg?label=%20)](packages/integrations/image/CHANGELOG.md) | -| [@astrojs/mdx](packages/integrations/mdx) | [![astro version](https://img.shields.io/npm/v/@astrojs/mdx.svg?label=%20)](packages/integrations/mdx/CHANGELOG.md) | -| [@astrojs/prefetch](packages/integrations/prefetch) | [![astro version](https://img.shields.io/npm/v/@astrojs/prefetch.svg?label=%20)](packages/integrations/prefetch/CHANGELOG.md) | +| [@astrojs/alpinejs](packages/integrations/alpinejs) | [![astro version](https://img.shields.io/npm/v/@astrojs/alpinejs.svg?label=%20)](packages/integrations/alpinejs/CHANGELOG.md) | +| [@astrojs/image](packages/integrations/image) | [![astro version](https://img.shields.io/npm/v/@astrojs/image.svg?label=%20)](packages/integrations/image/CHANGELOG.md) | +| [@astrojs/mdx](packages/integrations/mdx) | [![astro version](https://img.shields.io/npm/v/@astrojs/mdx.svg?label=%20)](packages/integrations/mdx/CHANGELOG.md) | +| [@astrojs/prefetch](packages/integrations/prefetch) | [![astro version](https://img.shields.io/npm/v/@astrojs/prefetch.svg?label=%20)](packages/integrations/prefetch/CHANGELOG.md) | [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6178/badge)](https://bestpractices.coreinfrastructure.org/projects/6178) @@ -71,10 +72,9 @@ Several official projects are maintained outside of this repo: | Project | Repository | | ------------------------------------------------------------------- | ----------------------------------------------------------------------- | -| [@astrojs/compiler](https://github.com/withastro/compiler) | [withastro/compiler](https://github.com/withastro/compiler) | +| [@astrojs/compiler](https://github.com/withastro/compiler) | [withastro/compiler](https://github.com/withastro/compiler) | | [Astro Language Tools](https://github.com/withastro/language-tools) | [withastro/language-tools](https://github.com/withastro/language-tools) | - ## Links - [License (MIT)](LICENSE) @@ -92,8 +92,7 @@ Astro is generously supported by Netlify, Storyblok, and several other amazing o

    -[![Astro's sponsors.](https://astro.build/sponsors.png -"Astro's sponsors. +[![Astro's sponsors.](https://astro.build/sponsors.png "Astro's sponsors. Platinum sponsors: Netlify, storyblok, Vercel, Ship Shape, Google Chrome Gold sponsors: ‹div›RIOTS, DEEPGRAM, CloudCannon Sponsors: Monogram, Qoddi, Dimension")](https://github.com/sponsors/withastro) diff --git a/examples/basics/README.md b/examples/basics/README.md index 43c1d6d0cb51..75d44e0daef1 100644 --- a/examples/basics/README.md +++ b/examples/basics/README.md @@ -12,7 +12,6 @@ npm create astro@latest -- --template basics ![basics](https://user-images.githubusercontent.com/4677417/186188965-73453154-fdec-4d6b-9c34-cb35c248ae5b.png) - ## 🚀 Project Structure Inside of your Astro project, you'll see the following folders and files: diff --git a/examples/blog/README.md b/examples/blog/README.md index 579d3244a0cd..33c8496b6569 100644 --- a/examples/blog/README.md +++ b/examples/blog/README.md @@ -10,7 +10,6 @@ npm create astro@latest -- --template blog > 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun! - ![blog](https://user-images.githubusercontent.com/4677417/186189140-4ef17aac-c3c9-4918-a8c2-ce86ba1bb394.png) Features: diff --git a/examples/blog/src/content/blog/first-post.md b/examples/blog/src/content/blog/first-post.md index 33b844032f78..eb5e250f8263 100644 --- a/examples/blog/src/content/blog/first-post.md +++ b/examples/blog/src/content/blog/first-post.md @@ -1,8 +1,8 @@ --- -title: "First post" -description: "Lorem ipsum dolor sit amet" -pubDate: "Jul 08 2022" -heroImage: "/placeholder-hero.jpg" +title: 'First post' +description: 'Lorem ipsum dolor sit amet' +pubDate: 'Jul 08 2022' +heroImage: '/placeholder-hero.jpg' --- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet. diff --git a/examples/blog/src/content/blog/markdown-style-guide.md b/examples/blog/src/content/blog/markdown-style-guide.md index 242e862782cd..bb7bb2daabd6 100644 --- a/examples/blog/src/content/blog/markdown-style-guide.md +++ b/examples/blog/src/content/blog/markdown-style-guide.md @@ -1,8 +1,8 @@ --- -title: "Markdown Style Guide" -description: "Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro." -pubDate: "Jul 01 2022" -heroImage: "/placeholder-hero.jpg" +title: 'Markdown Style Guide' +description: 'Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro.' +pubDate: 'Jul 01 2022' +heroImage: '/placeholder-hero.jpg' --- Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro. diff --git a/examples/blog/src/content/blog/second-post.md b/examples/blog/src/content/blog/second-post.md index 1bd5ee4658a4..b5a0679383c4 100644 --- a/examples/blog/src/content/blog/second-post.md +++ b/examples/blog/src/content/blog/second-post.md @@ -1,8 +1,8 @@ --- -title: "Second post" -description: "Lorem ipsum dolor sit amet" -pubDate: "Jul 22 2022" -heroImage: "/placeholder-hero.jpg" +title: 'Second post' +description: 'Lorem ipsum dolor sit amet' +pubDate: 'Jul 22 2022' +heroImage: '/placeholder-hero.jpg' --- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet. diff --git a/examples/blog/src/content/blog/third-post.md b/examples/blog/src/content/blog/third-post.md index d7f1f24b0408..a2bc343bd7de 100644 --- a/examples/blog/src/content/blog/third-post.md +++ b/examples/blog/src/content/blog/third-post.md @@ -1,8 +1,8 @@ --- -title: "Third post" -description: "Lorem ipsum dolor sit amet" -pubDate: "Jul 15 2022" -heroImage: "/placeholder-hero.jpg" +title: 'Third post' +description: 'Lorem ipsum dolor sit amet' +pubDate: 'Jul 15 2022' +heroImage: '/placeholder-hero.jpg' --- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet. diff --git a/examples/component/README.md b/examples/component/README.md index 00f1a04e51f4..c92a01a954f4 100644 --- a/examples/component/README.md +++ b/examples/component/README.md @@ -10,7 +10,6 @@ npm create astro@latest -- --template component [![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/non-html-pages) [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/component/devcontainer.json) - ## 🚀 Project Structure Inside of your Astro project, you'll see the following folders and files: @@ -27,9 +26,10 @@ Inside of your Astro project, you'll see the following folders and files: The `index.ts` file is the "entry point" for your package. Export your components in `index.ts` to make them importable from your package. ## 🧞 Commands + All commands are run from the root of the project, from a terminal: -| Command | Action | -| :--------------------- | :----------------------------------------------- | -| `npm link` | Registers this package locally. Run `npm link my-component-library` in an Astro project to install your components -| `npm publish` | [Publishes](https://docs.npmjs.com/creating-and-publishing-unscoped-public-packages#publishing-unscoped-public-packages) this package to NPM. Requires you to be [logged in](https://docs.npmjs.com/cli/v8/commands/npm-adduser) +| Command | Action | +| :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `npm link` | Registers this package locally. Run `npm link my-component-library` in an Astro project to install your components | +| `npm publish` | [Publishes](https://docs.npmjs.com/creating-and-publishing-unscoped-public-packages#publishing-unscoped-public-packages) this package to NPM. Requires you to be [logged in](https://docs.npmjs.com/cli/v8/commands/npm-adduser) | diff --git a/examples/deno/README.md b/examples/deno/README.md index 0b1ea4c4bda7..98f7ee020622 100644 --- a/examples/deno/README.md +++ b/examples/deno/README.md @@ -12,7 +12,6 @@ npm create astro@latest -- --template deno ![basics](https://user-images.githubusercontent.com/4677417/186188965-73453154-fdec-4d6b-9c34-cb35c248ae5b.png) - ## 🚀 Project Structure Inside of your Astro project, you'll see the following folders and files: diff --git a/examples/framework-alpine/README.md b/examples/framework-alpine/README.md index 3bd88aa01ea8..9c61ea1b0f81 100644 --- a/examples/framework-alpine/README.md +++ b/examples/framework-alpine/README.md @@ -9,4 +9,3 @@ npm create astro@latest -- --template framework-alpine [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/framework-alpine/devcontainer.json) This example showcases Astro working with [AlpineJS](https://alpinejs.dev/). - diff --git a/examples/framework-lit/README.md b/examples/framework-lit/README.md index 830822fd4936..9afdb987cb03 100644 --- a/examples/framework-lit/README.md +++ b/examples/framework-lit/README.md @@ -8,4 +8,4 @@ npm create astro@latest -- --template framework-lit [![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/framework-lit) [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/framework-lit/devcontainer.json) -This example showcases Astro working with [Lit](https://lit.dev/). \ No newline at end of file +This example showcases Astro working with [Lit](https://lit.dev/). diff --git a/examples/framework-vue/README.md b/examples/framework-vue/README.md index bc311c9dd413..07f94e1c3f54 100644 --- a/examples/framework-vue/README.md +++ b/examples/framework-vue/README.md @@ -9,4 +9,3 @@ npm create astro@latest -- --template framework-vue [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/framework-vue/devcontainer.json) This example showcases Astro working with [Vue](https://v3.vuejs.org/). - diff --git a/examples/integration/README.md b/examples/integration/README.md index f40c3dbd0a88..a6709d4004de 100644 --- a/examples/integration/README.md +++ b/examples/integration/README.md @@ -10,7 +10,6 @@ npm create astro@latest -- --template integration [![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/integration) [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/integration/devcontainer.json) - ## 🚀 Project Structure Inside of your Astro project, you'll see the following folders and files: @@ -25,9 +24,10 @@ Inside of your Astro project, you'll see the following folders and files: The `index.ts` file is the "entry point" for your integration. Export your integration in `index.ts` to make them importable from your package. ## 🧞 Commands + All commands are run from the root of the project, from a terminal: -| Command | Action | -| :--------------------- | :----------------------------------------------- | -| `npm link` | Registers this package locally. Run `npm link my-integration` in an Astro project to install your integration -| `npm publish` | [Publishes](https://docs.npmjs.com/creating-and-publishing-unscoped-public-packages#publishing-unscoped-public-packages) this package to NPM. Requires you to be [logged in](https://docs.npmjs.com/cli/v8/commands/npm-adduser) +| Command | Action | +| :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `npm link` | Registers this package locally. Run `npm link my-integration` in an Astro project to install your integration | +| `npm publish` | [Publishes](https://docs.npmjs.com/creating-and-publishing-unscoped-public-packages#publishing-unscoped-public-packages) this package to NPM. Requires you to be [logged in](https://docs.npmjs.com/cli/v8/commands/npm-adduser) | diff --git a/examples/portfolio/README.md b/examples/portfolio/README.md index cc9cdd5e3871..7ca90501af54 100644 --- a/examples/portfolio/README.md +++ b/examples/portfolio/README.md @@ -12,7 +12,6 @@ npm create astro@latest -- --template portfolio ![portfolio](https://user-images.githubusercontent.com/357379/210779178-a98f0fb7-6b1a-4068-894c-8e1403e26654.jpg) - ## 🧞 Commands All commands are run from the root of the project, from a terminal: diff --git a/package.json b/package.json index 26a48fc801cd..b65d19e88979 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "only-allow": "^1.1.1", "organize-imports-cli": "^0.10.0", "prettier": "^2.8.8", - "prettier-plugin-astro": "^0.8.1", + "prettier-plugin-astro": "^0.10.0", "tiny-glob": "^0.2.9", "turbo": "^1.10.3", "typescript": "~5.0.2" diff --git a/packages/astro-prism/README.md b/packages/astro-prism/README.md index 1e8e92fa21a4..f5627d06200c 100644 --- a/packages/astro-prism/README.md +++ b/packages/astro-prism/README.md @@ -8,7 +8,7 @@ This package exports a component to support highlighting inside an Astro file. E ```astro --- -import { Prism } from "@astrojs/prism" +import { Prism } from '@astrojs/prism'; --- @@ -21,11 +21,14 @@ This package exports a `runHighlighterWithAstro` function to highlight while mak ```typescript import { runHighlighterWithAstro } from '@astrojs/prism'; -runHighlighterWithAstro(` +runHighlighterWithAstro( + ` --- const helloAstro = 'Hello, Astro!'; ---

    -`, 'astro'); +`, + 'astro' +); ``` diff --git a/packages/astro-rss/README.md b/packages/astro-rss/README.md index 43adaad92b6e..47dfc1747635 100644 --- a/packages/astro-rss/README.md +++ b/packages/astro-rss/README.md @@ -36,14 +36,14 @@ export async function get(context) { // Pull in your project "site" from the endpoint context // https://docs.astro.build/en/reference/api-reference/#contextsite site: context.site, - items: posts.map(post => ({ + items: posts.map((post) => ({ // Assumes all RSS feed item properties are in post frontmatter ...post.data, // Generate a `url` from each post `slug` // This assumes all blog posts are rendered as `/blog/[slug]` routes // https://docs.astro.build/en/guides/content-collections/#generating-pages-from-content-collections link: `/blog/${post.slug}/`, - })) + })), }); } ``` @@ -180,9 +180,10 @@ By default, the library will add trailing slashes to the emitted URLs. To preven ```js import rss from '@astrojs/rss'; -export const get = () => rss({ - trailingSlash: false -}); +export const get = () => + rss({ + trailingSlash: false, + }); ``` ## `RSSFeedItem` @@ -193,12 +194,13 @@ An example feed item might look like: ```js const item = { - title: "Alpha Centauri: so close you can touch it", - link: "/blog/alpha-centuari", - pubDate: new Date("2023-06-04"), - description: "Alpha Centauri is a triple star system, containing Proxima Centauri, the closest star to our sun at only 4.24 light-years away.", - categories: ["stars", "space"] -} + title: 'Alpha Centauri: so close you can touch it', + link: '/blog/alpha-centuari', + pubDate: new Date('2023-06-04'), + description: + 'Alpha Centauri is a triple star system, containing Proxima Centauri, the closest star to our sun at only 4.24 light-years away.', + categories: ['stars', 'space'], +}; ``` ### `title` @@ -259,15 +261,16 @@ An object that defines the `title` and `url` of the original feed for items that ```js const item = { - title: "Alpha Centauri: so close you can touch it", - link: "/blog/alpha-centuari", - pubDate: new Date("2023-06-04"), - description: "Alpha Centauri is a triple star system, containing Proxima Centauri, the closest star to our sun at only 4.24 light-years away.", - source: { - title: "The Galactic Times", - url: "https://galactictimes.space/feed.xml" - } -} + title: 'Alpha Centauri: so close you can touch it', + link: '/blog/alpha-centuari', + pubDate: new Date('2023-06-04'), + description: + 'Alpha Centauri is a triple star system, containing Proxima Centauri, the closest star to our sun at only 4.24 light-years away.', + source: { + title: 'The Galactic Times', + url: 'https://galactictimes.space/feed.xml', + }, +}; ``` #### `source.title` @@ -290,16 +293,17 @@ An object to specify properties for an included media source (e.g. a podcast) wi ```js const item = { - title: "Alpha Centauri: so close you can touch it", - link: "/blog/alpha-centuari", - pubDate: new Date("2023-06-04"), - description: "Alpha Centauri is a triple star system, containing Proxima Centauri, the closest star to our sun at only 4.24 light-years away.", - enclosure: { - url: "/media/alpha-centauri.aac", + title: 'Alpha Centauri: so close you can touch it', + link: '/blog/alpha-centuari', + pubDate: new Date('2023-06-04'), + description: + 'Alpha Centauri is a triple star system, containing Proxima Centauri, the closest star to our sun at only 4.24 light-years away.', + enclosure: { + url: '/media/alpha-centauri.aac', length: 124568, - type: "audio/aac" - } -} + type: 'audio/aac', + }, +}; ``` #### `enclosure.url` @@ -361,9 +365,7 @@ export async function get(context) { title: 'Buzz’s Blog', description: 'A humble Astronaut’s guide to the stars', site: context.site, - items: await pagesGlobToRssItems( - import.meta.glob('./blog/*.{md,mdx}'), - ), + items: await pagesGlobToRssItems(import.meta.glob('./blog/*.{md,mdx}')), }); } ``` diff --git a/packages/astro/README.md b/packages/astro/README.md index ebd4ca3c7767..9e3ff67c3ac9 100644 --- a/packages/astro/README.md +++ b/packages/astro/README.md @@ -8,10 +8,8 @@

    - ## Install - ```bash # Recommended! npm create astro@latest @@ -20,7 +18,7 @@ npm create astro@latest npm install --save-dev astro ``` -Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide. +Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide. Looking for quick examples? [Open a starter project](https://astro.new/) right in your browser. @@ -31,9 +29,10 @@ Visit our [official documentation](https://docs.astro.build/). ## Support Having trouble? Get help in the official [Astro Discord](https://astro.build/chat). + ## Contributing -**New contributors welcome!** Check out our [Contributors Guide](/CONTRIBUTING.md) for help getting started. +**New contributors welcome!** Check out our [Contributors Guide](/CONTRIBUTING.md) for help getting started. Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll help you get your first contribution in no time! @@ -42,5 +41,3 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll Astro is generously supported by [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), and several other amazing organizations [listed here.](https://astro.build/) [❤️ Sponsor Astro! ❤️](https://github.com/withastro/.github/blob/main/FUNDING.md) - - diff --git a/packages/astro/src/core/build/plugins/README.md b/packages/astro/src/core/build/plugins/README.md index 32ac8c448f6f..1451581631f1 100644 --- a/packages/astro/src/core/build/plugins/README.md +++ b/packages/astro/src/core/build/plugins/README.md @@ -2,12 +2,11 @@ This file serves as developer documentation to explain how the internal plugins work - ## `plugin-middleware` This plugin is responsible to retrieve the `src/middleware.{ts.js}` file and emit an entry point during the SSR build. -The final file is emitted only if the user has the middleware file. The final name of the file is `middleware.mjs`. +The final file is emitted only if the user has the middleware file. The final name of the file is `middleware.mjs`. This is **not** a virtual module. The plugin will try to resolve the physical file. @@ -20,7 +19,12 @@ The emitted file is called `renderers.mjs`. The emitted file has content similar to: ```js -const renderers = [Object.assign({"name":"astro:jsx","serverEntrypoint":"astro/jsx/server.js","jsxImportSource":"astro"}, { ssr: server_default }),]; +const renderers = [ + Object.assign( + { name: 'astro:jsx', serverEntrypoint: 'astro/jsx/server.js', jsxImportSource: 'astro' }, + { ssr: server_default } + ), +]; export { renderers }; ``` @@ -32,19 +36,20 @@ This plugin is responsible to collect all pages inside an Astro application, and This plugin **will emit code** only when building a static site. In order to achieve that, the plugin emits these pages as **virtual modules**. Doing so allows us to bypass: + - rollup resolution of the files - possible plugins that get triggered when the name of the module has an extension e.g. `.astro` The plugin does the following operations: + - loop through all the pages and collects their paths; - with each path, we create a new [string](#plugin-pages-mapping-resolution) that will serve and virtual module for that particular page - when resolving the page, we check if the `id` of the module starts with `@astro-page` - once the module is resolved, we emit [the code of the module](#plugin-pages-code-generation) - ### `plugin pages` mapping resolution -The mapping is as follows: +The mapping is as follows: ``` src/pages/index.astro => @astro-page:src/pages/index@_@astro @@ -53,14 +58,13 @@ src/pages/index.astro => @astro-page:src/pages/index@_@astro 1. We add a fixed prefix, which is used as virtual module naming convention; 2. We replace the dot that belongs extension with an arbitrary string. -This kind of patterns will then allow us to retrieve the path physical path of the +This kind of patterns will then allow us to retrieve the path physical path of the file back from that string. This is important for the [code generation](#plugin-pages-code-generation) - - ### `plugin pages` code generation When generating the code of the page, we will import and export the following modules: + - the `renderers.mjs` - the `middleware.mjs` - the page, via dynamic import @@ -79,6 +83,7 @@ export { middleware, page }; ``` If we have a `pages/` folder that looks like this: + ``` ├── blog │ ├── first.astro @@ -89,8 +94,9 @@ If we have a `pages/` folder that looks like this: └── second.astro ``` -The emitted entry points will be stored inside a `pages/` folder, and they +The emitted entry points will be stored inside a `pages/` folder, and they will look like this: + ``` ├── _astro │ ├── first.132e69e0.css @@ -117,7 +123,7 @@ will look like this: └── renderers.mjs ``` -Of course, all these files will be deleted by Astro at the end build. +Of course, all these files will be deleted by Astro at the end build. ## `plugin-ssr` (WIP) @@ -130,15 +136,14 @@ The plugin will collect all the [virtual pages](#plugin-pages) and create a JavaScript `Map`. These map will look like this: ```js -const _page$0 = () => import("../chunks/.mjs") -const _page$1 = () => import("../chunks/.mjs") +const _page$0 = () => import('../chunks/.mjs'); +const _page$1 = () => import('../chunks/.mjs'); const pageMap = new Map([ - ["src/pages/index.astro", _page$0], - ["src/pages/about.astro", _page$1], -]) + ['src/pages/index.astro', _page$0], + ['src/pages/about.astro', _page$1], +]); ``` It will also import the [`renderers`](#plugin-renderers) virtual module and the [`middleware`](#plugin-middleware) virtual module. - diff --git a/packages/astro/src/core/errors/README.md b/packages/astro/src/core/errors/README.md index 2e6ffb3ae826..789afd73e168 100644 --- a/packages/astro/src/core/errors/README.md +++ b/packages/astro/src/core/errors/README.md @@ -9,30 +9,36 @@ **Error Format** Name (key of the object definition): + - As with the error code, this property is a static reference to the error. The shape should be similar to JavaScript's native errors (TypeError, ReferenceError): pascal-cased, no spaces, no special characters etc. (ex: `ClientAddressNotAvailable`) - This is the only part of the error message that should not be written as a full, proper sentence complete with Capitalization and end punctuation. Title: + - Use this property to briefly describe the error in a few words. This is the user's way to see at a glance what has happened and will be prominently displayed in the UI (ex: `{feature} is not available in static mode.`) Do not include further details such as why this error occurred or possible solutions. Message: + - Begin with **what happened** and **why**. (ex: `Could not use {feature} because Server⁠-⁠side Rendering is not enabled.`) - Then, **describe the action the user should take**. (ex: `Update your Astro config with `output: 'server'` to enable Server⁠-⁠side Rendering.`) - Although this does not need to be as brief as the `title`, try to keep sentences short, clear and direct to give the reader all the necessary information quickly as possible. - Instead of writing a longer message, consider using a `hint`. Hint: + - A `hint` can be used for any additional info that might help the user. (ex: a link to the documentation, or a common cause) **Writing Style** + - Write in proper sentences. Include periods at the end of sentences. Avoid using exclamation marks! (Leave them to Houston!) - Technical jargon is mostly okay! But, most abbreviations should be avoided. If a developer is unfamiliar with a technical term, spelling it out in full allows them to look it up on the web more easily. -- Describe the _what_, _why_ and _action to take_ from the user's perspective. Assume they don't know Astro internals, and care only about how Astro is _used_. (ex: `You are missing...` vs `Astro/file cannot find...`) +- Describe the _what_, _why_ and _action to take_ from the user's perspective. Assume they don't know Astro internals, and care only about how Astro is _used_. (ex: `You are missing...` vs `Astro/file cannot find...`) - Avoid using cutesy language. (ex: Oops!) This tone minimizes the significance of the error, which _is_ important to the developer. The developer may be frustrated and your error message shouldn't be making jokes about their struggles. Only include words and phrases that help the developer **interpret the error** and **fix the problem**. **Choosing an Error Code** Choose any available error code in the appropriate range: + - 01xxx and 02xxx are reserved for compiler errors and warnings respectively - 03xxx: Astro errors (your error most likely goes here!) - 04xxx: Vite errors @@ -49,17 +55,19 @@ Users are not reading codes sequentially. They're much more likely to directly l If you are unsure about which error code to choose, ask [Erika](https://github.com/Princesseuh)! ### CLI specifics tips: + - If the error happened **during an action that changes the state of the project** (ex: editing configuration, creating files), the error should **reassure the user** about the state of their project (ex: "Failed to update configuration. Your project has been restored to its previous state.") - If an "error" happened because of a conscious user action (ex: pressing CTRL+C during a choice), it is okay to add more personality (ex: "Operation cancelled. See you later, astronaut!"). Do keep in mind the previous point however (ex: "Operation cancelled. No worries, your project folder has already been created") ### Shape + - **Error codes and names are permanent**, and should never be changed, nor deleted. Users should always be able to find an error by searching, and this ensures a matching result. When an error is no longer relevant, it should be deprecated, not removed. - Contextual information may be used to enhance the message or the hint. However, the code that caused the error or the position of the error should not be included in the message as they will already be shown as part of the error. - Do not prefix `title`, `message` and `hint` with descriptive words such as "Error:" or "Hint:" as it may lead to duplicated labels in the UI / CLI. - Dynamic error messages must use the following shape: ```js -message: (arguments) => `text ${substitute}` +message: (arguments) => `text ${substitute}`; ``` Please avoid including too much logic inside the errors if you can. The last thing you want is for a bug to happen inside what's already an error! @@ -76,22 +84,24 @@ Here's how to create and format the comments: ```js /** - * @docs <- Needed for the comment to be used for docs - * @message <- (Optional) Clearer error message to show in cases where the original one is too complex (ex: because of conditional messages) - * @see <- List of additional references users can look at - * @description <- Description of the error - */ + * @docs <- Needed for the comment to be used for docs + * @message <- (Optional) Clearer error message to show in cases where the original one is too complex (ex: because of conditional messages) + * @see <- List of additional references users can look at + * @description <- Description of the error + */ ``` + Example: + ```js /** - * @docs - * @message Route returned a `returnedValue`. Only a Response can be returned from Astro files. - * @see - * - [Response](https://docs.astro.build/en/guides/server-side-rendering/#response) - * @description - * Only instances of [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) can be returned inside Astro files. - */ + * @docs + * @message Route returned a `returnedValue`. Only a Response can be returned from Astro files. + * @see + * - [Response](https://docs.astro.build/en/guides/server-side-rendering/#response) + * @description + * Only instances of [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) can be returned inside Astro files. + */ ``` The `@message` property is intended to provide slightly more context when it is helpful: a more descriptive error message or a collection of common messages if there are multiple possible error messages. Try to avoid making substantial changes to existing messages so that they are easy to find for users who copy and search the exact content of an error message. diff --git a/packages/astro/src/vite-plugin-config-alias/README.md b/packages/astro/src/vite-plugin-config-alias/README.md index 85971c90aa0a..3b470adeda33 100644 --- a/packages/astro/src/vite-plugin-config-alias/README.md +++ b/packages/astro/src/vite-plugin-config-alias/README.md @@ -18,9 +18,9 @@ Consider the following example configuration: With this configuration, the following imports would map to the same location. ```js -import Test from '../components/Test.astro' +import Test from '../components/Test.astro'; -import Test from 'components/Test.astro' +import Test from 'components/Test.astro'; -import Test from 'components:Test' +import Test from 'components:Test'; ``` diff --git a/packages/create-astro/README.md b/packages/create-astro/README.md index 0b0c9813c309..5341d60f02e5 100644 --- a/packages/create-astro/README.md +++ b/packages/create-astro/README.md @@ -26,6 +26,7 @@ npm create astro@latest my-astro-project -- --template minimal # yarn yarn create astro my-astro-project --template minimal ``` + [Check out the full list][examples] of example templates, available on GitHub. You can also use any GitHub repo as a template: @@ -38,16 +39,16 @@ npm create astro@latest my-astro-project -- --template cassidoo/shopify-react-as May be provided in place of prompts -| Name | Description | -|:-------------|:----------------------------------------------------| -| `--template ` | Specify your template. | -| `--install` / `--no-install` | Install dependencies (or not). | -| `--git` / `--no-git` | Initialize git repo (or not). | -| `--yes` (`-y`) | Skip all prompt by accepting defaults. | -| `--no` (`-n`) | Skip all prompt by declining defaults. | -| `--dry-run` | Walk through steps without executing. | -| `--skip-houston` | Skip Houston animation. | -| `--typescript     ` or ``. This behavior can be changed in your `astro.config.*` file to use a custom query selector when finding prefetch links. -__`astro.config.mjs`__ +By default the prefetch script searches the page for any links that include a `rel="prefetch"` attribute, ex: `` or ``. This behavior can be changed in your `astro.config.*` file to use a custom query selector when finding prefetch links. + +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; @@ -72,17 +73,20 @@ import prefetch from '@astrojs/prefetch'; export default defineConfig({ // ... - integrations: [prefetch({ - // Only prefetch links with an href that begins with `/products` - selector: "a[href^='/products']" - })], + integrations: [ + prefetch({ + // Only prefetch links with an href that begins with `/products` + selector: "a[href^='/products']", + }), + ], }); ``` + ### config.throttle - + By default the prefetch script will only prefetch one link at a time. This behavior can be changed in your `astro.config.*` file to increase the limit for concurrent downloads. -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; @@ -90,14 +94,17 @@ import prefetch from '@astrojs/prefetch'; export default defineConfig({ // ... - integrations: [prefetch({ - // Allow up to three links to be prefetched concurrently - throttle: 3 - })], + integrations: [ + prefetch({ + // Allow up to three links to be prefetched concurrently + throttle: 3, + }), + ], }); ``` ## Troubleshooting + - If your installation doesn't seem to be working, try restarting the dev server. - If a link doesn't seem to be prefetching, make sure that the link is pointing to a page on the same domain and matches the integration's `selector` option. diff --git a/packages/integrations/react/README.md b/packages/integrations/react/README.md index 61f9b1418a6e..68daef6e420b 100644 --- a/packages/integrations/react/README.md +++ b/packages/integrations/react/README.md @@ -9,6 +9,7 @@ There are two ways to add integrations to your project. Let's try the most conve ### `astro add` command Astro includes a CLI tool for adding first party integrations: `astro add`. This command will: + 1. (Optionally) Install all necessary dependencies and peer dependencies 2. (Also optionally) Update your `astro.config.*` file to apply this integration @@ -41,7 +42,7 @@ npm install react react-dom Now, apply this integration to your `astro.config.*` file using the `integrations` property: -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js ins={2} "react()" import { defineConfig } from 'astro/config'; @@ -56,6 +57,7 @@ export default defineConfig({ ## Getting started To use your first React component in Astro, head to our [UI framework documentation][astro-ui-frameworks]. You'll explore: + - 📦 how framework components are loaded, - 💧 client-side hydration options, and - 🤝 opportunities to mix and nest frameworks together diff --git a/packages/integrations/sitemap/README.md b/packages/integrations/sitemap/README.md index cb532f7b9298..80ea96288540 100644 --- a/packages/integrations/sitemap/README.md +++ b/packages/integrations/sitemap/README.md @@ -2,7 +2,6 @@ This **[Astro integration][astro-integration]** generates a sitemap based on your routes when you build your Astro project. - - [Why Astro Sitemap](#why-astro-sitemap) - [Installation](#installation) - [Usage](#usage) @@ -23,9 +22,9 @@ With Astro Sitemap, you don't have to worry about creating this file: build your ## Installation ### Quick Install - + The `astro add` command-line tool automates the installation for you. Run one of the following commands in a new terminal window. (If you aren't sure which package manager you're using, run the first command.) Then, follow the prompts, and type "y" in the terminal (meaning "yes") for each one. - + ```sh # Using NPM npx astro add sitemap @@ -34,18 +33,20 @@ yarn astro add sitemap # Using PNPM pnpm astro add sitemap ``` - + If you run into any issues, [feel free to report them to us on GitHub](https://github.com/withastro/astro/issues) and try the manual installation steps below. ### Manual Install - + First, install the `@astrojs/sitemap` package using your package manager. If you're using npm or aren't sure, run this in the terminal: + ```sh npm install @astrojs/sitemap ``` + Then, apply this integration to your `astro.config.*` file using the `integrations` property: -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js ins={2} "sitemap()" import { defineConfig } from 'astro/config'; @@ -54,15 +55,14 @@ import sitemap from '@astrojs/sitemap'; export default defineConfig({ // ... integrations: [sitemap()], -}) +}); ``` - ## Usage `@astrojs/sitemap` requires a deployment / site URL for generation. Add your site's URL under your `astro.config.*` using the `site` property. This must begin with `http:` or `https:`. -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; @@ -72,7 +72,7 @@ export default defineConfig({ // ... site: 'https://stargazers.club', integrations: [sitemap()], -}) +}); ``` Note that unlike other configuration options, `site` is set in the root `defineConfig` object, rather than inside the `sitemap()` call. @@ -87,11 +87,11 @@ After verifying that the sitemaps are built, you can add them to your site's ` - + ``` -```yaml ins={4} title="public/robots.txt" +```txt ins={4} title="public/robots.txt" User-agent: * Allow: / @@ -129,66 +129,69 @@ Sitemap: https:///sitemap-index.xml To configure this integration, pass an object to the `sitemap()` function call in `astro.config.mjs`. -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; import sitemap from '@astrojs/sitemap'; export default defineConfig({ - integrations: [sitemap({ - filter: ... - })] + integrations: [ + sitemap({ + // configuration options + }), + ], }); ``` ### filter - -All pages are included in your sitemap by default. By adding a custom `filter` function, you can filter included pages by URL. -__`astro.config.mjs`__ +All pages are included in your sitemap by default. By adding a custom `filter` function, you can filter included pages by URL. + +**`astro.config.mjs`** ```js -... - sitemap({ - filter: (page) => page !== 'https://stargazers.club/secret-vip-lounge' - }), +// ... +sitemap({ + filter: (page) => page !== 'https://stargazers.club/secret-vip-lounge', +}); ``` The function will be called for every page on your site. The `page` function parameter is the full URL of the page currently under considering, including your `site` domain. Return `true` to include the page in your sitemap, and `false` to leave it out. To filter multiple pages, add arguments with target URLs. -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js -... - sitemap({ - filter: (page) => - page !== "https://stargazers.club/secret-vip-lounge-1" && - page !== "https://stargazers.club/secret-vip-lounge-2" && - page !== "https://stargazers.club/secret-vip-lounge-3" && - page !== "https://stargazers.club/secret-vip-lounge-4", - }), +// ... +sitemap({ + filter: (page) => + page !== 'https://stargazers.club/secret-vip-lounge-1' && + page !== 'https://stargazers.club/secret-vip-lounge-2' && + page !== 'https://stargazers.club/secret-vip-lounge-3' && + page !== 'https://stargazers.club/secret-vip-lounge-4', +}); ``` - + ### customPages - + In some cases, a page might be part of your deployed site but not part of your Astro project. If you'd like to include a page in your sitemap that _isn't_ created by Astro, you can use this option. -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js -... - sitemap({ - customPages: ['https://stargazers.club/external-page', 'https://stargazers.club/external-page2'] - }), +// ... +sitemap({ + customPages: ['https://stargazers.club/external-page', 'https://stargazers.club/external-page2'], +}); ``` + ### entryLimit The maximum number entries per sitemap file. The default value is 45000. A sitemap index and multiple sitemaps are created if you have more entries. See this [explanation of splitting up a large sitemap](https://developers.google.com/search/docs/advanced/sitemaps/large-sitemaps). -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; @@ -208,12 +211,12 @@ export default defineConfig({ These options correspond to the ``, ``, and `` tags in the [Sitemap XML specification.](https://www.sitemaps.org/protocol.html) -Note that `changefreq` and `priority` are ignored by Google. +Note that `changefreq` and `priority` are ignored by Google. > **Note** > Due to limitations of Astro's [Integration API](https://docs.astro.build/en/reference/integrations-reference/), this integration can't analyze a given page's source code. This configuration option can set `changefreq`, `lastmod` and `priority` on a _site-wide_ basis; see the next option **serialize** for how you can set these values on a per-page basis. -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; @@ -236,21 +239,22 @@ export default defineConfig({ A function called for each sitemap entry just before writing to a disk. This function can be asynchronous. It receives as its parameter a `SitemapItem` object that can have these properties: - - `url` (absolute page URL). This is the only property that is guaranteed to be on `SitemapItem`. - - `changefreq` - - `lastmod` (ISO formatted date, `String` type) - - `priority` - - `links`. -This `links` property contains a `LinkItem` list of alternate pages including a parent page. +- `url` (absolute page URL). This is the only property that is guaranteed to be on `SitemapItem`. +- `changefreq` +- `lastmod` (ISO formatted date, `String` type) +- `priority` +- `links`. + +This `links` property contains a `LinkItem` list of alternate pages including a parent page. The `LinkItem` type has two fields: `url` (the fully-qualified URL for the version of this page for the specified language) and `lang` (a supported language code targeted by this version of the page). -The `serialize` function should return `SitemapItem`, touched or not. +The `serialize` function should return `SitemapItem`, touched or not. The example below shows the ability to add sitemap specific properties individually. -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; @@ -283,13 +287,13 @@ To localize a sitemap, pass an object to this `i18n` option. This object has two required properties: - `defaultLocale`: `String`. Its value must exist as one of `locales` keys. -- `locales`: `Record`, key/value - pairs. The key is used to look for a locale part in a page path. The value is a language attribute, only English alphabet and hyphen allowed. +- `locales`: `Record`, key/value - pairs. The key is used to look for a locale part in a page path. The value is a language attribute, only English alphabet and hyphen allowed. [Read more about language attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang). [Read more about localization](https://developers.google.com/search/docs/advanced/crawling/localized-versions#all-method-guidelines). -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; @@ -298,11 +302,11 @@ import sitemap from '@astrojs/sitemap'; export default defineConfig({ site: 'https://stargazers.club', integrations: [ - sitemap({ + sitemap({ i18n: { - defaultLocale: 'en', // All urls that don't contain `es` or `fr` after `https://stargazers.club/` will be treated as default locale, i.e. `en` + defaultLocale: 'en', // All urls that don't contain `es` or `fr` after `https://stargazers.club/` will be treated as default locale, i.e. `en` locales: { - en: 'en-US', // The `defaultLocale` value must present in `locales` keys + en: 'en-US', // The `defaultLocale` value must present in `locales` keys es: 'es-ES', fr: 'fr-CA', }, @@ -344,9 +348,10 @@ The resulting sitemap looks like this: ``` ## Examples + - The official Astro website uses Astro Sitemap to generate [its sitemap](https://astro.build/sitemap-index.xml). - The [integrations playground template](https://github.com/withastro/astro/tree/latest/examples/integrations-playground?on=github) comes with Astro Sitemap installed. Try adding a route and building the project! -- [Browse projects with Astro Sitemap on GitHub](https://github.com/search?q=%22@astrojs/sitemap%22+filename:package.json&type=Code) for more examples! +- [Browse projects with Astro Sitemap on GitHub](https://github.com/search?q=%22@astrojs/sitemap%22+filename:package.json&type=Code) for more examples! ## Troubleshooting diff --git a/packages/integrations/solid/README.md b/packages/integrations/solid/README.md index 338951bf236d..e9f123f14cdf 100644 --- a/packages/integrations/solid/README.md +++ b/packages/integrations/solid/README.md @@ -9,6 +9,7 @@ There are two ways to add integrations to your project. Let's try the most conve ### `astro add` command Astro includes a CLI tool for adding first party integrations: `astro add`. This command will: + 1. (Optionally) Install all necessary dependencies and peer dependencies 2. (Also optionally) Update your `astro.config.*` file to apply this integration @@ -41,21 +42,22 @@ npm install solid-js Now, apply this integration to your `astro.config.*` file using the `integrations` property: -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js ins={2} "solid()" import { defineConfig } from 'astro/config'; import solid from '@astrojs/solid-js'; export default defineConfig({ - // ... - integrations: [solid()], + // ... + integrations: [solid()], }); ``` ## Getting started To use your first SolidJS component in Astro, head to our [UI framework documentation][astro-ui-frameworks]. You'll explore: + - 📦 how framework components are loaded, - 💧 client-side hydration options, and - 🤝 opportunities to mix and nest frameworks together diff --git a/packages/integrations/svelte/README.md b/packages/integrations/svelte/README.md index 1c8b98b82adb..70e14ebb871a 100644 --- a/packages/integrations/svelte/README.md +++ b/packages/integrations/svelte/README.md @@ -9,6 +9,7 @@ There are two ways to add integrations to your project. Let's try the most conve ### `astro add` command Astro includes a CLI tool for adding first party integrations: `astro add`. This command will: + 1. (Optionally) Install all necessary dependencies and peer dependencies 2. (Also optionally) Update your `astro.config.*` file to apply this integration @@ -41,7 +42,7 @@ npm install svelte Now, apply this integration to your `astro.config.*` file using the `integrations` property: -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js ins={2} "svelte()" import { defineConfig } from 'astro/config'; @@ -56,6 +57,7 @@ export default defineConfig({ ## Getting started To use your first Svelte component in Astro, head to our [UI framework documentation][astro-ui-frameworks]. You'll explore: + - 📦 how framework components are loaded, - 💧 client-side hydration options, and - 🤝 opportunities to mix and nest frameworks together @@ -85,7 +87,7 @@ This integration passes the following default options to the Svelte compiler: const defaultOptions = { emitCss: true, compilerOptions: { dev: isDev, hydratable: true }, - preprocess: vitePreprocess() + preprocess: vitePreprocess(), }; ``` @@ -95,7 +97,7 @@ Providing your own `preprocess` options **will** override the [`vitePreprocess() You can set options either by passing them to the `svelte` integration in `astro.config.mjs` or in `svelte.config.js`. Either of these would override the default `preprocess` setting: -__`astro.config.mjs`__ +**`astro.config.mjs`** ```js import { defineConfig } from 'astro/config'; @@ -106,7 +108,7 @@ export default defineConfig({ }); ``` -__`svelte.config.js`__ +**`svelte.config.js`** ```js export default { @@ -120,7 +122,7 @@ export default { If you're using a preprocessor like TypeScript or SCSS in your Svelte files, you can create a `svelte.config.js` file so that the Svelte IDE extension can correctly parse the Svelte files. -__`svelte.config.js`__ +**`svelte.config.js`** ```js import { vitePreprocess } from '@astrojs/svelte'; diff --git a/packages/integrations/tailwind/README.md b/packages/integrations/tailwind/README.md index f0595dbe527e..fb62efade7fb 100644 --- a/packages/integrations/tailwind/README.md +++ b/packages/integrations/tailwind/README.md @@ -17,20 +17,18 @@ Tailwind lets you use utility classes instead of writing CSS. These utility clas If you don't like those predefined settings, you can [customize the Tailwind configuration file](https://tailwindcss.com/docs/configuration) to your project's design requirements. For example, if the "large text" in your design is actually `2rem`, you can [change the `lg` fontSize setting](https://tailwindcss.com/docs/font-size#customizing-your-theme) to `2rem`. -Tailwind is also a great choice to add styles to React, Preact, or Solid components, which don't support a ` ``` -```txt ins={4} title="public/robots.txt" + +``` ins={4} title="public/robots.txt" User-agent: * Allow: / From 57e603038fa51f5cf023c086705e2ced67434b38 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Tue, 27 Jun 2023 11:59:22 +0800 Subject: [PATCH 60/60] Handle esbuild 0.18 changes (#7479) --- .changeset/happy-stingrays-carry.md | 5 +++++ packages/astro/src/vite-plugin-astro/compile.ts | 2 ++ packages/astro/src/vite-plugin-jsx/index.ts | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 .changeset/happy-stingrays-carry.md diff --git a/.changeset/happy-stingrays-carry.md b/.changeset/happy-stingrays-carry.md new file mode 100644 index 000000000000..f63778dcf23b --- /dev/null +++ b/.changeset/happy-stingrays-carry.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Handle esbuild 0.18 changes diff --git a/packages/astro/src/vite-plugin-astro/compile.ts b/packages/astro/src/vite-plugin-astro/compile.ts index 799e09e8e565..6bee4f672ae0 100644 --- a/packages/astro/src/vite-plugin-astro/compile.ts +++ b/packages/astro/src/vite-plugin-astro/compile.ts @@ -41,6 +41,8 @@ export async function cachedFullCompilation({ tsconfigRaw: { compilerOptions: { // Ensure client:only imports are treeshaken + // @ts-expect-error anticipate esbuild 0.18 feature + verbatimModuleSyntax: false, importsNotUsedAsValues: 'remove', }, }, diff --git a/packages/astro/src/vite-plugin-jsx/index.ts b/packages/astro/src/vite-plugin-jsx/index.ts index 91aa63909d2d..9364a4e0b77a 100644 --- a/packages/astro/src/vite-plugin-jsx/index.ts +++ b/packages/astro/src/vite-plugin-jsx/index.ts @@ -160,6 +160,8 @@ export default function jsx({ settings, logging }: AstroPluginJSXOptions): Plugi tsconfigRaw: { compilerOptions: { // Ensure client:only imports are treeshaken + // @ts-expect-error anticipate esbuild 0.18 feature + verbatimModuleSyntax: false, importsNotUsedAsValues: 'remove', }, },