diff --git a/.changeset/four-zoos-taste.md b/.changeset/four-zoos-taste.md deleted file mode 100644 index 6078bcdadb6e..000000000000 --- a/.changeset/four-zoos-taste.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"astro": patch ---- - -Limits parallel imports within `getCollection()` to prevent EMFILE errors when accessing files diff --git a/.changeset/mean-candles-hammer.md b/.changeset/mean-candles-hammer.md new file mode 100644 index 000000000000..cb825a493a58 --- /dev/null +++ b/.changeset/mean-candles-hammer.md @@ -0,0 +1,5 @@ +--- +"astro": patch +--- + +Fixes `astro add` sometimes modifying `baseUrl` unintentionally diff --git a/.changeset/old-pugs-jog.md b/.changeset/old-pugs-jog.md deleted file mode 100644 index 3d56f9e040ba..000000000000 --- a/.changeset/old-pugs-jog.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"astro": patch ---- - -Fixes a case where the i18n fallback failed to correctly redirect to the index page with SSR enabled diff --git a/examples/basics/package.json b/examples/basics/package.json index e6967359976c..e32ef884cb3e 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 03925559a3a6..f7e1d6b4b8a2 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^2.3.0", "@astrojs/rss": "^4.0.5", "@astrojs/sitemap": "^3.1.2", - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/component/package.json b/examples/component/package.json index 422950059d17..e4bbfe2e9459 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.6.0" + "astro": "^4.6.1" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index c8d8d8655397..f731ddf0ff86 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.4.0", "@types/alpinejs": "^3.13.5", "alpinejs": "^3.13.3", - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 407d65877b65..4cfbb0e05757 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^4.0.1", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^4.6.0", + "astro": "^4.6.1", "lit": "^3.1.2" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 43ded5197100..5f8d13af7168 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -18,7 +18,7 @@ "@astrojs/vue": "^4.1.0", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", - "astro": "^4.6.0", + "astro": "^4.6.1", "preact": "^10.19.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 870bd442e740..f36f406a5e20 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.2.0", "@preact/signals": "^1.2.1", - "astro": "^4.6.0", + "astro": "^4.6.1", "preact": "^10.19.2" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 3ea028b46da0..205b05d6a9e3 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.3.0", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", - "astro": "^4.6.0", + "astro": "^4.6.1", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 0695f05c1c35..bed80c53f211 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^4.1.0", - "astro": "^4.6.0", + "astro": "^4.6.1", "solid-js": "^1.8.5" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index bc2f8ce3d3aa..d41823b0404d 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^5.4.0", - "astro": "^4.6.0", + "astro": "^4.6.1", "svelte": "^4.2.5" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index f6044a9075a7..28bab6c81c41 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^4.1.0", - "astro": "^4.6.0", + "astro": "^4.6.1", "vue": "^3.3.8" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 3c45703a6643..599a3a1c8eab 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^8.2.5", - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index f9b5103cea22..91f5793991b7 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.6.0" + "astro": "^4.6.1" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index d078dcaee950..cb608654a3dd 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^8.2.5", - "astro": "^4.6.0", + "astro": "^4.6.1", "html-minifier": "^4.0.0" }, "devDependencies": { diff --git a/examples/minimal/package.json b/examples/minimal/package.json index a0b8dfcb1cdf..840a5ac7c6dd 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 3b7608d70e1a..260c84d09f61 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 9eb3b2b97e7d..caec4c105fa0 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 667ed53e12b2..45210122da37 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^8.2.5", "@astrojs/svelte": "^5.4.0", - "astro": "^4.6.0", + "astro": "^4.6.1", "svelte": "^4.2.5" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index e9efca280ec8..bc4e0e23a21b 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.0", + "astro": "^4.6.1", "sass": "^1.69.5", "sharp": "^0.32.6" } diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json index 26fe5823ca45..512a2bcc80c4 100644 --- a/examples/view-transitions/package.json +++ b/examples/view-transitions/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@astrojs/tailwind": "^5.1.0", "@astrojs/node": "^8.2.5", - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 193589627c44..f799e483f45c 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.10.0", - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 449c58d70937..84b5ca0dcfae 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^5.1.0", - "astro": "^4.6.0", + "astro": "^4.6.1", "hast-util-select": "^6.0.2", "rehype-autolink-headings": "^7.1.0", "rehype-slug": "^6.0.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 493ec1a85271..580dd76819f3 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.0" + "astro": "^4.6.1" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index c996b84223db..c1b05389ace3 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^2.3.0", "@astrojs/preact": "^3.2.0", - "astro": "^4.6.0", + "astro": "^4.6.1", "preact": "^10.19.2" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 7fe2f1dabcef..122a12cfc7f9 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.2.0", "@nanostores/preact": "^0.5.0", - "astro": "^4.6.0", + "astro": "^4.6.1", "nanostores": "^0.9.5", "preact": "^10.19.2" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 20020732a554..a6ff3928869e 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^2.3.0", "@astrojs/tailwind": "^5.1.0", "@types/canvas-confetti": "^1.6.3", - "astro": "^4.6.0", + "astro": "^4.6.1", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.9.1", "postcss": "^8.4.28", diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index b408fa7190b0..9f98c60e0e42 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^4.6.0", + "astro": "^4.6.1", "vitest": "^1.3.1" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index d38f80b01bce..5161ed864e28 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 4.6.1 + +### Patch Changes + +- [#10708](https://github.com/withastro/astro/pull/10708) [`742866c5669a2be4f8b5a4c861cadb933c381415`](https://github.com/withastro/astro/commit/742866c5669a2be4f8b5a4c861cadb933c381415) Thanks [@horo-fox](https://github.com/horo-fox)! - Limits parallel imports within `getCollection()` to prevent EMFILE errors when accessing files + +- [#10755](https://github.com/withastro/astro/pull/10755) [`c6d59b6fb7db20af957a8706c8159c50619235ef`](https://github.com/withastro/astro/commit/c6d59b6fb7db20af957a8706c8159c50619235ef) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a case where the i18n fallback failed to correctly redirect to the index page with SSR enabled + ## 4.6.0 ### Minor Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index e60cb18a87a0..0c3935e3f990 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "4.6.0", + "version": "4.6.1", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts index d1c7eec2e9ca..2f8b73d560f1 100644 --- a/packages/astro/src/cli/add/index.ts +++ b/packages/astro/src/cli/add/index.ts @@ -968,16 +968,16 @@ async function updateTSConfig( inputConfig = { tsconfig: defaultTSConfig, tsconfigFile: path.join(cwd, 'tsconfig.json'), - rawConfig: { tsconfig: defaultTSConfig, tsconfigFile: path.join(cwd, 'tsconfig.json') }, + rawConfig: defaultTSConfig, }; } else { - inputConfigText = JSON.stringify(inputConfig.rawConfig.tsconfig, null, 2); + inputConfigText = JSON.stringify(inputConfig.rawConfig, null, 2); } const configFileName = path.basename(inputConfig.tsconfigFile); const outputConfig = updateTSConfigForFramework( - inputConfig.rawConfig.tsconfig, + inputConfig.rawConfig, firstIntegrationWithTSSettings ); diff --git a/packages/astro/src/core/config/tsconfig.ts b/packages/astro/src/core/config/tsconfig.ts index f0e747877842..25c9b01ba4c8 100644 --- a/packages/astro/src/core/config/tsconfig.ts +++ b/packages/astro/src/core/config/tsconfig.ts @@ -1,3 +1,4 @@ +import { readFile } from 'node:fs/promises'; import { join } from 'node:path'; import { TSConfckParseError, @@ -5,6 +6,7 @@ import { type TSConfckParseResult, find, parse, + toJson, } from 'tsconfck'; import type { CompilerOptions, TypeAcquisition } from 'typescript'; @@ -64,7 +66,7 @@ type TSConfigResult = Promise< export async function loadTSConfig( root: string | undefined, findUp = false -): Promise> { +): Promise> { const safeCwd = root ?? process.cwd(); const [jsconfig, tsconfig] = await Promise.all( @@ -85,7 +87,13 @@ export async function loadTSConfig( return parsedConfig; } - return { ...parsedConfig, rawConfig: parsedConfig.extended?.[0] ?? parsedConfig.tsconfig }; + // tsconfck does not return the original config, so we need to parse it ourselves + // https://github.com/dominikg/tsconfck/issues/138 + const rawConfig = await readFile(tsconfig, 'utf-8') + .then(toJson) + .then((content) => JSON.parse(content) as TSConfig); + + return { ...parsedConfig, rawConfig }; } if (jsconfig) { @@ -95,7 +103,11 @@ export async function loadTSConfig( return parsedConfig; } - return { ...parsedConfig, rawConfig: parsedConfig.extended?.[0] ?? parsedConfig.tsconfig }; + const rawConfig = await readFile(jsconfig, 'utf-8') + .then(toJson) + .then((content) => JSON.parse(content) as TSConfig); + + return { ...parsedConfig, rawConfig: rawConfig }; } return 'missing-config'; diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts index e18221c428f1..6cb22cc00e99 100644 --- a/packages/astro/src/core/errors/errors-data.ts +++ b/packages/astro/src/core/errors/errors-data.ts @@ -1079,7 +1079,7 @@ export const IncorrectStrategyForI18n = { name: 'IncorrectStrategyForI18n', title: "You can't use the current function with the current strategy", message: (functionName: string) => - `The function \`${functionName}\' can only be used when the \`i18n.routing.strategy\` is set to \`"manual"\`.`, + `The function \`${functionName}\` can only be used when the \`i18n.routing.strategy\` is set to \`"manual"\`.`, } satisfies ErrorData; /** diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts index 4155de863db6..eb05df6f5db6 100644 --- a/packages/astro/src/core/render-context.ts +++ b/packages/astro/src/core/render-context.ts @@ -264,7 +264,8 @@ export class RenderContext { // `Astro.self` is added by the compiler const astroGlobalCombined: Omit = { - ...astroGlobalPartial, + generator: astroGlobalPartial.generator, + glob: astroGlobalPartial.glob, cookies, get clientAddress() { return renderContext.clientAddress(); diff --git a/packages/astro/test/fixtures/tsconfig-handling/baseUrl/tsconfig.json b/packages/astro/test/fixtures/tsconfig-handling/baseUrl/tsconfig.json new file mode 100644 index 000000000000..bd5b17453a2c --- /dev/null +++ b/packages/astro/test/fixtures/tsconfig-handling/baseUrl/tsconfig.json @@ -0,0 +1,6 @@ +{ + "files": ["i-have-base-url"], + "compilerOptions": { + "baseUrl": ".", + } +} diff --git a/packages/astro/test/units/config/config-tsconfig.test.js b/packages/astro/test/units/config/config-tsconfig.test.js index c6372cbe0766..a82ef8b25d7f 100644 --- a/packages/astro/test/units/config/config-tsconfig.test.js +++ b/packages/astro/test/units/config/config-tsconfig.test.js @@ -1,7 +1,9 @@ import * as assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; import * as path from 'node:path'; import { describe, it } from 'node:test'; import { fileURLToPath } from 'node:url'; +import { toJson } from 'tsconfck'; import { loadTSConfig, updateTSConfigForFramework } from '../../../dist/core/config/index.js'; const cwd = fileURLToPath(new URL('../../fixtures/tsconfig-handling/', import.meta.url)); @@ -37,6 +39,15 @@ describe('TSConfig handling', () => { assert.equal(invalidConfig, 'invalid-config'); assert.equal(missingConfig, 'missing-config'); }); + + it('does not change baseUrl in raw config', async () => { + const loadedConfig = await loadTSConfig(path.join(cwd, 'baseUrl')); + const rawConfig = await readFile(path.join(cwd, 'baseUrl', 'tsconfig.json'), 'utf-8') + .then(toJson) + .then((content) => JSON.parse(content)); + + assert.deepEqual(loadedConfig.rawConfig, rawConfig); + }); }); describe('tsconfig / jsconfig updates', () => { diff --git a/packages/db/CHANGELOG.md b/packages/db/CHANGELOG.md index 5c462e3c5084..e7087ef74c5b 100644 --- a/packages/db/CHANGELOG.md +++ b/packages/db/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/db +## 0.10.4 + +### Patch Changes + +- [#10764](https://github.com/withastro/astro/pull/10764) [`d1080ea81de0db1d1aed97a65c490766c17ab312`](https://github.com/withastro/astro/commit/d1080ea81de0db1d1aed97a65c490766c17ab312) Thanks [@delucis](https://github.com/delucis)! - Improves `package.json` metadata fields + ## 0.10.3 ### Patch Changes diff --git a/packages/db/package.json b/packages/db/package.json index e58bf32b8f9b..d4e56e19bf95 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,8 +1,15 @@ { "name": "@astrojs/db", - "version": "0.10.3", - "description": "", + "version": "0.10.4", + "description": "Add libSQL and Astro Studio support to your Astro site", "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/withastro/astro.git", + "directory": "packages/db" + }, + "bugs": "https://github.com/withastro/astro/issues", + "homepage": "https://docs.astro.build/en/guides/integrations-guide/db/", "type": "module", "author": "withastro", "types": "./index.d.ts", diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md index 1a1b7e053781..9b7d2ff51c82 100644 --- a/packages/integrations/vercel/CHANGELOG.md +++ b/packages/integrations/vercel/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/vercel +## 7.5.3 + +### Patch Changes + +- [#10756](https://github.com/withastro/astro/pull/10756) [`c75ededdb401cfa55e1ad2682d5e95494f49604e`](https://github.com/withastro/astro/commit/c75ededdb401cfa55e1ad2682d5e95494f49604e) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes `widths` and `densities` not working when using Vercel's Image Optimization. + + Note that you still need to make sure that the widths you're outputting are enabled in [the `imageConfig` property of the Vercel adapter](https://docs.astro.build/en/guides/integrations-guide/vercel/#imagesconfig) in order for these properties to work. + ## 7.5.2 ### Patch Changes diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 207668a94c13..1702249184c9 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/vercel", "description": "Deploy your site to Vercel", - "version": "7.5.2", + "version": "7.5.3", "type": "module", "author": "withastro", "license": "MIT", diff --git a/packages/integrations/vercel/src/image/build-service.ts b/packages/integrations/vercel/src/image/build-service.ts index bd58d3af61ce..e793b896e4d1 100644 --- a/packages/integrations/vercel/src/image/build-service.ts +++ b/packages/integrations/vercel/src/image/build-service.ts @@ -1,7 +1,9 @@ import type { ExternalImageService } from 'astro'; +import { baseService } from 'astro/assets'; import { isESMImportedImage, sharedValidateOptions } from './shared.js'; const service: ExternalImageService = { + ...baseService, validateOptions: (options, serviceOptions) => sharedValidateOptions(options, serviceOptions.service.config, 'production'), getHTMLAttributes(options) { @@ -29,7 +31,8 @@ const service: ExternalImageService = { } } - const { src, width, height, format, quality, ...attributes } = props; + const { src, width, height, format, quality, densities, widths, formats, ...attributes } = + options; return { ...attributes, diff --git a/packages/integrations/vercel/src/image/shared-dev-service.ts b/packages/integrations/vercel/src/image/shared-dev-service.ts index 4251603a704c..8ca87e99aaa9 100644 --- a/packages/integrations/vercel/src/image/shared-dev-service.ts +++ b/packages/integrations/vercel/src/image/shared-dev-service.ts @@ -1,7 +1,9 @@ import type { LocalImageService } from 'astro'; +import { baseService } from 'astro/assets'; import { sharedValidateOptions } from './shared.js'; export const baseDevService: Omit = { + ...baseService, validateOptions: (options, serviceOptions) => sharedValidateOptions(options, serviceOptions.service.config, 'development'), getURL(options) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9c2f670cde60..f8cb84e92944 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -134,7 +134,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/blog: @@ -149,13 +149,13 @@ importers: specifier: ^3.1.2 version: link:../../packages/integrations/sitemap astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/framework-alpine: @@ -170,7 +170,7 @@ importers: specifier: ^3.13.3 version: 3.13.8 astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/framework-lit: @@ -182,7 +182,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro lit: specifier: ^3.1.2 @@ -212,7 +212,7 @@ importers: specifier: ^18.2.15 version: 18.2.24 astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -242,7 +242,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.20.1) astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -260,7 +260,7 @@ importers: specifier: ^18.2.15 version: 18.2.24 astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -275,7 +275,7 @@ importers: specifier: ^4.1.0 version: link:../../packages/integrations/solid astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro solid-js: specifier: ^1.8.5 @@ -287,7 +287,7 @@ importers: specifier: ^5.4.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro svelte: specifier: ^4.2.5 @@ -299,7 +299,7 @@ importers: specifier: ^4.1.0 version: link:../../packages/integrations/vue astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro vue: specifier: ^3.3.8 @@ -311,13 +311,13 @@ importers: specifier: ^8.2.5 version: link:../../packages/integrations/node astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/middleware: @@ -326,7 +326,7 @@ importers: specifier: ^8.2.5 version: link:../../packages/integrations/node astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -339,19 +339,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/ssr: @@ -363,7 +363,7 @@ importers: specifier: ^5.4.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro svelte: specifier: ^4.2.5 @@ -372,7 +372,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro sass: specifier: ^1.69.5 @@ -390,7 +390,7 @@ importers: specifier: ^5.1.0 version: link:../../packages/integrations/tailwind astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/with-markdoc: @@ -399,7 +399,7 @@ importers: specifier: ^0.10.0 version: link:../../packages/integrations/markdoc astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/with-markdown-plugins: @@ -408,7 +408,7 @@ importers: specifier: ^5.1.0 version: link:../../packages/markdown/remark astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro hast-util-select: specifier: ^6.0.2 @@ -429,7 +429,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro examples/with-mdx: @@ -441,7 +441,7 @@ importers: specifier: ^3.2.0 version: link:../../packages/integrations/preact astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -456,7 +456,7 @@ importers: specifier: ^0.5.0 version: 0.5.1(nanostores@0.9.5)(preact@10.20.1) astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro nanostores: specifier: ^0.9.5 @@ -477,7 +477,7 @@ importers: specifier: ^1.6.3 version: 1.6.4 astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -495,7 +495,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^4.6.0 + specifier: ^4.6.1 version: link:../../packages/astro vitest: specifier: ^1.3.1