Merge branch 'main' into chore/remove-unused-imports

.changeset/breezy-radios-grab.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/db': patch
+---
+
+Fixes `isDbError()` guard for `LibsqlError`

examples/basics/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   }
 }

examples/blog/package.json

@@ -13,6 +13,6 @@
     "@astrojs/mdx": "^4.0.2",
     "@astrojs/rss": "^4.0.10",
     "@astrojs/sitemap": "^3.2.1",
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

examples/container-with-vitest/package.json

@@ -11,8 +11,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@astrojs/react": "^4.0.0",
-    "astro": "^5.0.4",
+    "@astrojs/react": "^4.1.0",
+    "astro": "^5.0.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vitest": "^2.1.6"

examples/framework-alpine/package.json

@@ -13,6 +13,6 @@
     "@astrojs/alpinejs": "^0.4.0",
     "@types/alpinejs": "^3.13.10",
     "alpinejs": "^3.14.3",
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   }
 }

examples/framework-multiple/package.json

@@ -11,13 +11,13 @@
   },
   "dependencies": {
     "@astrojs/preact": "^4.0.0",
-    "@astrojs/react": "^4.0.0",
+    "@astrojs/react": "^4.1.0",
     "@astrojs/solid-js": "^5.0.0",
     "@astrojs/svelte": "^7.0.1",
-    "@astrojs/vue": "^5.0.1",
+    "@astrojs/vue": "^5.0.2",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "preact": "^10.24.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

examples/framework-preact/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@astrojs/preact": "^4.0.0",
     "@preact/signals": "^1.3.0",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "preact": "^10.24.3"
   }
 }

examples/framework-react/package.json

@@ -10,10 +10,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^4.0.0",
+    "@astrojs/react": "^4.1.0",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

examples/framework-solid/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^5.0.0",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "solid-js": "^1.9.3"
   }
 }

examples/framework-svelte/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^7.0.1",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "svelte": "^5.1.16"
   }
 }

examples/framework-vue/package.json

@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^5.0.1",
-    "astro": "^5.0.4",
+    "@astrojs/vue": "^5.0.2",
+    "astro": "^5.0.5",
     "vue": "^3.5.12"
   }
 }

examples/hackernews/package.json

@@ -11,6 +11,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^9.0.0",
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   }
 }

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/minimal/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   }
 }

examples/portfolio/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   }
 }

examples/ssr/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/node": "^9.0.0",
     "@astrojs/svelte": "^7.0.1",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "svelte": "^5.1.16"
   }
 }

examples/starlog/package.json

@@ -9,7 +9,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "sass": "^1.80.6",
     "sharp": "^0.33.3"
   }

examples/toolbar-app/package.json

@@ -15,6 +15,6 @@
     "./app": "./dist/app.js"
   },
   "devDependencies": {
-    "astro": "^5.0.4"
+    "astro": "^5.0.5"
   }
 }

examples/with-markdoc/package.json

@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^0.12.2",
-    "astro": "^5.0.4"
+    "@astrojs/markdoc": "^0.12.3",
+    "astro": "^5.0.5"
   }
 }

examples/with-mdx/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@astrojs/mdx": "^4.0.2",
     "@astrojs/preact": "^4.0.0",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "preact": "^10.24.3"
   }
 }

examples/with-nanostores/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@astrojs/preact": "^4.0.0",
     "@nanostores/preact": "^0.5.2",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "nanostores": "^0.11.3",
     "preact": "^10.24.3"
   }

examples/with-tailwindcss/package.json

@@ -13,7 +13,7 @@
     "@astrojs/mdx": "^4.0.2",
     "@astrojs/tailwind": "^5.1.3",
     "@types/canvas-confetti": "^1.6.4",
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "autoprefixer": "^10.4.20",
     "canvas-confetti": "^1.9.3",
     "postcss": "^8.4.49",

examples/with-vitest/package.json

@@ -11,7 +11,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^5.0.4",
+    "astro": "^5.0.5",
     "vitest": "^2.1.6"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,21 @@
 # astro
 
