astro 7.1.5 → 7.2.0

package/dist/core/sync/index.js

@@ -6,7 +6,7 @@ import colors from "piccolore";
 import { createServer } from "vite";
 import { syncFonts } from "../../assets/fonts/sync.js";
 import { CONTENT_TYPES_FILE } from "../../content/consts.js";
-import { getDataStoreDir, getDataStoreFile } from "../../content/paths.js";
+import { getDataStoreChunkSize, getDataStoreDir, getDataStoreFile } from "../../content/paths.js";
 import { globalContentLayer } from "../../content/instance.js";
 import { createContentTypesGenerator } from "../../content/index.js";
 import { MutableDataStore } from "../../content/mutable-data-store.js";
@@ -59,7 +59,7 @@ async function clearContentLayerCache({
   fs = fsMod,
   isDev
 }) {
-  if (settings.config.experimental.collectionStorage === "chunked") {
+  if (getDataStoreChunkSize(settings) !== void 0) {
     const dataStore = getDataStoreDir(settings, isDev);
     if (fs.existsSync(dataStore)) {
       logger.debug("content", "clearing data store");
@@ -98,9 +98,10 @@ async function syncInternal({
       settings.timer.start("Sync content layer");
       let store;
       try {
-        if (settings.config.experimental.collectionStorage === "chunked") {
+        const chunkSize = getDataStoreChunkSize(settings);
+        if (chunkSize !== void 0) {
           const dataStoreDir = getDataStoreDir(settings, isDev);
-          store = await MutableDataStore.fromDir(dataStoreDir);
+          store = await MutableDataStore.fromDir(dataStoreDir, chunkSize);
         } else {
           const dataStoreFile = getDataStoreFile(settings, isDev);
           store = await MutableDataStore.fromFile(dataStoreFile);

package/dist/integrations/hooks.js

@@ -260,7 +260,9 @@ async function runHookConfigSetup({
     try {
       updatedConfig = await validateConfigRefined(updatedConfig);
       if (isLoggerUpdated) {
-        logger.setDestination(await loadLoggerDestination(updatedConfig.logger));
+        logger.setDestination(
+          await loadLoggerDestination(updatedConfig.logger, updatedConfig.root)
+        );
       }
     } catch (error) {
       integrationLogger.error("An error occurred while updating the config");

package/dist/runtime/prerender/static-paths.js

@@ -61,7 +61,11 @@ class StaticPaths {
     });
     for (const staticPath of staticPaths) {
       const pathname = stringifyParams(staticPath.params, route, manifest.trailingSlash);
-      paths.push({ pathname, route });
+      paths.push({
+        pathname,
+        route,
+        cacheKey: staticPath.cacheKey === void 0 ? void 0 : String(staticPath.cacheKey)
+      });
     }
     return paths;
   }

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

@@ -35,6 +35,9 @@ function isCustomElement(tagName) {
   return tagName.includes("-");
 }
 function handleBooleanAttribute(key, value, shouldEscape, tagName) {
+  if (key === "popover") {
+    return markHTMLString(value ? ` ${key}` : "");
+  }
   if (tagName && isCustomElement(tagName)) {
     return markHTMLString(` ${key}="${toAttributeString(value, shouldEscape)}"`);
   }

package/dist/types/public/common.d.ts

@@ -13,6 +13,7 @@ export interface GetStaticPathsOptions {
 export type GetStaticPathsItem = {
     params: Params;
     props?: Props;
+    cacheKey?: string | number;
 };
 export type GetStaticPathsResult = GetStaticPathsItem[];
 export type GetStaticPathsResultKeyed = GetStaticPathsResult & {

package/dist/types/public/config.d.ts

@@ -1171,6 +1171,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * Setting `build.format` controls what `Astro.url` is set to during the build. When it is:
          * - `directory` - The `Astro.url.pathname` will include a trailing slash to mimic folder behavior. (e.g. `/foo/`)
          * - `file` - The `Astro.url.pathname` will include `.html`. (e.g. `/foo.html`)
+         * - `preserve` - The `Astro.url.pathname` matches the generated file for each page: index pages include a trailing slash (e.g. `/foo/`), while non-index pages include `.html` (e.g. `/foo.html`).
          *
          * This means that when you create relative URLs using `new URL('./relative', Astro.url)`, you will get consistent behavior between dev and build.
          *
@@ -1535,7 +1536,8 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      * @description
      *
      * The entrypoint for the [logger implementation](https://docs.astro.build/en/reference/logger-reference/#the-logger-implementation).
-     * This can be an npm package, or a `URL` pointing to a file in your project:
+     * This can be an npm package, a path relative to your project root, or a `URL` pointing to a
+     * file in your project:
      *
      * ```js title="astro.config.mjs"
      * import { defineConfig } from 'astro/config';
@@ -1546,6 +1548,9 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      *   }
      * });
      * ```
+     *
+     * The logger entrypoint must be a JavaScript file. TypeScript is not supported. If Astro fails to load
+     *  the implementation, it falls back to its default logger.
      */
     /**
      * @docs
@@ -1573,6 +1578,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
     /**
      * @docs
      * @kind heading
+     * @type {object | false}
      * @version 5.7.0
      * @name Session Options
      * @description
@@ -1596,9 +1602,19 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      *
      * Session drivers are configured at build time. This means environment variables used in the driver configuration are inlined. You must create your own driver entrypoint to [override the configuration at runtime](https://docs.astro.build/en/guides/sessions/#overriding-the-configuration-at-runtime).
      *
+     * Since Astro v7.2.0, you can opt out of session support by setting the option to `false`. When sessions are disabled, the session runtime is excluded from the SSR bundle, and adapters skip wiring their default session driver. This is useful for serverless and edge runtimes where bundle parse time is sensitive.
+     *
+     * ```js title="astro.config.mjs"
+     * import { defineConfig } from 'astro/config';
+     *
+     * export default defineConfig({
+     *   session: false,
+     * });
+     * ```
+     *
      * See [the sessions guide](https://docs.astro.build/en/guides/sessions/) for more information.
      */
-    session?: SessionConfig<TDriver>;
+    session?: SessionConfig<TDriver> | false;
     /**
      * @docs
      * @name session.driver
@@ -3128,7 +3144,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
         svgOptimizer?: SvgOptimizer;
         /**
          * @name experimental.collectionStorage
-         * @type {'single-file' | 'chunked'}
+         * @type {'single-file' | 'chunked' | { type: 'chunked', chunkSize: number }}
          * @default `'single-file'`
          * @version 7.1.0
          * @description
@@ -3139,22 +3155,72 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * file. For very large content collections, this file can grow large
          * enough to hit platform file-size limits.
          *
-         * When set to `'chunked'`, the store is split across many smaller,
-         * content-addressed files so that no single file grows unbounded.
+         * When set to `'chunked'`, the store is split into files
+         * with a maximum size of 20 MiB each. To customize the maximum size,
+         * pass an object with `type: 'chunked'` and `chunkSize`. A 1 MiB limit
+         * is recommended for broad adapter compatibility.
          *
          * ```js
          * import { defineConfig } from 'astro/config';
          *
          * export default defineConfig({
          *   experimental: {
-         *     collectionStorage: 'chunked',
+         *     collectionStorage: {
+         *       type: 'chunked',
+         *       chunkSize: 1024 * 1024,
+         *     },
          *   },
          * });
          * ```
          *
          * See the [experimental data store chunking documentation](https://docs.astro.build/en/reference/experimental-flags/collection-storage/) for more information.
          */
-        collectionStorage?: 'single-file' | 'chunked';
+        collectionStorage?: 'single-file' | 'chunked' | {
+            type: 'chunked';
+            /** Maximum UTF-8 byte size of each data store chunk. */
+            chunkSize: number;
+        };
+        /**
+         * @name experimental.incrementalBuild
+         * @type {boolean}
+         * @default `false`
+         * @version 7.2
+         * @description
+         *
+         * Enables incremental static builds. When enabled, pages with a `cacheKey` returned
+         * from `getStaticPaths()` can be skipped during subsequent builds if neither
+         * their data nor their dependencies have changed.
+         *
+         * On the first build, all pages are rendered normally and a cache manifest is saved.
+         * On subsequent builds, each page is checked against the manifest: if the page's
+         * `cacheKey` and the hash of its module dependency graph both match, the page is
+         * skipped and the previous output is preserved.
+         *
+         * ```js
+         * // astro.config.mjs
+         * {
+         *   experimental: {
+         *     incrementalBuild: true,
+         *   },
+         * }
+         * ```
+         *
+         * In your dynamic routes, return a `cacheKey` from `getStaticPaths()`:
+         *
+         * ```js
+         * // src/pages/blog/[slug].astro
+         * export async function getStaticPaths() {
+         *   const posts = await fetchPosts();
+         *   return posts.map(post => ({
+         *     params: { slug: post.slug },
+         *     props: { post },
+         *     cacheKey: post.digest,
+         *   }));
+         * }
+         * ```
+         * See the [experimental incremental static builds](https://docs.astro.build/en/reference/experimental-flags/incremental-build/) for more information.
+         */
+        incrementalBuild?: boolean;
     };
 }
 /**

package/dist/types/public/integrations.d.ts

@@ -1,7 +1,7 @@
 import type { AddressInfo } from 'node:net';
 import type { ViteDevServer, InlineConfig } from 'vite';
 import type { SerializedSSRManifest } from '../../core/app/types.js';
-import type { AssetsGlobalStaticImagesList } from '../../assets/types.js';
+import type { AssetsGlobalStaticImagesList, SerializedStaticImage } from '../../assets/types.js';
 import type { PageBuildData } from '../../core/build/types.js';
 import type { AstroIntegrationLogger } from '../../core/logger/core.js';
 import type { AdapterFeatureStability } from '../../integrations/features-validation.js';
@@ -194,6 +194,28 @@ export type AstroAdapter = {
 export interface PathWithRoute {
     pathname: string;
     route: RouteData;
+    cacheKey?: string;
+}
+/**
+ * Incremental-build data an out-of-process prerenderer collects while rendering
+ * a page, reported back to the build process so skipped pages can be tracked and
+ * replayed without a re-render.
+ */
+export interface PrerenderRenderMetadata {
+    /** Root-relative `filePath`s of the content entries the page rendered. */
+    contentEntryKeys?: string[];
+    /** Optimized-image transforms the page resolved. */
+    staticImages?: SerializedStaticImage[];
+}
+/**
+ * The richer result a prerenderer's `render()` may return instead of a bare
+ * `Response`, pairing the rendered response with the incremental-build metadata
+ * collected for that page. Used by out-of-process prerenderers, which collect
+ * the metadata in their own runtime rather than in the build's collectors.
+ */
+export interface PrerenderResult {
+    response: Response;
+    metadata?: PrerenderRenderMetadata;
 }
 /**
  * Custom prerenderer that adapters can provide to control how pages are prerendered.
@@ -217,10 +239,15 @@ export interface AstroPrerenderer {
      *   use the `pathname` from the `PathWithRoute` entry returned by `getStaticPaths`.
      * @param options - Render options
      * @param options.routeData - The matched route for this path
+     * @returns A `Response`, or a {@link PrerenderResult} pairing the response with
+     *   the incremental-build metadata the page resolved. Out-of-process
+     *   prerenderers return the latter to report metadata they collect in their own
+     *   runtime; in-process prerenderers populate the build's collectors directly
+     *   and return a bare `Response`.
      */
     render: (request: Request, options: {
         routeData: RouteData;
-    }) => Promise<Response>;
+    }) => Promise<Response | PrerenderResult>;
     /**
      * Returns images collected in the adapter's runtime (e.g. workerd) to be merged
      * into the Node-side static image list. The default Sharp pipeline runs after.

package/dist/types/public/preview.d.ts

@@ -1,8 +1,10 @@
 import type { OutgoingHttpHeaders } from 'node:http';
+import type { ResolvedServerUrls } from 'vite';
 import type { AstroIntegrationLogger } from '../../core/logger/core.js';
 export interface PreviewServer {
     host?: string;
     port: number;
+    urls?: ResolvedServerUrls;
     closed(): Promise<void>;
     stop(): Promise<void>;
 }

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

@@ -68,6 +68,7 @@ function configAliasVitePlugin({
           let hasReplacement = false;
           const replaceAliases = (match, importId) => {
             if (!importId) return match;
+            if (importId.startsWith("data:")) return match;
             const resolved = resolveWithAlias(importId, configAlias);
             if (resolved) {
               hasReplacement = true;

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

@@ -16,7 +16,10 @@ const ALWAYS_NOEXTERNAL = [
   // Full explanation and related bug report: https://github.com/withastro/astro/pull/3667
   "@nanostores/preact",
   // fontsource packages are CSS that need to be processed
-  "@fontsource/*"
+  "@fontsource/*",
+  // Must be bundled so the prerender output resolves Astro's own copy, not an
+  // older hoisted version from another dependency. See https://github.com/withastro/astro/issues/17508
+  "neotraverse"
 ];
 function vitePluginEnvironment({
   command,

package/dist/vite-plugin-hmr-reload/index.js

@@ -3,15 +3,38 @@ import { VIRTUAL_PAGE_RESOLVED_MODULE_ID } from "../vite-plugin-pages/const.js";
 import { RESOLVED_MODULE_DEV_CSS_PREFIX } from "../vite-plugin-css/const.js";
 import { getDevCssModuleNameFromPageVirtualModuleName } from "../vite-plugin-css/util.js";
 import { isAstroServerEnvironment } from "../environments.js";
-const STYLE_EXT_REGEX = /\.(?:css|scss|sass|less|styl|pcss)$/i;
+const STYLE_EXT_REGEX = /\.(?:css|less|sass|scss|styl|stylus|pcss|postcss|sss)$/i;
+const STYLE_COMPONENT_EXT_REGEX = /\.(astro|svelte|vue)$/i;
 const RAW_QUERY_REGEX = /(?:\?|&)raw(?:&|$)/;
 function hasStyleExtension(id) {
   return STYLE_EXT_REGEX.test(id.split("?")[0]);
 }
-function isStyleModule(mod) {
-  if (mod.id && RAW_QUERY_REGEX.test(mod.id) && hasStyleExtension(mod.id)) return false;
-  if (mod.file && hasStyleExtension(mod.file)) return true;
-  return mod.id ? hasStyleExtension(mod.id) : false;
+function isComponentStyleModule(id) {
+  const [filename, rawQuery] = id.split("?", 2);
+  const extensionMatch = STYLE_COMPONENT_EXT_REGEX.exec(filename);
+  if (!rawQuery || !extensionMatch) return false;
+  const query = new URLSearchParams(rawQuery);
+  return query.get("type") === "style" && query.has(extensionMatch[1].toLowerCase());
+}
+function getStyleModuleType(mod) {
+  if (mod.id && RAW_QUERY_REGEX.test(mod.id) && hasStyleExtension(mod.id)) return;
+  if (mod.id && isComponentStyleModule(mod.id)) return "component";
+  if (mod.file && hasStyleExtension(mod.file)) return "file";
+  return mod.id && hasStyleExtension(mod.id) ? "file" : void 0;
+}
+function hasClientStyleModuleByFile(moduleGraph, mod, styleType) {
+  if (mod.file == null || moduleGraph.getModulesByFile == null) return false;
+  const fileModules = moduleGraph.getModulesByFile(mod.file);
+  if (fileModules == null) return false;
+  for (const fileMod of fileModules) {
+    if (fileMod.id == null) continue;
+    if (styleType === "component") {
+      if (isComponentStyleModule(fileMod.id)) return true;
+    } else if (!RAW_QUERY_REGEX.test(fileMod.id) && hasStyleExtension(fileMod.id)) {
+      return true;
+    }
+  }
+  return false;
 }
 function hmrReload() {
   return {
@@ -22,19 +45,45 @@ function hmrReload() {
       handler({ modules, server, timestamp, file }) {
         if (!isAstroServerEnvironment(this.environment)) return;
         let hasSsrOnlyModules = false;
+        let hasStyleModules = false;
         let hasSkippedStyleModules = false;
         const invalidatedModules = /* @__PURE__ */ new Set();
         for (const mod of modules) {
           if (mod.id == null) continue;
-          if (isStyleModule(mod)) {
+          const styleType = getStyleModuleType(mod);
+          const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
+          if (styleType) {
+            hasStyleModules = true;
+            if (clientModule == null && !hasClientStyleModuleByFile(server.environments.client.moduleGraph, mod, styleType)) {
+              this.environment.moduleGraph.invalidateModule(
+                mod,
+                invalidatedModules,
+                timestamp,
+                true
+              );
+              hasSsrOnlyModules = true;
+              continue;
+            }
             hasSkippedStyleModules = true;
             continue;
           }
-          const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
           if (clientModule != null) continue;
           this.environment.moduleGraph.invalidateModule(mod, invalidatedModules, timestamp, true);
           hasSsrOnlyModules = true;
         }
+        const invalidateDevCssModules = () => {
+          for (const [id, mod] of this.environment.moduleGraph.idToModuleMap) {
+            if (id.startsWith(RESOLVED_MODULE_DEV_CSS_PREFIX)) {
+              this.environment.moduleGraph.invalidateModule(mod, void 0, timestamp, true);
+              if (isRunnableDevEnvironment(this.environment)) {
+                const runnerMod = this.environment.runner.evaluatedModules.getModuleById(id);
+                if (runnerMod) {
+                  this.environment.runner.evaluatedModules.invalidateModule(runnerMod);
+                }
+              }
+            }
+          }
+        };
         for (const invalidatedModule of invalidatedModules) {
           if (invalidatedModule.id?.startsWith(VIRTUAL_PAGE_RESOLVED_MODULE_ID)) {
             const cssMod = this.environment.moduleGraph.getModuleById(
@@ -45,6 +94,9 @@ function hmrReload() {
           }
         }
         if (hasSsrOnlyModules) {
+          if (hasStyleModules) {
+            invalidateDevCssModules();
+          }
           if (isRunnableDevEnvironment(this.environment)) {
             for (const invalidated of invalidatedModules) {
               if (invalidated.id == null) continue;
@@ -67,17 +119,7 @@ function hmrReload() {
           return [];
         }
         if (hasSkippedStyleModules) {
-          for (const [id, mod] of this.environment.moduleGraph.idToModuleMap) {
-            if (id.startsWith(RESOLVED_MODULE_DEV_CSS_PREFIX)) {
-              this.environment.moduleGraph.invalidateModule(mod, void 0, timestamp, true);
-              if (isRunnableDevEnvironment(this.environment)) {
-                const runnerMod = this.environment.runner.evaluatedModules.getModuleById(id);
-                if (runnerMod) {
-                  this.environment.runner.evaluatedModules.invalidateModule(runnerMod);
-                }
-              }
-            }
-          }
+          invalidateDevCssModules();
           return [];
         }
         if (modules.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.1.5",
+  "version": "7.2.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -96,11 +96,10 @@
     "README.md"
   ],
   "dependencies": {
-    "@astrojs/compiler-rs": "^0.3.1",
+    "@astrojs/compiler-rs": "^0.3.2",
     "@capsizecss/unpack": "^4.0.0",
     "@clack/prompts": "^1.1.0",
     "@oslojs/encoding": "^1.1.0",
-    "@rollup/pluginutils": "^5.3.0",
     "am-i-vibing": "^0.4.0",
     "aria-query": "^5.3.2",
     "axobject-query": "^4.1.0",