Merge pull request #127 from withastro/main

a345

.changeset/mean-pugs-nail.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes a case where a warning was logged even when the feature `i18nDomains` wasn't enabled

.changeset/tidy-deers-double.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Load 404.html on all non-existent paths on astro preview.

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/blog/package.json

@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.1.1",
     "@astrojs/rss": "^4.0.4",
     "@astrojs/sitemap": "^3.0.5",
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/component/package.json

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

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.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.0.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "lit": "^3.1.2"
   }
 }

examples/framework-multiple/package.json

@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^4.0.1",
     "@astrojs/svelte": "^5.0.3",
     "@astrojs/vue": "^4.0.8",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/framework-preact/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.1.0",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "preact": "^10.19.2"
   }
 }

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.9",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^4.0.1",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "solid-js": "^1.8.5"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.3",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "svelte": "^4.2.5"
   }
 }

examples/framework-vue/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.8",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "vue": "^3.3.8"
   }
 }

examples/hackernews/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.2.0",
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/integration/package.json

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

examples/middleware/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.2.0",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/ssr/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^8.2.0",
     "@astrojs/svelte": "^5.0.3",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "svelte": "^4.2.5"
   }
 }

examples/starlog/package.json

@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "sass": "^1.69.5",
     "sharp": "^0.32.6"
   }

examples/view-transitions/package.json

@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.1.0",
     "@astrojs/node": "^8.2.0",
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/with-markdoc/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.8.3",
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.2.1",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",

examples/with-markdown-shiki/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.3.0"
+    "astro": "^4.3.1"
   }
 }

examples/with-mdx/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.1.1",
     "@astrojs/preact": "^3.1.0",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "preact": "^10.19.2"
   }
 }

examples/with-nanostores/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.1.0",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }

examples/with-tailwindcss/package.json

@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^2.1.1",
     "@astrojs/tailwind": "^5.1.0",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",

examples/with-vitest/package.json

@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.3.0",
+    "astro": "^4.3.1",
     "vitest": "^1.2.1"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,19 @@
 # astro
 
