astro 2.1.9 → 2.2.1

package/dist/core/render/result.js

@@ -1,9 +1,13 @@
-import { renderSlot, stringifyChunk } from "../../runtime/server/index.js";
+import {
+  renderSlotToString,
+  stringifyChunk
+} from "../../runtime/server/index.js";
 import { renderJSX } from "../../runtime/server/jsx.js";
 import { AstroCookies } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { warn } from "../logger/core.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
+const responseSentSymbol = Symbol.for("astro.responseSent");
 function onlyAvailableInSSR(name) {
   return function _onlyAvailableInSSR() {
     switch (name) {
@@ -66,7 +70,9 @@ class Slots {
       const expression = getFunctionExpression(component);
       if (expression) {
         const slot = () => expression(...args);
-        return await renderSlot(result, slot).then((res) => res != null ? String(res) : res);
+        return await renderSlotToString(result, slot).then(
+          (res) => res != null ? String(res) : res
+        );
       }
       if (typeof component === "function") {
         return await renderJSX(result, component(...args)).then(
@@ -74,7 +80,7 @@ class Slots {
         );
       }
     }
-    const content = await renderSlot(result, this.#slots[name]);
+    const content = await renderSlotToString(result, this.#slots[name]);
     const outHTML = stringifyChunk(result, content);
     return outHTML;
   }
@@ -138,6 +144,11 @@ function createResult(args) {
         request,
         url,
         redirect: args.ssr ? (path, status) => {
+          if (request[responseSentSymbol]) {
+            throw new AstroError({
+              ...AstroErrorData.ResponseSentError
+            });
+          }
           return new Response(null, {
             status: status || 302,
             headers: {

package/dist/core/render/ssr-element.d.ts

@@ -1,13 +1,14 @@
 import type { SSRElement } from '../../@types/astro';
-export declare function createLinkStylesheetElement(href: string, base?: string): SSRElement;
-export declare function createLinkStylesheetElementSet(hrefs: string[], base?: string): Set<SSRElement>;
+export declare function createAssetLink(href: string, base?: string, assetsPrefix?: string): string;
+export declare function createLinkStylesheetElement(href: string, base?: string, assetsPrefix?: string): SSRElement;
+export declare function createLinkStylesheetElementSet(hrefs: string[], base?: string, assetsPrefix?: string): Set<SSRElement>;
 export declare function createModuleScriptElement(script: {
     type: 'inline' | 'external';
     value: string;
-}, base?: string): SSRElement;
-export declare function createModuleScriptElementWithSrc(src: string, site?: string): SSRElement;
-export declare function createModuleScriptElementWithSrcSet(srces: string[], site?: string): Set<SSRElement>;
+}, base?: string, assetsPrefix?: string): SSRElement;
+export declare function createModuleScriptElementWithSrc(src: string, base?: string, assetsPrefix?: string): SSRElement;
+export declare function createModuleScriptElementWithSrcSet(srces: string[], site?: string, assetsPrefix?: string): Set<SSRElement>;
 export declare function createModuleScriptsSet(scripts: {
     type: 'inline' | 'external';
     value: string;
-}[], base?: string): Set<SSRElement>;
+}[], base?: string, assetsPrefix?: string): Set<SSRElement>;

package/dist/core/render/ssr-element.js

@@ -1,28 +1,31 @@
 import slashify from "slash";
-import { appendForwardSlash, removeLeadingForwardSlash } from "../../core/path.js";
-function getRootPath(base) {
-  return appendForwardSlash(new URL(base || "/", "http://localhost/").pathname);
-}
-function joinToRoot(href, base) {
-  const rootPath = getRootPath(base);
-  const normalizedHref = slashify(href);
-  return appendForwardSlash(rootPath) + removeLeadingForwardSlash(normalizedHref);
+import { joinPaths, prependForwardSlash } from "../../core/path.js";
+function createAssetLink(href, base, assetsPrefix) {
+  if (assetsPrefix) {
+    return joinPaths(assetsPrefix, slashify(href));
+  } else if (base) {
+    return prependForwardSlash(joinPaths(base, slashify(href)));
+  } else {
+    return href;
+  }
 }
-function createLinkStylesheetElement(href, base) {
+function createLinkStylesheetElement(href, base, assetsPrefix) {
   return {
     props: {
       rel: "stylesheet",
-      href: joinToRoot(href, base)
+      href: createAssetLink(href, base, assetsPrefix)
     },
     children: ""
   };
 }
-function createLinkStylesheetElementSet(hrefs, base) {
-  return new Set(hrefs.map((href) => createLinkStylesheetElement(href, base)));
+function createLinkStylesheetElementSet(hrefs, base, assetsPrefix) {
+  return new Set(
+    hrefs.map((href) => createLinkStylesheetElement(href, base, assetsPrefix))
+  );
 }
-function createModuleScriptElement(script, base) {
+function createModuleScriptElement(script, base, assetsPrefix) {
   if (script.type === "external") {
-    return createModuleScriptElementWithSrc(script.value, base);
+    return createModuleScriptElementWithSrc(script.value, base, assetsPrefix);
   } else {
     return {
       props: {
@@ -32,22 +35,27 @@ function createModuleScriptElement(script, base) {
     };
   }
 }
-function createModuleScriptElementWithSrc(src, site) {
+function createModuleScriptElementWithSrc(src, base, assetsPrefix) {
   return {
     props: {
       type: "module",
-      src: joinToRoot(src, site)
+      src: createAssetLink(src, base, assetsPrefix)
     },
     children: ""
   };
 }
-function createModuleScriptElementWithSrcSet(srces, site) {
-  return new Set(srces.map((src) => createModuleScriptElementWithSrc(src, site)));
+function createModuleScriptElementWithSrcSet(srces, site, assetsPrefix) {
+  return new Set(
+    srces.map((src) => createModuleScriptElementWithSrc(src, site, assetsPrefix))
+  );
 }
-function createModuleScriptsSet(scripts, base) {
-  return new Set(scripts.map((script) => createModuleScriptElement(script, base)));
+function createModuleScriptsSet(scripts, base, assetsPrefix) {
+  return new Set(
+    scripts.map((script) => createModuleScriptElement(script, base, assetsPrefix))
+  );
 }
 export {
+  createAssetLink,
   createLinkStylesheetElement,
   createLinkStylesheetElementSet,
   createModuleScriptElement,

package/dist/core/sync/index.js

@@ -7,7 +7,7 @@ import { runHookConfigSetup } from "../../integrations/index.js";
 import { setUpEnvTs } from "../../vite-plugin-inject-env-ts/index.js";
 import { getTimeStat } from "../build/util.js";
 import { createVite } from "../create-vite.js";
-import { AstroError, AstroErrorData } from "../errors/index.js";
+import { AstroError, AstroErrorData, createSafeError } from "../errors/index.js";
 import { info } from "../logger/core.js";
 import { printHelp } from "../messages.js";
 async function syncCli(settings, { logging, fs, flags }) {
@@ -64,7 +64,14 @@ async function sync(settings, { logging, fs }) {
       }
     }
   } catch (e) {
-    throw new AstroError(AstroErrorData.GenerateContentTypesError);
+    const safeError = createSafeError(e);
+    throw new AstroError(
+      {
+        ...AstroErrorData.GenerateContentTypesError,
+        message: AstroErrorData.GenerateContentTypesError.message(safeError.message)
+      },
+      { cause: e }
+    );
   } finally {
     await tempViteServer.close();
   }

package/dist/core/util.d.ts

@@ -37,7 +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 rootRelativePath(root: URL, 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,14 +114,14 @@ function relativeToSrcDir(config, idOrUrl) {
   }
   return id.slice(slash(fileURLToPath(config.srcDir)).length);
 }
-function rootRelativePath(config, idOrUrl) {
+function rootRelativePath(root, idOrUrl) {
   let id;
   if (typeof idOrUrl !== "string") {
     id = unwrapId(viteID(idOrUrl));
   } else {
     id = idOrUrl;
   }
-  return prependForwardSlash(id.slice(normalizePath(fileURLToPath(config.root)).length));
+  return prependForwardSlash(id.slice(normalizePath(fileURLToPath(root)).length));
 }
 function emoji(char, fallback) {
   return process.platform !== "win32" ? char : fallback;

package/dist/runtime/server/index.d.ts

@@ -3,7 +3,7 @@ export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
 export { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from './escape.js';
 export { renderJSX } from './jsx.js';
-export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderStyleElement, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
+export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderSlotToString, renderStyleElement, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, AstroComponentInstance, ComponentSlots, RenderInstruction, } from './render/index.js';
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;
 /** @internal Associate JSX components with a specific renderer (see /src/vite-plugin-jsx/tag.ts) */

package/dist/runtime/server/index.js

@@ -18,6 +18,7 @@ import {
   renderPage,
   renderScriptElement,
   renderSlot,
+  renderSlotToString,
   renderStyleElement,
   renderTemplate,
   renderTemplate as renderTemplate2,
@@ -107,6 +108,7 @@ export {
   renderPage,
   renderScriptElement,
   renderSlot,
+  renderSlotToString,
   renderStyleElement,
   renderTemplate2 as renderTemplate,
   renderToString,

package/dist/runtime/server/render/common.d.ts

@@ -6,7 +6,7 @@ export declare const Fragment: unique symbol;
 export declare const Renderer: unique symbol;
 export declare const encoder: TextEncoder;
 export declare const decoder: TextDecoder;
-export declare function stringifyChunk(result: SSRResult, chunk: string | SlotString | RenderInstruction): any;
+export declare function stringifyChunk(result: SSRResult, chunk: string | SlotString | RenderInstruction): string;
 export declare class HTMLParts {
     parts: string;
     constructor();

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

@@ -13,7 +13,7 @@ import {
 } from "./astro/index.js";
 import { Fragment, Renderer, stringifyChunk } from "./common.js";
 import { componentIsHTMLElement, renderHTMLElement } from "./dom.js";
-import { renderSlot, renderSlots } from "./slot.js";
+import { renderSlots, renderSlotToString } from "./slot.js";
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from "./util.js";
 const rendererAliases = /* @__PURE__ */ new Map([["solid", "solid-js"]]);
 function guessRenderers(componentUrl) {
@@ -166,7 +166,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     }
   } else {
     if (metadata.hydrate === "only") {
-      html = await renderSlot(result, slots == null ? void 0 : slots.fallback);
+      html = await renderSlotToString(result, slots == null ? void 0 : slots.fallback);
     } else {
       ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call(
         { result },
@@ -261,7 +261,7 @@ function sanitizeElementName(tag) {
   return tag.trim().split(unsafe)[0].trim();
 }
 async function renderFragmentComponent(result, slots = {}) {
-  const children = await renderSlot(result, slots == null ? void 0 : slots.default);
+  const children = await renderSlotToString(result, slots == null ? void 0 : slots.default);
   if (children == null) {
     return children;
   }

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

@@ -1,5 +1,5 @@
 import { markHTMLString } from "../escape.js";
-import { renderSlot } from "./slot.js";
+import { renderSlotToString } from "./slot.js";
 import { toAttributeString } from "./util.js";
 function componentIsHTMLElement(Component) {
   return typeof HTMLElement !== "undefined" && HTMLElement.isPrototypeOf(Component);
@@ -11,7 +11,7 @@ async function renderHTMLElement(result, constructor, props, slots) {
     attrHTML += ` ${attr}="${toAttributeString(await props[attr])}"`;
   }
   return markHTMLString(
-    `<${name}${attrHTML}>${await renderSlot(result, slots == null ? void 0 : slots.default)}</${name}>`
+    `<${name}${attrHTML}>${await renderSlotToString(result, slots == null ? void 0 : slots.default)}</${name}>`
   );
 }
 function getHTMLElementName(constructor) {

package/dist/runtime/server/render/index.d.ts

@@ -5,7 +5,7 @@ export { renderComponent, renderComponentToIterable } from './component.js';
 export { renderHTMLElement } from './dom.js';
 export { maybeRenderHead, renderHead } from './head.js';
 export { renderPage } from './page.js';
-export { renderSlot, type ComponentSlots } from './slot.js';
+export { renderSlot, renderSlotToString, type ComponentSlots } from './slot.js';
 export { renderScriptElement, renderStyleElement, renderUniqueStylesheet } from './tags.js';
 export type { RenderInstruction } from './types';
 export { addAttribute, defineScriptVars, voidElementNames } from './util.js';

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

@@ -9,7 +9,7 @@ import { renderComponent, renderComponentToIterable } from "./component.js";
 import { renderHTMLElement } from "./dom.js";
 import { maybeRenderHead, renderHead } from "./head.js";
 import { renderPage } from "./page.js";
-import { renderSlot } from "./slot.js";
+import { renderSlot, renderSlotToString } from "./slot.js";
 import { renderScriptElement, renderStyleElement, renderUniqueStylesheet } from "./tags.js";
 import { addAttribute, defineScriptVars, voidElementNames } from "./util.js";
 export {
@@ -27,6 +27,7 @@ export {
   renderPage,
   renderScriptElement,
   renderSlot,
+  renderSlotToString,
   renderStyleElement,
   renderTemplate,
   renderToString,

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

@@ -48,8 +48,9 @@ async function bufferHeadContent(result) {
   }
 }
 async function renderPage(result, componentFactory, props, children, streaming, route) {
-  var _a;
+  var _a, _b;
   if (!isAstroComponentFactory(componentFactory)) {
+    result._metadata.headInTree = ((_a = result.componentMetadata.get(componentFactory.moduleId)) == null ? void 0 : _a.containsHead) ?? false;
     const pageProps = { ...props ?? {}, "server:root": true };
     let output;
     let head = "";
@@ -91,7 +92,7 @@ async function renderPage(result, componentFactory, props, children, streaming,
       ])
     });
   }
-  result._metadata.headInTree = ((_a = result.componentMetadata.get(componentFactory.moduleId)) == null ? void 0 : _a.containsHead) ?? false;
+  result._metadata.headInTree = ((_b = result.componentMetadata.get(componentFactory.moduleId)) == null ? void 0 : _b.containsHead) ?? false;
   const factoryReturnValue = await componentFactory(result, props, children);
   const factoryIsHeadAndContent = isHeadAndContent(factoryReturnValue);
   if (isRenderTemplateResult(factoryReturnValue) || factoryIsHeadAndContent) {

package/dist/runtime/server/render/slot.d.ts

@@ -12,7 +12,8 @@ export declare class SlotString extends HTMLString {
     constructor(content: string, instructions: null | RenderInstruction[]);
 }
 export declare function isSlotString(str: string): str is any;
-export declare function renderSlot(result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult): Promise<string>;
+export declare function renderSlot(result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult): AsyncGenerator<any, void, undefined>;
+export declare function renderSlotToString(result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult): Promise<string>;
 interface RenderSlotsResult {
     slotInstructions: null | RenderInstruction[];
     children: Record<string, string>;

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

@@ -12,27 +12,30 @@ slotString;
 function isSlotString(str) {
   return !!str[slotString];
 }
-async function renderSlot(result, slotted, fallback) {
+async function* renderSlot(result, slotted, fallback) {
   if (slotted) {
     let iterator = renderChild(typeof slotted === "function" ? slotted(result) : slotted);
-    let content = "";
-    let instructions = null;
-    for await (const chunk of iterator) {
-      if (typeof chunk.type === "string") {
-        if (instructions === null) {
-          instructions = [];
-        }
-        instructions.push(chunk);
-      } else {
-        content += chunk;
-      }
-    }
-    return markHTMLString(new SlotString(content, instructions));
+    yield* iterator;
   }
   if (fallback) {
-    return renderSlot(result, fallback);
+    yield* renderSlot(result, fallback);
+  }
+}
+async function renderSlotToString(result, slotted, fallback) {
+  let content = "";
+  let instructions = null;
+  let iterator = renderSlot(result, slotted, fallback);
+  for await (const chunk of iterator) {
+    if (typeof chunk.type === "string") {
+      if (instructions === null) {
+        instructions = [];
+      }
+      instructions.push(chunk);
+    } else {
+      content += chunk;
+    }
   }
-  return "";
+  return markHTMLString(new SlotString(content, instructions));
 }
 async function renderSlots(result, slots = {}) {
   let slotInstructions = null;
@@ -40,7 +43,7 @@ async function renderSlots(result, slots = {}) {
   if (slots) {
     await Promise.all(
       Object.entries(slots).map(
-        ([key, value]) => renderSlot(result, value).then((output) => {
+        ([key, value]) => renderSlotToString(result, value).then((output) => {
           if (output.instructions) {
             if (slotInstructions === null) {
               slotInstructions = [];
@@ -58,5 +61,6 @@ export {
   SlotString,
   isSlotString,
   renderSlot,
+  renderSlotToString,
   renderSlots
 };

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

@@ -6,4 +6,4 @@ export declare function handle404Response(origin: string, req: http.IncomingMess
 export declare function handle500Response(loader: ModuleLoader, res: http.ServerResponse, err: ErrorWithMetadata): Promise<void>;
 export declare function writeHtmlResponse(res: http.ServerResponse, statusCode: number, html: string): void;
 export declare function writeWebResponse(res: http.ServerResponse, webResponse: Response): Promise<void>;
-export declare function writeSSRResult(webResponse: Response, res: http.ServerResponse): Promise<void>;
+export declare function writeSSRResult(webRequest: Request, webResponse: Response, res: http.ServerResponse): Promise<void>;

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

@@ -76,7 +76,8 @@ async function writeWebResponse(res, webResponse) {
   }
   res.end();
 }
-async function writeSSRResult(webResponse, res) {
+async function writeSSRResult(webRequest, webResponse, res) {
+  Reflect.set(webRequest, Symbol.for("astro.responseSent"), true);
   return writeWebResponse(res, webResponse);
 }
 export {

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

@@ -151,7 +151,7 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, env, manif
   } else {
     const result = await renderPage(options);
     throwIfRedirectNotAllowed(result, config);
-    return await writeSSRResult(result, res);
+    return await writeSSRResult(request, result, res);
   }
 }
 export {

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

@@ -24,6 +24,7 @@ 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) {
@@ -42,6 +43,14 @@ function envVitePlugin({ 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"
+        }
+      };
+    },
     configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;
     },

package/dist/vite-plugin-integrations-container/index.d.ts

@@ -0,0 +1,8 @@
+import type { Plugin as VitePlugin } from 'vite';
+import type { AstroSettings } from '../@types/astro.js';
+import type { LogOptions } from '../core/logger/core.js';
+/** Connect Astro integrations into Vite, as needed. */
+export default function astroIntegrationsContainerPlugin({ settings, logging, }: {
+    settings: AstroSettings;
+    logging: LogOptions;
+}): VitePlugin;

package/dist/vite-plugin-integrations-container/index.js

@@ -0,0 +1,15 @@
+import { runHookServerSetup } from "../integrations/index.js";
+function astroIntegrationsContainerPlugin({
+  settings,
+  logging
+}) {
+  return {
+    name: "astro:integration-container",
+    configureServer(server) {
+      runHookServerSetup({ config: settings.config, server, logging });
+    }
+  };
+}
+export {
+  astroIntegrationsContainerPlugin as default
+};

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

@@ -54,6 +54,7 @@ function markdown({ settings, logging }) {
     // passing to the transform hook. This lets us get the truly raw value
     // to escape "import.meta.env" ourselves.
     async load(id) {
+      var _a;
       if (isMarkdownFile(id)) {
         const { fileId, fileUrl } = getFileInfo(id, settings.config);
         const rawFile = await fs.promises.readFile(fileId, "utf-8");
@@ -67,17 +68,13 @@ function markdown({ settings, logging }) {
         let html = renderResult.code;
         const { headings } = renderResult.metadata;
         let imagePaths = [];
-        if (settings.config.experimental.assets) {
-          let paths = renderResult.vfile.data.imagePaths ?? [];
-          imagePaths = await Promise.all(
-            paths.map(async (imagePath) => {
-              var _a;
-              return {
-                raw: imagePath,
-                resolved: ((_a = await this.resolve(imagePath, id)) == null ? void 0 : _a.id) ?? path.join(path.dirname(id), imagePath)
-              };
-            })
-          );
+        if (settings.config.experimental.assets && renderResult.vfile.data.imagePaths) {
+          for (let imagePath of renderResult.vfile.data.imagePaths.values()) {
+            imagePaths.push({
+              raw: imagePath,
+              resolved: ((_a = await this.resolve(imagePath, id)) == null ? void 0 : _a.id) ?? path.join(path.dirname(id), imagePath)
+            });
+          }
         }
         const astroData = safelyGetAstroData(renderResult.vfile.data);
         if (astroData instanceof InvalidAstroDataError) {
@@ -102,7 +99,7 @@ function markdown({ settings, logging }) {
 
 				export const images = {
 					${imagePaths.map(
-          (entry) => `'${entry.raw}': await getImageSafely((await import("${entry.raw}")).default, "${entry.raw}", "${rootRelativePath(settings.config, entry.resolved)}")`
+          (entry) => `'${entry.raw}': await getImageSafely((await import("${entry.raw}")).default, "${entry.raw}", "${rootRelativePath(settings.config.root, entry.resolved)}")`
         )}
 				}
 

package/dist/vite-plugin-scanner/scan.js

@@ -8,6 +8,21 @@ function includesExport(code) {
   }
   return false;
 }
+function isQuoted(value) {
+  return (value[0] === '"' || value[0] === "'") && value[value.length - 1] === value[0];
+}
+function isTruthy(value) {
+  if (isQuoted(value)) {
+    value = value.slice(1, -1);
+  }
+  return value === "true" || value === "1";
+}
+function isFalsy(value) {
+  if (isQuoted(value)) {
+    value = value.slice(1, -1);
+  }
+  return value === "false" || value === "0";
+}
 let didInit = false;
 async function scan(code, id) {
   if (!includesExport(code))
@@ -23,14 +38,14 @@ async function scan(code, id) {
     if (BOOLEAN_EXPORTS.has(name)) {
       const prefix = code.slice(0, endOfLocalName).split("export").pop().trim().replace("prerender", "").trim();
       const suffix = code.slice(endOfLocalName).trim().replace(/\=/, "").trim().split(/[;\n]/)[0];
-      if (prefix !== "const" || !(suffix === "true" || suffix === "false")) {
+      if (prefix !== "const" || !(isTruthy(suffix) || isFalsy(suffix))) {
         throw new AstroError({
           ...AstroErrorData.InvalidPrerenderExport,
           message: AstroErrorData.InvalidPrerenderExport.message(prefix, suffix),
           location: { file: id }
         });
       } else {
-        pageOptions[name] = suffix === "true";
+        pageOptions[name] = isTruthy(suffix);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.1.9",
+  "version": "2.2.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -93,9 +93,9 @@
     "src/content/template"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.3.0",
+    "@astrojs/compiler": "^1.3.1",
     "@astrojs/language-server": "^0.28.3",
-    "@astrojs/markdown-remark": "^2.1.2",
+    "@astrojs/markdown-remark": "^2.1.3",
     "@astrojs/telemetry": "^2.1.0",
     "@astrojs/webapi": "^2.1.0",
     "@babel/core": "^7.18.2",
@@ -142,7 +142,7 @@
     "typescript": "*",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "^4.1.2",
+    "vite": "^4.2.1",
     "vitefu": "^0.2.4",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"