astro 3.3.2 → 3.3.4

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

@@ -86,7 +86,7 @@ function assets({
       },
       // In build, rewrite paths to ESM imported images in code to their final location
       async renderChunk(code) {
-        const assetUrlRE = /__ASTRO_ASSET_IMAGE__([a-z\d]{8})__(?:_(.*?)__)?/g;
+        const assetUrlRE = /__ASTRO_ASSET_IMAGE__([\w$]{8})__(?:_(.*?)__)?/g;
         let match;
         let s;
         while (match = assetUrlRE.exec(code)) {

package/dist/cli/add/index.js

@@ -583,7 +583,11 @@ ${message}`
             ...inheritedFlags,
             ...installCommand.dependencies
           ],
-          { cwd }
+          {
+            cwd,
+            // reset NODE_ENV to ensure install command run in dev mode
+            env: { NODE_ENV: void 0 }
+          }
         );
         spinner.succeed();
         return 1 /* updated */;

package/dist/core/app/index.d.ts

@@ -8,6 +8,10 @@ export interface RenderErrorOptions {
     routeData?: RouteData;
     response?: Response;
     status: 404 | 500;
+    /**
+     * Whether to skip onRequest() while rendering the error page. Defaults to false.
+     */
+    skipMiddleware?: boolean;
 }
 export declare class App {
     #private;

package/dist/core/app/index.js

@@ -208,7 +208,7 @@ class App {
    * If it is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
    * This also handles pre-rendered /404 or /500 routes
    */
-  async #renderError(request, { status, response: originalResponse }) {
+  async #renderError(request, { status, response: originalResponse, skipMiddleware = false }) {
     const errorRouteData = matchRoute("/" + status, this.#manifestData);
     const url = new URL(request.url);
     if (errorRouteData) {
@@ -232,12 +232,22 @@ class App {
           status
         );
         const page = await mod.page();
-        if (mod.onRequest) {
+        if (skipMiddleware === false && mod.onRequest) {
           this.#pipeline.setMiddlewareFunction(mod.onRequest);
         }
+        if (skipMiddleware) {
+          this.#pipeline.unsetMiddlewareFunction();
+        }
         const response2 = await this.#pipeline.renderRoute(newRenderContext, page);
         return this.#mergeResponses(response2, originalResponse);
       } catch {
+        if (skipMiddleware === false && mod.onRequest) {
+          return this.#renderError(request, {
+            status,
+            response: originalResponse,
+            skipMiddleware: true
+          });
+        }
       }
     }
     const response = this.#mergeResponses(new Response(null, { status }), originalResponse);

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.3.2";
+  const currentVersion = "3.3.4";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.3.2";
+  const version = "3.3.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.3.2"}`
+        `v${"3.3.4"}`
       )} ${headline}`
     );
   }

package/dist/core/pipeline.d.ts

@@ -25,6 +25,10 @@ export declare class Pipeline {
      * A middleware function that will be called before each request.
      */
     setMiddlewareFunction(onRequest: MiddlewareEndpointHandler): void;
+    /**
+     * Removes the current middleware function. Subsequent requests won't trigger any middleware.
+     */
+    unsetMiddlewareFunction(): void;
     /**
      * Returns the current environment
      */

package/dist/core/pipeline.js

@@ -33,6 +33,12 @@ class Pipeline {
   setMiddlewareFunction(onRequest) {
     this.#onRequest = onRequest;
   }
+  /**
+   * Removes the current middleware function. Subsequent requests won't trigger any middleware.
+   */
+  unsetMiddlewareFunction() {
+    this.#onRequest = void 0;
+  }
   /**
    * Returns the current environment
    */

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

@@ -16,7 +16,7 @@ function renderAllHeadContent(result) {
     return renderElement("script", script, false);
   });
   const links = Array.from(result.links).filter(uniqueElements).map((link) => renderElement("link", link, false));
-  let content = links.join("\n") + styles.join("\n") + scripts.join("\n");
+  let content = styles.join("\n") + links.join("\n") + scripts.join("\n");
   if (result._metadata.extraHead.length > 0) {
     for (const part of result._metadata.extraHead) {
       content += part;

package/dist/transitions/router.js

@@ -1,4 +1,4 @@
-const persistState = (state) => history.state && history.replaceState(state, "");
+const updateScrollPosition = (positions) => history.state && history.replaceState({ ...history.state, ...positions }, "");
 const inBrowser = import.meta.env.SSR === false;
 const supportsViewTransitions = inBrowser && !!document.startViewTransition;
 const transitionEnabledOnThisPage = () => inBrowser && !!document.querySelector('[name="astro-view-transitions-enabled"]');
@@ -26,6 +26,7 @@ const announce = () => {
   );
 };
 const PERSIST_ATTR = "data-astro-transition-persist";
+const VITE_ID = "data-vite-dev-id";
 let parser;
 let currentHistoryIndex = 0;
 if (inBrowser) {
@@ -79,11 +80,6 @@ function getFallback() {
   }
   return "animate";
 }
-function markScriptsExec() {
-  for (const script of document.scripts) {
-    script.dataset.astroExec = "";
-  }
-}
 function runScripts() {
   let wait = Promise.resolve();
   for (const script of Array.from(document.scripts)) {
@@ -112,7 +108,7 @@ function isInfinite(animation) {
   const style = window.getComputedStyle(effect.target, effect.pseudoElement);
   return style.animationIterationCount === "infinite";
 }
-const updateHistoryAndScrollPosition = (toLocation, replace, intraPage) => {
+const moveToLocation = (toLocation, replace, intraPage) => {
   const fresh = !samePage(toLocation);
   let scrolledToTop = false;
   if (toLocation.href !== location.href) {
@@ -139,6 +135,28 @@ const updateHistoryAndScrollPosition = (toLocation, replace, intraPage) => {
     }
   }
 };
+function stylePreloadLinks(newDocument) {
+  const links = [];
+  for (const el of newDocument.querySelectorAll("head link[rel=stylesheet]")) {
+    if (!document.querySelector(
+      `[${PERSIST_ATTR}="${el.getAttribute(
+        PERSIST_ATTR
+      )}"], link[rel=stylesheet][href="${el.getAttribute("href")}"]`
+    )) {
+      const c = document.createElement("link");
+      c.setAttribute("rel", "preload");
+      c.setAttribute("as", "style");
+      c.setAttribute("href", el.getAttribute("href"));
+      links.push(
+        new Promise((resolve) => {
+          ["load", "error"].forEach((evName) => c.addEventListener(evName, resolve));
+          document.head.append(c);
+        })
+      );
+    }
+  }
+  return links;
+}
 async function updateDOM(newDocument, toLocation, options, popState, fallback) {
   const persistedHeadElement = (el) => {
     const id = el.getAttribute(PERSIST_ATTR);
@@ -154,7 +172,7 @@ async function updateDOM(newDocument, toLocation, options, popState, fallback) {
   };
   const saveFocus = () => {
     const activeElement = document.activeElement;
-    if (activeElement?.closest("[data-astro-transition-persist]")) {
+    if (activeElement?.closest(`[${PERSIST_ATTR}]`)) {
       if (activeElement instanceof HTMLInputElement || activeElement instanceof HTMLTextAreaElement) {
         const start = activeElement.selectionStart;
         const end = activeElement.selectionEnd;
@@ -217,41 +235,20 @@ async function updateDOM(newDocument, toLocation, options, popState, fallback) {
     if (popState) {
       scrollTo(popState.scrollX, popState.scrollY);
     } else {
-      updateHistoryAndScrollPosition(toLocation, options.history === "replace", false);
+      moveToLocation(toLocation, options.history === "replace", false);
     }
     triggerEvent("astro:after-swap");
   };
-  const links = [];
-  for (const el of newDocument.querySelectorAll("head link[rel=stylesheet]")) {
-    if (!document.querySelector(
-      `[${PERSIST_ATTR}="${el.getAttribute(
-        PERSIST_ATTR
-      )}"], link[rel=stylesheet][href="${el.getAttribute("href")}"]`
-    )) {
-      const c = document.createElement("link");
-      c.setAttribute("rel", "preload");
-      c.setAttribute("as", "style");
-      c.setAttribute("href", el.getAttribute("href"));
-      links.push(
-        new Promise((resolve) => {
-          ["load", "error"].forEach((evName) => c.addEventListener(evName, resolve));
-          document.head.append(c);
-        })
-      );
-    }
-  }
+  const links = stylePreloadLinks(newDocument);
   links.length && await Promise.all(links);
   if (fallback === "animate") {
     const currentAnimations = document.getAnimations();
     document.documentElement.dataset.astroTransitionFallback = "old";
     const newAnimations = document.getAnimations().filter((a) => !currentAnimations.includes(a) && !isInfinite(a));
     const finished = Promise.all(newAnimations.map((a) => a.finished));
-    const fallbackSwap = () => {
-      swap();
-      document.documentElement.dataset.astroTransitionFallback = "new";
-    };
     await finished;
-    fallbackSwap();
+    swap();
+    document.documentElement.dataset.astroTransitionFallback = "new";
   } else {
     swap();
   }
@@ -274,6 +271,8 @@ async function transition(direction, toLocation, options, popState) {
     location.href = href;
     return;
   }
+  if (import.meta.env.DEV)
+    await prepareForClientOnlyComponents(newDocument, toLocation);
   if (!popState) {
     history.replaceState({ ...history.state, scrollX, scrollY }, "");
   }
@@ -289,7 +288,6 @@ async function transition(direction, toLocation, options, popState) {
     await finished;
   } finally {
     await runScripts();
-    markScriptsExec();
     onPageLoad();
     announce();
   }
@@ -313,7 +311,7 @@ function navigate(href, options) {
   }
   const toLocation = new URL(href, location.href);
   if (location.origin === toLocation.origin && samePage(toLocation)) {
-    updateHistoryAndScrollPosition(toLocation, options?.history === "replace", true);
+    moveToLocation(toLocation, options?.history === "replace", true);
   } else {
     transition("forward", toLocation, options ?? {});
   }
@@ -345,18 +343,55 @@ function onPopState(ev) {
     transition(direction, new URL(location.href), {}, state);
   }
 }
+const onScroll = () => {
+  updateScrollPosition({ scrollX, scrollY });
+};
 if (inBrowser) {
   if (supportsViewTransitions || getFallback() !== "none") {
     addEventListener("popstate", onPopState);
     addEventListener("load", onPageLoad);
-    const updateState = () => {
-      persistState({ ...history.state, scrollX, scrollY });
-    };
     if ("onscrollend" in window)
-      addEventListener("scrollend", updateState);
+      addEventListener("scrollend", onScroll);
     else
-      addEventListener("scroll", throttle(updateState, 300));
-    markScriptsExec();
+      addEventListener("scroll", throttle(onScroll, 300));
+  }
+  for (const script of document.scripts) {
+    script.dataset.astroExec = "";
+  }
+}
+async function prepareForClientOnlyComponents(newDocument, toLocation) {
+  if (newDocument.body.querySelector(`astro-island[client='only']`)) {
+    const nextPage = document.createElement("iframe");
+    nextPage.setAttribute("src", toLocation.href);
+    nextPage.style.display = "none";
+    document.body.append(nextPage);
+    await hydrationDone(nextPage);
+    const nextHead = nextPage.contentDocument?.head;
+    if (nextHead) {
+      document.head.querySelectorAll(`style[${PERSIST_ATTR}=""]`).forEach((s) => s.removeAttribute(PERSIST_ATTR));
+      const viteIds = [...nextHead.querySelectorAll(`style[${VITE_ID}]`)].map(
+        (style) => style.getAttribute(VITE_ID)
+      );
+      viteIds.forEach((id) => {
+        const style = document.head.querySelector(`style[${VITE_ID}="${id}"]`);
+        if (style && !newDocument.head.querySelector(`style[${VITE_ID}="${id}"]`)) {
+          newDocument.head.appendChild(style);
+        }
+      });
+    }
+    async function hydrationDone(loadingPage) {
+      await new Promise(
+        (r) => loadingPage.contentWindow?.addEventListener("load", r, { once: true })
+      );
+      return new Promise(async (r) => {
+        for (let count = 0; count <= 20; ++count) {
+          if (!loadingPage.contentDocument.body.querySelector("astro-island[ssr]"))
+            break;
+          await new Promise((r2) => setTimeout(r2, 50));
+        }
+        r();
+      });
+    }
   }
 }
 export {

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

@@ -1,3 +1,4 @@
+import { slash } from "@astrojs/internal-helpers/path";
 import { fileURLToPath } from "node:url";
 import {
   cachedCompilation,
@@ -55,7 +56,7 @@ async function handleHotUpdate(ctx, { config, logger, compile, source }) {
     }
   }
   const mods = [...filtered].filter((m) => !m.url.endsWith("="));
-  const file = ctx.file.replace(config.root.pathname, "/");
+  const file = ctx.file.replace(slash(fileURLToPath(config.root)), "/");
   if (isStyleOnlyChange) {
     logger.info("astro", msg.hmr({ file, style: true }));
     return mods.filter((mod) => mod.id !== ctx.file && !mod.id?.endsWith(".ts"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -162,7 +162,7 @@
     "zod": "3.21.1",
     "@astrojs/internal-helpers": "0.2.1",
     "@astrojs/markdown-remark": "3.3.0",
-    "@astrojs/telemetry": "3.0.3"
+    "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
     "sharp": "^0.32.5"