[pull] main from withastro:main

.changeset/mean-icons-applaud.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes the wording of the an error message

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:0-18
+FROM mcr.microsoft.com/devcontainers/javascript-node:1-18
 
 # Install playwright
 RUN npm install -g @playwright/test

.devcontainer/examples.Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:0-18
+FROM mcr.microsoft.com/devcontainers/javascript-node:1-18
 
 # Install latest pnpm
 RUN npm install -g pnpm

.editorconfig

@@ -11,5 +11,5 @@ indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = false
 
-[{.*,*.md,*.json,*.toml,*.yml,}]
+[{.*,*.md,*.json,*.toml,*.yml,*.json5}]
 indent_style = space

.git-blame-ignore-revs

@@ -6,3 +6,5 @@
 59e8c71786fd1c154904b3fefa7d26d88f4d92d2
 # Change formatting (#10180)
 062623438b5dfd66682a967edc7b7c91bd29e888
+# Update to trailingComma: 'all' (#11640)
+72c7ae9901de927ae8d9d5be63cbaef4f976422c

.github/ISSUE_TEMPLATE/---01-bug-report.yml

@@ -10,7 +10,7 @@ body:
         Thank you for taking the time to file a bug report! Please fill out this form as completely as possible.
 
         ✅ I am using the **latest version of Astro** and all plugins.
-        ✅ I am using a version of Node that Astro supports (`>=18.14.1`)
+        ✅ I am using a version of Node that Astro supports (`v18.17.1` or `v20.3.0` or higher.)
   - type: textarea
     id: astro-info
     attributes:
@@ -42,7 +42,7 @@ body:
     id: bug-reproduction
     attributes:
       label: Link to Minimal Reproducible Example
-      description: 'Use [astro.new](https://astro.new) to create a minimal reproduction of the problem. **A minimal reproduction is required** so that others can help debug your issue. If a report is vague (e.g. just a generic error message) and has no reproduction, it may be auto-closed. Not sure how to create a minimal example? [Read our guide](https://docs.astro.build/en/guides/troubleshooting/#creating-minimal-reproductions)'
+      description: 'Use [StackBlitz](https://astro.new/repro) to create a minimal reproduction of the problem. **A minimal reproduction is required** so that others can help debug your issue. If a report is vague (e.g. just a generic error message) and has no reproduction, it may be auto-closed. Not sure how to create a minimal example? [Read our guide](https://docs.astro.build/en/guides/troubleshooting/#creating-minimal-reproductions)'
       placeholder: 'https://stackblitz.com/abcd1234'
     validations:
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: 💁 Support
+    url: https://astro.build/chat
+    about: 'This issue tracker is not for support questions. Join us on Discord for assistance!'
   - name: 📘 Documentation
     url: https://github.com/withastro/docs
     about: File an issue or make an improvement to the docs website.
@@ -9,6 +12,3 @@ contact_links:
   - name: 👾 Chat
     url: https://astro.build/chat
     about: Our Discord server is active, come join us!
-  - name: 💁 Support
-    url: https://astro.build/chat
-    about: 'This issue tracker is not for support questions. Join us on Discord for assistance!'

.github/labeler.yml

