astro 5.0.3 → 5.0.4

package/dist/container/index.js

@@ -36,7 +36,6 @@ function createManifest(manifest, renderers, middleware) {
     i18n: manifest?.i18n,
     checkOrigin: false,
     middleware: manifest?.middleware ?? middlewareInstance,
-    envGetSecretEnabled: false,
     key: createKey()
   };
 }

package/dist/content/content-layer.js

@@ -114,7 +114,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "5.0.3") {
+    if (previousAstroVersion !== "5.0.4") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -122,8 +122,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.0.3") {
-      await this.#store.metaStore().set("astro-version", "5.0.3");
+    if ("5.0.4") {
+      await this.#store.metaStore().set("astro-version", "5.0.4");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/content/vite-plugin-content-assets.js

@@ -26,7 +26,7 @@ function astroContentAssetPropagationPlugin({
         const params = new URLSearchParams(query);
         const importerParam = params.get("importer");
         const importerPath = importerParam ? fileURLToPath(new URL(importerParam, settings.config.root)) : importer;
-        const resolved = this.resolve(base, importerPath, { skipSelf: true, ...opts });
+        const resolved = await this.resolve(base, importerPath, { skipSelf: true, ...opts });
         if (!resolved) {
           throw new AstroError({
             ...AstroErrorData.ImageNotFound,

package/dist/core/app/index.js

@@ -173,7 +173,6 @@ class App {
         this.#logger.error(null, error.stack);
         return this.#renderError(request, { status: 500, error, clientAddress });
       }
-      Reflect.set(request, clientLocalsSymbol, locals);
     }
     if (!routeData) {
       routeData = this.match(request);

package/dist/core/app/types.d.ts

@@ -59,7 +59,6 @@ export type SSRManifest = {
     i18n: SSRManifestI18n | undefined;
     middleware?: () => Promise<AstroMiddlewareInstance> | AstroMiddlewareInstance;
     checkOrigin: boolean;
-    envGetSecretEnabled: boolean;
 };
 export type SSRManifestI18n = {
     fallback: Record<string, string> | undefined;

package/dist/core/base-pipeline.js

@@ -1,8 +1,5 @@
-import { setGetEnv } from "../env/runtime.js";
 import { createI18nMiddleware } from "../i18n/middleware.js";
 import { createOriginCheckMiddleware } from "./app/middlewares.js";
-import { AstroError } from "./errors/errors.js";
-import { AstroErrorData } from "./errors/index.js";
 import { NOOP_MIDDLEWARE_FN } from "./middleware/noop-middleware.js";
 import { sequence } from "./middleware/sequence.js";
 import { RouteCache } from "./render/route-cache.js";

package/dist/core/build/generate.js

@@ -389,8 +389,7 @@ function createBuildManifest(settings, internals, renderers, middleware, key) {
       };
     },
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
-    key,
-    envGetSecretEnabled: false
+    key
   };
 }
 export {

package/dist/core/build/plugins/plugin-manifest.js

@@ -208,8 +208,7 @@ function buildManifest(opts, internals, staticFiles, encodedKey) {
     buildFormat: settings.config.build.format,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
     serverIslandNameMap: Array.from(settings.serverIslandNameMap),
-    key: encodedKey,
-    envGetSecretEnabled: (unwrapSupportKind(settings.adapter?.supportedAstroFeatures.envGetSecret) ?? "unsupported") !== "unsupported"
+    key: encodedKey
   };
 }
 export {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.0.3";
+const ASTRO_VERSION = "5.0.4";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/create-vite.js

@@ -12,6 +12,7 @@ import {
   astroContentImportPlugin,
   astroContentVirtualModPlugin
 } from "../content/index.js";
+import { createEnvLoader } from "../env/env-loader.js";
 import { astroEnv } from "../env/vite-plugin-env.js";
 import astroInternationalization from "../i18n/vite-plugin-i18n.js";
 import astroPrefetch from "../prefetch/vite-plugin-prefetch.js";
@@ -83,6 +84,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     }
   });
   const srcDirPattern = glob.convertPathToPattern(fileURLToPath(settings.config.srcDir));
+  const envLoader = createEnvLoader();
   const commonConfig = {
     // Tell Vite not to combine config from vite.config.js with our provided inline config
     configFile: false,
@@ -107,8 +109,8 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       // the build to run very slow as the filewatcher is triggered often.
       command === "dev" && vitePluginAstroServer({ settings, logger, fs, manifest, ssrManifest }),
       // ssrManifest is only required in dev mode, where it gets created before a Vite instance is created, and get passed to this function
-      envVitePlugin({ settings }),
-      astroEnv({ settings, mode, sync }),
+      envVitePlugin({ envLoader }),
+      astroEnv({ settings, mode, sync, envLoader }),
       markdownVitePlugin({ settings, logger }),
       htmlVitePlugin(),
       astroPostprocessVitePlugin(),

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.0.3";
+  const currentVersion = "5.0.4";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/errors-data.d.ts

@@ -856,7 +856,7 @@ export declare const AstroGlobNoMatch: {
 /**
  * @docs
  * @see
- * - [Astro.redirect](https://docs.astro.build/en/reference/api-reference/#astroredirect)
+ * - [Astro.redirect](https://docs.astro.build/en/reference/api-reference/#redirect)
  * @description
  * A redirect must be given a location with the `Location` header.
  */

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.0.3";
+  const version = "5.0.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.0.3"}`
+        `v${"5.0.4"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/index.d.ts

@@ -22,11 +22,15 @@ export type CreateContext = {
      * User defined default locale
      */
     defaultLocale: string;
+    /**
+     * Initial value of the locals
+     */
+    locals: App.Locals;
 };
 /**
  * Creates a context to be passed to Astro middleware `onRequest` function.
  */
-declare function createContext({ request, params, userDefinedLocales, defaultLocale, }: CreateContext): APIContext;
+declare function createContext({ request, params, userDefinedLocales, defaultLocale, locals, }: CreateContext): APIContext;
 /**
  * It attempts to serialize `value` and return it as a string.
  *

package/dist/core/middleware/index.js

@@ -17,7 +17,8 @@ function createContext({
   request,
   params = {},
   userDefinedLocales = [],
-  defaultLocale = ""
+  defaultLocale = "",
+  locals
 }) {
   let preferredLocale = void 0;
   let preferredLocaleList = void 0;
@@ -70,15 +71,14 @@ function createContext({
       return clientIpAddress;
     },
     get locals() {
-      let locals = Reflect.get(request, clientLocalsSymbol);
+      let _locals = locals ?? Reflect.get(request, clientLocalsSymbol);
       if (locals === void 0) {
-        locals = {};
-        Reflect.set(request, clientLocalsSymbol, locals);
+        _locals = {};
       }
-      if (typeof locals !== "object") {
+      if (typeof _locals !== "object") {
         throw new AstroError(AstroErrorData.LocalsNotAnObject);
       }
-      return locals;
+      return _locals;
     },
     set locals(_) {
       throw new AstroError(AstroErrorData.LocalsReassigned);

package/dist/core/request.d.ts

@@ -27,5 +27,5 @@ export interface CreateRequestOptions {
  *
  * This is used by the static build to create fake requests for prerendering, and by the dev server to convert node requests into the standard request object.
  */
-export declare function createRequest({ url, headers, method, body, logger, locals, isPrerendered, routePattern, }: CreateRequestOptions): Request;
+export declare function createRequest({ url, headers, method, body, logger, isPrerendered, routePattern, }: CreateRequestOptions): Request;
 export {};

package/dist/core/request.js

@@ -1,11 +1,9 @@
-const clientLocalsSymbol = Symbol.for("astro.locals");
 function createRequest({
   url,
   headers,
   method = "GET",
   body = void 0,
   logger,
-  locals,
   isPrerendered = false,
   routePattern
 }) {
@@ -43,7 +41,6 @@ function createRequest({
       }
     });
   }
-  Reflect.set(request, clientLocalsSymbol, locals ?? {});
   return request;
 }
 export {

package/dist/env/env-loader.d.ts

@@ -0,0 +1,6 @@
+import type { AstroConfig } from '../types/public/index.js';
+export declare const createEnvLoader: () => {
+    load: (mode: string, config: AstroConfig) => Record<string, string>;
+    getPrivateEnv: () => Record<string, string>;
+};
+export type EnvLoader = ReturnType<typeof createEnvLoader>;

package/dist/env/env-loader.js

@@ -0,0 +1,45 @@
+import { fileURLToPath } from "node:url";
+import { loadEnv } from "vite";
+const isValidIdentifierRe = /^[_$a-zA-Z][\w$]*$/;
+function getPrivateEnv(fullEnv, astroConfig) {
+  const viteConfig = astroConfig.vite;
+  let envPrefixes = ["PUBLIC_"];
+  if (viteConfig.envPrefix) {
+    envPrefixes = Array.isArray(viteConfig.envPrefix) ? viteConfig.envPrefix : [viteConfig.envPrefix];
+  }
+  const privateEnv = {};
+  for (const key in fullEnv) {
+    if (isValidIdentifierRe.test(key) && envPrefixes.every((prefix) => !key.startsWith(prefix))) {
+      if (typeof process.env[key] !== "undefined") {
+        let value = process.env[key];
+        if (typeof value !== "string") {
+          value = `${value}`;
+        }
+        if (value === "0" || value === "1" || value === "true" || value === "false") {
+          privateEnv[key] = value;
+        } else {
+          privateEnv[key] = `process.env.${key}`;
+        }
+      } else {
+        privateEnv[key] = JSON.stringify(fullEnv[key]);
+      }
+    }
+  }
+  return privateEnv;
+}
+const createEnvLoader = () => {
+  let privateEnv = {};
+  return {
+    load: (mode, config) => {
+      const loaded = loadEnv(mode, config.vite.envDir ?? fileURLToPath(config.root), "");
+      privateEnv = getPrivateEnv(loaded, config);
+      return loaded;
+    },
+    getPrivateEnv: () => {
+      return privateEnv;
+    }
+  };
+};
+export {
+  createEnvLoader
+};

package/dist/env/runtime.d.ts

@@ -2,8 +2,8 @@ import { AstroError } from '../core/errors/index.js';
 import type { ValidationResultInvalid } from './validators.js';
 export { validateEnvVariable, getEnvFieldType } from './validators.js';
 export type GetEnv = (key: string) => string | undefined;
-type OnSetGetEnv = (reset: boolean) => void;
-export declare function setGetEnv(fn: GetEnv, reset?: boolean): void;
+type OnSetGetEnv = () => void;
+export declare function setGetEnv(fn: GetEnv): void;
 export declare function setOnSetGetEnv(fn: OnSetGetEnv): void;
 export declare function getEnv(...args: Parameters<GetEnv>): string | undefined;
 export declare function createInvalidVariablesError(key: string, type: string, result: ValidationResultInvalid): AstroError;

package/dist/env/runtime.js

@@ -2,9 +2,9 @@ import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { invalidVariablesToError } from "./errors.js";
 import { validateEnvVariable, getEnvFieldType } from "./validators.js";
 let _getEnv = (key) => process.env[key];
-function setGetEnv(fn, reset = false) {
+function setGetEnv(fn) {
   _getEnv = fn;
-  _onSetGetEnv(reset);
+  _onSetGetEnv();
 }
 let _onSetGetEnv = () => {
 };

package/dist/env/vite-plugin-env.d.ts

@@ -1,9 +1,11 @@
-import { type Plugin } from 'vite';
+import type { Plugin } from 'vite';
 import type { AstroSettings } from '../types/astro.js';
+import type { EnvLoader } from './env-loader.js';
 interface AstroEnvPluginParams {
     settings: AstroSettings;
     mode: string;
     sync: boolean;
+    envLoader: EnvLoader;
 }
-export declare function astroEnv({ settings, mode, sync }: AstroEnvPluginParams): Plugin;
+export declare function astroEnv({ settings, mode, sync, envLoader }: AstroEnvPluginParams): Plugin;
 export {};

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

@@ -1,6 +1,4 @@
 import { readFileSync } from "node:fs";
-import { fileURLToPath } from "node:url";
-import { loadEnv } from "vite";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import {
   MODULE_TEMPLATE_URL,
@@ -9,17 +7,23 @@ import {
 } from "./constants.js";
 import { invalidVariablesToError } from "./errors.js";
 import { getEnvFieldType, validateEnvVariable } from "./validators.js";
-function astroEnv({ settings, mode, sync }) {
+function astroEnv({ settings, mode, sync, envLoader }) {
   const { schema, validateSecrets } = settings.config.env;
+  let isDev;
   let templates = null;
   return {
     name: "astro-env-plugin",
     enforce: "pre",
+    config(_, { command }) {
+      isDev = command !== "build";
+    },
     buildStart() {
-      const loadedEnv = loadEnv(mode, fileURLToPath(settings.config.root), "");
-      for (const [key, value] of Object.entries(loadedEnv)) {
-        if (value !== void 0) {
-          process.env[key] = value;
+      const loadedEnv = envLoader.load(mode, settings.config);
+      if (!isDev) {
+        for (const [key, value] of Object.entries(loadedEnv)) {
+          if (value !== void 0) {
+            process.env[key] = value;
+          }
         }
       }
       const validatedVariables = validatePublicVariables({
@@ -29,7 +33,7 @@ function astroEnv({ settings, mode, sync }) {
         sync
       });
       templates = {
-        ...getTemplates(schema, validatedVariables),
+        ...getTemplates(schema, validatedVariables, isDev ? loadedEnv : null),
         internal: `export const schema = ${JSON.stringify(schema)};`
       };
     },
@@ -92,7 +96,7 @@ function validatePublicVariables({
   }
   return valid;
 }
-function getTemplates(schema, validatedVariables) {
+function getTemplates(schema, validatedVariables, loadedEnv) {
   let client = "";
   let server = readFileSync(MODULE_TEMPLATE_URL, "utf-8");
   let onSetGetEnv = "";
@@ -110,10 +114,15 @@ function getTemplates(schema, validatedVariables) {
     }
     server += `export let ${key} = _internalGetSecret(${JSON.stringify(key)});
 `;
-    onSetGetEnv += `${key} = reset ? undefined : _internalGetSecret(${JSON.stringify(key)});
+    onSetGetEnv += `${key} = _internalGetSecret(${JSON.stringify(key)});
 `;
   }
   server = server.replace("// @@ON_SET_GET_ENV@@", onSetGetEnv);
+  if (loadedEnv) {
+    server = server.replace("// @@GET_ENV@@", `return (${JSON.stringify(loadedEnv)})[key];`);
+  } else {
+    server = server.replace("// @@GET_ENV@@", "return _getEnv(key);");
+  }
   return {
     client,
     server

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

@@ -150,7 +150,6 @@ function createDevelopmentManifest(settings) {
     inlinedScripts: /* @__PURE__ */ new Map(),
     i18n: i18nManifest,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
-    envGetSecretEnabled: false,
     key: hasEnvironmentKey() ? getEnvironmentKey() : createKey(),
     middleware() {
       return {

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

@@ -176,7 +176,7 @@ async function handleRoute({
     const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
     if (fourOhFourRoute) {
       renderContext = await RenderContext.create({
-        locals,
+        locals: {},
         pipeline,
         pathname,
         middleware: isDefaultPrerendered404(fourOhFourRoute.route) ? void 0 : middleware,

package/dist/vite-plugin-env/index.d.ts

@@ -1,7 +1,7 @@
 import type * as vite from 'vite';
-import type { AstroSettings } from '../types/astro.js';
+import type { EnvLoader } from '../env/env-loader.js';
 interface EnvPluginOptions {
-    settings: AstroSettings;
+    envLoader: EnvLoader;
 }
-export default function envVitePlugin({ settings }: EnvPluginOptions): vite.Plugin;
+export default function envVitePlugin({ envLoader }: EnvPluginOptions): vite.Plugin;
 export {};

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

@@ -1,39 +1,6 @@
-import { fileURLToPath } from "node:url";
 import { transform } from "esbuild";
 import MagicString from "magic-string";
-import { loadEnv } from "vite";
 const importMetaEnvOnlyRe = /\bimport\.meta\.env\b(?!\.)/;
-const isValidIdentifierRe = /^[_$a-zA-Z][\w$]*$/;
-function getPrivateEnv(viteConfig, astroConfig) {
-  let envPrefixes = ["PUBLIC_"];
-  if (viteConfig.envPrefix) {
-    envPrefixes = Array.isArray(viteConfig.envPrefix) ? viteConfig.envPrefix : [viteConfig.envPrefix];
-  }
-  const fullEnv = loadEnv(
-    viteConfig.mode,
-    viteConfig.envDir ?? fileURLToPath(astroConfig.root),
-    ""
-  );
-  const privateEnv = {};
-  for (const key in fullEnv) {
-    if (isValidIdentifierRe.test(key) && envPrefixes.every((prefix) => !key.startsWith(prefix))) {
-      if (typeof process.env[key] !== "undefined") {
-        let value = process.env[key];
-        if (typeof value !== "string") {
-          value = `${value}`;
-        }
-        if (value === "0" || value === "1" || value === "true" || value === "false") {
-          privateEnv[key] = value;
-        } else {
-          privateEnv[key] = `process.env.${key}`;
-        }
-      } else {
-        privateEnv[key] = JSON.stringify(fullEnv[key]);
-      }
-    }
-  }
-  return privateEnv;
-}
 function getReferencedPrivateKeys(source, privateEnv) {
   const references = /* @__PURE__ */ new Set();
   for (const key in privateEnv) {
@@ -70,13 +37,12 @@ async function replaceDefine(code, id, define, config) {
     map: result.map || null
   };
 }
-function envVitePlugin({ settings }) {
+function envVitePlugin({ envLoader }) {
   let privateEnv;
   let defaultDefines;
   let isDev;
   let devImportMetaEnvPrepend;
   let viteConfig;
-  const { config: astroConfig } = settings;
   return {
     name: "astro:vite-plugin-env",
     config(_, { command }) {
@@ -102,7 +68,7 @@ function envVitePlugin({ settings }) {
       if (!options?.ssr || !source.includes("import.meta.env")) {
         return;
       }
-      privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
+      privateEnv ??= envLoader.getPrivateEnv();
       if (isDev) {
         const s = new MagicString(source);
         if (!devImportMetaEnvPrepend) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -159,7 +159,7 @@
     "zod-to-json-schema": "^3.23.5",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.2",
-    "@astrojs/markdown-remark": "6.0.0",
+    "@astrojs/markdown-remark": "6.0.1",
     "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {

package/templates/env.mjs

@@ -1,13 +1,22 @@
 // @ts-check
 import { schema } from 'virtual:astro:env/internal';
 import {
+	getEnv as _getEnv,
 	createInvalidVariablesError,
-	getEnv,
 	getEnvFieldType,
 	setOnSetGetEnv,
 	validateEnvVariable,
 } from 'astro/env/runtime';
 
+// @ts-expect-error
+/** @returns {string} */
+// used while generating the virtual module
+// biome-ignore lint/correctness/noUnusedFunctionParameters: `key` is used by the generated code
+// biome-ignore lint/correctness/noUnusedVariables: `key` is used by the generated code
+const getEnv = (key) => {
+	// @@GET_ENV@@
+};
+
 export const getSecret = (key) => {
 	return getEnv(key);
 };
@@ -25,9 +34,6 @@ const _internalGetSecret = (key) => {
 	throw createInvalidVariablesError(key, type, result);
 };
 
-// used while generating the virtual module
-// biome-ignore lint/correctness/noUnusedFunctionParameters: `reset` is used by the generated code
-// biome-ignore lint/correctness/noUnusedVariables: `reset` is used by the generated code
-setOnSetGetEnv((reset) => {
+setOnSetGetEnv(() => {
 	// @@ON_SET_GET_ENV@@
 });