astro 4.10.2 → 4.10.3

package/dist/core/routing/astro-designed-error-pages.d.ts

@@ -1,5 +1,6 @@
 import type { ManifestData, RouteData } from '../../@types/astro.js';
 export declare const DEFAULT_404_ROUTE: RouteData;
+export declare const DEFAULT_500_ROUTE: RouteData;
 export declare function ensure404Route(manifest: ManifestData): ManifestData;
 export declare function default404Page({ pathname }: {
     pathname: string;

package/dist/core/routing/astro-designed-error-pages.js

@@ -1,5 +1,5 @@
 import notFoundTemplate from "../../template/4xx.js";
-import { DEFAULT_404_COMPONENT } from "../constants.js";
+import { DEFAULT_404_COMPONENT, DEFAULT_500_COMPONENT } from "../constants.js";
 const DEFAULT_404_ROUTE = {
   component: DEFAULT_404_COMPONENT,
   generate: () => "",
@@ -13,6 +13,19 @@ const DEFAULT_404_ROUTE = {
   fallbackRoutes: [],
   isIndex: false
 };
+const DEFAULT_500_ROUTE = {
+  component: DEFAULT_500_COMPONENT,
+  generate: () => "",
+  params: [],
+  pattern: /\/500/,
+  prerender: false,
+  pathname: "/500",
+  segments: [[{ content: "500", dynamic: false, spread: false }]],
+  type: "page",
+  route: "/500",
+  fallbackRoutes: [],
+  isIndex: false
+};
 function ensure404Route(manifest) {
   if (!manifest.routes.some((route) => route.route === "/404")) {
     manifest.routes.push(DEFAULT_404_ROUTE);
@@ -33,6 +46,7 @@ async function default404Page({ pathname }) {
 default404Page.isAstroComponentFactory = true;
 export {
   DEFAULT_404_ROUTE,
+  DEFAULT_500_ROUTE,
   default404Page,
   ensure404Route
 };

package/dist/core/util.js

@@ -78,8 +78,11 @@ function isInjectedRoute(file, settings) {
   return false;
 }
 function isPublicRoute(file, config) {
-  const pagesDir = resolvePages(config);
-  const parts = file.toString().replace(pagesDir.toString(), "").split("/").slice(1);
+  const rootDir = config.root.toString();
+  const pagesDir = resolvePages(config).toString();
+  const fileDir = file.toString();
+  const normalizedDir = fileDir.startsWith(pagesDir) ? fileDir.slice(pagesDir.length) : fileDir.slice(rootDir.length);
+  const parts = normalizedDir.replace(pagesDir.toString(), "").split("/").slice(1);
   for (const part of parts) {
     if (part.startsWith("_")) return false;
   }

package/dist/env/constants.d.ts

@@ -4,7 +4,6 @@ export declare const VIRTUAL_MODULES_IDS: {
     internal: string;
 };
 export declare const VIRTUAL_MODULES_IDS_VALUES: Set<string>;
-export declare const PUBLIC_PREFIX = "PUBLIC_";
 export declare const ENV_TYPES_FILE = "env.d.ts";
 export declare const MODULE_TEMPLATE_URL: URL;
 export declare const TYPES_TEMPLATE_URL: URL;

package/dist/env/constants.js

@@ -4,7 +4,6 @@ const VIRTUAL_MODULES_IDS = {
   internal: "virtual:astro:env/internal"
 };
 const VIRTUAL_MODULES_IDS_VALUES = new Set(Object.values(VIRTUAL_MODULES_IDS));
-const PUBLIC_PREFIX = "PUBLIC_";
 const ENV_TYPES_FILE = "env.d.ts";
 const PKG_BASE = new URL("../../", import.meta.url);
 const MODULE_TEMPLATE_URL = new URL("templates/env/module.mjs", PKG_BASE);
@@ -12,7 +11,6 @@ const TYPES_TEMPLATE_URL = new URL("templates/env/types.d.ts", PKG_BASE);
 export {
   ENV_TYPES_FILE,
   MODULE_TEMPLATE_URL,
-  PUBLIC_PREFIX,
   TYPES_TEMPLATE_URL,
   VIRTUAL_MODULES_IDS,
   VIRTUAL_MODULES_IDS_VALUES

package/dist/env/runtime.d.ts

@@ -1,6 +1,8 @@
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
 export { validateEnvVariable } from './validators.js';
 export type GetEnv = (key: string) => string | undefined;
-export declare function setGetEnv(fn: GetEnv): void;
+export declare function setGetEnv(fn: GetEnv, reset?: boolean): void;
+declare let _onSetGetEnv: (reset: boolean) => void;
+export declare function setOnSetGetEnv(fn: typeof _onSetGetEnv): void;
 export declare function getEnv(...args: Parameters<GetEnv>): string | undefined;
 export declare function createInvalidVariableError(...args: Parameters<typeof AstroErrorData.EnvInvalidVariable.message>): AstroError;

package/dist/env/runtime.js

@@ -1,8 +1,14 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { validateEnvVariable } from "./validators.js";
 let _getEnv = (key) => process.env[key];
-function setGetEnv(fn) {
+function setGetEnv(fn, reset = false) {
   _getEnv = fn;
+  _onSetGetEnv(reset);
+}
+let _onSetGetEnv = (reset) => {
+};
+function setOnSetGetEnv(fn) {
+  _onSetGetEnv = fn;
 }
 function getEnv(...args) {
   return _getEnv(...args);
@@ -17,5 +23,6 @@ export {
   createInvalidVariableError,
   getEnv,
   setGetEnv,
+  setOnSetGetEnv,
   validateEnvVariable
 };

package/dist/env/schema.d.ts

@@ -220,7 +220,7 @@ declare const EnvFieldMetadata: z.ZodUnion<[z.ZodObject<{
     context: "server";
     access: "secret";
 }>]>;
-export declare const EnvSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodIntersection<z.ZodUnion<[z.ZodObject<{
+export declare const EnvSchema: z.ZodRecord<z.ZodString, z.ZodIntersection<z.ZodUnion<[z.ZodObject<{
     context: z.ZodLiteral<"client">;
     access: z.ZodLiteral<"public">;
 }, "strip", z.ZodTypeAny, {
@@ -344,83 +344,7 @@ export declare const EnvSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodInter
     values: string[];
     default?: string | undefined;
     optional?: boolean | undefined;
-}>]>>>, Record<string, ({
-    context: "client";
-    access: "public";
-} | {
-    context: "server";
-    access: "public";
-} | {
-    context: "server";
-    access: "secret";
-}) & ({
-    type: "string";
-    length?: number | undefined;
-    includes?: string | undefined;
-    endsWith?: string | undefined;
-    startsWith?: string | undefined;
-    default?: string | undefined;
-    url?: boolean | undefined;
-    optional?: boolean | undefined;
-    min?: number | undefined;
-    max?: number | undefined;
-} | {
-    type: "number";
-    default?: number | undefined;
-    optional?: boolean | undefined;
-    min?: number | undefined;
-    max?: number | undefined;
-    gt?: number | undefined;
-    lt?: number | undefined;
-    int?: boolean | undefined;
-} | {
-    type: "boolean";
-    default?: boolean | undefined;
-    optional?: boolean | undefined;
-} | {
-    type: "enum";
-    values: string[];
-    default?: string | undefined;
-    optional?: boolean | undefined;
-})>, Record<string, ({
-    context: "client";
-    access: "public";
-} | {
-    context: "server";
-    access: "public";
-} | {
-    context: "server";
-    access: "secret";
-}) & ({
-    type: "string";
-    length?: number | undefined;
-    includes?: string | undefined;
-    endsWith?: string | undefined;
-    startsWith?: string | undefined;
-    default?: string | undefined;
-    url?: boolean | undefined;
-    optional?: boolean | undefined;
-    min?: number | undefined;
-    max?: number | undefined;
-} | {
-    type: "number";
-    default?: number | undefined;
-    optional?: boolean | undefined;
-    min?: number | undefined;
-    max?: number | undefined;
-    gt?: number | undefined;
-    lt?: number | undefined;
-    int?: boolean | undefined;
-} | {
-    type: "boolean";
-    default?: boolean | undefined;
-    optional?: boolean | undefined;
-} | {
-    type: "enum";
-    values: string[];
-    default?: string | undefined;
-    optional?: boolean | undefined;
-})>>;
+}>]>>>;
 type Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};

package/dist/env/schema.js

@@ -1,5 +1,4 @@
 import { z } from "zod";
-import { PUBLIC_PREFIX } from "./constants.js";
 const StringSchema = z.object({
   type: z.literal("string"),
   optional: z.boolean().optional(),
@@ -76,22 +75,7 @@ const EnvSchema = z.record(
     message: "A valid variable name can only contain uppercase letters and underscores."
   }),
   z.intersection(EnvFieldMetadata, EnvFieldType)
-).superRefine((schema, ctx) => {
-  for (const [key, value] of Object.entries(schema)) {
-    if (key.startsWith(PUBLIC_PREFIX) && value.access !== "public") {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: `An environment variable whose name is prefixed by "${PUBLIC_PREFIX}" must be public.`
-      });
-    }
-    if (value.access === "public" && !key.startsWith(PUBLIC_PREFIX)) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: `An environment variable that is public must have a name prefixed by "${PUBLIC_PREFIX}".`
-      });
-    }
-  }
-});
+);
 export {
   EnvSchema
 };

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/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/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/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.2",
+  "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",
@@ -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,21 +157,21 @@
     "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/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.4",
+    "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;
 }