astro 2.1.8 → 2.2.0

package/dist/content/utils.js

@@ -5,10 +5,10 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
 import { z } from "zod";
-import { emitESMImage } from "../assets/utils/emitAsset.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { CONTENT_TYPES_FILE } from "./consts.js";
 import { errorMap } from "./error-map.js";
+import { createImage } from "./runtime-assets.js";
 const collectionConfigParser = z.object({
   schema: z.any().optional()
 });
@@ -25,22 +25,6 @@ const contentConfigParser = z.object({
 const msg = {
   collectionConfigMissing: (collection) => `${collection} does not have a config. We suggest adding one for type safety!`
 };
-async function patchAssets(frontmatterEntry, watchMode, fileEmitter, astroSettings) {
-  for (const key of Object.keys(frontmatterEntry)) {
-    if (typeof frontmatterEntry[key] === "object" && frontmatterEntry[key] !== null) {
-      if (frontmatterEntry[key]["__astro_asset"]) {
-        frontmatterEntry[key] = await emitESMImage(
-          frontmatterEntry[key].src,
-          watchMode,
-          fileEmitter,
-          astroSettings
-        );
-      } else {
-        await patchAssets(frontmatterEntry[key], watchMode, fileEmitter, astroSettings);
-      }
-    }
-  }
-}
 function getEntrySlug({
   id,
   collection,
@@ -56,50 +40,27 @@ function getEntrySlug({
     });
   }
 }
-async function getEntryData(entry, collectionConfig, resolver) {
+async function getEntryData(entry, collectionConfig, pluginContext, settings) {
   let { slug, ...data } = entry.unvalidatedData;
-  if (collectionConfig.schema) {
-    if (typeof collectionConfig.schema === "object" && !("safeParseAsync" in collectionConfig.schema)) {
-      throw new AstroError({
-        title: "Invalid content collection config",
-        message: `New: Content collection schemas must be Zod objects. Update your collection config to use \`schema: z.object({...})\` instead of \`schema: {...}\`.`,
-        hint: "See https://docs.astro.build/en/reference/api-reference/#definecollection for an example.",
-        code: 99999
-      });
+  let schema = collectionConfig.schema;
+  if (typeof schema === "function") {
+    if (!settings.config.experimental.assets) {
+      throw new Error(
+        "The function shape for schema can only be used when `experimental.assets` is enabled."
+      );
     }
-    if (typeof collectionConfig.schema === "object" && "shape" in collectionConfig.schema && collectionConfig.schema.shape.slug) {
+    schema = schema({
+      image: createImage(settings, pluginContext, entry._internal.filePath)
+    });
+  }
+  if (schema) {
+    if (typeof schema === "object" && "shape" in schema && schema.shape.slug) {
       throw new AstroError({
         ...AstroErrorData.ContentSchemaContainsSlugError,
         message: AstroErrorData.ContentSchemaContainsSlugError.message(entry.collection)
       });
     }
-    async function preprocessAssetPaths(object) {
-      if (typeof object !== "object" || object === null)
-        return;
-      for (let [schemaName, schema] of Object.entries(object)) {
-        if (schema._def.description === "__image") {
-          object[schemaName] = z.preprocess(
-            async (value) => {
-              var _a;
-              if (!value || typeof value !== "string")
-                return value;
-              return (_a = await resolver(value)) == null ? void 0 : _a.id;
-            },
-            schema,
-            { description: void 0 }
-          );
-        } else if ("shape" in schema) {
-          await preprocessAssetPaths(schema.shape);
-        } else if ("unwrap" in schema) {
-          const unwrapped = schema.unwrap().shape;
-          if (unwrapped) {
-            await preprocessAssetPaths(unwrapped);
-          }
-        }
-      }
-    }
-    await preprocessAssetPaths(collectionConfig.schema.shape);
-    const parsed = await collectionConfig.schema.safeParseAsync(entry.unvalidatedData, {
+    const parsed = await schema.safeParseAsync(entry.unvalidatedData, {
       errorMap
     });
     if (parsed.success) {
@@ -288,6 +249,5 @@ export {
   globalContentConfigObserver,
   loadContentConfig,
   msg,
-  parseFrontmatter,
-  patchAssets
+  parseFrontmatter
 };

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

@@ -1,9 +1,8 @@
-import npath from "node:path";
 import { pathToFileURL } from "url";
 import { moduleIsTopLevelPage, walkParentInfos } from "../core/build/graph.js";
 import { getPageDataByViteID } from "../core/build/internal.js";
 import { createViteLoader } from "../core/module-loader/vite.js";
-import { prependForwardSlash } from "../core/path.js";
+import { joinPaths, prependForwardSlash } from "../core/path.js";
 import { getStylesForURL } from "../core/render/dev/css.js";
 import { getScriptsForURL } from "../core/render/dev/scripts.js";
 import {
@@ -59,7 +58,11 @@ function astroContentAssetPropagationPlugin({
           devModuleLoader,
           "development"
         );
-        const hoistedScripts = await getScriptsForURL(pathToFileURL(basePath), devModuleLoader);
+        const hoistedScripts = await getScriptsForURL(
+          pathToFileURL(basePath),
+          settings.config.root,
+          devModuleLoader
+        );
         return {
           code: code.replace(JSON.stringify(LINKS_PLACEHOLDER), JSON.stringify([...urls])).replace(JSON.stringify(STYLES_PLACEHOLDER), JSON.stringify([...stylesMap.values()])).replace(JSON.stringify(SCRIPTS_PLACEHOLDER), JSON.stringify([...hoistedScripts]))
         };
@@ -87,7 +90,13 @@ function astroConfigBuildPlugin(options, internals) {
       "build:post": ({ ssrOutputs, clientOutputs, mutate }) => {
         var _a, _b;
         const outputs = ssrOutputs.flatMap((o) => o.output);
-        const prependBase = (src) => prependForwardSlash(npath.posix.join(options.settings.config.base, src));
+        const prependBase = (src) => {
+          if (options.settings.config.build.assetsPrefix) {
+            return joinPaths(options.settings.config.build.assetsPrefix, src);
+          } else {
+            return prependForwardSlash(joinPaths(options.settings.config.base, src));
+          }
+        };
         for (const chunk of outputs) {
           if (chunk.type === "chunk" && (chunk.code.includes(LINKS_PLACEHOLDER) || chunk.code.includes(SCRIPTS_PLACEHOLDER))) {
             let entryCSS = /* @__PURE__ */ new Set();

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

@@ -13,8 +13,7 @@ import {
   getEntrySlug,
   getEntryType,
   globalContentConfigObserver,
-  NoCollectionError,
-  patchAssets
+  NoCollectionError
 } from "./utils.js";
 function isContentFlagImport(viteId, contentEntryExts) {
   const { searchParams, pathname } = new URL(viteId, "file://");
@@ -164,9 +163,9 @@ export const _internal = {
     let data = collectionConfig ? await getEntryData(
       { id, collection, slug, _internal, unvalidatedData },
       collectionConfig,
-      (idToResolve) => pluginContext.resolve(idToResolve, fileId)
+      pluginContext,
+      settings
     ) : unvalidatedData;
-    await patchAssets(data, pluginContext.meta.watchMode, pluginContext.emitFile, settings);
     const contentEntryModule = {
       id,
       slug,

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -16,16 +16,13 @@ function astroContentVirtualModPlugin({
     )
   );
   const contentEntryExts = getContentEntryExts(settings);
-  const assetsDir = settings.config.experimental.assets ? contentPaths.assetsDir.toString() : "undefined";
   const extGlob = contentEntryExts.length === 1 ? (
     // Wrapping {...} breaks when there is only one extension
     contentEntryExts[0]
   ) : `{${contentEntryExts.join(",")}}`;
   const entryGlob = `${relContentDir}**/*${extGlob}`;
   const virtualModContents = fsMod.readFileSync(contentPaths.virtualModTemplate, "utf-8").replace("@@CONTENT_DIR@@", relContentDir).replace("@@ENTRY_GLOB_PATH@@", entryGlob).replace("@@RENDER_ENTRY_GLOB_PATH@@", entryGlob);
-  const virtualAssetsModContents = fsMod.readFileSync(contentPaths.virtualAssetsModTemplate, "utf-8").replace("@@ASSETS_DIR@@", assetsDir);
   const astroContentVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
-  const allContents = settings.config.experimental.assets ? virtualModContents + virtualAssetsModContents : virtualModContents;
   return {
     name: "astro-content-virtual-mod-plugin",
     enforce: "pre",
@@ -37,7 +34,7 @@ function astroContentVirtualModPlugin({
     load(id) {
       if (id === astroContentVirtualModuleId) {
         return {
-          code: allContents
+          code: virtualModContents
         };
       }
     }

package/dist/core/app/index.js

@@ -18,6 +18,7 @@ import { matchRoute } from "../routing/match.js";
 import { deserializeManifest } from "./common.js";
 const pagesVirtualModuleId = "@astrojs-pages-virtual-entry";
 const resolvedPagesVirtualModuleId = "\0" + pagesVirtualModuleId;
+const responseSentSymbol = Symbol.for("astro.responseSent");
 class App {
   #env;
   #manifest;
@@ -168,6 +169,7 @@ class App {
         status
       });
       const response = await renderPage(mod, ctx, this.#env);
+      Reflect.set(request, responseSentSymbol, true);
       return response;
     } catch (err) {
       error(this.#logging, "ssr", err.stack || err.message || String(err));

package/dist/core/build/add-rollup-input.d.ts

@@ -1,2 +1,2 @@
-import type { InputOptions } from 'rollup';
-export declare function addRollupInput(inputOptions: InputOptions, newInputs: string[]): InputOptions;
+import type { Rollup } from 'vite';
+export declare function addRollupInput(inputOptions: Rollup.InputOptions, newInputs: string[]): Rollup.InputOptions;

package/dist/core/build/generate.js

@@ -1,12 +1,12 @@
 import fs from "fs";
 import * as colors from "kleur/colors";
 import { bgGreen, black, cyan, dim, green, magenta } from "kleur/colors";
-import npath from "path";
 import { fileURLToPath } from "url";
 import {
   generateImage as generateImageInternal,
   getStaticImageList
 } from "../../assets/internal.js";
+import { deleteWasmFiles } from "../../assets/services/vendor/squoosh/copy-wasm.js";
 import { hasPrerenderedPages } from "../../core/build/internal.js";
 import {
   prependForwardSlash,
@@ -20,7 +20,11 @@ import { AstroError } from "../errors/index.js";
 import { debug, info } from "../logger/core.js";
 import { createEnvironment, createRenderContext, renderPage } from "../render/index.js";
 import { callGetStaticPaths } from "../render/route-cache.js";
-import { createLinkStylesheetElementSet, createModuleScriptsSet } from "../render/ssr-element.js";
+import {
+  createAssetLink,
+  createLinkStylesheetElementSet,
+  createModuleScriptsSet
+} from "../render/ssr-element.js";
 import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
 import { getOutputFilename } from "../util.js";
@@ -82,7 +86,10 @@ ${bgGreen(black(` ${verb} static routes `))}`);
     info(opts.logging, null, `
 ${bgGreen(black(` generating optimized images `))}`);
     for (const imageData of getStaticImageList()) {
-      await generateImage(opts, imageData[0], imageData[1]);
+      await generateImage(opts, imageData[1].options, imageData[1].path);
+    }
+    if (opts.settings.config.image.service === "astro/assets/services/squoosh" && opts.settings.config.output === "static") {
+      await deleteWasmFiles(new URL("./chunks", opts.settings.config.outDir));
     }
     delete globalThis.astroAsset.addStaticImage;
   }
@@ -234,17 +241,26 @@ async function generatePath(pathname, opts, gopts) {
     addPageName(pathname, opts);
   }
   debug("build", `Generating: ${pathname}`);
-  const links = createLinkStylesheetElementSet(linkIds, settings.config.base);
+  const links = createLinkStylesheetElementSet(
+    linkIds,
+    settings.config.base,
+    settings.config.build.assetsPrefix
+  );
   const scripts = createModuleScriptsSet(
     hoistedScripts ? [hoistedScripts] : [],
-    settings.config.base
+    settings.config.base,
+    settings.config.build.assetsPrefix
   );
   if (settings.scripts.some((script) => script.stage === "page")) {
     const hashedFilePath = internals.entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);
     if (typeof hashedFilePath !== "string") {
       throw new Error(`Cannot find the built path for ${PAGE_SCRIPT_ID}`);
     }
-    const src = prependForwardSlash(npath.posix.join(settings.config.base, hashedFilePath));
+    const src = createAssetLink(
+      hashedFilePath,
+      settings.config.base,
+      settings.config.build.assetsPrefix
+    );
     scripts.add({
       props: { type: "module", src },
       children: ""
@@ -280,7 +296,11 @@ async function generatePath(pathname, opts, gopts) {
         }
         throw new Error(`Cannot find the built path for ${specifier}`);
       }
-      return prependForwardSlash(npath.posix.join(settings.config.base, hashedFilePath));
+      return createAssetLink(
+        hashedFilePath,
+        settings.config.base,
+        settings.config.build.assetsPrefix
+      );
     },
     routeCache,
     site: settings.config.site ? new URL(settings.config.base, settings.config.site).toString() : settings.config.site,

package/dist/core/build/internal.d.ts

@@ -1,4 +1,4 @@
-import type { OutputChunk, RenderedChunk } from 'rollup';
+import type { Rollup } from 'vite';
 import type { PageBuildData, ViteID } from './types';
 import type { SSRResult } from '../../@types/astro';
 import type { PageOptions } from '../../vite-plugin-astro/types';
@@ -57,7 +57,7 @@ export interface BuildInternals {
      */
     discoveredScripts: Set<string>;
     staticFiles: Set<string>;
-    ssrEntryChunk?: OutputChunk;
+    ssrEntryChunk?: Rollup.OutputChunk;
     componentMetadata: SSRResult['componentMetadata'];
 }
 /**
@@ -70,7 +70,7 @@ export declare function trackPageData(internals: BuildInternals, component: stri
  * Tracks client-only components to the pages they are associated with.
  */
 export declare function trackClientOnlyPageDatas(internals: BuildInternals, pageData: PageBuildData, clientOnlys: string[]): void;
-export declare function getPageDatasByChunk(internals: BuildInternals, chunk: RenderedChunk): Generator<PageBuildData, void, unknown>;
+export declare function getPageDatasByChunk(internals: BuildInternals, chunk: Rollup.RenderedChunk): Generator<PageBuildData, void, unknown>;
 export declare function getPageDatasByClientOnlyID(internals: BuildInternals, viteid: ViteID): Generator<PageBuildData, void, unknown>;
 export declare function getPageDataByComponent(internals: BuildInternals, component: string): PageBuildData | undefined;
 export declare function getPageDataByViteID(internals: BuildInternals, viteid: ViteID): PageBuildData | undefined;

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

@@ -1,6 +1,5 @@
 import * as crypto from "node:crypto";
 import * as npath from "node:path";
-import { transformWithEsbuild } from "vite";
 import { isBuildableCSSRequest } from "../../render/dev/util.js";
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import * as assetName from "../css-asset-name.js";
@@ -166,34 +165,6 @@ function rollupPluginAstroBuildCSS(options) {
           }
         }
       }
-    },
-    {
-      name: "astro:rollup-plugin-build-css-minify",
-      enforce: "post",
-      async generateBundle(_outputOptions, bundle) {
-        var _a, _b, _c;
-        if (options.target === "server") {
-          for (const [, output] of Object.entries(bundle)) {
-            if (output.type === "asset") {
-              if (((_a = output.name) == null ? void 0 : _a.endsWith(".css")) && typeof output.source === "string") {
-                const cssTarget = (_b = settings.config.vite.build) == null ? void 0 : _b.cssTarget;
-                const minify = ((_c = settings.config.vite.build) == null ? void 0 : _c.minify) !== false;
-                const { code: minifiedCSS } = await transformWithEsbuild(
-                  output.source,
-                  output.name,
-                  {
-                    loader: "css",
-                    minify,
-                    target: cssTarget || void 0,
-                    sourcemap: false
-                  }
-                );
-                output.source = minifiedCSS;
-              }
-            }
-          }
-        }
-      }
     }
   ];
 }

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

@@ -16,13 +16,6 @@ function vitePluginInternals(input, internals) {
       };
       return extra;
     },
-    configResolved(resolvedConfig) {
-      const plugins = resolvedConfig.plugins;
-      const viteAsset = plugins.find((p) => p.name === "vite:asset");
-      if (viteAsset) {
-        delete viteAsset.generateBundle;
-      }
-    },
     async generateBundle(_options, bundle) {
       const promises = [];
       const mapping = /* @__PURE__ */ new Map();

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

@@ -3,7 +3,7 @@ import { fileURLToPath } from "url";
 import { runHookBuildSsr } from "../../../integrations/index.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { pagesVirtualModuleId } from "../../app/index.js";
-import { removeLeadingForwardSlash, removeTrailingForwardSlash } from "../../path.js";
+import { joinPaths, prependForwardSlash } from "../../path.js";
 import { serializeRouteData } from "../../routing/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
@@ -104,8 +104,13 @@ function buildManifest(opts, internals, staticFiles) {
   if (settings.scripts.some((script) => script.stage === "page")) {
     staticFiles.push(entryModules[PAGE_SCRIPT_ID]);
   }
-  const bareBase = removeTrailingForwardSlash(removeLeadingForwardSlash(settings.config.base));
-  const joinBase = (pth) => bareBase ? bareBase + "/" + pth : pth;
+  const prefixAssetPath = (pth) => {
+    if (settings.config.build.assetsPrefix) {
+      return joinPaths(settings.config.build.assetsPrefix, pth);
+    } else {
+      return prependForwardSlash(joinPaths(settings.config.base, pth));
+    }
+  };
   for (const pageData of eachPrerenderedPageData(internals)) {
     if (!pageData.route.pathname)
       continue;
@@ -133,7 +138,7 @@ function buildManifest(opts, internals, staticFiles) {
     const scripts = [];
     if (pageData.hoistedScript) {
       const hoistedValue = pageData.hoistedScript.value;
-      const value = hoistedValue.endsWith(".js") ? joinBase(hoistedValue) : hoistedValue;
+      const value = hoistedValue.endsWith(".js") ? prefixAssetPath(hoistedValue) : hoistedValue;
       scripts.unshift(
         Object.assign({}, pageData.hoistedScript, {
           value
@@ -144,10 +149,10 @@ function buildManifest(opts, internals, staticFiles) {
       const src = entryModules[PAGE_SCRIPT_ID];
       scripts.push({
         type: "external",
-        value: joinBase(src)
+        value: prefixAssetPath(src)
       });
     }
-    const links = sortedCSS(pageData).map((pth) => joinBase(pth));
+    const links = sortedCSS(pageData).map((pth) => prefixAssetPath(pth));
     routes.push({
       file: "",
       links,
@@ -171,7 +176,7 @@ function buildManifest(opts, internals, staticFiles) {
     componentMetadata: Array.from(internals.componentMetadata),
     renderers: [],
     entryModules,
-    assets: staticFiles.map((s) => settings.config.base + s)
+    assets: staticFiles.map(prefixAssetPath)
   };
   return ssrManifest;
 }

package/dist/core/build/static-build.js

@@ -94,7 +94,7 @@ ${bgMagenta(black(" finalizing server assets "))}
   }
 }
 async function ssrBuild(opts, internals, input, container) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const { settings, viteConfig } = opts;
   const ssr = settings.config.output === "server";
   const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir);
@@ -105,13 +105,16 @@ async function ssrBuild(opts, internals, input, container) {
     logLevel: opts.viteConfig.logLevel ?? "error",
     build: {
       target: "esnext",
+      // Vite defaults cssMinify to false in SSR by default, but we want to minify it
+      // as the CSS generated are used and served to the client.
+      cssMinify: ((_a = viteConfig.build) == null ? void 0 : _a.minify) == null ? true : !!((_b = viteConfig.build) == null ? void 0 : _b.minify),
       ...viteConfig.build,
       emptyOutDir: false,
       manifest: false,
       outDir: fileURLToPath(out),
       copyPublicDir: !ssr,
       rollupOptions: {
-        ...(_a = viteConfig.build) == null ? void 0 : _a.rollupOptions,
+        ...(_c = viteConfig.build) == null ? void 0 : _c.rollupOptions,
         input: [],
         output: {
           format: "esm",
@@ -119,7 +122,7 @@ async function ssrBuild(opts, internals, input, container) {
           // We need to keep these separate
           chunkFileNames: `chunks/[name].[hash].mjs`,
           assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
-          ...(_c = (_b = viteConfig.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.output,
+          ...(_e = (_d = viteConfig.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output,
           entryFileNames(chunkInfo) {
             if (chunkInfo.facadeModuleId === resolvedPagesVirtualModuleId) {
               return opts.buildConfig.serverEntry;
@@ -130,6 +133,7 @@ async function ssrBuild(opts, internals, input, container) {
         }
       },
       ssr: true,
+      ssrEmitAssets: true,
       // improve build performance
       minify: false,
       modulePreload: { polyfill: false },

package/dist/core/config/schema.d.ts

@@ -41,8 +41,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
         server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
         assets: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+        assetsPrefix: z.ZodOptional<z.ZodString>;
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     }, "strip", z.ZodTypeAny, {
+        assetsPrefix?: string | undefined;
         assets: string;
         server: URL;
         format: "file" | "directory";
@@ -53,6 +55,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
+        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
@@ -178,6 +181,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         hooks: {};
     }[];
     build: {
+        assetsPrefix?: string | undefined;
         assets: string;
         server: URL;
         format: "file" | "directory";
@@ -226,6 +230,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
+        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
     image?: {
@@ -338,8 +343,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
         server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
         assets: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+        assetsPrefix: z.ZodOptional<z.ZodString>;
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     }, "strip", z.ZodTypeAny, {
+        assetsPrefix?: string | undefined;
         assets: string;
         server: URL;
         format: "file" | "directory";
@@ -350,6 +357,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
+        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
@@ -416,6 +424,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         hooks: {};
     }[];
     build: {
+        assetsPrefix?: string | undefined;
         assets: string;
         server: URL;
         format: "file" | "directory";
@@ -464,6 +473,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
+        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
     image?: {
@@ -513,6 +523,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         hooks: {};
     }[];
     build: {
+        assetsPrefix?: string | undefined;
         assets: string;
         server: URL;
         format: "file" | "directory";
@@ -561,6 +572,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
+        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
     image?: {

package/dist/core/config/schema.js

@@ -54,6 +54,7 @@ const AstroConfigSchema = z.object({
     client: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.client).transform((val) => new URL(val)),
     server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => new URL(val)),
     assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
+    assetsPrefix: z.string().optional(),
     serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry)
   }).optional().default({}),
   server: z.preprocess(
@@ -119,6 +120,7 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
       client: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.client).transform((val) => new URL(val, fileProtocolRoot)),
       server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => new URL(val, fileProtocolRoot)),
       assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
+      assetsPrefix: z.string().optional(),
       serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry)
     }).optional().default({}),
     server: z.preprocess(

package/dist/core/constants.js

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

package/dist/core/cookies/cookies.js

@@ -1,6 +1,8 @@
 import { parse, serialize } from "cookie";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 const DELETED_EXPIRATION = /* @__PURE__ */ new Date(0);
 const DELETED_VALUE = "deleted";
+const responseSentSymbol = Symbol.for("astro.responseSent");
 class AstroCookie {
   constructor(value) {
     this.value = value;
@@ -117,6 +119,11 @@ class AstroCookies {
       serialize(key, serializedValue, serializeOptions),
       true
     ]);
+    if (this.#request[responseSentSymbol]) {
+      throw new AstroError({
+        ...AstroErrorData.ResponseSentError
+      });
+    }
   }
   /**
    * Astro.cookies.header() returns an iterator for the cookies that have previously

package/dist/core/create-vite.js

@@ -16,7 +16,6 @@ import envVitePlugin from "../vite-plugin-env/index.js";
 import astroHeadPlugin from "../vite-plugin-head/index.js";
 import htmlVitePlugin from "../vite-plugin-html/index.js";
 import { astroInjectEnvTsPlugin } from "../vite-plugin-inject-env-ts/index.js";
-import astroIntegrationsContainerPlugin from "../vite-plugin-integrations-container/index.js";
 import jsxVitePlugin from "../vite-plugin-jsx/index.js";
 import astroLoadFallbackPlugin from "../vite-plugin-load-fallback/index.js";
 import markdownVitePlugin from "../vite-plugin-markdown/index.js";
@@ -24,6 +23,7 @@ import astroScannerPlugin from "../vite-plugin-scanner/index.js";
 import astroScriptsPlugin from "../vite-plugin-scripts/index.js";
 import astroScriptsPageSSRPlugin from "../vite-plugin-scripts/page-ssr.js";
 import { vitePluginSSRManifest } from "../vite-plugin-ssr-manifest/index.js";
+import { joinPaths } from "./path.js";
 const ALWAYS_NOEXTERNAL = [
   // This is only because Vite's native ESM doesn't resolve "exports" correctly.
   "astro",
@@ -93,7 +93,6 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
       htmlVitePlugin(),
       jsxVitePlugin({ settings, logging }),
       astroPostprocessVitePlugin({ settings }),
-      astroIntegrationsContainerPlugin({ settings, logging }),
       astroScriptsPageSSRPlugin({ settings }),
       astroHeadPlugin({ settings }),
       astroScannerPlugin({ settings }),
@@ -145,6 +144,16 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
       external: [...mode === "dev" ? ONLY_DEV_EXTERNAL : [], ...astroPkgsConfig.ssr.external]
     }
   };
+  const assetsPrefix = settings.config.build.assetsPrefix;
+  if (assetsPrefix) {
+    commonConfig.experimental = {
+      renderBuiltUrl(filename, { type }) {
+        if (type === "asset") {
+          return joinPaths(assetsPrefix, filename);
+        }
+      }
+    };
+  }
   let result = commonConfig;
   if (command && ((_b = settings.config.vite) == null ? void 0 : _b.plugins)) {
     let { plugins, ...rest } = settings.config.vite;

package/dist/core/dev/container.js

@@ -42,9 +42,6 @@ async function createContainer(params = {}) {
       server: { host, headers, open },
       optimizeDeps: {
         include: rendererClientEntries
-      },
-      define: {
-        "import.meta.env.BASE_URL": settings.config.base ? JSON.stringify(settings.config.base) : "undefined"
       }
     },
     { settings, logging, mode: "dev", command: "dev", fs }