Merge branch 'main' into main

examples/basics/package.json

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

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.1"
+    "astro": "^4.3.2"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.3.1"
+    "astro": "^4.3.2"
   },
   "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.1"
+    "astro": "^4.3.2"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.0.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.3.1",
+    "astro": "^4.3.2",
     "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.1",
+    "astro": "^4.3.2",
     "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.1",
+    "astro": "^4.3.2",
     "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.1",
+    "astro": "^4.3.2",
     "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.1",
+    "astro": "^4.3.2",
     "solid-js": "^1.8.5"
   }
 }

examples/framework-svelte/package.json

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

examples/framework-vue/package.json

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

examples/hackernews/package.json

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

examples/integration/package.json

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

examples/middleware/package.json

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

examples/minimal/package.json

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

examples/non-html-pages/package.json

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

examples/portfolio/package.json

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

examples/ssr/package.json

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

examples/starlog/package.json

@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.3.1",
+    "astro": "^4.3.2",
     "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.1"
+    "astro": "^4.3.2"
   }
 }

examples/with-markdoc/package.json

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

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.2.1",
-    "astro": "^4.3.1",
+    "astro": "^4.3.2",
     "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.1"
+    "astro": "^4.3.2"
   }
 }

examples/with-mdx/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.1.1",
     "@astrojs/preact": "^3.1.0",
-    "astro": "^4.3.1",
+    "astro": "^4.3.2",
     "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.1",
+    "astro": "^4.3.2",
     "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.1",
+    "astro": "^4.3.2",
     "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.1",
+    "astro": "^4.3.2",
     "vitest": "^1.2.1"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,13 @@
 # astro
 
+## 4.3.2
+
+### Patch Changes
+
+- [#9932](https://github.com/withastro/astro/pull/9932) [`9f0d89fa7e9e7c08c8600b0c49c2cce7489a7582`](https://github.com/withastro/astro/commit/9f0d89fa7e9e7c08c8600b0c49c2cce7489a7582) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a case where a warning was logged even when the feature `i18nDomains` wasn't enabled
+
+- [#9907](https://github.com/withastro/astro/pull/9907) [`6c894af5ab79f290f4ff7feb68617a66e91febc1`](https://github.com/withastro/astro/commit/6c894af5ab79f290f4ff7feb68617a66e91febc1) Thanks [@ktym4a](https://github.com/ktym4a)! - Load 404.html on all non-existent paths on astro preview.
+
 ## 4.3.1
 
 ### Patch Changes

packages/astro/package.json

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

packages/astro/src/core/preview/vite-plugin-astro-preview.ts

@@ -12,6 +12,18 @@ const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
 export function vitePluginAstroPreview(settings: AstroSettings): Plugin {
 	const { base, outDir, trailingSlash } = settings.config;
 
+	function handle404(req: IncomingMessage, res: ServerResponse) {
+		const errorPagePath = fileURLToPath(outDir + '/404.html');
+		if (fs.existsSync(errorPagePath)) {
+			res.statusCode = 404;
+			res.setHeader('Content-Type', 'text/html;charset=utf-8');
+			res.end(fs.readFileSync(errorPagePath));
+		} else {
+			res.statusCode = 404;
+			res.end(notFoundTemplate(req.url!, 'Not Found'));
+		}
+	}
+
 	return {
 		name: 'astro:preview',
 		apply: 'serve',
@@ -48,6 +60,14 @@ export function vitePluginAstroPreview(settings: AstroSettings): Plugin {
 					}
 				}
 
+				// TODO: look into why the replacement needs to happen here
+				for (const middleware of server.middlewares.stack) {
+					// This hardcoded name will not break between Vite versions
+					if ((middleware.handle as Connect.HandleFunction).name === 'vite404Middleware') {
+						middleware.handle = handle404;
+					}
+				}
+
 				next();
 			});
 
@@ -77,25 +97,6 @@ export function vitePluginAstroPreview(settings: AstroSettings): Plugin {
 
 					next();
 				});
-
-				// Vite has its own 404 middleware, we replace it with ours instead.
-				for (const middleware of server.middlewares.stack) {
-					// This hardcoded name will not break between Vite versions
-					if ((middleware.handle as Connect.HandleFunction).name === 'vite404Middleware') {
-						// Fallback to 404 page if it exists
-						middleware.handle = (req: IncomingMessage, res: ServerResponse) => {
-							const errorPagePath = fileURLToPath(outDir + '/404.html');
-							if (fs.existsSync(errorPagePath)) {
-								res.statusCode = 404;
-								res.setHeader('Content-Type', 'text/html;charset=utf-8');
-								res.end(fs.readFileSync(errorPagePath));
-							} else {
-								res.statusCode = 404;
-								res.end(notFoundTemplate(req.url!, 'Not Found'));
-							}
-						};
-					}
-				}
 			};
 		},
 	};

packages/astro/src/integrations/astroFeaturesValidation.ts

@@ -70,7 +70,7 @@ export function validateSupportedFeatures(
 	);
 	validationResult.assets = validateAssetsFeature(assets, adapterName, config, logger);
 
-	if (i18nDomains) {
+	if (i18nDomains && config?.experimental?.i18nDomains === true && !config.i18n?.domains) {
 		validationResult.i18nDomains = validateSupportKind(
 			i18nDomains,
 			adapterName,

packages/astro/test/dev-routing.test.js

@@ -22,6 +22,16 @@ describe('Development Routing', () => {
 			expect(response.status).to.equal(200);
 		});
 
+		it('200 when loading non-UTF-8 file name', async () => {
+			const response = await fixture.fetch('/テスト');
+			expect(response.status).to.equal(200);
+		});
+
+		it('200 when loading include space file name', async () => {
+			const response = await fixture.fetch('/te st');
+			expect(response.status).to.equal(200);
+		});
+
 		it('200 when adding search params', async () => {
 			const response = await fixture.fetch('/?foo=bar');
 			expect(response.status).to.equal(200);
@@ -315,6 +325,26 @@ describe('Development Routing', () => {
 			expect(response.status).to.equal(200);
 		});
 
+		it('200 when loading /テスト.html', async () => {
+			const response = await fixture.fetch('/テスト.html');
+			expect(response.status).to.equal(200);
+		});
+
+		it('200 when loading /テスト', async () => {
+			const response = await fixture.fetch('/テスト');
+			expect(response.status).to.equal(200);
+		});
+
+		it('200 when loading /te st.html', async () => {
+			const response = await fixture.fetch('/te st.html');
+			expect(response.status).to.equal(200);
+		});
+
+		it('200 when loading /te st', async () => {
+			const response = await fixture.fetch('/te st');
+			expect(response.status).to.equal(200);
+		});
+
 		it('200 when loading /another.html', async () => {
 			const response = await fixture.fetch('/another.html');
 			expect(response.status).to.equal(200);

packages/astro/test/fixtures/without-site-config/src/pages/te st.astro

@@ -0,0 +1 @@
+<div>testing</div>

packages/astro/test/fixtures/without-site-config/src/pages/テスト.astro

@@ -0,0 +1 @@
+<div>testing</div>