astro 4.1.1 → 4.1.2

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

@@ -5,7 +5,6 @@ import { getProxyCode } from "../assets/utils/proxy.js";
 import { AstroError } from "../core/errors/errors.js";
 import { AstroErrorData } from "../core/errors/index.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
-import { escapeViteEnvReferences } from "../vite-plugin-utils/index.js";
 import { CONTENT_FLAG, DATA_FLAG } from "./consts.js";
 import {
   getContentEntryExts,
@@ -59,7 +58,7 @@ function astroContentImportPlugin({
             fs,
             pluginContext: this
           });
-          const code = escapeViteEnvReferences(`
+          const code = `
 export const id = ${JSON.stringify(id)};
 export const collection = ${JSON.stringify(collection)};
 export const data = ${stringifyEntryData(data, isServerLikeOutput(settings.config))};
@@ -68,7 +67,7 @@ export const _internal = {
 	filePath: ${JSON.stringify(_internal.filePath)},
 	rawData: ${JSON.stringify(_internal.rawData)},
 };
-`);
+`;
           return code;
         } else if (hasContentFlag(viteId, CONTENT_FLAG)) {
           const fileId = viteId.split("?")[0];
@@ -80,7 +79,7 @@ export const _internal = {
             fs,
             pluginContext: this
           });
-          const code = escapeViteEnvReferences(`
+          const code = `
 						export const id = ${JSON.stringify(id)};
 						export const collection = ${JSON.stringify(collection)};
 						export const slug = ${JSON.stringify(slug)};
@@ -90,7 +89,7 @@ export const _internal = {
 							type: 'content',
 							filePath: ${JSON.stringify(_internal.filePath)},
 							rawData: ${JSON.stringify(_internal.rawData)},
-						};`);
+						};`;
           return { code, map: { mappings: "" } };
         }
       },

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.1.1";
+const ASTRO_VERSION = "4.1.2";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/cookies/cookies.d.ts

@@ -73,5 +73,10 @@ declare class AstroCookies implements AstroCookiesInterface {
      * @returns
      */
     headers(): Generator<string, void, unknown>;
+    /**
+     * Behaves the same as AstroCookies.prototype.headers(),
+     * but allows a warning when cookies are set after the instance is consumed.
+     */
+    static consume(cookies: AstroCookies): Generator<string, void, unknown>;
 }
 export { AstroCookies };

package/dist/core/cookies/cookies.js

