astro 7.1.3 → 7.1.4

package/dist/assets/types.d.ts

@@ -168,6 +168,17 @@ type ImageSharedProps<T> = T & {
      * ```
      */
     position?: string;
+    /**
+     * The background color to use when converting images with transparency to a format that does not support it (e.g. PNG to JPEG).
+     *
+     * The value is a string that specifies a CSS color value, e.g. `#fff`, `white`, `rgb(255, 255, 255)`.
+     *
+     * **Example**:
+     * ```astro
+     * <Image src={...} format="jpeg" background="#fff" alt="..." />
+     * ```
+     */
+    background?: string;
 } & ({
     /**
      * The layout type for responsive images.

package/dist/cli/dev/background.js

@@ -66,6 +66,7 @@ async function background({
   const astroBin = resolve(dirname(require2.resolve("astro/package.json")), "bin", "astro.mjs");
   const child = spawn(process.execPath, [astroBin, ...args], {
     detached: true,
+    windowsHide: true,
     stdio: ["ignore", logFd, logFd],
     cwd: rootPath,
     env: { ...process.env, ASTRO_DEV_BACKGROUND: "1" }

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "7.1.3";
+  version = "7.1.4";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/container/index.js

@@ -1,7 +1,5 @@
-import { posix } from "node:path";
-import { getDefaultClientDirectives } from "../core/client-directive/index.js";
-import { ASTRO_CONFIG_DEFAULTS } from "../core/config/schemas/index.js";
-import { validateConfig } from "../core/config/validate.js";
+import { getDefaultClientDirectives } from "../core/client-directive/default.js";
+import { ASTRO_CONFIG_DEFAULTS } from "../core/config/schemas/defaults.js";
 import { createKey } from "../core/encryption.js";
 import { FetchState } from "../core/fetch/fetch-state.js";
 import { AstroMiddleware } from "../core/middleware/astro-middleware.js";
@@ -14,15 +12,18 @@ import { validateSegment } from "../core/routing/segment.js";
 import { SlotString } from "../runtime/server/render/slot.js";
 import { ContainerPipeline } from "./pipeline.js";
 import { createConsoleLogger } from "../core/logger/impls/console.js";
-const { gfm: _, smartypants: __, ...containerMarkdownDefaults } = ASTRO_CONFIG_DEFAULTS.markdown;
-const CONTAINER_CONFIG_DEFAULTS = { ...ASTRO_CONFIG_DEFAULTS, markdown: containerMarkdownDefaults };
 function createManifest(manifest, renderers, middleware) {
   function middlewareInstance() {
     return {
       onRequest: middleware ?? NOOP_MIDDLEWARE_FN
     };
   }
-  const root = new URL(import.meta.url);
+  let root;
+  try {
+    root = new URL(import.meta.url);
+  } catch {
+    root = new URL("file:///container/");
+  }
   return {
     rootDir: root,
     srcDir: manifest?.srcDir ?? new URL(ASTRO_CONFIG_DEFAULTS.srcDir, root),
@@ -81,17 +82,17 @@ class experimental_AstroContainer {
     streaming = false,
     manifest,
     renderers,
-    resolve,
-    astroConfig
+    resolve
   }) {
+    const ssrManifest = createManifest(manifest, renderers);
     this.#pipeline = ContainerPipeline.create({
       logger: createConsoleLogger({ level: "error" }),
-      manifest: createManifest(manifest, renderers),
+      manifest: ssrManifest,
       streaming,
       renderers: renderers ?? manifest?.renderers ?? [],
       resolve: async (specifier) => {
         if (this.#withManifest) {
-          return this.#containerResolve(specifier, astroConfig);
+          return this.#containerResolve(specifier, ssrManifest);
         } else if (resolve) {
           return resolve(specifier);
         }
@@ -101,10 +102,10 @@ class experimental_AstroContainer {
     this.#astroMiddleware = new AstroMiddleware(this.#pipeline);
     this.#pagesHandler = new PagesHandler(this.#pipeline);
   }
-  async #containerResolve(specifier, astroConfig) {
-    const found = this.#pipeline.manifest.entryModules[specifier];
+  async #containerResolve(specifier, manifest) {
+    const found = manifest.entryModules[specifier];
     if (found) {
-      return new URL(found, astroConfig?.build.client).toString();
+      return new URL(found, manifest.buildClientDir).toString();
     }
     return found;
   }
@@ -115,12 +116,10 @@ class experimental_AstroContainer {
    */
   static async create(containerOptions = {}) {
     const { streaming = false, manifest, renderers = [], resolve } = containerOptions;
-    const astroConfig = await validateConfig(CONTAINER_CONFIG_DEFAULTS, process.cwd(), "container");
     return new experimental_AstroContainer({
       streaming,
       manifest,
       renderers,
-      astroConfig,
       resolve
     });
   }
@@ -208,10 +207,8 @@ class experimental_AstroContainer {
   // NOTE: we keep this private via TS instead via `#` so it's still available on the surface, so we can play with it.
   // @ts-expect-error @ematipico: I plan to use it for a possible integration that could help people
   static async createFromManifest(manifest) {
-    const astroConfig = await validateConfig(CONTAINER_CONFIG_DEFAULTS, process.cwd(), "container");
     const container = new experimental_AstroContainer({
-      manifest,
-      astroConfig
+      manifest
     });
     container.#withManifest = true;
     return container;
@@ -330,7 +327,7 @@ class experimental_AstroContainer {
     this.#pipeline.insertRoute(routeData, componentInstance);
   }
   #createRoute(url, params, type) {
-    const segments = removeLeadingForwardSlash(url.pathname).split(posix.sep).filter(Boolean).map((s) => {
+    const segments = removeLeadingForwardSlash(url.pathname).split("/").filter(Boolean).map((s) => {
       validateSegment(s);
       return getParts(s, url.pathname);
     });

package/dist/content/content-layer.js

@@ -196,7 +196,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "7.1.3") {
+    if (previousAstroVersion && previousAstroVersion !== "7.1.4") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -204,8 +204,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("7.1.3") {
-      this.#store.metaStore().set("astro-version", "7.1.3");
+    if ("7.1.4") {
+      this.#store.metaStore().set("astro-version", "7.1.4");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/loaders/file.js

@@ -1,7 +1,7 @@
 import { existsSync, promises as fs } from "node:fs";
 import { fileURLToPath } from "node:url";
 import yaml from "js-yaml";
-import toml from "smol-toml";
+import * as toml from "smol-toml";
 import { FileGlobNotSupported, FileParserNotFound } from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/index.js";
 import { posixRelative } from "../utils.js";

package/dist/content/loaders/glob.js

@@ -232,7 +232,12 @@ function glob(globOptions) {
         return;
       }
       watcher.add(filePath);
-      const matchesGlob = (entry) => !entry.startsWith("../") && picomatch.isMatch(entry, globOptions.pattern);
+      const patterns = Array.isArray(globOptions.pattern) ? globOptions.pattern : [globOptions.pattern];
+      const positivePatterns = patterns.filter((p) => !p.startsWith("!"));
+      const negationPatterns = patterns.filter((p) => p.startsWith("!")).map((p) => p.slice(1));
+      const matchesGlob = (entry) => !entry.startsWith("../") && picomatch.isMatch(entry, positivePatterns, {
+        ignore: negationPatterns.length > 0 ? negationPatterns : void 0
+      });
       const basePath = fileURLToPath(baseDir);
       async function onChange(changedPath) {
         const entry = posixRelative(basePath, changedPath);

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

@@ -10,6 +10,14 @@ export interface BuildInternals {
      * build so the client can pick up the same information and use the same chunk ids.
      */
     cssModuleToChunkIdMap: Map<string, string>;
+    /**
+     * Maps a key describing the exact set of CSS modules bundled into a chunk of the
+     * prerender environment to the CSS asset filename emitted for that chunk. The SSR
+     * environment renames its own CSS assets to these filenames when they are backed by
+     * the same CSS source modules, so the prerender and server builds don't emit
+     * duplicate stylesheets for shared layouts (#17298).
+     */
+    prerenderCssAssetByModuleKey: Map<string, string>;
     /**
      * If script is inlined, its id and inlined code is mapped here. The resolved id is
      * an URL like "/_astro/something.js" but will no longer exist as the content is now

package/dist/core/build/internal.js

@@ -4,6 +4,7 @@ function createBuildInternals() {
   return {
     clientInput: /* @__PURE__ */ new Set(),
     cssModuleToChunkIdMap: /* @__PURE__ */ new Map(),
+    prerenderCssAssetByModuleKey: /* @__PURE__ */ new Map(),
     inlinedScripts: /* @__PURE__ */ new Map(),
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
     pagesByKeys: /* @__PURE__ */ new Map(),

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

@@ -46,6 +46,20 @@ function rollupPluginAstroBuildCSS(options) {
               internals.cssModuleToChunkIdMap.set(moduleId, chunk.fileName);
             }
           }
+          const cssModuleIds = Object.keys(chunk.modules || {}).filter(isCSSRequest);
+          const importedCss = chunk.viteMetadata?.importedCss;
+          if (cssModuleIds.length > 0 && importedCss?.size === 1) {
+            const moduleKey = cssModuleIds.sort().join("\n");
+            const [assetFileName] = importedCss;
+            if (this.environment?.name === ASTRO_VITE_ENVIRONMENT_NAMES.prerender) {
+              internals.prerenderCssAssetByModuleKey.set(moduleKey, assetFileName);
+            } else {
+              const prerenderFileName = internals.prerenderCssAssetByModuleKey.get(moduleKey);
+              if (prerenderFileName && prerenderFileName !== assetFileName) {
+                renameBundleAsset(bundle, assetFileName, prerenderFileName);
+              }
+            }
+          }
           for (const [moduleId, moduleInfo] of Object.entries(chunk.modules || {})) {
             if (moduleInfo.renderedExports.length > 0) {
               const existing = internals.ssrRenderedExports?.get(moduleId);
@@ -112,6 +126,21 @@ function rollupPluginAstroBuildCSS(options) {
               for (const importedCssImport of meta.importedCss) {
                 const cssToInfoRecord = pagesToCss[pageData.moduleSpecifier] ??= {};
                 cssToInfoRecord[importedCssImport] = { depth: -1, order: -1 };
+                if (deletedCssAssets.has(importedCssImport)) {
+                  const cssAsset = deletedCssAssets.get(importedCssImport);
+                  if (cssAsset.type === "asset" && typeof cssAsset.source === "string" && cssAsset.source.length > 0) {
+                    const sheet = {
+                      type: "inline",
+                      content: cssAsset.source
+                    };
+                    const alreadyAdded = pageData.styles.some(
+                      (s) => s.sheet.type === "inline" && s.sheet.content === sheet.content
+                    );
+                    if (!alreadyAdded) {
+                      pageData.styles.push({ depth: -1, order: -1, sheet });
+                    }
+                  }
+                }
               }
             }
           }
@@ -316,6 +345,21 @@ function rollupPluginAstroBuildCSS(options) {
   };
   return [cssBuildPlugin, singleCssPlugin, inlineStylesheetsPlugin];
 }
+function renameBundleAsset(bundle, fromFileName, toFileName) {
+  const asset = bundle[fromFileName];
+  if (!asset || asset.type !== "asset" || bundle[toFileName]) return;
+  asset.fileName = toFileName;
+  for (const chunk of Object.values(bundle)) {
+    if (chunk.type !== "chunk") continue;
+    const meta = chunk.viteMetadata;
+    if (meta?.importedCss?.delete(fromFileName)) {
+      meta.importedCss.add(toFileName);
+    }
+    if (meta?.importedAssets?.delete(fromFileName)) {
+      meta.importedAssets.add(toFileName);
+    }
+  }
+}
 function shouldDeleteCSSChunk(allModules, internals) {
   const componentPaths = /* @__PURE__ */ new Set();
   for (const componentPath of internals.discoveredClientOnlyComponents.keys()) {

package/dist/core/config/schemas/base.d.ts

@@ -16,73 +16,8 @@ type RemarkPlugin = ComplexifyWithUnion<_RemarkPlugin>;
 export type RemarkRehype = ComplexifyWithOmit<_RemarkRehype>;
 /** @lintignore */
 export type Smartypants = ComplexifyWithOmit<_Smartypants>;
-export declare const ASTRO_CONFIG_DEFAULTS: {
-    root: string;
-    srcDir: string;
-    publicDir: string;
-    outDir: string;
-    cacheDir: string;
-    base: string;
-    trailingSlash: "ignore";
-    build: {
-        format: "directory";
-        client: string;
-        server: string;
-        assets: string;
-        serverEntry: string;
-        redirects: true;
-        inlineStylesheets: "auto";
-        concurrency: number;
-    };
-    image: {
-        endpoint: {
-            entrypoint: undefined;
-            route: "/_image";
-        };
-        service: {
-            entrypoint: "astro/assets/services/sharp";
-            config: {};
-        };
-        dangerouslyProcessSVG: false;
-        responsiveStyles: false;
-    };
-    devToolbar: {
-        enabled: true;
-    };
-    compressHTML: "jsx";
-    server: {
-        host: false;
-        port: number;
-        open: false;
-        allowedHosts: never[];
-    };
-    integrations: never[];
-    markdown: Required<Omit<import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions, "image">>;
-    vite: {};
-    legacy: {
-        collectionsBackwardsCompat: false;
-    };
-    redirects: {};
-    security: {
-        checkOrigin: true;
-        allowedDomains: never[];
-        csp: false;
-        actionBodySizeLimit: number;
-        serverIslandBodySizeLimit: number;
-    };
-    env: {
-        schema: {};
-        validateSecrets: false;
-    };
-    prerenderConflictBehavior: "warn";
-    fetchFile: string;
-    experimental: {
-        clientPrerender: false;
-        contentIntellisense: false;
-        chromeDevtoolsWorkspace: false;
-        collectionStorage: "single-file";
-    };
-};
+import { ASTRO_CONFIG_DEFAULTS } from './defaults.js';
+export { ASTRO_CONFIG_DEFAULTS };
 export declare const AstroConfigSchema: z.ZodObject<{
     root: z.ZodPipe<z.ZodDefault<z.ZodOptional<z.ZodString>>, z.ZodTransform<URL, string>>;
     srcDir: z.ZodPipe<z.ZodDefault<z.ZodOptional<z.ZodString>>, z.ZodTransform<URL, string>>;
@@ -563,4 +498,3 @@ export declare const AstroConfigSchema: z.ZodObject<{
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type AstroConfigType = z.infer<typeof AstroConfigSchema>;
-export {};

package/dist/core/config/schemas/base.js

@@ -1,7 +1,4 @@
-import {
-  markdownConfigDefaults,
-  syntaxHighlightDefaults
-} from "@astrojs/internal-helpers/markdown";
+import { syntaxHighlightDefaults } from "@astrojs/internal-helpers/markdown";
 import { satteri } from "@astrojs/markdown-satteri";
 import { bundledThemes } from "shiki";
 import * as z from "zod/v4";
@@ -16,67 +13,7 @@ import {
   cspResourceEntrySchema
 } from "../../csp/config.js";
 import { SessionSchema } from "../../session/config.js";
-const ASTRO_CONFIG_DEFAULTS = {
-  root: ".",
-  srcDir: "./src",
-  publicDir: "./public",
-  outDir: "./dist",
-  cacheDir: "./node_modules/.astro",
-  base: "/",
-  trailingSlash: "ignore",
-  build: {
-    format: "directory",
-    client: "./client/",
-    server: "./server/",
-    assets: "_astro",
-    serverEntry: "entry.mjs",
-    redirects: true,
-    inlineStylesheets: "auto",
-    concurrency: 1
-  },
-  image: {
-    endpoint: { entrypoint: void 0, route: "/_image" },
-    service: { entrypoint: "astro/assets/services/sharp", config: {} },
-    dangerouslyProcessSVG: false,
-    responsiveStyles: false
-  },
-  devToolbar: {
-    enabled: true
-  },
-  compressHTML: "jsx",
-  server: {
-    host: false,
-    port: 4321,
-    open: false,
-    allowedHosts: []
-  },
-  integrations: [],
-  markdown: markdownConfigDefaults,
-  vite: {},
-  legacy: {
-    collectionsBackwardsCompat: false
-  },
-  redirects: {},
-  security: {
-    checkOrigin: true,
-    allowedDomains: [],
-    csp: false,
-    actionBodySizeLimit: 1024 * 1024,
-    serverIslandBodySizeLimit: 1024 * 1024
-  },
-  env: {
-    schema: {},
-    validateSecrets: false
-  },
-  prerenderConflictBehavior: "warn",
-  fetchFile: "fetch",
-  experimental: {
-    clientPrerender: false,
-    contentIntellisense: false,
-    chromeDevtoolsWorkspace: false,
-    collectionStorage: "single-file"
-  }
-};
+import { ASTRO_CONFIG_DEFAULTS } from "./defaults.js";
 const highlighterTypesSchema = z.union([z.literal("shiki"), z.literal("prism")]).default(syntaxHighlightDefaults.type);
 const quoteCharacterMapSchema = z.object({
   double: z.string(),

package/dist/core/config/schemas/defaults.d.ts

@@ -0,0 +1,67 @@
+export declare const ASTRO_CONFIG_DEFAULTS: {
+    root: string;
+    srcDir: string;
+    publicDir: string;
+    outDir: string;
+    cacheDir: string;
+    base: string;
+    trailingSlash: "ignore";
+    build: {
+        format: "directory";
+        client: string;
+        server: string;
+        assets: string;
+        serverEntry: string;
+        redirects: true;
+        inlineStylesheets: "auto";
+        concurrency: number;
+    };
+    image: {
+        endpoint: {
+            entrypoint: undefined;
+            route: "/_image";
+        };
+        service: {
+            entrypoint: "astro/assets/services/sharp";
+            config: {};
+        };
+        dangerouslyProcessSVG: false;
+        responsiveStyles: false;
+    };
+    devToolbar: {
+        enabled: true;
+    };
+    compressHTML: "jsx";
+    server: {
+        host: false;
+        port: number;
+        open: false;
+        allowedHosts: never[];
+    };
+    integrations: never[];
+    markdown: Required<Omit<import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions, "image">>;
+    vite: {};
+    legacy: {
+        collectionsBackwardsCompat: false;
+    };
+    redirects: {};
+    security: {
+        checkOrigin: true;
+        allowedDomains: never[];
+        csp: false;
+        actionBodySizeLimit: number;
+        serverIslandBodySizeLimit: number;
+    };
+    env: {
+        schema: {};
+        validateSecrets: false;
+    };
+    prerenderConflictBehavior: "warn";
+    fetchFile: string;
+    experimental: {
+        clientPrerender: false;
+        contentIntellisense: false;
+        chromeDevtoolsWorkspace: false;
+        collectionStorage: "single-file";
+    };
+};

package/dist/core/config/schemas/defaults.js

@@ -0,0 +1,65 @@
+import { markdownConfigDefaults } from "@astrojs/internal-helpers/markdown";
+const ASTRO_CONFIG_DEFAULTS = {
+  root: ".",
+  srcDir: "./src",
+  publicDir: "./public",
+  outDir: "./dist",
+  cacheDir: "./node_modules/.astro",
+  base: "/",
+  trailingSlash: "ignore",
+  build: {
+    format: "directory",
+    client: "./client/",
+    server: "./server/",
+    assets: "_astro",
+    serverEntry: "entry.mjs",
+    redirects: true,
+    inlineStylesheets: "auto",
+    concurrency: 1
+  },
+  image: {
+    endpoint: { entrypoint: void 0, route: "/_image" },
+    service: { entrypoint: "astro/assets/services/sharp", config: {} },
+    dangerouslyProcessSVG: false,
+    responsiveStyles: false
+  },
+  devToolbar: {
+    enabled: true
+  },
+  compressHTML: "jsx",
+  server: {
+    host: false,
+    port: 4321,
+    open: false,
+    allowedHosts: []
+  },
+  integrations: [],
+  markdown: markdownConfigDefaults,
+  vite: {},
+  legacy: {
+    collectionsBackwardsCompat: false
+  },
+  redirects: {},
+  security: {
+    checkOrigin: true,
+    allowedDomains: [],
+    csp: false,
+    actionBodySizeLimit: 1024 * 1024,
+    serverIslandBodySizeLimit: 1024 * 1024
+  },
+  env: {
+    schema: {},
+    validateSecrets: false
+  },
+  prerenderConflictBehavior: "warn",
+  fetchFile: "fetch",
+  experimental: {
+    clientPrerender: false,
+    contentIntellisense: false,
+    chromeDevtoolsWorkspace: false,
+    collectionStorage: "single-file"
+  }
+};
+export {
+  ASTRO_CONFIG_DEFAULTS
+};

package/dist/core/config/settings.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import yaml from "js-yaml";
-import toml from "smol-toml";
+import * as toml from "smol-toml";
 import { getContentPaths } from "../../content/index.js";
 import createPreferences from "../../preferences/index.js";
 import { markdownContentEntryType } from "../../vite-plugin-markdown/content-entry-type.js";

package/dist/core/config/vite-load.js

@@ -23,7 +23,7 @@ async function loadConfigWithVite({
   let server;
   try {
     const plugins = loadFallbackPlugin({ fs, root: pathToFileURL(root) });
-    server = await createMinimalViteDevServer(plugins);
+    server = await createMinimalViteDevServer(plugins, root);
     if (isRunnableDevEnvironment(server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr])) {
       const environment = server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
       const mod = await environment.runner.import(configPath);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.1.3";
+const ASTRO_VERSION = "7.1.4";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const ASTRO_ERROR_HEADER = "X-Astro-Error";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

package/dist/core/cookies/cookies.js

@@ -49,7 +49,7 @@ class AstroCookies {
         name: key,
         value: DELETED_VALUE,
         expires: DELETED_EXPIRATION,
-        // Unset `expires` to to ensure that `expires` takes precedence.
+        // Unset `maxAge` to ensure that `expires` takes precedence.
         maxAge: void 0
       }),
       false

package/dist/core/createMinimalViteDevServer.d.ts

@@ -5,4 +5,4 @@ import { type ViteDevServer, type Plugin } from 'vite';
  * NOTE: This is intentionally in its own module to avoid pulling `vite`'s heavy `createServer`
  * (and transitively Rollup) into every file that imports from `viteUtils.ts`.
  */
-export declare function createMinimalViteDevServer(plugins?: Plugin[]): Promise<ViteDevServer>;
+export declare function createMinimalViteDevServer(plugins?: Plugin[], root?: string): Promise<ViteDevServer>;

package/dist/core/createMinimalViteDevServer.js

@@ -1,12 +1,14 @@
 import { createServer } from "vite";
-async function createMinimalViteDevServer(plugins = []) {
+async function createMinimalViteDevServer(plugins = [], root) {
   return await createServer({
+    root,
     configFile: false,
     server: { middlewareMode: true, hmr: false, watch: null, ws: false },
     optimizeDeps: { noDiscovery: true },
     clearScreen: false,
     appType: "custom",
     ssr: { external: true },
+    resolve: { tsconfigPaths: true },
     plugins
   });
 }

package/dist/core/dev/dev.js

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

package/dist/core/messages/runtime.js

@@ -270,7 +270,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"7.1.3"}`
+        `v${"7.1.4"}`
       )} ${headline}`
     );
   }

package/dist/core/session/drivers.d.ts

@@ -1,7 +1,7 @@
 import type { SessionDriverConfig } from './types.js';
 export declare const sessionDrivers: {
-    http: (config?: import("unstorage/drivers/http").HTTPOptions | undefined) => SessionDriverConfig;
     fs: (config?: import("unstorage/drivers/fs").FSStorageOptions | undefined) => SessionDriverConfig;
+    http: (config?: import("unstorage/drivers/http").HTTPOptions | undefined) => SessionDriverConfig;
     azureAppConfiguration: (config?: import("unstorage/drivers/azure-app-configuration").AzureAppConfigurationOptions | undefined) => SessionDriverConfig;
     azureCosmos: (config?: import("unstorage/drivers/azure-cosmos").AzureCosmosOptions | undefined) => SessionDriverConfig;
     azureKeyVault: (config?: import("unstorage/drivers/azure-key-vault").AzureKeyVaultOptions | undefined) => SessionDriverConfig;

package/dist/core/session/handler.js

@@ -20,7 +20,8 @@ async function provideSessionAsync(state, config) {
         config,
         runtimeMode: pipeline.runtimeMode,
         driverFactory,
-        mockStorage: null
+        mockStorage: null,
+        logger: pipeline.logger
       });
     },
     finalize(session) {

package/dist/core/session/runtime.d.ts

@@ -1,18 +1,21 @@
 import type { RuntimeMode } from '../../types/public/config.js';
 import type { AstroCookies } from '../cookies/cookies.js';
+import type { AstroLogger } from '../logger/core.js';
 import type { SessionDriverFactory } from './types.js';
 import type { SSRManifestSession } from '../app/types.js';
 import { type Storage } from 'unstorage';
 export declare const PERSIST_SYMBOL: unique symbol;
+export interface AstroSessionOptions {
+    cookies: AstroCookies;
+    config: SSRManifestSession | undefined;
+    runtimeMode: RuntimeMode;
+    driverFactory: SessionDriverFactory | null;
+    mockStorage: Storage | null;
+    logger: AstroLogger;
+}
 export declare class AstroSession {
     #private;
-    constructor({ cookies, config, runtimeMode, driverFactory, mockStorage, }: {
-        cookies: AstroCookies;
-        config: SSRManifestSession | undefined;
-        runtimeMode: RuntimeMode;
-        driverFactory: SessionDriverFactory | null;
-        mockStorage: Storage | null;
-    });
+    constructor({ cookies, config, runtimeMode, driverFactory, mockStorage, logger, }: AstroSessionOptions);
     /**
      * Gets a session value. Returns `undefined` if the session or value does not exist.
      */

package/dist/core/session/runtime.js

@@ -46,7 +46,7 @@ class AstroSession {
   // When we load the data from storage, we need to merge it with the local partial data,
   // preserving in-memory changes and deletions.
   #partial = true;
-  // The driver factory function provided by the pipeline
+  #logger;
   #driverFactory;
   static #sharedStorage = /* @__PURE__ */ new Map();
   constructor({
@@ -54,8 +54,10 @@ class AstroSession {
     config,
     runtimeMode,
     driverFactory,
-    mockStorage
+    mockStorage,
+    logger
   }) {
+    this.#logger = logger;
     if (!config) {
       throw new AstroError({
         ...SessionStorageInitError,
@@ -185,7 +187,8 @@ class AstroSession {
     try {
       data = await this.#ensureData();
     } catch (err) {
-      console.error("Failed to load session data during regeneration:", err);
+      this.#logger.error("session", `Failed to load session data during regeneration: ${err}`);
+      this.#partial = false;
     }
     const oldSessionId = this.#sessionID;
     this.#sessionID = crypto.randomUUID();
@@ -195,7 +198,7 @@ class AstroSession {
     await this.#setCookie();
     if (oldSessionId && this.#storage) {
       this.#storage.removeItem(oldSessionId).catch((err) => {
-        console.error("Failed to remove old session data:", err);
+        this.#logger.error("session", `Failed to remove old session ${oldSessionId}: ${err}`);
       });
     }
   }
@@ -232,7 +235,7 @@ class AstroSession {
     if (this.#toDestroy.size > 0) {
       const cleanupPromises = [...this.#toDestroy].map(
         (sessionId) => storage.removeItem(sessionId).catch((err) => {
-          console.error("Failed to clean up session %s:", sessionId, err);
+          this.#logger.error("session", `Failed to remove session ${sessionId}: ${err}`);
         })
       );
       await Promise.all(cleanupPromises);
@@ -296,7 +299,7 @@ class AstroSession {
     try {
       const storedMap = unflatten(raw);
       if (!(storedMap instanceof Map)) {
-        await this.destroy();
+        this.destroy();
         throw new AstroError({
           ...SessionStorageInitError,
           message: SessionStorageInitError.message(
@@ -315,7 +318,7 @@ class AstroSession {
       this.#partial = false;
       return this.#data;
     } catch (err) {
-      await this.destroy();
+      this.destroy();
       if (err instanceof AstroError) {
         throw err;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -121,7 +121,7 @@
     "http-cache-semantics": "^4.2.0",
     "js-yaml": "^4.1.1",
     "jsonc-parser": "^3.3.1",
-    "magic-string": "^0.30.21",
+    "magic-string": "^1.0.0",
     "magicast": "^0.5.2",
     "mrmime": "^2.0.1",
     "neotraverse": "^1.0.1",
@@ -147,8 +147,8 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.10.1",
-    "@astrojs/telemetry": "3.3.3",
-    "@astrojs/markdown-satteri": "0.3.4"
+    "@astrojs/markdown-satteri": "0.3.4",
+    "@astrojs/telemetry": "3.3.3"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0 || ^0.35.0"
@@ -186,7 +186,7 @@
     "typescript": "^6.0.3",
     "undici": "^7.22.0",
     "vitest": "^4.1.0",
-    "@astrojs/check": "0.9.9",
+    "@astrojs/check": "0.9.10",
     "@astrojs/markdown-remark": "7.2.1",
     "astro-scripts": "0.0.14"
   },
@@ -204,7 +204,7 @@
   },
   "scripts": {
     "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"",
-    "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm && tsc -b && astro-check -- -- --root ./components",
+    "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm && tsc -b && astro-check -- -- --tsconfig ./tsconfig.components.json",
     "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm",
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
     "test": "pnpm run test:unit && pnpm run test:integration && pnpm run test:types",

package/components/env.d.ts

@@ -1,2 +0,0 @@
-/// <reference path="../client.d.ts" />
-/// <reference path="../dev-only.d.ts" />