@@ -40,5 +40,5 @@
 - packages/integrations/vue/**
 
 'docs pr':
-- packages/astro/src/@types/astro.ts
+- packages/astro/src/types/public/**
 - packages/astro/src/core/errors/errors-data.ts

.github/renovate.json5

@@ -1,12 +1,29 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base", "schedule:weekly", "group:allNonMajor"],
+  "extends": [
+    "config:recommended",
+    "schedule:weekly",
+    "group:allNonMajor",
+    ":disablePeerDependencies", 
+    "regexManagers:biomeVersions",
+  ],
   "labels": ["dependencies"],
   "rangeStrategy": "bump",
+  "postUpdateOptions": ["pnpmDedupe"],
+  "ignorePaths": ["**/node_modules/**"],
+  "packageRules": [
+    // TODO: remove once the tailwind integration is removed
+    {
+      "matchPackageNames": ["tailwindcss"],
+      "ignorePaths": ["packages/integrations/tailwind"]
+    }
+  ],
   "ignoreDeps": [
     // manually bumping deps
     "@biomejs/biome",
     "@types/node",
+    "astro-embed", // TODO: investigate upgrade (zod import issues with atproto)
+    "drizzle-orm", // TODO: investigate upgrade (has type issues)
     "sharp",
 
     // manually bumping workflow actions
@@ -19,5 +36,6 @@
 
     // follow vite deps version
     "postcss-load-config",
+    "esbuild",
   ],
 }

.github/scripts/announce.mjs

@@ -1,12 +1,12 @@
-import { globby as glob } from 'globby';
-import { fileURLToPath } from 'node:url';
 import { readFile } from 'node:fs/promises';
+import { fileURLToPath } from 'node:url';
+import { globby as glob } from 'globby';
 import { setOutput } from './utils.mjs';
 
 const { GITHUB_REF = 'main' } = process.env;
 const baseUrl = new URL(`https://github.com/withastro/astro/blob/${GITHUB_REF}/`);
 
-const emojis = ['🎉', '🥳', '🚀', '🧑‍🚀', '🎊', '🏆', '✅', '🤩', '🤖', '🙌'];
+const emojis = ['🎉', '🥳', '🚀', '🧑', '🎊', '🏆', '✅', '🤩', '🤖', '🙌'];
 const descriptors = [
 	'new releases',
 	'hot and fresh updates',
@@ -18,34 +18,34 @@ const descriptors = [
 	'updates',
 ];
 const verbs = [
-	"just went out!",
-	"just launched!",
-	"now available!",
-	"in the wild!",
-	"now live!",
-	"hit the registry!",
-	"to share!",
-	"for you!",
-	"for y’all! 🤠",
-	"comin’ your way!",
-	"comin’ atcha!",
-	"comin’ in hot!",
-	"freshly minted on the blockchain! (jk)",
-	"[is] out (now with 100% more reticulated splines!)",
-	"(as seen on TV!)",
-	"just dropped!",
-	"– artisanally hand-crafted just for you.",
-	"– oh happy day!",
-	"– enjoy!",
-	"now out. Be the first on your block to download!",
-	"made with love 💕",
-	"[is] out! Our best [version] yet!",
-	"[is] here. DOWNLOAD! DOWNLOAD! DOWNLOAD!",
-	"... HUZZAH!",
-	"[has] landed!",
-	"landed! The internet just got a little more fun.",
-	"– from our family to yours.",
-	"– go forth and build!"
+	'just went out!',
+	'just launched!',
+	'now available!',
+	'in the wild!',
+	'now live!',
+	'hit the registry!',
+	'to share!',
+	'for you!',
+	'for y’all! 🤠',
+	'comin’ your way!',
+	'comin’ atcha!',
+	'comin’ in hot!',
+	'freshly minted on the blockchain! (jk)',
+	'[is] out (now with 100% more reticulated splines!)',
+	'(as seen on TV!)',
+	'just dropped!',
+	'– artisanally hand-crafted just for you.',
+	'– oh happy day!',
+	'– enjoy!',
+	'now out. Be the first on your block to download!',
+	'made with love 💕',
+	'[is] out! Our best [version] yet!',
+	'[is] here. DOWNLOAD! DOWNLOAD! DOWNLOAD!',
+	'... HUZZAH!',
+	'[has] landed!',
+	'landed! The internet just got a little more fun.',
+	'– from our family to yours.',
+	'– go forth and build!',
 ];
 const extraVerbs = [
 	'new',
@@ -72,7 +72,7 @@ const plurals = new Map([
 
 function pluralize(text) {
 	return text.replace(/(\[([^\]]+)\])/gm, (_, _full, match) =>
-		plurals.has(match) ? plurals.get(match) : `${match}s`
+		plurals.has(match) ? plurals.get(match) : `${match}s`,
 	);
 }
 
@@ -91,7 +91,7 @@ async function generatePackageMap() {
 			const pkgFile = fileURLToPath(new URL(pkg, packageRoot));
 			const content = await readFile(pkgFile).then((res) => JSON.parse(res.toString()));
 			packageMap.set(content.name, `./packages/${pkg.replace('/package.json', '')}`);
-		})
+		}),
 	);
 }
 
@@ -110,7 +110,7 @@ async function generateMessage() {
 				version,
 				url: new URL(`${p}/CHANGELOG.md#${version.replace(/\./g, '')}`, baseUrl).toString(),
 			};
-		})
+		}),
 	);
 
 	const emoji = item(emojis);
@@ -122,7 +122,7 @@ async function generateMessage() {
 	if (packages.length === 1) {
 		const { name, version, url } = packages[0];
 		message += `${emoji} \`${name}@${version}\` ${singularlize(
-			verb
+			verb,
 		)}\nRead the [release notes →](<${url}>)\n`;
 	} else {
 		message += `${emoji} Some ${descriptor} ${pluralize(verb)}\n\n`;
@@ -141,7 +141,7 @@ async function generateMessage() {
 		message += `\nAlso ${item(extraVerbs)}:`;
 
 		const remainingPackages = packages.filter((p) => p.name !== name);
-		for (const { name, version, url } of remainingPackages) {
+		for (const { name, version, _url } of remainingPackages) {
 			message += `\n• \`${name}@${version}\``;
 		}
 
@@ -159,7 +159,7 @@ async function generateMessage() {
 
 async function run() {
 	const content = await generateMessage();
-	console.log(content);
+	console.info(content);
 	setOutput('DISCORD_MESSAGE', content);
 }
 

.github/scripts/bundle-size.mjs

@@ -1,18 +1,18 @@
-import { build } from 'esbuild';
 import { existsSync } from 'node:fs';
+import { build } from 'esbuild';
 
 const CLIENT_RUNTIME_PATH = 'packages/astro/src/runtime/client/';
 
 function formatBytes(bytes, decimals = 2) {
-    if (bytes === 0) return '0 B';
+	if (bytes === 0) return '0 B';
 
-    const k = 1024;
-    const dm = decimals < 0 ? 0 : decimals;
-    const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+	const k = 1024;
+	const dm = decimals < 0 ? 0 : decimals;
+	const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
+	const i = Math.floor(Math.log(bytes) / Math.log(k));
 
-    return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+	return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
 }
 
 export default async function checkBundleSize({ github, context }) {
@@ -24,7 +24,7 @@ export default async function checkBundleSize({ github, context }) {
 		pull_number: PR_NUM,
 	});
 	const clientRuntimeFiles = files.filter((file) => {
-		return file.filename.startsWith(CLIENT_RUNTIME_PATH) && file.status !== 'removed'
+		return file.filename.startsWith(CLIENT_RUNTIME_PATH) && file.status !== 'removed';
 	});
 	if (clientRuntimeFiles.length === 0) return;
 
@@ -35,17 +35,24 @@ export default async function checkBundleSize({ github, context }) {
 	const output = await bundle(clientRuntimeFiles);
 
 	for (let [filename, { oldSize, newSize, sourceFile }] of Object.entries(output)) {
-		filename = ['idle', 'load', 'media', 'only', 'visible'].includes(filename) ? `client:${filename}` : filename;
-		const prefix = (newSize - oldSize) === 0 ? '' : (newSize - oldSize) > 0 ? '+ ' : '- ';
+		filename = ['idle', 'load', 'media', 'only', 'visible'].includes(filename)
+			? `client:${filename}`
+			: filename;
+		const prefix = newSize - oldSize === 0 ? '' : newSize - oldSize > 0 ? '+ ' : '- ';
 		const change = `${prefix}${formatBytes(newSize - oldSize)}`;
-		table.push(`| [\`${filename}\`](https://github.com/${context.repo.owner}/${context.repo.repo}/tree/${context.payload.pull_request.head.ref}/${sourceFile}) | ${formatBytes(oldSize)} | ${formatBytes(newSize)} | ${change} |`);
+		table.push(
+			`| [\`${filename}\`](https://github.com/${context.repo.owner}/${context.repo.repo}/tree/${context.payload.pull_request.head.ref}/${sourceFile}) | ${formatBytes(oldSize)} | ${formatBytes(newSize)} | ${change} |`,
+		);
 	}
 
 	const { data: comments } = await github.rest.issues.listComments({
 		...context.repo,
-		issue_number: PR_NUM
-	})
-	const comment = comments.find(comment => comment.user.login === 'github-actions[bot]' && comment.body.includes('Bundle Size Check'));
+		issue_number: PR_NUM,
+	});
+	const comment = comments.find(
+		(comment) =>
+			comment.user.login === 'github-actions[bot]' && comment.body.includes('Bundle Size Check'),
+	);
 	const method = comment ? 'updateComment' : 'createComment';
 	const payload = comment ? { comment_id: comment.id } : { issue_number: PR_NUM };
 	await github.rest.issues[method]({
@@ -60,27 +67,36 @@ ${table.join('\n')}`,
 }
 
 async function bundle(files) {
-
 	const { metafile } = await build({
-		entryPoints: [...files.map(({ filename }) => filename), ...files.map(({ filename }) => `main/${filename}`).filter(f => existsSync(f))],
+		entryPoints: [
+			...files.map(({ filename }) => filename),
+			...files.map(({ filename }) => `main/${filename}`).filter((f) => existsSync(f)),
+		],
 		bundle: true,
 		minify: true,
 		sourcemap: false,
 		target: ['es2018'],
 		outdir: 'out',
 		external: ['astro:*', 'aria-query', 'axobject-query'],
 		metafile: true,
-	})
+	});
 
 	return Object.entries(metafile.outputs).reduce((acc, [filename, info]) => {
 		filename = filename.slice('out/'.length);
 		if (filename.startsWith('main/')) {
 			filename = filename.slice('main/'.length).replace(CLIENT_RUNTIME_PATH, '').replace('.js', '');
 			const oldSize = info.bytes;
-			return Object.assign(acc, { [filename]: Object.assign(acc[filename] ?? { oldSize: 0, newSize: 0 }, { oldSize }) });
+			return Object.assign(acc, {
+				[filename]: Object.assign(acc[filename] ?? { oldSize: 0, newSize: 0 }, { oldSize }),
+			});
 		}
 		filename = filename.replace(CLIENT_RUNTIME_PATH, '').replace('.js', '');
 		const newSize = info.bytes;
-		return Object.assign(acc, { [filename]: Object.assign(acc[filename] ?? { oldSize: 0, newSize: 0 }, { newSize, sourceFile: Object.keys(info.inputs).find(src => src.endsWith('.ts')) }) });
+		return Object.assign(acc, {
+			[filename]: Object.assign(acc[filename] ?? { oldSize: 0, newSize: 0 }, {
+				newSize,
+				sourceFile: Object.keys(info.inputs).find((src) => src.endsWith('.ts')),
+			}),
+		});
 	}, {});
 }