+## 5.0.5
+
+### Patch Changes
+
+- [#12705](https://github.com/withastro/astro/pull/12705) [`0d1eab5`](https://github.com/withastro/astro/commit/0d1eab560d56c51c359bbd35e8bfb51e238611ee) Thanks [@ascorbic](https://github.com/ascorbic)! - Fixes a bug where MDX files with certain characters in the name would cause builds to fail
+
+- [#12707](https://github.com/withastro/astro/pull/12707) [`2aaed2d`](https://github.com/withastro/astro/commit/2aaed2d2a96ab35461af24e8d12b20f1da33983f) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a bug where the middleware was incorrectly imported during the build
+
+- [#12697](https://github.com/withastro/astro/pull/12697) [`1c4a032`](https://github.com/withastro/astro/commit/1c4a032247747c830be94dbdd0c953511a6bfa53) Thanks [@ascorbic](https://github.com/ascorbic)! - Fix a bug that caused builds to fail if an image had a quote mark in its name
+
+- [#12694](https://github.com/withastro/astro/pull/12694) [`495f46b`](https://github.com/withastro/astro/commit/495f46bca78665732e51c629d93a68fa392b88a4) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a bug where the experimental feature `experimental.svg` was incorrectly used when generating ESM images
+
+- [#12658](https://github.com/withastro/astro/pull/12658) [`3169593`](https://github.com/withastro/astro/commit/316959355c3d59723ecb3e0f417becf1f03ddd74) Thanks [@jurajkapsz](https://github.com/jurajkapsz)! - Fixes astro info copy to clipboard process not returning to prompt in certain cases.
+
+- [#12712](https://github.com/withastro/astro/pull/12712) [`b01c74a`](https://github.com/withastro/astro/commit/b01c74aeccc4ec76b64fa75d163df58274b37970) Thanks [@ascorbic](https://github.com/ascorbic)! - Fixes a bug which misidentified pages as markdown if a query string ended in a markdown extension
+
 ## 5.0.4
 
 ### Patch Changes

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

packages/astro/src/assets/utils/node/emitAsset.ts

@@ -15,6 +15,7 @@ export async function emitESMImage(
 	_watchMode: boolean,
 	// FIX: in Astro 6, this function should not be passed in dev mode at all.
 	// Or rethink the API so that a function that throws isn't passed through.
+	experimentalSvgEnabled: boolean,
 	fileEmitter?: FileEmitter,
 ): Promise<ImageMetadataWithContents | undefined> {
 	if (!id) {
@@ -44,7 +45,8 @@ export async function emitESMImage(
 	});
 
 	// Attach file data for SVGs
-	if (fileMetadata.format === 'svg') {
+	// TODO: this is a workaround to prevent a memory leak, and it must be fixed before we remove the experimental flag, see
+	if (fileMetadata.format === 'svg' && experimentalSvgEnabled === true) {
 		emittedImage.contents = fileData;
 	}
 

packages/astro/src/assets/vite-plugin-assets.ts

@@ -205,7 +205,12 @@ export default function assets({ settings }: { settings: AstroSettings }): vite.
 					}
 
 					const emitFile = shouldEmitFile ? this.emitFile : undefined;
-					const imageMetadata = await emitESMImage(id, this.meta.watchMode, emitFile);
+					const imageMetadata = await emitESMImage(
+						id,
+						this.meta.watchMode,
+						!!settings.config.experimental.svg,
+						emitFile,
+					);
 
 					if (!imageMetadata) {
 						throw new AstroError({

packages/astro/src/cli/info/index.ts

@@ -66,7 +66,7 @@ export async function copyToClipboard(text: string, force?: boolean) {
 		// Unix: check if a supported command is installed
 
 		const unixCommands: Array<[string, Array<string>]> = [
-			['xclip', ['-sel', 'clipboard', '-l', '1']],
+			['xclip', ['-selection', 'clipboard', '-l', '1']],
 			['wl-copy', []],
 		];
 		for (const [unixCommand, unixArgs] of unixCommands) {
@@ -101,7 +101,7 @@ export async function copyToClipboard(text: string, force?: boolean) {
 	}
 
 	try {
-		const result = spawnSync(command, args, { input: text });
+		const result = spawnSync(command, args, { input: text, stdio: ['pipe', 'ignore', 'ignore'] });
 		if (result.error) {
 			throw result.error;
 		}

packages/astro/src/content/content-layer.ts

@@ -206,6 +206,7 @@ export class ContentLayer {
 						},
 						collectionWithResolvedSchema,
 						false,
+						!!this.#settings.config.experimental.svg,
 					);
 
 					return parsedData;

packages/astro/src/content/mutable-data-store.ts

@@ -102,7 +102,7 @@ export class MutableDataStore extends ImmutableDataStore {
 		const exports: Array<string> = [];
 		this.#assetImports.forEach((id) => {
 			const symbol = importIdToSymbolName(id);
-			imports.push(`import ${symbol} from '${id}';`);
+			imports.push(`import ${symbol} from ${JSON.stringify(id)};`);
 			exports.push(`[${JSON.stringify(id)}, ${symbol}]`);
 		});
 		const code = /* js */ `
@@ -137,7 +137,7 @@ export default new Map([${exports.join(', ')}]);
 		// We then export them all, mapped by the import id, so we can find them again in the build.
 		const lines: Array<string> = [];
 		for (const [fileName, specifier] of this.#moduleImports) {
-			lines.push(`['${fileName}', () => import('${specifier}')]`);
+			lines.push(`[${JSON.stringify(fileName)}, () => import(${JSON.stringify(specifier)})]`);
 		}
 		const code = `
 export default new Map([\n${lines.join(',\n')}]);

packages/astro/src/content/runtime-assets.ts

@@ -7,13 +7,15 @@ export function createImage(
 	pluginContext: PluginContext,
 	shouldEmitFile: boolean,
 	entryFilePath: string,
+	experimentalSvgEnabled: boolean,
 ) {
 	return () => {
 		return z.string().transform(async (imagePath, ctx) => {
 			const resolvedFilePath = (await pluginContext.resolve(imagePath, entryFilePath))?.id;
 			const metadata = (await emitESMImage(
 				resolvedFilePath,
 				pluginContext.meta.watchMode,
+				experimentalSvgEnabled,
 				shouldEmitFile ? pluginContext.emitFile : undefined,
 			)) as OmitBrand<ImageMetadata>;
 

packages/astro/src/content/utils.ts

@@ -164,6 +164,7 @@ export async function getEntryDataAndImages<
 	},
 	collectionConfig: CollectionConfig,
 	shouldEmitFile: boolean,
+	experimentalSvgEnabled: boolean,
 	pluginContext?: PluginContext,
 ): Promise<{ data: TOutputData; imageImports: Array<string> }> {
 	let data: TOutputData;
@@ -182,7 +183,12 @@ export async function getEntryDataAndImages<
 	if (typeof schema === 'function') {
 		if (pluginContext) {
 			schema = schema({
-				image: createImage(pluginContext, shouldEmitFile, entry._internal.filePath),
+				image: createImage(
+					pluginContext,
+					shouldEmitFile,
+					entry._internal.filePath,
+					experimentalSvgEnabled,
+				),
 			});
 		} else if (collectionConfig.type === CONTENT_LAYER_TYPE) {
 			schema = schema({
@@ -257,12 +263,14 @@ export async function getEntryData(
 	},
 	collectionConfig: CollectionConfig,
 	shouldEmitFile: boolean,
+	experimentalSvgEnabled: boolean,
 	pluginContext?: PluginContext,
 ) {
 	const { data } = await getEntryDataAndImages(
 		entry,
 		collectionConfig,
 		shouldEmitFile,
+		experimentalSvgEnabled,
 		pluginContext,
 	);
 	return data;

packages/astro/src/content/vite-plugin-content-imports.ts

@@ -245,6 +245,7 @@ async function getContentEntryModule(
 				{ id, collection, _internal, unvalidatedData },
 				collectionConfig,
 				params.shouldEmitFile,
+				!!params.config.experimental.svg,
 				pluginContext,
 			)
 		: unvalidatedData;
@@ -280,6 +281,7 @@ async function getDataEntryModule(
 				{ id, collection, _internal, unvalidatedData },
 				collectionConfig,
 				params.shouldEmitFile,
+				!!params.config.experimental.svg,
 				pluginContext,
 			)
 		: unvalidatedData;