astro 3.0.3 → 3.0.5

package/components/ViewTransitions.astro

@@ -98,6 +98,17 @@ const { fallback = 'animate' } = Astro.props as Props;
 		return wait;
 	}
 
+	function isInfinite(animation: Animation) {
+		const effect = animation.effect;
+		if(
+			!effect ||
+			!(effect instanceof KeyframeEffect) ||
+			!effect.target
+		) return false;
+    const style = window.getComputedStyle(effect.target, effect.pseudoElement);
+    return style.animationIterationCount === "infinite";
+}
+
 	const parser = new DOMParser();
 
 	async function updateDOM(html: string, state?: State, fallback?: Fallback) {
@@ -221,8 +232,10 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 		if (fallback === 'animate') {
 			// Trigger the animations
+			const currentAnimations = document.getAnimations();
 			document.documentElement.dataset.astroTransitionFallback = 'old';
-			const finished = Promise.all(document.getAnimations().map(a => a.finished));
+			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';
@@ -347,9 +360,18 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// Just ignore stateless entries.
 			// The browser will handle navigation fine without our help
 			if (ev.state === null) {
+				if (history.scrollRestoration) {
+					history.scrollRestoration = "auto";
+				}
 				return;
 			}
 
+			// With the default "auto", the browser will jump to the old scroll position
+			// before the ViewTransition is complete.
+			if (history.scrollRestoration) {
+				history.scrollRestoration = "manual";
+			}
+
 			const state: State | undefined = history.state;
 			const nextIndex = state?.index ?? currentHistoryIndex + 1;
 			const direction: Direction = nextIndex > currentHistoryIndex ? 'forward' : 'back';

package/dist/cli/info/index.js

@@ -1,41 +1,93 @@
 import * as colors from "kleur/colors";
+import { execSync } from "node:child_process";
 import { arch, platform } from "node:os";
-import whichPm from "which-pm";
+import prompts from "prompts";
 import { resolveConfig } from "../../core/config/index.js";
 import { ASTRO_VERSION } from "../../core/constants.js";
 import { flagsToAstroInlineConfig } from "../flags.js";
 async function printInfo({ flags }) {
+  const rows = [
+    ["Astro", `v${ASTRO_VERSION}`],
+    ["Node", process.version],
+    ["System", getSystem()],
+    ["Package Manager", getPackageManager()]
+  ];
   const inlineConfig = flagsToAstroInlineConfig(flags);
-  const packageManager = await whichPm(process.cwd());
-  let adapter = "Couldn't determine.";
-  let integrations = [];
-  const MAX_PADDING = 25;
-  function printRow(label, value) {
-    const padding = MAX_PADDING - label.length;
-    console.log(`${colors.bold(label)}` + " ".repeat(padding) + `${colors.green(value)}`);
-  }
   try {
     const { userConfig } = await resolveConfig(inlineConfig, "info");
-    if (userConfig.adapter?.name) {
-      adapter = userConfig.adapter.name;
-    }
-    if (userConfig.integrations) {
-      integrations = (userConfig?.integrations ?? []).filter(Boolean).flat().map((i) => i?.name);
-    }
-  } catch (_e) {
+    rows.push(["Output", userConfig.output ?? "static"]);
+    rows.push(["Adapter", userConfig.adapter?.name ?? "none"]);
+    const integrations = (userConfig?.integrations ?? []).filter(Boolean).flat().map((i) => i?.name).filter(Boolean);
+    rows.push(["Integrations", integrations.length > 0 ? integrations : "none"]);
+  } catch {
+  }
+  let output = "";
+  for (const [label, value] of rows) {
+    output += printRow(label, value);
   }
+  await copyToClipboard(output.trim());
+}
+const SUPPORTED_SYSTEM = /* @__PURE__ */ new Set(["darwin", "win32"]);
+async function copyToClipboard(text) {
+  const system = platform();
+  if (!SUPPORTED_SYSTEM.has(system))
+    return;
   console.log();
-  const packageManagerName = packageManager?.name ?? "Couldn't determine.";
-  printRow("Astro version", `v${ASTRO_VERSION}`);
-  printRow("Package manager", packageManagerName);
-  printRow("Platform", platform());
-  printRow("Architecture", arch());
-  printRow("Adapter", adapter);
-  let integrationsString = "None or couldn't determine.";
-  if (integrations.length > 0) {
-    integrationsString = integrations.join(", ");
+  const { shouldCopy } = await prompts({
+    type: "confirm",
+    name: "shouldCopy",
+    message: "Copy to clipboard?",
+    initial: true
+  });
+  if (!shouldCopy)
+    return;
+  const command = system === "darwin" ? "pbcopy" : "clip";
+  try {
+    execSync(`echo ${JSON.stringify(text.trim())} | ${command}`, {
+      encoding: "utf8",
+      stdio: "ignore"
+    });
+  } catch (e) {
+    console.error(
+      colors.red(`
+Sorry, something went wrong!`) + ` Please copy the text above manually.`
+    );
+  }
+}
+const PLATFORM_TO_OS = {
+  darwin: "macOS",
+  win32: "Windows",
+  linux: "Linux"
+};
+function getSystem() {
+  const system = PLATFORM_TO_OS[platform()] ?? platform();
+  return `${system} (${arch()})`;
+}
+function getPackageManager() {
+  if (!process.env.npm_config_user_agent) {
+    return "unknown";
+  }
+  const specifier = process.env.npm_config_user_agent.split(" ")[0];
+  const name = specifier.substring(0, specifier.lastIndexOf("/"));
+  return name === "npminstall" ? "cnpm" : name;
+}
+const MAX_PADDING = 25;
+function printRow(label, value) {
+  const padding = MAX_PADDING - label.length;
+  const [first, ...rest] = Array.isArray(value) ? value : [value];
+  let plaintext = `${label}${" ".repeat(padding)}${first}`;
+  let richtext = `${colors.bold(label)}${" ".repeat(padding)}${colors.green(first)}`;
+  if (rest.length > 0) {
+    for (const entry of rest) {
+      plaintext += `
+${" ".repeat(MAX_PADDING)}${entry}`;
+      richtext += `
+${" ".repeat(MAX_PADDING)}${colors.green(entry)}`;
+    }
   }
-  printRow("Integrations", integrationsString);
+  plaintext += "\n";
+  console.log(richtext);
+  return plaintext;
 }
 export {
   printInfo

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

@@ -111,7 +111,10 @@ function vitePluginSSRSplit(internals, adapter, options) {
     options(opts) {
       if (options.settings.config.build.split || functionPerRouteEnabled) {
         const inputs = /* @__PURE__ */ new Set();
-        for (const path of Object.keys(options.allPages)) {
+        for (const [path, pageData] of Object.entries(options.allPages)) {
+          if (routeIsRedirect(pageData.route)) {
+            continue;
+          }
           inputs.add(getVirtualModulePageNameFromPath(SPLIT_MODULE_ID, path));
         }
         return addRollupInput(opts, Array.from(inputs));

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.0.3";
+const ASTRO_VERSION = "3.0.5";
 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.0.3";
+  const currentVersion = "3.0.5";
   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.0.3";
+  const version = "3.0.5";
   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.0.3"}`
+        `v${"3.0.5"}`
       )} ${headline}`
     );
   }

package/dist/integrations/index.js

@@ -40,6 +40,7 @@ async function runHookConfigSetup({
   let updatedConfig = { ...settings.config };
   let updatedSettings = { ...settings, config: updatedConfig };
   let addedClientDirectives = /* @__PURE__ */ new Map();
+  let astroJSXRenderer = null;
   for (const integration of settings.config.integrations) {
     if (integration.hooks?.["astro:config:setup"]) {
       let addPageExtension2 = function(...input) {
@@ -63,7 +64,11 @@ async function runHookConfigSetup({
           if (!renderer.serverEntrypoint) {
             throw new Error(`Renderer ${bold(renderer.name)} does not provide a serverEntrypoint.`);
           }
-          updatedSettings.renderers.push(renderer);
+          if (renderer.name === "astro:jsx") {
+            astroJSXRenderer = renderer;
+          } else {
+            updatedSettings.renderers.push(renderer);
+          }
         },
         injectScript: (stage, content) => {
           updatedSettings.scripts.push({ stage, content });
@@ -112,6 +117,9 @@ async function runHookConfigSetup({
       }
     }
   }
+  if (astroJSXRenderer) {
+    updatedSettings.renderers.push(astroJSXRenderer);
+  }
   updatedSettings.config = updatedConfig;
   return updatedSettings;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",