astro 4.10.2 → 4.11.0

package/dist/vite-plugin-astro-server/route.js

@@ -21,6 +21,10 @@ function getCustom404Route(manifestData) {
   const route404 = /^\/404\/?$/;
   return manifestData.routes.find((r) => route404.test(r.route));
 }
+function getCustom500Route(manifestData) {
+  const route500 = /^\/500\/?$/;
+  return manifestData.routes.find((r) => route500.test(r.route));
+}
 async function matchRoute(pathname, manifestData, pipeline) {
   const { config, logger, routeCache, serverLike, settings } = pipeline;
   const matches = matchAllRoutes(pathname, manifestData);
@@ -104,11 +108,8 @@ async function handleRoute({
 }) {
   const timeStart = performance.now();
   const { config, loader, logger } = pipeline;
-  if (!matchedRoute && !config.i18n) {
-    if (isLoggedRequest(pathname)) {
-      logger.info(null, req({ url: pathname, method: incomingRequest.method, statusCode: 404 }));
-    }
-    return handle404Response(origin, incomingRequest, incomingResponse);
+  if (!matchedRoute) {
+    throw new Error("No route matched, and default 404 route was not found.");
   }
   let request;
   let renderContext;
@@ -117,97 +118,55 @@ async function handleRoute({
   let route;
   const middleware = (await loadMiddleware(loader)).onRequest;
   const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
-  if (!matchedRoute) {
-    if (config.i18n) {
-      const locales = config.i18n.locales;
-      const pathNameHasLocale = pathname.split("/").filter(Boolean).some((segment) => {
-        let found = false;
-        for (const locale of locales) {
-          if (typeof locale === "string") {
-            if (normalizeTheLocale(locale) === normalizeTheLocale(segment)) {
-              found = true;
-              break;
-            }
-          } else {
-            if (locale.path === segment) {
-              found = true;
-              break;
-            }
-          }
-        }
-        return found;
-      });
-      if (!pathNameHasLocale && pathname !== "/") {
-        return handle404Response(origin, incomingRequest, incomingResponse);
-      }
-    }
-    request = createRequest({
-      base: config.base,
-      url,
-      headers: incomingRequest.headers,
-      logger,
-      // no route found, so we assume the default for rendering the 404 page
-      staticLike: config.output === "static" || config.output === "hybrid"
-    });
-    route = {
-      component: "",
-      generate(_data) {
-        return "";
-      },
-      params: [],
-      // Disable eslint as we only want to generate an empty RegExp
-      // eslint-disable-next-line prefer-regex-literals
-      pattern: new RegExp(""),
-      prerender: false,
-      segments: [],
-      type: "fallback",
-      route: "",
-      fallbackRoutes: [],
-      isIndex: false
-    };
-    renderContext = RenderContext.create({
-      pipeline,
-      pathname,
-      middleware,
-      request,
-      routeData: route
-    });
-  } else {
-    const filePath = matchedRoute.filePath;
-    const { preloadedComponent } = matchedRoute;
-    route = matchedRoute.route;
-    request = createRequest({
-      base: config.base,
-      url,
-      headers: incomingRequest.headers,
-      method: incomingRequest.method,
-      body,
-      logger,
-      clientAddress: incomingRequest.socket.remoteAddress,
-      staticLike: config.output === "static" || route.prerender
-    });
-    for (const [name, value] of Object.entries(config.server.headers ?? {})) {
-      if (value) incomingResponse.setHeader(name, value);
+  const filePath = matchedRoute.filePath;
+  const { preloadedComponent } = matchedRoute;
+  route = matchedRoute.route;
+  request = createRequest({
+    base: config.base,
+    url,
+    headers: incomingRequest.headers,
+    method: incomingRequest.method,
+    body,
+    logger,
+    clientAddress: incomingRequest.socket.remoteAddress,
+    staticLike: config.output === "static" || route.prerender
+  });
+  for (const [name, value] of Object.entries(config.server.headers ?? {})) {
+    if (value) incomingResponse.setHeader(name, value);
+  }
+  options = {
+    pipeline,
+    filePath,
+    preload: preloadedComponent,
+    pathname,
+    request,
+    route
+  };
+  mod = preloadedComponent;
+  const isPrerendered404 = matchedRoute.route.route === "/404" && matchedRoute.route.prerender;
+  renderContext = RenderContext.create({
+    locals,
+    pipeline,
+    pathname,
+    middleware: isPrerendered404 ? void 0 : middleware,
+    request,
+    routeData: route
+  });
+  let response;
+  try {
+    response = await renderContext.render(mod);
+  } catch (err) {
+    const custom500 = getCustom500Route(manifestData);
+    if (!custom500) {
+      throw err;
     }
-    options = {
-      pipeline,
-      filePath,
-      preload: preloadedComponent,
-      pathname,
-      request,
-      route
-    };
-    mod = preloadedComponent;
-    renderContext = RenderContext.create({
-      locals,
-      pipeline,
-      pathname,
-      middleware,
-      request,
-      routeData: route
-    });
+    logger.error("router", err.stack || err.message);
+    const filePath500 = new URL(`./${custom500.component}`, config.root);
+    const preloaded500Component = await pipeline.preload(custom500, filePath500);
+    renderContext.props.error = err;
+    response = await renderContext.render(preloaded500Component);
+    status = 500;
   }
-  let response = await renderContext.render(mod);
   if (isLoggedRequest(pathname)) {
     const timeEnd = performance.now();
     logger.info(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.10.2",
+  "version": "4.11.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -118,7 +118,7 @@
     "@babel/types": "^7.24.7",
     "@types/babel__core": "^7.20.5",
     "@types/cookie": "^0.6.0",
-    "acorn": "^8.11.3",
+    "acorn": "^8.12.0",
     "aria-query": "^5.3.0",
     "axobject-query": "^4.0.0",
     "boxen": "^7.1.1",
@@ -157,20 +157,20 @@
     "rehype": "^13.0.1",
     "resolve": "^1.22.8",
     "semver": "^7.6.2",
-    "shiki": "^1.6.3",
+    "shiki": "^1.6.5",
     "string-width": "^7.1.0",
     "strip-ansi": "^7.1.0",
     "tsconfck": "^3.1.0",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "vite": "^5.2.13",
+    "vite": "^5.3.1",
     "vitefu": "^0.2.5",
     "which-pm": "^2.2.0",
     "yargs-parser": "^21.1.1",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.0",
-    "@astrojs/internal-helpers": "0.4.0",
     "@astrojs/markdown-remark": "5.1.0",
+    "@astrojs/internal-helpers": "0.4.0",
     "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
@@ -204,7 +204,7 @@
     "eol": "^0.9.1",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.1.2",
-    "memfs": "^4.9.2",
+    "memfs": "^4.9.3",
     "node-mocks-http": "^1.14.1",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
@@ -212,8 +212,9 @@
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.18.0",
-    "sass": "^1.77.4",
+    "sass": "^1.77.5",
     "srcset-parse": "^1.1.0",
+    "undici": "^6.19.2",
     "unified": "^11.0.4",
     "astro-scripts": "0.0.14"
   },

package/templates/env/module.mjs

@@ -1,18 +1,27 @@
 import { schema } from 'virtual:astro:env/internal';
-import { createInvalidVariableError, getEnv, validateEnvVariable } from 'astro/env/runtime';
+import {
+	createInvalidVariableError,
+	getEnv,
+	setOnSetGetEnv,
+	validateEnvVariable,
+} from 'astro/env/runtime';
 
 export const getSecret = (key) => {
+	return getEnv(key);
+};
+
+const _internalGetSecret = (key) => {
 	const rawVariable = getEnv(key);
 	const variable = rawVariable === '' ? undefined : rawVariable;
 	const options = schema[key];
 
-	if (!options) {
-		return variable;
-	}
-
 	const result = validateEnvVariable(variable, options);
 	if (result.ok) {
 		return result.value;
 	}
 	throw createInvalidVariableError(key, result.type);
 };
+
+setOnSetGetEnv((reset) => {
+	// @@ON_SET_GET_ENV@@
+});

package/templates/env/types.d.ts

@@ -5,16 +5,5 @@ declare module 'astro:env/client' {
 declare module 'astro:env/server' {
 	// @@SERVER@@
 
-	type SecretValues = {
-		// @@SECRET_VALUES@@
-	};
-
-	type SecretValue = keyof SecretValues;
-
-	type Loose<T> = T | (string & {});
-	type Strictify<T extends string> = T extends `${infer _}` ? T : never;
-
-	export const getSecret: <TKey extends Loose<SecretValue>>(
-		key: TKey
-	) => TKey extends Strictify<SecretValue> ? SecretValues[TKey] : string | undefined;
+	export const getSecret: (key: string) => string | undefined;
 }