@@ -28,10 +28,12 @@ class AstroCookies {
   #request;
   #requestValues;
   #outgoing;
+  #consumed;
   constructor(request) {
     this.#request = request;
     this.#requestValues = null;
     this.#outgoing = null;
+    this.#consumed = false;
   }
   /**
    * Astro.cookies.delete(key) is used to delete a cookie. Using this method will result
@@ -101,6 +103,13 @@ class AstroCookies {
    * @param options Options for the cookie, such as the path and security settings.
    */
   set(key, value, options) {
+    if (this.#consumed) {
+      const warning = new Error(
+        "Astro.cookies.set() was called after the cookies had already been sent to the browser.\nThis may have happened if this method was called in an imported component.\nPlease make sure that Astro.cookies.set() is only called in the frontmatter of the main page."
+      );
+      warning.name = "Warning";
+      console.warn(warning);
+    }
     let serializedValue;
     if (typeof value === "string") {
       serializedValue = value;
@@ -140,6 +149,14 @@ class AstroCookies {
       yield value[1];
     }
   }
+  /**
+   * Behaves the same as AstroCookies.prototype.headers(),
+   * but allows a warning when cookies are set after the instance is consumed.
+   */
+  static consume(cookies) {
+    cookies.#consumed = true;
+    return cookies.headers();
+  }
   #ensureParsed(options = void 0) {
     if (!this.#requestValues) {
       this.#parse(options);

package/dist/core/cookies/response.d.ts

@@ -1,4 +1,4 @@
-import type { AstroCookies } from './cookies.js';
+import { AstroCookies } from './cookies.js';
 export declare function attachCookiesToResponse(response: Response, cookies: AstroCookies): void;
 export declare function responseHasCookies(response: Response): boolean;
 export declare function getSetCookiesFromResponse(response: Response): Generator<string, string[]>;

package/dist/core/cookies/response.js

@@ -1,3 +1,4 @@
+import { AstroCookies } from "./cookies.js";
 const astroCookiesSymbol = Symbol.for("astro.cookies");
 function attachCookiesToResponse(response, cookies) {
   Reflect.set(response, astroCookiesSymbol, cookies);
@@ -18,7 +19,7 @@ function* getSetCookiesFromResponse(response) {
   if (!cookies) {
     return [];
   }
-  for (const headerValue of cookies.headers()) {
+  for (const headerValue of AstroCookies.consume(cookies)) {
     yield headerValue;
   }
   return [];

package/dist/core/create-vite.js

@@ -121,7 +121,9 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     root: fileURLToPath(settings.config.root),
     envPrefix: settings.config.vite?.envPrefix ?? "PUBLIC_",
     define: {
-      "import.meta.env.SITE": settings.config.site ? JSON.stringify(settings.config.site) : "undefined"
+      "import.meta.env.SITE": stringifyForDefine(settings.config.site),
+      "import.meta.env.BASE_URL": stringifyForDefine(settings.config.base),
+      "import.meta.env.ASSETS_PREFIX": stringifyForDefine(settings.config.build.assetsPrefix)
     },
     server: {
       hmr: process.env.NODE_ENV === "test" || process.env.NODE_ENV === "production" ? false : void 0,
@@ -245,6 +247,9 @@ function isCommonNotAstro(dep) {
     // check prefix omitting @scope/
   );
 }
+function stringifyForDefine(value) {
+  return typeof value === "string" ? JSON.stringify(value) : "undefined";
+}
 export {
   createVite
 };

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.1.1";
+  const currentVersion = "4.1.2";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/dev/utils.js

@@ -133,7 +133,7 @@ function cleanErrorStack(stack) {
   return stack.split(/\n/g).map((l) => l.replace(/\/@fs\//g, "/")).join("\n");
 }
 function getDocsForError(err) {
-  if (err.name in AstroErrorData) {
+  if (err.name !== "UnknownError" && err.name in AstroErrorData) {
     return `https://docs.astro.build/en/reference/errors/${getKebabErrorName(err.name)}/`;
   }
   return void 0;

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

@@ -389,7 +389,7 @@ export declare const NoMatchingImport: {
 export declare const InvalidPrerenderExport: {
     name: string;
     title: string;
-    message: (prefix: string, suffix: string, isHydridOuput: boolean) => string;
+    message(prefix: string, suffix: string, isHydridOuput: boolean): string;
     hint: string;
 };
 /**
@@ -883,6 +883,38 @@ export declare const FailedToFindPageMapSSR: {
     title: string;
     message: string;
 };
+/**
+ * @docs
+ * @description
+ * Astro can't find the requested locale. All supported locales must be configured in [i18n.locales](/en/reference/configuration-reference/#i18nlocales) and have corresponding directories within `src/pages/`.
+ */
+export declare const MissingLocale: {
+    name: string;
+    title: string;
+    message: (locale: string) => string;
+};
+/**
+ * @docs
+ * @description
+ * Astro could not find an associated file with content while trying to render the route. This is an Astro error and not a user error. If restarting the dev server does not fix the problem, please file an issue.
+ */
+export declare const CantRenderPage: {
+    name: string;
+    title: string;
+    message: string;
+    hint: string;
+};
+/**
+ * @docs
+ * @description
+ * Astro could not find any code to handle a rejected `Promise`. Make sure all your promises have an `await` or `.catch()` handler.
+ */
+export declare const UnhandledRejection: {
+    name: string;
+    title: string;
+    message: (stack: string) => string;
+    hint: string;
+};
 /**
  * @docs
  * @kind heading
@@ -1068,7 +1100,7 @@ export declare const UnknownContentCollectionError: {
 export declare const InvalidContentEntryFrontmatterError: {
     name: string;
     title: string;
-    message: (collection: string, entryId: string, error: ZodError) => string;
+    message(collection: string, entryId: string, error: ZodError): string;
     hint: string;
 };
 /**
@@ -1082,7 +1114,7 @@ export declare const InvalidContentEntryFrontmatterError: {
 export declare const InvalidContentEntrySlugError: {
     name: string;
     title: string;
-    message: (collection: string, entryId: string) => string;
+    message(collection: string, entryId: string): string;
     hint: string;
 };
 /**
@@ -1113,7 +1145,6 @@ export declare const CollectionDoesNotExistError: {
 };
 /**
  * @docs
- * @message `COLLECTION_NAME` contains a mix of content and data entries. All entries must be of the same type.
  * @see
  * - [Defining content collections](https://docs.astro.build/en/guides/content-collections/#defining-collections)
  * @description
@@ -1122,12 +1153,11 @@ export declare const CollectionDoesNotExistError: {
 export declare const MixedContentDataCollectionError: {
     name: string;
     title: string;
-    message: (collection: string) => string;
+    message: (collectionName: string) => string;
     hint: string;
 };
 /**
  * @docs
- * @message `COLLECTION_NAME` contains entries of type `ACTUAL_TYPE`, but is configured as a `EXPECTED_TYPE` collection.
  * @see
  * - [Defining content collections](https://docs.astro.build/en/guides/content-collections/#defining-collections)
  * @description
@@ -1147,7 +1177,7 @@ export declare const ContentCollectionTypeMismatchError: {
 export declare const DataCollectionEntryParseError: {
     name: string;
     title: string;
-    message: (entryId: string, errorMessage: string) => string;
+    message(entryId: string, errorMessage: string): string;
     hint: string;
 };
 /**
@@ -1159,7 +1189,7 @@ export declare const DataCollectionEntryParseError: {
 export declare const DuplicateContentEntrySlugError: {
     name: string;
     title: string;
-    message: (collection: string, slug: string, preExisting: string, alsoFound: string) => string;
+    message(collection: string, slug: string, preExisting: string, alsoFound: string): string;
 };
 /**
  * @docs
@@ -1174,24 +1204,7 @@ export declare const UnsupportedConfigTransformError: {
     message: (parseError: string) => string;
     hint: string;
 };
-export declare const MissingLocale: {
-    name: string;
-    title: string;
-    message: (locale: string) => string;
-};
-export declare const CantRenderPage: {
-    name: string;
-    title: string;
-    message: string;
-    hint: string;
-};
 export declare const UnknownError: {
     name: string;
     title: string;
 };
-export declare const UnhandledRejection: {
-    name: string;
-    title: string;
-    message: (stack: string) => string;
-    hint: string;
-};

package/dist/core/errors/errors-data.js

@@ -125,7 +125,7 @@ const NoMatchingImport = {
 const InvalidPrerenderExport = {
   name: "InvalidPrerenderExport",
   title: "Invalid prerender export.",
-  message: (prefix, suffix, isHydridOuput) => {
+  message(prefix, suffix, isHydridOuput) {
     const defaultExpectedValue = isHydridOuput ? "false" : "true";
     let msg = `A \`prerender\` export has been detected, but its value cannot be statically analyzed.`;
     if (prefix !== "const")
@@ -308,6 +308,24 @@ const FailedToFindPageMapSSR = {
   title: "Astro couldn't find the correct page to render",
   message: "Astro couldn't find the correct page to render, probably because it wasn't correctly mapped for SSR usage. This is an internal error. Please file an issue."
 };
+const MissingLocale = {
+  name: "MissingLocaleError",
+  title: "The provided locale does not exist.",
+  message: (locale) => `The locale/path \`${locale}\` does not exist in the configured \`i18n.locales\`.`
+};
+const CantRenderPage = {
+  name: "CantRenderPage",
+  title: "Astro can't render the route.",
+  message: "Astro cannot find any content to render for this route. There is no file or redirect associated with this route.",
+  hint: "If you expect to find a route here, this may be an Astro bug. Please file an issue/restart the dev server"
+};
+const UnhandledRejection = {
+  name: "UnhandledRejection",
+  title: "Unhandled rejection",
+  message: (stack) => `Astro detected an unhandled rejection. Here's the stack trace:
+${stack}`,
+  hint: "Make sure your promises all have an `await` or a `.catch()` handler."
+};
 const UnknownCSSError = {
   name: "UnknownCSSError",
   title: "Unknown CSS Error."
@@ -368,7 +386,7 @@ const UnknownContentCollectionError = {
 const InvalidContentEntryFrontmatterError = {
   name: "InvalidContentEntryFrontmatterError",
   title: "Content entry frontmatter does not match schema.",
-  message: (collection, entryId, error) => {
+  message(collection, entryId, error) {
     return [
       `**${String(collection)} \u2192 ${String(
         entryId
@@ -381,7 +399,7 @@ const InvalidContentEntryFrontmatterError = {
 const InvalidContentEntrySlugError = {
   name: "InvalidContentEntrySlugError",
   title: "Invalid content entry slug.",
-  message: (collection, entryId) => {
+  message(collection, entryId) {
     return `${String(collection)} \u2192 ${String(
       entryId
     )} has an invalid slug. \`slug\` must be a string.`;
@@ -403,22 +421,18 @@ const CollectionDoesNotExistError = {
 const MixedContentDataCollectionError = {
   name: "MixedContentDataCollectionError",
   title: "Content and data cannot be in same collection.",
-  message: (collection) => {
-    return `**${collection}** contains a mix of content and data entries. All entries must be of the same type.`;
-  },
+  message: (collectionName) => `**${collectionName}** contains a mix of content and data entries. All entries must be of the same type.`,
   hint: "Store data entries in a new collection separate from your content collection."
 };
 const ContentCollectionTypeMismatchError = {
   name: "ContentCollectionTypeMismatchError",
   title: "Collection contains entries of a different type.",
-  message: (collection, expectedType, actualType) => {
-    return `${collection} contains ${expectedType} entries, but is configured as a ${actualType} collection.`;
-  }
+  message: (collection, expectedType, actualType) => `${collection} contains ${expectedType} entries, but is configured as a ${actualType} collection.`
 };
 const DataCollectionEntryParseError = {
   name: "DataCollectionEntryParseError",
   title: "Data collection entry failed to parse.",
-  message: (entryId, errorMessage) => {
+  message(entryId, errorMessage) {
     return `**${entryId}** failed to parse: ${errorMessage}`;
   },
   hint: "Ensure your data entry is an object with valid JSON (for `.json` entries) or YAML (for `.yaml` entries)."
@@ -426,7 +440,7 @@ const DataCollectionEntryParseError = {
 const DuplicateContentEntrySlugError = {
   name: "DuplicateContentEntrySlugError",
   title: "Duplicate content entry slug.",
-  message: (collection, slug, preExisting, alsoFound) => {
+  message(collection, slug, preExisting, alsoFound) {
     return `**${collection}** contains multiple entries with the same slug: \`${slug}\`. Slugs must be unique.
 
 Entries: 
@@ -441,29 +455,7 @@ const UnsupportedConfigTransformError = {
 Full error: ${parseError}`,
   hint: "See the devalue library for all supported types: https://github.com/rich-harris/devalue"
 };
-const MissingLocale = {
-  name: "MissingLocaleError",
-  title: "The provided locale does not exist.",
-  message: (locale) => {
-    return `The locale/path \`${locale}\` does not exist in the configured \`i18n.locales\`.`;
-  }
-};
-const CantRenderPage = {
-  name: "CantRenderPage",
-  title: "Astro can't render the route.",
-  message: "Astro cannot find any content to render for this route. There is no file or redirect associated with this route.",
-  hint: "If you expect to find a route here, this may be an Astro bug. Please file an issue/restart the dev server"
-};
 const UnknownError = { name: "UnknownError", title: "Unknown Error." };
-const UnhandledRejection = {
-  name: "UnhandledRejection",
-  title: "Unhandled rejection",
-  message: (stack) => {
-    return `Astro detected an unhandled rejection. Here's the stack trace:
-${stack}`;
-  },
-  hint: "Make sure your promises all have an `await` or a `.catch()` handler."
-};
 export {
   AstroGlobNoMatch,
   AstroGlobUsedOutside,

package/dist/core/messages.js

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

package/dist/core/redirects/helpers.js

@@ -24,8 +24,8 @@ function redirectRouteGenerate(redirectRoute, data) {
 }
 function redirectRouteStatus(redirectRoute, method = "GET") {
   const routeData = redirectRoute.redirectRoute;
-  if (typeof routeData?.redirect === "object") {
-    return routeData.redirect.status;
+  if (routeData && typeof redirectRoute.redirect === "object") {
+    return redirectRoute.redirect.status;
   } else if (method !== "GET") {
     return 308;
   }

package/dist/core/routing/manifest/create.js

@@ -333,7 +333,13 @@ This route collides with: "${collision.component}".`
       pathname: pathname || void 0,
       prerender: false,
       redirect: to,
-      redirectRoute: routes.find((r) => r.route === to),
+      redirectRoute: routes.find((r) => {
+        if (typeof to === "object") {
+          return r.route === to.destination;
+        } else {
+          return r.route === to;
+        }
+      }),
       fallbackRoutes: []
     };
     const lastSegmentIsDynamic = (r) => !!r.segments.at(-1)?.at(-1)?.dynamic;

package/dist/runtime/client/dev-overlay/plugins/astro.js

@@ -10,7 +10,7 @@ var astro_default = {
   async init(canvas, eventTarget) {
     createCanvas();
     document.addEventListener("astro:after-swap", createCanvas);
-    eventTarget.addEventListener("plugin-toggled", async (event) => {
+    eventTarget.addEventListener("app-toggled", async (event) => {
       resetDebugButton();
       if (!(event instanceof CustomEvent))
         return;

package/dist/runtime/client/dev-overlay/plugins/audit/index.js

@@ -44,7 +44,7 @@ var audit_default = {
         })
       );
     }
-    eventTarget.addEventListener("plugin-toggled", (event) => {
+    eventTarget.addEventListener("app-toggled", (event) => {
       if (event.detail.state === true) {
         document.addEventListener("click", onPageClick, true);
       } else {

package/dist/runtime/client/dev-overlay/plugins/xray.js

@@ -33,7 +33,7 @@ var xray_default = {
         })
       );
     }
-    eventTarget.addEventListener("plugin-toggled", (event) => {
+    eventTarget.addEventListener("app-toggled", (event) => {
       if (event.detail.state === true) {
         document.addEventListener("click", onPageClick, true);
       } else {

package/dist/transitions/router.js

@@ -98,12 +98,15 @@ function runScripts() {
   for (const script of Array.from(document.scripts)) {
     if (script.dataset.astroExec === "")
       continue;
+    const type = script.getAttribute("type");
+    if (type && type !== "module" && type !== "text/javascript")
+      continue;
     const newScript = document.createElement("script");
     newScript.innerHTML = script.innerHTML;
     for (const attr of script.attributes) {
       if (attr.name === "src") {
         const p = new Promise((r) => {
-          newScript.onload = r;
+          newScript.onload = newScript.onerror = r;
         });
         wait = wait.then(() => p);
       }

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

@@ -284,7 +284,10 @@ async function handleRoute({
     return;
   }
   if (status && response.status !== status && (status === 404 || status === 500)) {
-    response = new Response(response.body, { ...response, status });
+    response = new Response(response.body, {
+      status,
+      headers: response.headers
+    });
   }
   await writeSSRResult(request, response, incomingResponse);
 }

package/dist/vite-plugin-config-alias/index.js

@@ -48,6 +48,9 @@ function configAliasVitePlugin({
       for (const alias of configAlias) {
         if (alias.find.test(id)) {
           const updatedId = id.replace(alias.find, alias.replacement);
+          if (updatedId.includes("*")) {
+            return updatedId;
+          }
           const resolved = await this.resolve(updatedId, importer, { skipSelf: true, ...options });
           if (resolved)
             return resolved;

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

@@ -3,5 +3,5 @@ import type { AstroSettings } from '../@types/astro.js';
 interface EnvPluginOptions {
     settings: AstroSettings;
 }
-export default function envVitePlugin({ settings }: EnvPluginOptions): vite.PluginOption;
+export default function envVitePlugin({ settings }: EnvPluginOptions): vite.Plugin;
 export {};

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

@@ -1,6 +1,9 @@
-import MagicString from "magic-string";
 import { fileURLToPath } from "node:url";
 import { loadEnv } from "vite";
+import { transform } from "esbuild";
+import MagicString from "magic-string";
+const importMetaEnvOnlyRe = /\bimport\.meta\.env\b(?!\.)/;
+const isValidIdentifierRe = /^[_$a-zA-Z][_$a-zA-Z0-9]*$/;
 function getPrivateEnv(viteConfig, astroConfig) {
   let envPrefixes = ["PUBLIC_"];
   if (viteConfig.envPrefix) {
@@ -13,7 +16,7 @@ function getPrivateEnv(viteConfig, astroConfig) {
   );
   const privateEnv = {};
   for (const key in fullEnv) {
-    if (envPrefixes.every((prefix) => !key.startsWith(prefix))) {
+    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") {
@@ -29,10 +32,6 @@ function getPrivateEnv(viteConfig, astroConfig) {
       }
     }
   }
-  privateEnv.SITE = astroConfig.site ? JSON.stringify(astroConfig.site) : "undefined";
-  privateEnv.SSR = JSON.stringify(true);
-  privateEnv.BASE_URL = astroConfig.base ? JSON.stringify(astroConfig.base) : "undefined";
-  privateEnv.ASSETS_PREFIX = astroConfig.build.assetsPrefix ? JSON.stringify(astroConfig.build.assetsPrefix) : "undefined";
   return privateEnv;
 }
 function getReferencedPrivateKeys(source, privateEnv) {
@@ -44,63 +43,102 @@ function getReferencedPrivateKeys(source, privateEnv) {
   }
   return references;
 }
+async function replaceDefine(code, id, define, config) {
+  const replacementMarkers = {};
+  const env = define["import.meta.env"];
+  if (env) {
+    const marker = `__astro_import_meta_env${"_".repeat(
+      env.length - 23
+      /* length of preceding string */
+    )}`;
+    replacementMarkers[marker] = env;
+    define = { ...define, "import.meta.env": marker };
+  }
+  const esbuildOptions = config.esbuild || {};
+  const result = await transform(code, {
+    loader: "js",
+    charset: esbuildOptions.charset ?? "utf8",
+    platform: "neutral",
+    define,
+    sourcefile: id,
+    sourcemap: config.command === "build" ? !!config.build.sourcemap : true
+  });
+  for (const marker in replacementMarkers) {
+    result.code = result.code.replaceAll(marker, replacementMarkers[marker]);
+  }
+  return {
+    code: result.code,
+    map: result.map || null
+  };
+}
 function envVitePlugin({ settings }) {
   let privateEnv;
+  let defaultDefines;
+  let isDev;
+  let devImportMetaEnvPrepend;
   let viteConfig;
   const { config: astroConfig } = settings;
   return {
     name: "astro:vite-plugin-env",
-    enforce: "pre",
-    config() {
-      return {
-        define: {
-          "import.meta.env.BASE_URL": astroConfig.base ? JSON.stringify(astroConfig.base) : "undefined",
-          "import.meta.env.ASSETS_PREFIX": astroConfig.build.assetsPrefix ? JSON.stringify(astroConfig.build.assetsPrefix) : "undefined"
-        }
-      };
+    config(_, { command }) {
+      isDev = command !== "build";
     },
     configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;
+      const viteDefinePluginIndex = resolvedConfig.plugins.findIndex(
+        (p) => p.name === "vite:define"
+      );
+      if (viteDefinePluginIndex !== -1) {
+        const myPluginIndex = resolvedConfig.plugins.findIndex(
+          (p) => p.name === "astro:vite-plugin-env"
+        );
+        if (myPluginIndex !== -1) {
+          const myPlugin = resolvedConfig.plugins[myPluginIndex];
+          resolvedConfig.plugins.splice(viteDefinePluginIndex, 0, myPlugin);
+          resolvedConfig.plugins.splice(myPluginIndex, 1);
+        }
+      }
     },
-    async transform(source, id, options) {
+    transform(source, id, options) {
       if (!options?.ssr || !source.includes("import.meta.env")) {
         return;
       }
-      let s;
-      const pattern = new RegExp(
-        // Do not allow preceding '.', but do allow preceding '...' for spread operations
-        `(?<!(?<!\\.\\.)\\.)\\b(import\\.meta\\.env\\.(.+?)|import\\.meta\\.env)\\b(?!\\s*?=[^=])`,
-        "g"
-      );
-      let references;
-      let match;
-      while (match = pattern.exec(source)) {
-        let replacement;
-        if (match[0] === "import.meta.env") {
-          privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
-          references ??= getReferencedPrivateKeys(source, privateEnv);
-          replacement = `(Object.assign(import.meta.env,{`;
-          for (const key of references.values()) {
-            replacement += `${key}:${privateEnv[key]},`;
+      privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
+      if (isDev) {
+        const s = new MagicString(source);
+        if (!devImportMetaEnvPrepend) {
+          devImportMetaEnvPrepend = `Object.assign(import.meta.env,{`;
+          for (const key in privateEnv) {
+            devImportMetaEnvPrepend += `${key}:${privateEnv[key]},`;
           }
-          replacement += "}))";
-        } else if (match[2]) {
-          privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
-          replacement = privateEnv[match[2]];
-        }
-        if (replacement) {
-          const start = match.index;
-          const end = start + match[0].length;
-          s ??= new MagicString(source);
-          s.overwrite(start, end, replacement);
+          devImportMetaEnvPrepend += "});";
         }
-      }
-      if (s) {
+        s.prepend(devImportMetaEnvPrepend);
         return {
           code: s.toString(),
           map: s.generateMap({ hires: "boundary" })
         };
       }
+      if (!defaultDefines) {
+        defaultDefines = {};
+        for (const key in privateEnv) {
+          defaultDefines[`import.meta.env.${key}`] = privateEnv[key];
+        }
+      }
+      let defines = defaultDefines;
+      if (importMetaEnvOnlyRe.test(source)) {
+        const references = getReferencedPrivateKeys(source, privateEnv);
+        let replacement = `(Object.assign(import.meta.env,{`;
+        for (const key of references.values()) {
+          replacement += `${key}:${privateEnv[key]},`;
+        }
+        replacement += "}))";
+        defines = {
+          ...defaultDefines,
+          "import.meta.env": replacement
+        };
+      }
+      return replaceDefine(source, id, defines, viteConfig);
     }
   };
 }

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

@@ -10,7 +10,7 @@ import { normalizePath } from "vite";
 import { AstroError, AstroErrorData, MarkdownError } from "../core/errors/index.js";
 import { isMarkdownFile } from "../core/util.js";
 import { shorthash } from "../runtime/server/shorthash.js";
-import { escapeViteEnvReferences, getFileInfo } from "../vite-plugin-utils/index.js";
+import { getFileInfo } from "../vite-plugin-utils/index.js";
 import { getMarkdownCodeForImages } from "./images.js";
 function safeMatter(source, id) {
   try {
@@ -86,7 +86,7 @@ function markdown({ settings, logger }) {
             `[${id}] Astro now supports MDX! Support for components in ".md" (or alternative extensions like ".markdown") files using the "setup" frontmatter is no longer enabled by default. Migrate this file to MDX.`
           );
         }
-        const code = escapeViteEnvReferences(`
+        const code = `
 				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent, maybeRenderHead } from ${JSON.stringify(
           astroServerRuntimeModulePath
         )};
@@ -128,7 +128,7 @@ function markdown({ settings, logger }) {
 							})}\`;` : `render\`\${maybeRenderHead(result)}\${unescapeHTML(html)}\`;`}
 				});
 				export default Content;
-				`);
+				`;
         return {
           code,
           meta: {

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

@@ -1,10 +1,4 @@
 import type { AstroConfig } from '../@types/astro.js';
-/**
- * Converts the first dot in `import.meta.env` to its Unicode escape sequence,
- * which prevents Vite from replacing strings like `import.meta.env.SITE`
- * in our JS representation of modules like Markdown
- */
-export declare function escapeViteEnvReferences(code: string): string;
 export declare function getFileInfo(id: string, config: AstroConfig): {
     fileId: string;
     fileUrl: string | undefined;

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

@@ -6,9 +6,6 @@ import {
   removeLeadingForwardSlashWindows
 } from "../core/path.js";
 import { viteID } from "../core/util.js";
-function escapeViteEnvReferences(code) {
-  return code.replace(/import\.meta\.env/g, "import\\u002Emeta.env").replace(/process\.env/g, "process\\u002Eenv");
-}
 function getFileInfo(id, config) {
   const sitePathname = appendForwardSlash(
     config.site ? new URL(config.base, config.site).pathname : config.base
@@ -38,7 +35,6 @@ function cleanUrl(url) {
 }
 export {
   cleanUrl,
-  escapeViteEnvReferences,
   getFileInfo,
   normalizeFilename
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -166,7 +166,7 @@
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
-    "sharp": "^0.33.1"
+    "sharp": "^0.32.6"
   },
   "devDependencies": {
     "@astrojs/check": "^0.3.1",