astro 5.2.6 → 5.3.1

package/dist/runtime/server/render/astro/render-template.js

@@ -1,7 +1,7 @@
 import { markHTMLString } from "../../escape.js";
 import { isPromise } from "../../util.js";
 import { renderChild } from "../any.js";
-import { renderToBufferDestination } from "../util.js";
+import { createBufferedRenderer } from "../util.js";
 const renderTemplateResultSym = Symbol.for("astro.renderTemplateResult");
 class RenderTemplateResult {
   [renderTemplateResultSym] = true;
@@ -23,22 +23,32 @@ class RenderTemplateResult {
       return expression;
     });
   }
-  async render(destination) {
-    const expRenders = this.expressions.map((exp) => {
-      return renderToBufferDestination((bufferDestination) => {
+  render(destination) {
+    const flushers = this.expressions.map((exp) => {
+      return createBufferedRenderer(destination, (bufferDestination) => {
         if (exp || exp === 0) {
           return renderChild(bufferDestination, exp);
         }
       });
     });
-    for (let i = 0; i < this.htmlParts.length; i++) {
-      const html = this.htmlParts[i];
-      const expRender = expRenders[i];
-      destination.write(markHTMLString(html));
-      if (expRender) {
-        await expRender.renderToFinalDestination(destination);
+    let i = 0;
+    const iterate = () => {
+      while (i < this.htmlParts.length) {
+        const html = this.htmlParts[i];
+        const flusher = flushers[i];
+        i++;
+        if (html) {
+          destination.write(markHTMLString(html));
+        }
+        if (flusher) {
+          const result = flusher.flush();
+          if (isPromise(result)) {
+            return result.then(iterate);
+          }
+        }
       }
-    }
+    };
+    return iterate();
   }
 }
 function isRenderTemplateResult(obj) {

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

@@ -1,4 +1,5 @@
 import { AstroError, AstroErrorData } from "../../../../core/errors/index.js";
+import { isPromise } from "../../util.js";
 import { chunkToByteArray, chunkToString, encoder } from "../common.js";
 import { promiseWithResolvers } from "../util.js";
 import { isHeadAndContent } from "./head-and-content.js";
@@ -206,12 +207,10 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       }
     }
   };
-  const renderPromise = templateResult.render(destination);
-  renderPromise.then(() => {
-    renderingComplete = true;
-    next?.resolve();
-  }).catch((err) => {
+  const renderResult = toPromise(() => templateResult.render(destination));
+  renderResult.catch((err) => {
     error = err;
+  }).finally(() => {
     renderingComplete = true;
     next?.resolve();
   });
@@ -221,6 +220,14 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
     }
   };
 }
+function toPromise(fn) {
+  try {
+    const result = fn();
+    return isPromise(result) ? result : Promise.resolve(result);
+  } catch (err) {
+    return Promise.reject(err);
+  }
+}
 export {
   renderToAsyncIterable,
   renderToReadableStream,

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

@@ -2,7 +2,7 @@ import type { RouteData, SSRResult } from '../../../types/public/internal.js';
 import { type RenderInstance } from './common.js';
 import { type ComponentSlots } from './slot.js';
 declare const needsHeadRenderingSymbol: unique symbol;
-export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, props: Record<string | number, any>, slots?: ComponentSlots): Promise<RenderInstance>;
+export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, props: Record<string | number, any>, slots?: ComponentSlots): RenderInstance | Promise<RenderInstance>;
 export declare function renderComponentToString(result: SSRResult, displayName: string, Component: unknown, props: Record<string | number, any>, slots?: any, isPage?: boolean, route?: RouteData): Promise<string>;
 export type NonAstroPageComponent = {
     name: string;

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

@@ -346,26 +346,28 @@ function renderAstroComponent(result, displayName, Component, props, slots = {})
   }
   const instance = createAstroComponentInstance(result, displayName, Component, props, slots);
   return {
-    async render(destination) {
-      await instance.render(destination);
+    render(destination) {
+      return instance.render(destination);
     }
   };
 }
-async function renderComponent(result, displayName, Component, props, slots = {}) {
+function renderComponent(result, displayName, Component, props, slots = {}) {
   if (isPromise(Component)) {
-    Component = await Component.catch(handleCancellation);
+    return Component.catch(handleCancellation).then((x) => {
+      return renderComponent(result, displayName, x, props, slots);
+    });
   }
   if (isFragmentComponent(Component)) {
-    return await renderFragmentComponent(result, slots).catch(handleCancellation);
+    return renderFragmentComponent(result, slots).catch(handleCancellation);
   }
   props = normalizeProps(props);
   if (isHTMLComponent(Component)) {
-    return await renderHTMLComponent(result, Component, props, slots).catch(handleCancellation);
+    return renderHTMLComponent(result, Component, props, slots).catch(handleCancellation);
   }
   if (isAstroComponentFactory(Component)) {
     return renderAstroComponent(result, displayName, Component, props, slots);
   }
-  return await renderFrameworkComponent(result, displayName, Component, props, slots).catch(
+  return renderFrameworkComponent(result, displayName, Component, props, slots).catch(
     handleCancellation
   );
   function handleCancellation(e) {

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

@@ -13,6 +13,9 @@ function renderAllHeadContent(result) {
   );
   result.styles.clear();
   const scripts = Array.from(result.scripts).filter(uniqueElements).map((script) => {
+    if (result.userAssetsBase) {
+      script.props.src = (result.base === "/" ? "" : result.base) + result.userAssetsBase + script.props.src;
+    }
     return renderElement("script", script, false);
   });
   const links = Array.from(result.links).filter(uniqueElements).map((link) => renderElement("link", link, false));

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

@@ -11,7 +11,9 @@ async function renderScript(result, id) {
     }
   }
   const resolved = await result.resolve(id);
-  return markHTMLString(`<script type="module" src="${resolved}"></script>`);
+  return markHTMLString(
+    `<script type="module" src="${result.userAssetsBase ? (result.base === "/" ? "" : result.base) + result.userAssetsBase : ""}${resolved}"></script>`
+  );
 }
 export {
   renderScript

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

@@ -1,4 +1,4 @@
-import type { RenderFunction } from './common.js';
+import type { RenderDestination, RenderFunction } from './common.js';
 import type { SSRElement } from '../../../types/public/internal.js';
 export declare const voidElementNames: RegExp;
 export declare const toAttributeString: (value: any, shouldEscape?: boolean) => any;
@@ -10,26 +10,32 @@ export declare function internalSpreadAttributes(values: Record<any, any>, shoul
 export declare function renderElement(name: string, { props: _props, children }: SSRElement, shouldEscape?: boolean): string;
 /**
  * Executes the `bufferRenderFunction` to prerender it into a buffer destination, and return a promise
- * with an object containing the `renderToFinalDestination` function to flush the buffer to the final
+ * with an object containing the `flush` function to flush the buffer to the final
  * destination.
  *
  * @example
  * ```ts
  * // Render components in parallel ahead of time
  * const finalRenders = [ComponentA, ComponentB].map((comp) => {
- *   return renderToBufferDestination(async (bufferDestination) => {
+ *   return createBufferedRenderer(finalDestination, async (bufferDestination) => {
  *     await renderComponentToDestination(bufferDestination);
  *   });
  * });
  * // Render array of components serially
  * for (const finalRender of finalRenders) {
- *   await finalRender.renderToFinalDestination(finalDestination);
+ *   await finalRender.flush();
  * }
  * ```
  */
-export declare function renderToBufferDestination(bufferRenderFunction: RenderFunction): {
-    renderToFinalDestination: RenderFunction;
-};
+export declare function createBufferedRenderer(destination: RenderDestination, renderFunction: RenderFunction): RendererFlusher;
+export interface RendererFlusher {
+    /**
+     * Flushes the current renderer to the underlying renderer.
+     *
+     * See example of `createBufferedRenderer` for usage.
+     */
+    flush(): void | Promise<void>;
+}
 export declare const isNode: boolean;
 export declare const isDeno: boolean;
 export type PromiseWithResolvers<T> = {

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

@@ -1,5 +1,6 @@
 import { clsx } from "clsx";
 import { HTMLString, markHTMLString } from "../escape.js";
+import { isPromise } from "../util.js";
 const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
 const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|inert|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
 const AMPERSAND_REGEX = /&/g;
@@ -103,28 +104,38 @@ class BufferedRenderer {
   chunks = [];
   renderPromise;
   destination;
-  constructor(bufferRenderFunction) {
-    this.renderPromise = bufferRenderFunction(this);
-    Promise.resolve(this.renderPromise).catch(noop);
+  /**
+   * Determines whether buffer has been flushed
+   * to the final destination.
+   */
+  flushed = false;
+  constructor(destination, renderFunction) {
+    this.destination = destination;
+    this.renderPromise = renderFunction(this);
+    if (isPromise(this.renderPromise)) {
+      Promise.resolve(this.renderPromise).catch(noop);
+    }
   }
   write(chunk) {
-    if (this.destination) {
+    if (this.flushed) {
       this.destination.write(chunk);
     } else {
       this.chunks.push(chunk);
     }
   }
-  async renderToFinalDestination(destination) {
+  flush() {
+    if (this.flushed) {
+      throw new Error("The render buffer has already been flushed.");
+    }
+    this.flushed = true;
     for (const chunk of this.chunks) {
-      destination.write(chunk);
+      this.destination.write(chunk);
     }
-    this.destination = destination;
-    await this.renderPromise;
+    return this.renderPromise;
   }
 }
-function renderToBufferDestination(bufferRenderFunction) {
-  const renderer = new BufferedRenderer(bufferRenderFunction);
-  return renderer;
+function createBufferedRenderer(destination, renderFunction) {
+  return new BufferedRenderer(destination, renderFunction);
 }
 const isNode = typeof process !== "undefined" && Object.prototype.toString.call(process) === "[object process]";
 const isDeno = typeof Deno !== "undefined";
@@ -151,6 +162,7 @@ function isHttpUrl(url) {
 }
 export {
   addAttribute,
+  createBufferedRenderer,
   defineScriptVars,
   formatList,
   internalSpreadAttributes,
@@ -158,7 +170,6 @@ export {
   isNode,
   promiseWithResolvers,
   renderElement,
-  renderToBufferDestination,
   toAttributeString,
   toStyleString,
   voidElementNames

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

@@ -495,6 +495,35 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          */
         checkOrigin?: boolean;
     };
+    /**
+     * @docs
+     * @name session
+     * @type {SessionConfig}
+     * @version 5.3.0
+     * @description
+     *
+     * Configures experimental session support by specifying a storage `driver` as well as any associated `options`.
+     * You must enable the `experimental.session` flag to use this feature.
+     * Some adapters may provide a default session driver, but you can override it with your own configuration.
+     *
+     * You can specify [any driver from Unstorage](https://unstorage.unjs.io/drivers) or provide a custom config which will override your adapter's default.
+     *
+     * See [the experimental session guide](https://docs.astro.build/en/reference/experimental-flags/sessions/) for more information.
+     *
+     * ```js title="astro.config.mjs"
+     *   {
+     *     session: {
+     *       // Required: the name of the Unstorage driver
+     *       driver: 'redis',
+     *       // The required options depend on the driver
+     *       options: {
+     *         url: process.env.REDIS_URL,
+     *       },
+     *     }
+     *   }
+     * ```
+     */
+    session?: SessionConfig<TSession>;
     /**
      * @docs
      * @name vite
@@ -1864,7 +1893,8 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
         /**
          *
          * @name experimental.session
-         * @type {SessionConfig}
+         * @type {boolean}
+         * @default `false`
          * @version 5.0.0
          * @description
          *
@@ -1881,29 +1911,11 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * <a href="/checkout">🛒 {cart?.length ?? 0} items</a>
          *
          * ```
-         * The object configures session management for your Astro site by specifying a `driver` as well as any `options` for your data storage.
-         *
-         * You can specify [any driver from Unstorage](https://unstorage.unjs.io/drivers) or provide a custom config which will override your adapter's default.
-         *
-         * ```js title="astro.config.mjs"
-         * 	{
-         * 		experimental: {
-         *  		session: {
-         *    		// Required: the name of the Unstorage driver
-         *    		driver: "redis",
-         *   			// The required options depend on the driver
-         *   			options: {
-         *     			url: process.env.REDIS_URL,
-         * 				}
-         * 			}
-         *   	},
-         * 	}
-         * ```
          *
-         * For more details, see [the Sessions RFC](https://github.com/withastro/roadmap/blob/sessions/proposals/0054-sessions.md).
+         * For more details, see [the experimental session guide](https://docs.astro.build/en/reference/experimental-flags/sessions/).
          *
          */
-        session?: SessionConfig<TSession>;
+        session?: boolean;
         /**
          *
          * @name experimental.svg

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

@@ -195,6 +195,7 @@ export interface SSRResult {
      */
     cancelled: boolean;
     base: string;
+    userAssetsBase: string | undefined;
     styles: Set<SSRElement>;
     scripts: Set<SSRElement>;
     links: Set<SSRElement>;

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

@@ -150,6 +150,7 @@ function createDevelopmentManifest(settings) {
     clientDirectives: settings.clientDirectives,
     renderers: [],
     base: settings.config.base,
+    userAssetsBase: settings.config?.vite?.base,
     assetsPrefix: settings.config.build.assetsPrefix,
     site: settings.config.site,
     componentMetadata: /* @__PURE__ */ new Map(),
@@ -162,7 +163,7 @@ function createDevelopmentManifest(settings) {
         onRequest: NOOP_MIDDLEWARE_FN
       };
     },
-    sessionConfig: settings.config.experimental.session
+    sessionConfig: settings.config.experimental.session ? settings.config.session : void 0
   };
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.2.6",
+  "version": "5.3.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -125,7 +125,6 @@
     "es-module-lexer": "^1.6.0",
     "esbuild": "^0.24.2",
     "estree-walker": "^3.0.3",
-    "fast-glob": "^3.3.3",
     "flattie": "^1.1.1",
     "github-slugger": "^2.0.0",
     "html-escaper": "3.0.3",
@@ -134,17 +133,18 @@
     "kleur": "^4.1.5",
     "magic-string": "^0.30.17",
     "magicast": "^0.3.5",
-    "micromatch": "^4.0.8",
     "mrmime": "^2.0.0",
     "neotraverse": "^0.6.18",
     "p-limit": "^6.2.0",
     "p-queue": "^8.1.0",
+    "picomatch": "^4.0.2",
     "preferred-pm": "^4.1.1",
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
     "semver": "^7.7.1",
     "shiki": "^1.29.2",
     "tinyexec": "^0.3.2",
+    "tinyglobby": "^0.2.12",
     "tsconfck": "^3.1.4",
     "ultrahtml": "^1.5.3",
     "unist-util-visit": "^5.0.0",
@@ -179,7 +179,7 @@
     "@types/html-escaper": "3.0.4",
     "@types/http-cache-semantics": "^4.0.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/micromatch": "^4.0.9",
+    "@types/picomatch": "^3.0.2",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
     "@types/yargs-parser": "^21.0.3",