+## 4.3.1
+
+### Patch Changes
+
+- [#9841](https://github.com/withastro/astro/pull/9841) [`27ea080e24e2c5cdc59b63b1dfe0a83a0c696597`](https://github.com/withastro/astro/commit/27ea080e24e2c5cdc59b63b1dfe0a83a0c696597) Thanks [@kristianbinau](https://github.com/kristianbinau)! - Makes the warning clearer when having a custom `base` and requesting a public URL without it
+
+- [#9888](https://github.com/withastro/astro/pull/9888) [`9d2fdb293d6a7323e10126cebad18ef9a2ea2800`](https://github.com/withastro/astro/commit/9d2fdb293d6a7323e10126cebad18ef9a2ea2800) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Improves error handling logic for the `astro sync` command.
+
+- [#9918](https://github.com/withastro/astro/pull/9918) [`d52529e09450c84933dd15d6481edb32269f537b`](https://github.com/withastro/astro/commit/d52529e09450c84933dd15d6481edb32269f537b) Thanks [@LarryIVC](https://github.com/LarryIVC)! - Adds the `name` attribute to the `<details>` tag type
+
+- [#9938](https://github.com/withastro/astro/pull/9938) [`1568afb78a163db63a4cde146dec87785a83db1d`](https://github.com/withastro/astro/commit/1568afb78a163db63a4cde146dec87785a83db1d) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes a regression where middleware did not run for prerendered pages and endpoints.
+
+- [#9931](https://github.com/withastro/astro/pull/9931) [`44674418965d658733d3602668a9354e18f8ef89`](https://github.com/withastro/astro/commit/44674418965d658733d3602668a9354e18f8ef89) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes a regression where a response created with `Response.redirect` or containing `null` as the body never completed in node-based adapters.
+
 ## 4.3.0
 
 ### Minor Changes

packages/astro/astro.js

@@ -20,8 +20,8 @@ async function main() {
 	const version = process.versions.node;
 	// Fast-path for higher Node.js versions
 	if ((parseInt(version) || 0) <= skipSemverCheckIfAbove) {
+		const semver = await import('semver');
 		try {
-			const semver = await import('semver');
 			if (!semver.satisfies(version, engines)) {
 				await errorNodeUnsupported();
 				return;

packages/astro/package.json

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

packages/astro/src/@types/astro.ts

@@ -206,7 +206,7 @@ export interface AstroGlobal<
 	 * const { name } = Astro.props
 	 * ```
 	 *
-	 * [Astro reference](https://docs.astro.build/en/core-concepts/astro-components/#component-props)
+	 * [Astro reference](https://docs.astro.build/en/basics/astro-components/#component-props)
 	 */
 	props: AstroSharedContext<Props, Params>['props'];
 	/** Information about the current request. This is a standard [Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object
@@ -1684,7 +1684,7 @@ export interface AstroUserConfig {
 		 * @version 4.2.0
 		 * @description
 		 *
-		 * Prioritizes redirects and injected routes equally alongside file-based project routes, following the same [route priority order rules](https://docs.astro.build/en/core-concepts/routing/#route-priority-order) for all routes.
+		 * Prioritizes redirects and injected routes equally alongside file-based project routes, following the same [route priority order rules](https://docs.astro.build/en/guides/routing/#route-priority-order) for all routes.
 		 *
 		 * This allows more control over routing in your project by not automatically prioritizing certain types of routes, and standardizes the route priority ordering for all routes.
 		 *
@@ -2023,7 +2023,7 @@ export type GetStaticPathsResultKeyed = GetStaticPathsResult & {
 };
 
 /**
- * Return an array of pages to generate for a [dynamic route](https://docs.astro.build/en/core-concepts/routing/#dynamic-routes). (**SSG Only**)
+ * Return an array of pages to generate for a [dynamic route](https://docs.astro.build/en/guides/routing/#dynamic-routes). (**SSG Only**)
  *
  * [Astro Reference](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
  */

packages/astro/src/core/app/node.ts

@@ -98,31 +98,30 @@ export class NodeApp extends App {
 	static async writeResponse(source: Response, destination: ServerResponse) {
 		const { status, headers, body } = source;
 		destination.writeHead(status, createOutgoingHttpHeaders(headers));
-		if (body) {
-			try {
-				const reader = body.getReader();
-				destination.on('close', () => {
-					// Cancelling the reader may reject not just because of
-					// an error in the ReadableStream's cancel callback, but
-					// also because of an error anywhere in the stream.
-					reader.cancel().catch((err) => {
-						// eslint-disable-next-line no-console
-						console.error(
-							`There was an uncaught error in the middle of the stream while rendering ${destination.req.url}.`,
-							err
-						);
-					});
+		if (!body) return destination.end();
+		try {
+			const reader = body.getReader();
+			destination.on('close', () => {
+				// Cancelling the reader may reject not just because of
+				// an error in the ReadableStream's cancel callback, but
+				// also because of an error anywhere in the stream.
+				reader.cancel().catch((err) => {
+					// eslint-disable-next-line no-console
+					console.error(
+						`There was an uncaught error in the middle of the stream while rendering ${destination.req.url}.`,
+						err
+					);
 				});
-				let result = await reader.read();
-				while (!result.done) {
-					destination.write(result.value);
-					result = await reader.read();
-				}
-				destination.end();
-				// the error will be logged by the "on end" callback above
-			} catch {
-				destination.end('Internal server error');
+			});
+			let result = await reader.read();
+			while (!result.done) {
+				destination.write(result.value);
+				result = await reader.read();
 			}
+			destination.end();
+			// the error will be logged by the "on end" callback above
+		} catch {
+			destination.end('Internal server error');
 		}
 	}
 }

packages/astro/src/core/build/buildPipeline.ts

@@ -125,6 +125,13 @@ export class BuildPipeline extends Pipeline {
 
 		const renderersEntryUrl = new URL(`renderers.mjs?time=${Date.now()}`, baseDirectory);
 		const renderers = await import(renderersEntryUrl.toString());
+
+		const middleware = await import(new URL('middleware.mjs', baseDirectory).toString())
+			.then((mod) => mod.onRequest)
+			// middleware.mjs is not emitted if there is no user middleware
+			// in which case the import fails with ERR_MODULE_NOT_FOUND, and we fall back to a no-op middleware
+			.catch(() => manifest.middleware);
+
 		if (!renderers) {
 			throw new Error(
 				"Astro couldn't find the emitted renderers. This is an internal error, please file an issue."
@@ -133,6 +140,7 @@ export class BuildPipeline extends Pipeline {
 		return {
 			...manifest,
 			renderers: renderers.renderers as SSRLoadedRenderer[],
+			middleware,
 		};
 	}