astro 2.0.18 → 2.1.1

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

@@ -64,7 +64,7 @@ export declare const AstroErrorData: {
      * @description
      * The `Astro.clientAddress` property is only available when [Server-side rendering](https://docs.astro.build/en/guides/server-side-rendering/) is enabled.
      *
-     * To get the user's IP address in static mode, different APIs such as [Ipify](https://www.ipify.org/) can be used in a [Client-side script](https://docs.astro.build/en/core-concepts/astro-components/#client-side-scripts) or it may be possible to get the user's IP using a serverless function hosted on your hosting provider.
+     * To get the user's IP address in static mode, different APIs such as [Ipify](https://www.ipify.org/) can be used in a [Client-side script](https://docs.astro.build/en/guides/client-side-scripts/) or it may be possible to get the user's IP using a serverless function hosted on your hosting provider.
      */
     readonly StaticClientAddressNotAvailable: {
         readonly title: "`Astro.clientAddress` is not available in static mode.";
@@ -397,6 +397,75 @@ export declare const AstroErrorData: {
         readonly message: (paramName: string) => string;
         readonly hint: "Rename your file to `[page].astro` or `[...page].astro`.";
     };
+    /**
+     * @docs
+     * @see
+     * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+     * - [Image component](https://docs.astro.build/en/guides/assets/#image--astroassets)
+     * - [Image component#alt](https://docs.astro.build/en/guides/assets/#alt-required)
+     * @description
+     * The `alt` property allows you to provide descriptive alt text to users of screen readers and other assistive technologies. In order to ensure your images are accessible, the `Image` component requires that an `alt` be specified.
+     *
+     * If the image is merely decorative (i.e. doesn’t contribute to the understanding of the page), set `alt=""` so that screen readers know to ignore the image.
+     */
+    readonly ImageMissingAlt: {
+        readonly title: "Missing alt property";
+        readonly code: 3022;
+        readonly message: "The alt property is required.";
+        readonly hint: "The `alt` property is important for the purpose of accessibility, without it users using screen readers or other assistive technologies won't be able to understand what your image is supposed to represent. See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attr-alt for more information.";
+    };
+    /**
+     * @docs
+     * @see
+     * - [Image Service API](https://docs.astro.build/en/reference/image-service-reference/)
+     * @description
+     * There was an error while loading the configured image service. This can be caused by various factors, such as your image service not properly exporting a compatible object in its default export, or an incorrect path.
+     *
+     * If you believe that your service is properly configured and this error is wrong, please [open an issue](https://astro.build/issues/).
+     */
+    readonly InvalidImageService: {
+        readonly title: "Error while loading image service";
+        readonly code: 3023;
+        readonly message: "There was an error loading the configured image service. Please see the stack trace for more information.";
+    };
+    /**
+     * @docs
+     * @message
+     * Missing width and height attributes for `IMAGE_URL`. When using remote images, both dimensions are always required in order to avoid cumulative layout shift (CLS).
+     * @see
+     * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+     * - [Image component#width-and-height](https://docs.astro.build/en/guides/assets/#width-and-height)
+     * @description
+     * For remote images, `width` and `height` cannot be inferred from the original file. As such, in order to avoid CLS, those two properties are always required.
+     *
+     * If your image is inside your `src` folder, you probably meant to import it instead. See [the Imports guide for more information](https://docs.astro.build/en/guides/imports/#other-assets).
+     */
+    readonly MissingImageDimension: {
+        readonly title: "Missing image dimensions";
+        readonly code: 3024;
+        readonly message: (missingDimension: 'width' | 'height' | 'both', imageURL: string) => string;
+        readonly hint: "If your image is inside your `src` folder, you probably meant to import it instead. See [the Imports guide for more information](https://docs.astro.build/en/guides/imports/#other-assets).";
+    };
+    /**
+     * @docs
+     * @description
+     * The built-in image services do not currently support optimizing all image formats.
+     *
+     * For unsupported formats such as SVGs and GIFs, you may be able to use an `img` tag directly:
+     * ```astro
+     * ---
+     * import rocket from '../assets/images/rocket.svg'
+     * ---
+     *
+     * <img src={rocket.src} width={rocket.width} height={rocket.height} alt="A rocketship in space." />
+     * ```
+     */
+    readonly UnsupportedImageFormat: {
+        readonly title: "Unsupported image format";
+        readonly code: 3025;
+        readonly message: (format: string, imagePath: string, supportedFormats: readonly string[]) => string;
+        readonly hint: "If you do not need optimization, using an `img` tag directly instead of the `Image` component might be what you're looking for.";
+    };
     /**
      * @docs
      * @see

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

@@ -145,6 +145,31 @@ Expected \`true\` value but got \`${suffix}\`.`;
     message: (paramName) => `[paginate()] page number param \`${paramName}\` not found in your filepath.`,
     hint: "Rename your file to `[page].astro` or `[...page].astro`."
   },
+  ImageMissingAlt: {
+    title: "Missing alt property",
+    code: 3022,
+    message: "The alt property is required.",
+    hint: "The `alt` property is important for the purpose of accessibility, without it users using screen readers or other assistive technologies won't be able to understand what your image is supposed to represent. See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attr-alt for more information."
+  },
+  InvalidImageService: {
+    title: "Error while loading image service",
+    code: 3023,
+    message: "There was an error loading the configured image service. Please see the stack trace for more information."
+  },
+  MissingImageDimension: {
+    title: "Missing image dimensions",
+    code: 3024,
+    message: (missingDimension, imageURL) => `Missing ${missingDimension === "both" ? "width and height attributes" : `${missingDimension} attribute`} for ${imageURL}. When using remote images, both dimensions are always required in order to avoid CLS.`,
+    hint: "If your image is inside your `src` folder, you probably meant to import it instead. See [the Imports guide for more information](https://docs.astro.build/en/guides/imports/#other-assets)."
+  },
+  UnsupportedImageFormat: {
+    title: "Unsupported image format",
+    code: 3025,
+    message: (format, imagePath, supportedFormats) => `Received unsupported format \`${format}\` from \`${imagePath}\`. Currently only ${supportedFormats.join(
+      ", "
+    )} are supported for optimization.`,
+    hint: "If you do not need optimization, using an `img` tag directly instead of the `Image` component might be what you're looking for."
+  },
   UnknownViteError: {
     title: "Unknown Vite Error.",
     code: 4e3

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.18";
+  const version = "2.1.1";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.0.18"}`
+        `v${"2.1.1"}`
       )} ${headline}`
     );
   }

package/dist/core/path.d.ts

@@ -12,3 +12,4 @@ export declare function isRelativePath(path: string): boolean;
 export declare function joinPaths(...paths: (string | undefined)[]): string;
 export declare function removeFileExtension(path: string): string;
 export declare function removeQueryString(path: string): string;
+export declare function isRemotePath(src: string): boolean;

package/dist/core/path.js

@@ -50,10 +50,14 @@ function removeQueryString(path) {
   const index = path.lastIndexOf("?");
   return index > 0 ? path.substring(0, index) : path;
 }
+function isRemotePath(src) {
+  return /^(http|ftp|https):?\/\//.test(src) || src.startsWith("data:");
+}
 export {
   appendExtension,
   appendForwardSlash,
   isRelativePath,
+  isRemotePath,
   joinPaths,
   prependForwardSlash,
   removeFileExtension,

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

@@ -1,10 +1,12 @@
 import type { AstroTelemetry } from '@astrojs/telemetry';
+import type { Arguments } from 'yargs-parser';
 import type { AstroSettings, PreviewServer } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
 interface PreviewOptions {
     logging: LogOptions;
     telemetry: AstroTelemetry;
+    flags?: Arguments;
 }
 /** The primary dev action */
-export default function preview(_settings: AstroSettings, { logging }: PreviewOptions): Promise<PreviewServer>;
+export default function preview(_settings: AstroSettings, { logging, flags }: PreviewOptions): Promise<PreviewServer | undefined>;
 export {};

package/dist/core/preview/index.js

@@ -1,9 +1,24 @@
+import { cyan } from "kleur/colors";
 import { createRequire } from "module";
 import { pathToFileURL } from "url";
 import { runHookConfigDone, runHookConfigSetup } from "../../integrations/index.js";
+import { printHelp } from "../messages.js";
 import createStaticPreviewServer from "./static-preview-server.js";
 import { getResolvedHostForHttpServer } from "./util.js";
-async function preview(_settings, { logging }) {
+async function preview(_settings, { logging, flags }) {
+  if ((flags == null ? void 0 : flags.help) || (flags == null ? void 0 : flags.h)) {
+    printHelp({
+      commandName: "astro preview",
+      usage: "[...flags]",
+      tables: {
+        Flags: [["--help (-h)", "See all available flags."]]
+      },
+      description: `Starts a local server to serve your static dist/ directory. Check ${cyan(
+        "https://docs.astro.build/en/reference/cli-reference/#astro-preview"
+      )} for more information.`
+    });
+    return;
+  }
   const settings = await runHookConfigSetup({
     settings: _settings,
     command: "preview",

package/dist/core/render/dev/environment.js

@@ -1,4 +1,3 @@
-import { getContentPaths } from "../../../content/index.js";
 import { createEnvironment } from "../index.js";
 import { RouteCache } from "../route-cache.js";
 import { createResolve } from "./resolve.js";
@@ -8,10 +7,7 @@ function createDevelopmentEnvironment(settings, logging, loader) {
   let env = createEnvironment({
     adapterName: (_a = settings.adapter) == null ? void 0 : _a.name,
     logging,
-    markdown: {
-      ...settings.config.markdown,
-      contentDir: getContentPaths(settings.config).contentDir
-    },
+    markdown: settings.config.markdown,
     mode,
     renderers: [],
     resolve: createResolve(loader, settings.config.root),

package/dist/core/render/environment.js

@@ -7,8 +7,7 @@ function createBasicEnvironment(options) {
   return createEnvironment({
     ...options,
     markdown: {
-      ...options.markdown ?? {},
-      contentDir: new URL("file:///src/content/")
+      ...options.markdown ?? {}
     },
     mode,
     renderers: options.renderers ?? [],

package/dist/core/render/result.js

@@ -1,22 +1,3 @@
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateSet = (obj, member, value, setter) => {
-  __accessCheck(obj, member, "write to private field");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
-};
-var _result, _slots, _loggingOpts;
 import {
   createScopedResult,
   renderSlot,
@@ -45,13 +26,13 @@ function getFunctionExpression(slot) {
   return slot.expressions[0];
 }
 class Slots {
+  #result;
+  #slots;
+  #loggingOpts;
   constructor(result, slots, logging) {
-    __privateAdd(this, _result, void 0);
-    __privateAdd(this, _slots, void 0);
-    __privateAdd(this, _loggingOpts, void 0);
-    __privateSet(this, _result, result);
-    __privateSet(this, _slots, slots);
-    __privateSet(this, _loggingOpts, logging);
+    this.#result = result;
+    this.#slots = slots;
+    this.#loggingOpts = logging;
     if (slots) {
       for (const key of Object.keys(slots)) {
         if (this[key] !== void 0) {
@@ -70,22 +51,22 @@ class Slots {
     }
   }
   has(name) {
-    if (!__privateGet(this, _slots))
+    if (!this.#slots)
       return false;
-    return Boolean(__privateGet(this, _slots)[name]);
+    return Boolean(this.#slots[name]);
   }
   async render(name, args = []) {
-    if (!__privateGet(this, _slots) || !this.has(name))
+    if (!this.#slots || !this.has(name))
       return;
-    const scoped = createScopedResult(__privateGet(this, _result), ScopeFlags.RenderSlot);
+    const scoped = createScopedResult(this.#result, ScopeFlags.RenderSlot);
     if (!Array.isArray(args)) {
       warn(
-        __privateGet(this, _loggingOpts),
+        this.#loggingOpts,
         "Astro.slots.render",
         `Expected second parameter to be an array, received a ${typeof args}. If you're trying to pass an array as a single argument and getting unexpected results, make sure you're passing your array as a item of an array. Ex: Astro.slots.render('default', [["Hello", "World"]])`
       );
     } else if (args.length > 0) {
-      const slotValue = __privateGet(this, _slots)[name];
+      const slotValue = this.#slots[name];
       const component = typeof slotValue === "function" ? await slotValue(scoped) : await slotValue;
       const expression = getFunctionExpression(component);
       if (expression) {
@@ -98,14 +79,11 @@ class Slots {
         );
       }
     }
-    const content = await renderSlot(scoped, __privateGet(this, _slots)[name]);
+    const content = await renderSlot(scoped, this.#slots[name]);
     const outHTML = stringifyChunk(scoped, content);
     return outHTML;
   }
 }
-_result = new WeakMap();
-_slots = new WeakMap();
-_loggingOpts = new WeakMap();
 let renderMarkdown = null;
 function createResult(args) {
   const { markdown, params, pathname, renderers, request, resolve } = args;

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

@@ -1,14 +1,27 @@
 /// <reference types="node" />
 import type fsMod from 'node:fs';
+import type { Arguments } from 'yargs-parser';
 import type { AstroSettings } from '../../@types/astro';
 import { LogOptions } from '../logger/core.js';
-type ProcessExit = 0 | 1;
-export declare function syncCli(settings: AstroSettings, { logging, fs }: {
+export type ProcessExit = 0 | 1;
+export type SyncOptions = {
     logging: LogOptions;
     fs: typeof fsMod;
-}): Promise<ProcessExit>;
-export declare function sync(settings: AstroSettings, { logging, fs }: {
+};
+export declare function syncCli(settings: AstroSettings, { logging, fs, flags }: {
     logging: LogOptions;
     fs: typeof fsMod;
+    flags?: Arguments;
 }): Promise<ProcessExit>;
-export {};
+/**
+ * Generate content collection types, and then returns the process exit signal.
+ *
+ * A non-zero process signal is emitted in case there's an error while generating content collection types.
+ *
+ * @param {SyncOptions} options
+ * @param {AstroSettings} settings Astro settings
+ * @param {typeof fsMod} options.fs The file system
+ * @param {LogOptions} options.logging Logging options
+ * @return {Promise<ProcessExit>}
+ */
+export declare function sync(settings: AstroSettings, { logging, fs }: SyncOptions): Promise<ProcessExit>;

package/dist/core/sync/index.js

@@ -9,7 +9,19 @@ import { getTimeStat } from "../build/util.js";
 import { createVite } from "../create-vite.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { info } from "../logger/core.js";
-async function syncCli(settings, { logging, fs }) {
+import { printHelp } from "../messages.js";
+async function syncCli(settings, { logging, fs, flags }) {
+  if ((flags == null ? void 0 : flags.help) || (flags == null ? void 0 : flags.h)) {
+    printHelp({
+      commandName: "astro sync",
+      usage: "[...flags]",
+      tables: {
+        Flags: [["--help (-h)", "See all available flags."]]
+      },
+      description: `Generates TypeScript types for all Astro modules.`
+    });
+    return 0;
+  }
   const resolvedSettings = await runHookConfigSetup({
     settings,
     logging,

package/dist/core/util.d.ts

@@ -37,6 +37,7 @@ export declare function isPage(file: URL, settings: AstroSettings): boolean;
 export declare function isEndpoint(file: URL, settings: AstroSettings): boolean;
 export declare function isModeServerWithNoAdapter(settings: AstroSettings): boolean;
 export declare function relativeToSrcDir(config: AstroConfig, idOrUrl: URL | string): string;
+export declare function rootRelativePath(config: AstroConfig, idOrUrl: URL | string): string;
 export declare function emoji(char: string, fallback: string): string;
 /**
  * Simulate Vite's resolve and import analysis so we can import the id as an URL

package/dist/core/util.js

@@ -114,6 +114,15 @@ function relativeToSrcDir(config, idOrUrl) {
   }
   return id.slice(slash(fileURLToPath(config.srcDir)).length);
 }
+function rootRelativePath(config, idOrUrl) {
+  let id;
+  if (typeof idOrUrl !== "string") {
+    id = unwrapId(viteID(idOrUrl));
+  } else {
+    id = idOrUrl;
+  }
+  return prependForwardSlash(id.slice(normalizePath(fileURLToPath(config.root)).length));
+}
 function emoji(char, fallback) {
   return process.platform !== "win32" ? char : fallback;
 }
@@ -170,6 +179,7 @@ export {
   resolveJsToTs,
   resolvePages,
   resolvePath,
+  rootRelativePath,
   unwrapId,
   viteID
 };

package/dist/integrations/index.js

@@ -3,6 +3,7 @@ import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import { mergeConfig } from "../core/config/config.js";
 import { info } from "../core/logger/core.js";
+import { mdxContentEntryType } from "../vite-plugin-markdown/content-entry-type.js";
 async function withTakingALongTimeMsg({
   name,
   hookResult,
@@ -33,8 +34,10 @@ async function runHookConfigSetup({
       let addPageExtension2 = function(...input) {
         const exts = input.flat(Infinity).map((ext) => `.${ext.replace(/^\./, "")}`);
         updatedSettings.pageExtensions.push(...exts);
+      }, addContentEntryType2 = function(contentEntryType) {
+        updatedSettings.contentEntryTypes.push(contentEntryType);
       };
-      var addPageExtension = addPageExtension2;
+      var addPageExtension = addPageExtension2, addContentEntryType = addContentEntryType2;
       const hooks = {
         config: updatedConfig,
         command,
@@ -66,11 +69,19 @@ async function runHookConfigSetup({
         writable: false,
         enumerable: false
       });
+      Object.defineProperty(hooks, "addContentEntryType", {
+        value: addContentEntryType2,
+        writable: false,
+        enumerable: false
+      });
       await withTakingALongTimeMsg({
         name: integration.name,
         hookResult: integration.hooks["astro:config:setup"](hooks),
         logging
       });
+      if (integration.name === "@astrojs/mdx" && !updatedSettings.contentEntryTypes.find((c) => c.extensions.includes(".mdx"))) {
+        addContentEntryType2(mdxContentEntryType);
+      }
     }
   }
   updatedSettings.config = updatedConfig;

package/dist/runtime/server/jsx.js

@@ -194,10 +194,17 @@ Did you forget to import the component or is it possible there is a typo?`);
 async function renderElement(result, tag, { children, ...props }) {
   return markHTMLString(
     `<${tag}${spreadAttributes(props)}${markHTMLString(
-      (children == null || children == "") && voidElementNames.test(tag) ? `/>` : `>${children == null ? "" : await renderJSX(result, children)}</${tag}>`
+      (children == null || children == "") && voidElementNames.test(tag) ? `/>` : `>${children == null ? "" : await renderJSX(result, prerenderElementChildren(tag, children))}</${tag}>`
     )}`
   );
 }
+function prerenderElementChildren(tag, children) {
+  if (typeof children === "string" && (tag === "style" || tag === "script")) {
+    return markHTMLString(children);
+  } else {
+    return children;
+  }
+}
 function useConsoleFilter() {
   consoleFilterRefs++;
   if (!originalConsoleError) {

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

@@ -85,7 +85,7 @@ Did you forget to import the component or is it possible there is a typo?`
             break;
           }
         } catch (e) {
-          error ?? (error = e);
+          error ??= e;
         }
       }
       if (!renderer && error) {

package/dist/runtime/server/response.js

@@ -1,42 +1,23 @@
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateSet = (obj, member, value, setter) => {
-  __accessCheck(obj, member, "write to private field");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
-};
 import { streamAsyncIterator } from "./util.js";
 const isNodeJS = typeof process === "object" && Object.prototype.toString.call(process) === "[object process]";
 let StreamingCompatibleResponse;
 function createResponseClass() {
-  var _isStream, _body, _a;
-  StreamingCompatibleResponse = (_a = class extends Response {
+  StreamingCompatibleResponse = class extends Response {
+    #isStream;
+    #body;
     constructor(body, init) {
       let isStream = body instanceof ReadableStream;
       super(isStream ? null : body, init);
-      __privateAdd(this, _isStream, void 0);
-      __privateAdd(this, _body, void 0);
-      __privateSet(this, _isStream, isStream);
-      __privateSet(this, _body, body);
+      this.#isStream = isStream;
+      this.#body = body;
     }
     get body() {
-      return __privateGet(this, _body);
+      return this.#body;
     }
     async text() {
-      if (__privateGet(this, _isStream) && isNodeJS) {
+      if (this.#isStream && isNodeJS) {
         let decoder = new TextDecoder();
-        let body = __privateGet(this, _body);
+        let body = this.#body;
         let out = "";
         for await (let chunk of streamAsyncIterator(body)) {
           out += decoder.decode(chunk);
@@ -46,8 +27,8 @@ function createResponseClass() {
       return super.text();
     }
     async arrayBuffer() {
-      if (__privateGet(this, _isStream) && isNodeJS) {
-        let body = __privateGet(this, _body);
+      if (this.#isStream && isNodeJS) {
+        let body = this.#body;
         let chunks = [];
         let len = 0;
         for await (let chunk of streamAsyncIterator(body)) {
@@ -64,7 +45,7 @@ function createResponseClass() {
       }
       return super.arrayBuffer();
     }
-  }, _isStream = new WeakMap(), _body = new WeakMap(), _a);
+  };
   return StreamingCompatibleResponse;
 }
 const createResponse = isNodeJS ? (body, init) => {

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

@@ -25,7 +25,7 @@ function astro(_opts) {
             const firstArgEnd = node.arguments[0].end;
             const lastArgEnd = node.arguments[node.arguments.length - 1].end;
             const firstArg = code.slice(firstArgStart, firstArgEnd);
-            s ?? (s = new MagicString(code));
+            s ??= new MagicString(code);
             s.overwrite(
               firstArgStart,
               lastArgEnd,

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

@@ -33,7 +33,7 @@ function createVitePluginAstroServer({
             handle: baseMiddleware(settings, logging)
           });
         }
-        viteServer.middlewares.use(async (req, res) => {
+        viteServer.middlewares.use(async function astroDevHandler(req, res) {
           if (req.url === void 0 || !req.method) {
             res.writeHead(500, "Incomplete request");
             res.end();

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

@@ -59,21 +59,21 @@ function envVitePlugin({ settings }) {
       while (match = pattern.exec(source)) {
         let replacement;
         if (match[0] === "import.meta.env") {
-          privateEnv ?? (privateEnv = getPrivateEnv(viteConfig, astroConfig));
-          references ?? (references = getReferencedPrivateKeys(source, privateEnv));
+          privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
+          references ??= getReferencedPrivateKeys(source, privateEnv);
           replacement = `(Object.assign(import.meta.env,{`;
           for (const key of references.values()) {
             replacement += `${key}:${privateEnv[key]},`;
           }
           replacement += "}))";
         } else if (match[2]) {
-          privateEnv ?? (privateEnv = getPrivateEnv(viteConfig, astroConfig));
+          privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
           replacement = privateEnv[match[2]];
         }
         if (replacement) {
           const start = match.index;
           const end = start + match[0].length;
-          s ?? (s = new MagicString(source));
+          s ??= new MagicString(source);
           s.overwrite(start, end, replacement);
         }
       }

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

@@ -32,9 +32,22 @@ async function setUpEnvTs({
     path.relative(fileURLToPath(settings.config.root), fileURLToPath(envTsPath))
   );
   if (fs.existsSync(envTsPath)) {
+    let typesEnvContents = await fs.promises.readFile(envTsPath, "utf-8");
+    if (settings.config.experimental.assets && typesEnvContents.includes('types="astro/client"')) {
+      typesEnvContents = typesEnvContents.replace(
+        'types="astro/client"',
+        'types="astro/client-image"'
+      );
+      await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
+    } else if (typesEnvContents.includes('types="astro/client-image"')) {
+      typesEnvContents = typesEnvContents.replace(
+        'types="astro/client-image"',
+        'types="astro/client"'
+      );
+      await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
+    }
     if (!fs.existsSync(dotAstroDir))
       return;
-    let typesEnvContents = await fs.promises.readFile(envTsPath, "utf-8");
     const expectedTypeReference = getDotAstroTypeReference(settings.config);
     if (!typesEnvContents.includes(expectedTypeReference)) {
       typesEnvContents = `${expectedTypeReference}
@@ -44,7 +57,9 @@ ${typesEnvContents}`;
     }
   } else {
     let referenceDefs = [];
-    if (settings.config.integrations.find((i) => i.name === "@astrojs/image")) {
+    if (settings.config.experimental.assets) {
+      referenceDefs.push('/// <reference types="astro/client-image" />');
+    } else if (settings.config.integrations.find((i) => i.name === "@astrojs/image")) {
       referenceDefs.push('/// <reference types="@astrojs/image/client" />');
     } else {
       referenceDefs.push('/// <reference types="astro/client" />');

package/dist/vite-plugin-markdown/content-entry-type.d.ts

@@ -0,0 +1,7 @@
+import { ContentEntryType } from '../@types/astro.js';
+export declare const markdownContentEntryType: ContentEntryType;
+/**
+ * MDX content type for compatibility with older `@astrojs/mdx` versions
+ * TODO: remove in next Astro minor release
+ */
+export declare const mdxContentEntryType: ContentEntryType;