astro 4.10.1 → 4.10.3

package/dist/env/validators.js

@@ -1,17 +1,66 @@
 function getEnvFieldType(options) {
   const optional = options.optional ? options.default !== void 0 ? false : true : false;
-  return `${options.type}${optional ? " | undefined" : ""}`;
+  let type;
+  if (options.type === "enum") {
+    type = options.values.map((v) => `'${v}'`).join(" | ");
+  } else {
+    type = options.type;
+  }
+  return `${type}${optional ? " | undefined" : ""}`;
 }
-const stringValidator = (input) => {
+const stringValidator = ({ max, min, length, url, includes, startsWith, endsWith }) => (input) => {
+  let valid = typeof input === "string";
+  if (valid && max !== void 0) {
+    valid = input.length <= max;
+  }
+  if (valid && min !== void 0) {
+    valid = input.length >= min;
+  }
+  if (valid && length !== void 0) {
+    valid = input.length === length;
+  }
+  if (valid && url !== void 0) {
+    try {
+      new URL(input);
+    } catch (_) {
+      valid = false;
+    }
+  }
+  if (valid && includes !== void 0) {
+    valid = input.includes(includes);
+  }
+  if (valid && startsWith !== void 0) {
+    valid = input.startsWith(startsWith);
+  }
+  if (valid && endsWith !== void 0) {
+    valid = input.endsWith(endsWith);
+  }
   return {
-    valid: typeof input === "string",
+    valid,
     parsed: input
   };
 };
-const numberValidator = (input) => {
+const numberValidator = ({ gt, min, lt, max, int }) => (input) => {
   const num = parseFloat(input ?? "");
+  let valid = !isNaN(num);
+  if (valid && gt !== void 0) {
+    valid = num > gt;
+  }
+  if (valid && min !== void 0) {
+    valid = num >= min;
+  }
+  if (valid && lt !== void 0) {
+    valid = num < lt;
+  }
+  if (valid && max !== void 0) {
+    valid = num <= max;
+  }
+  if (valid && int !== void 0) {
+    const isInt = Number.isInteger(num);
+    valid = int ? isInt : !isInt;
+  }
   return {
-    valid: !isNaN(num),
+    valid,
     parsed: num
   };
 };
@@ -22,12 +71,26 @@ const booleanValidator = (input) => {
     parsed: bool
   };
 };
+const enumValidator = ({ values }) => (input) => {
+  return {
+    valid: typeof input === "string" ? values.includes(input) : false,
+    parsed: input
+  };
+};
+function selectValidator(options) {
+  switch (options.type) {
+    case "string":
+      return stringValidator(options);
+    case "number":
+      return numberValidator(options);
+    case "boolean":
+      return booleanValidator;
+    case "enum":
+      return enumValidator(options);
+  }
+}
 function validateEnvVariable(value, options) {
-  const validator = {
-    string: stringValidator,
-    number: numberValidator,
-    boolean: booleanValidator
-  }[options.type];
+  const validator = selectValidator(options);
   const type = getEnvFieldType(options);
   if (options.optional || options.default !== void 0) {
     if (value === void 0) {

package/dist/env/vite-plugin-env.js

@@ -46,9 +46,8 @@ function astroEnv({
         fs,
         content: getDts({
           fs,
-          clientPublic: clientTemplates.types,
-          serverPublic: serverTemplates.types.public,
-          serverSecret: serverTemplates.types.secret
+          client: clientTemplates.types,
+          server: serverTemplates.types
         })
       });
     },
@@ -119,13 +118,12 @@ function validatePublicVariables({
   return valid;
 }
 function getDts({
-  clientPublic,
-  serverPublic,
-  serverSecret,
+  client,
+  server,
   fs
 }) {
   const template = fs.readFileSync(TYPES_TEMPLATE_URL, "utf-8");
-  return template.replace("// @@CLIENT@@", clientPublic).replace("// @@SERVER@@", serverPublic).replace("// @@SECRET_VALUES@@", serverSecret);
+  return template.replace("// @@CLIENT@@", client).replace("// @@SERVER@@", server);
 }
 function getClientTemplates({
   validatedVariables
@@ -148,26 +146,28 @@ function getServerTemplates({
   fs
 }) {
   let module = fs.readFileSync(MODULE_TEMPLATE_URL, "utf-8");
-  let publicTypes = "";
-  let secretTypes = "";
+  let types = "";
+  let onSetGetEnv = "";
   for (const { key, type, value } of validatedVariables.filter((e) => e.context === "server")) {
     module += `export const ${key} = ${JSON.stringify(value)};`;
-    publicTypes += `export const ${key}: ${type};	
+    types += `export const ${key}: ${type};	
 `;
   }
   for (const [key, options] of Object.entries(schema)) {
     if (!(options.context === "server" && options.access === "secret")) {
       continue;
     }
-    secretTypes += `${key}: ${getEnvFieldType(options)};		
+    types += `export const ${key}: ${getEnvFieldType(options)};		
+`;
+    module += `export let ${key} = _internalGetSecret(${JSON.stringify(key)});
+`;
+    onSetGetEnv += `${key} = reset ? undefined : _internalGetSecret(${JSON.stringify(key)});
 `;
   }
+  module = module.replace("// @@ON_SET_GET_ENV@@", onSetGetEnv);
   return {
     module,
-    types: {
-      public: publicTypes,
-      secret: secretTypes
-    }
+    types
   };
 }
 export {

package/dist/i18n/index.d.ts

@@ -60,7 +60,7 @@ export declare function getLocaleAbsoluteUrlList(params: GetLocalesAbsoluteUrlLi
  */
 export declare function getPathByLocale(locale: string, locales: Locales): string;
 /**
- * An utility function that retrieves the preferred locale that correspond to a path.
+ * A utility function that retrieves the preferred locale that correspond to a path.
  *
  * @param path
  * @param locales

package/dist/i18n/index.js

@@ -1,7 +1,7 @@
 import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { REROUTE_DIRECTIVE_HEADER } from "../core/constants.js";
-import { MissingLocale } from "../core/errors/errors-data.js";
+import { MissingLocale, i18nNoLocaleFoundInPath } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
 import { createI18nMiddleware } from "./middleware.js";
 function requestHasLocale(locales) {
@@ -110,21 +110,21 @@ function getPathByLocale(locale, locales) {
       }
     }
   }
-  throw new Unreachable();
+  throw new AstroError(i18nNoLocaleFoundInPath);
 }
 function getLocaleByPath(path, locales) {
   for (const locale of locales) {
     if (typeof locale !== "string") {
       if (locale.path === path) {
         const code = locale.codes.at(0);
-        if (code === void 0) throw new Unreachable();
+        if (code === void 0) throw new AstroError(i18nNoLocaleFoundInPath);
         return code;
       }
     } else if (locale === path) {
       return locale;
     }
   }
-  throw new Unreachable();
+  throw new AstroError(i18nNoLocaleFoundInPath);
 }
 function normalizeTheLocale(locale) {
   return locale.replaceAll("_", "-").toLowerCase();
@@ -163,13 +163,6 @@ function peekCodePathToUse(locales, locale) {
   }
   return void 0;
 }
-class Unreachable extends Error {
-  constructor() {
-    super(
-      "Astro encountered an unexpected line of code.\nIn most cases, this is not your fault, but a bug in astro code.\nIf there isn't one already, please create an issue.\nhttps://astro.build/issues"
-    );
-  }
-}
 function redirectToDefaultLocale({
   trailingSlash,
   format,

package/dist/jsx/server.d.ts

@@ -1,3 +1,4 @@
+import type { NamedSSRLoadedRendererValue } from '../@types/astro.js';
 export declare function check(Component: any, props: any, { default: children, ...slotted }?: {
     default?: null | undefined;
 }): Promise<any>;
@@ -6,8 +7,5 @@ export declare function renderToStaticMarkup(this: any, Component: any, props?:
 }): Promise<{
     html: any;
 }>;
-declare const _default: {
-    check: typeof check;
-    renderToStaticMarkup: typeof renderToStaticMarkup;
-};
-export default _default;
+declare const renderer: NamedSSRLoadedRendererValue;
+export default renderer;

package/dist/jsx/server.js

@@ -44,10 +44,12 @@ function throwEnhancedErrorIfMdxComponent(error, Component) {
     });
   }
 }
-var server_default = {
+const renderer = {
+  name: "astro:jsx",
   check,
   renderToStaticMarkup
 };
+var server_default = renderer;
 export {
   check,
   server_default as default,

package/dist/runtime/server/render/astro/render.js

@@ -150,6 +150,9 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       if (result.cancelled) return { done: true, value: void 0 };
       if (next !== null) {
         await next.promise;
+      } else if (!renderingComplete && !buffer.length) {
+        next = promiseWithResolvers();
+        await next.promise;
       }
       if (!renderingComplete) {
         next = promiseWithResolvers();
@@ -170,8 +173,9 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       }
       buffer.length = 0;
       const returnValue = {
-        // The iterator is done if there are no chunks to return.
-        done: length === 0,
+        // The iterator is done when rendering has finished
+        // and there are no more chunks to return.
+        done: length === 0 && renderingComplete,
         value: mergedArray
       };
       return returnValue;
@@ -197,6 +201,8 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       if (bytes.length > 0) {
         buffer.push(bytes);
         next?.resolve();
+      } else if (buffer.length > 0) {
+        next?.resolve();
       }
     }
   };

package/dist/vite-plugin-astro/index.js

@@ -148,7 +148,7 @@ File: ${id}`
     },
     async transform(source, id) {
       const parsedId = parseAstroRequest(id);
-      if (!id.endsWith(".astro") || parsedId.query.astro) {
+      if (!parsedId.filename.endsWith(".astro") || parsedId.query.astro) {
         return;
       }
       const filename = normalizePath(parsedId.filename);

package/dist/vite-plugin-astro-server/pipeline.d.ts

@@ -19,7 +19,7 @@ export declare class DevPipeline extends Pipeline {
     preload(routeData: RouteData, filePath: URL): Promise<ComponentInstance>;
     clearRouteCache(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     setManifestData(manifestData: ManifestData): void;
     rewriteKnownRoute(route: string, sourceRoute: RouteData): ComponentInstance;
 }

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

@@ -138,8 +138,8 @@ class DevPipeline extends Pipeline {
     if (!this.manifestData) {
       throw new Error("Missing manifest data. This is an internal error, please file an issue.");
     }
+    let finalUrl = void 0;
     for (const route of this.manifestData.routes) {
-      let finalUrl = void 0;
       if (payload instanceof URL) {
         finalUrl = payload;
       } else if (payload instanceof Request) {
@@ -155,13 +155,13 @@ class DevPipeline extends Pipeline {
         break;
       }
     }
-    if (foundRoute) {
+    if (foundRoute && finalUrl) {
       if (foundRoute.pathname === "/404") {
         const componentInstance = this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance];
+        return [foundRoute, componentInstance, finalUrl];
       } else {
         const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance];
+        return [foundRoute, componentInstance, finalUrl];
       }
     } else {
       throw new AstroError({

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

@@ -1,4 +1,4 @@
-import { collapseDuplicateSlashes, removeTrailingForwardSlash } from "../core/path.js";
+import { removeTrailingForwardSlash } from "../core/path.js";
 import { runWithErrorHandling } from "./controller.js";
 import { recordServerError } from "./error.js";
 import { handle500Response } from "./response.js";
@@ -12,7 +12,7 @@ async function handleRequest({
 }) {
   const { config, loader } = pipeline;
   const origin = `${loader.isHttps() ? "https" : "http"}://${incomingRequest.headers.host}`;
-  const url = new URL(collapseDuplicateSlashes(origin + incomingRequest.url));
+  const url = new URL(origin + incomingRequest.url);
   let pathname;
   if (config.trailingSlash === "never" && !incomingRequest.url) {
     pathname = "";

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);
@@ -207,7 +211,20 @@ async function handleRoute({
       routeData: route
     });
   }
-  let response = await renderContext.render(mod);
+  let response;
+  try {
+    response = await renderContext.render(mod);
+  } catch (err) {
+    const custom500 = getCustom500Route(manifestData);
+    if (!custom500) {
+      throw err;
+    }
+    logger.error("router", err.stack || err.message);
+    const filePath = new URL(`./${custom500.component}`, config.root);
+    const preloadedComponent = await pipeline.preload(custom500, filePath);
+    response = await renderContext.render(preloadedComponent);
+    status = 500;
+  }
   if (isLoggedRequest(pathname)) {
     const timeEnd = performance.now();
     logger.info(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.10.1",
+  "version": "4.10.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -110,15 +110,15 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^2.8.0",
-    "@babel/core": "^7.24.6",
-    "@babel/generator": "^7.24.6",
-    "@babel/parser": "^7.24.6",
-    "@babel/plugin-transform-react-jsx": "^7.24.6",
-    "@babel/traverse": "^7.24.6",
-    "@babel/types": "^7.24.6",
+    "@babel/core": "^7.24.7",
+    "@babel/generator": "^7.24.7",
+    "@babel/parser": "^7.24.7",
+    "@babel/plugin-transform-react-jsx": "^7.24.7",
+    "@babel/traverse": "^7.24.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",
@@ -128,14 +128,14 @@
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.6.0",
     "cssesc": "^3.0.0",
-    "debug": "^4.3.4",
+    "debug": "^4.3.5",
     "deterministic-object-hash": "^2.0.2",
     "devalue": "^5.0.0",
     "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.3",
     "es-module-lexer": "^1.5.3",
-    "esbuild": "^0.21.4",
+    "esbuild": "^0.21.5",
     "estree-walker": "^3.0.3",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
@@ -157,21 +157,21 @@
     "rehype": "^13.0.1",
     "resolve": "^1.22.8",
     "semver": "^7.6.2",
-    "shiki": "^1.6.1",
+    "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.12",
+    "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/telemetry": "3.1.0"
+    "@astrojs/telemetry": "3.1.0",
+    "@astrojs/markdown-remark": "5.1.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -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,7 +212,7 @@
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.18.0",
-    "sass": "^1.77.3",
+    "sass": "^1.77.5",
     "srcset-parse": "^1.1.0",
     "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;
 }