astro 3.3.3 → 3.3.4

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.3.3";
+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.3";
+  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.3";
+  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.3"}`
+        `v${"3.3.4"}`
       )} ${headline}`
     );
   }

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"]');
@@ -80,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)) {
@@ -113,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) {
@@ -140,11 +135,31 @@ 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);
-    if (id === "")
-      return void 0;
     const newEl = id && newDocument.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
     if (newEl) {
       return newEl;
@@ -201,7 +216,7 @@ async function updateDOM(newDocument, toLocation, options, popState, fallback) {
       const newEl = persistedHeadElement(el);
       if (newEl) {
         newEl.remove();
-      } else if (newEl === null) {
+      } else {
         el.remove();
       }
     }
@@ -220,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();
   }
@@ -294,7 +288,6 @@ async function transition(direction, toLocation, options, popState) {
     await finished;
   } finally {
     await runScripts();
-    markScriptsExec();
     onPageLoad();
     announce();
   }
@@ -318,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 ?? {});
   }
@@ -350,18 +343,20 @@ 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) {
@@ -380,7 +375,7 @@ async function prepareForClientOnlyComponents(newDocument, toLocation) {
       viteIds.forEach((id) => {
         const style = document.head.querySelector(`style[${VITE_ID}="${id}"]`);
         if (style && !newDocument.head.querySelector(`style[${VITE_ID}="${id}"]`)) {
-          style.setAttribute(PERSIST_ATTR, "");
+          newDocument.head.appendChild(style);
         }
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.3.3",
+  "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"