astro 2.9.7 → 2.10.1

package/components/ViewTransitions.astro

@@ -34,6 +34,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 		!!document.querySelector('[name="astro-view-transitions-enabled"]');
 	const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));
 	const onload = () => triggerEvent('astro:load');
+	const PERSIST_ATTR = 'data-astro-transition-persist';
 
 	const throttle = (cb: (...args: any[]) => any, delay: number) => {
 		let wait = false;
@@ -86,8 +87,50 @@ const { fallback = 'animate' } = Astro.props as Props;
 	async function updateDOM(dir: Direction, html: string, state?: State, fallback?: Fallback) {
 		const doc = parser.parseFromString(html, 'text/html');
 		doc.documentElement.dataset.astroTransition = dir;
+
+		// Check for a head element that should persist, either because it has the data
+		// attribute or is a link el.
+		const persistedHeadElement = (el: Element): Element | null => {
+			const id = el.getAttribute(PERSIST_ATTR);
+			const newEl = id && doc.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
+			if (newEl) {
+				return newEl;
+			}
+			if (el.matches('link[rel=stylesheet]')) {
+				const href = el.getAttribute('href');
+				return doc.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
+			}
+			return null;
+		};
+
 		const swap = () => {
-			document.documentElement.replaceWith(doc.documentElement);
+			// Swap head
+			for (const el of Array.from(document.head.children)) {
+				const newEl = persistedHeadElement(el);
+				// If the element exists in the document already, remove it
+				// from the new document and leave the current node alone
+				if (newEl) {
+					newEl.remove();
+				} else {
+					// Otherwise remove the element in the head. It doesn't exist in the new page.
+					el.remove();
+				}
+			}
+			// Everything left in the new head is new, append it all.
+			document.head.append(...doc.head.children);
+
+			// Move over persist stuff in the body
+			const oldBody = document.body;
+			document.body.replaceWith(doc.body);
+			for (const el of oldBody.querySelectorAll(`[${PERSIST_ATTR}]`)) {
+				const id = el.getAttribute(PERSIST_ATTR);
+				const newEl = document.querySelector(`[${PERSIST_ATTR}="${id}"]`);
+				if (newEl) {
+					// The element exists in the new page, replace it with the element
+					// from the old page so that state is preserved.
+					newEl.replaceWith(el);
+				}
+			}
 
 			if (state?.scrollY != null) {
 				scrollTo(0, state.scrollY);
@@ -97,17 +140,27 @@ const { fallback = 'animate' } = Astro.props as Props;
 		};
 
 		// Wait on links to finish, to prevent FOUC
-		const links = Array.from(doc.querySelectorAll('head link[rel=stylesheet]')).map(
-			(link) =>
-				new Promise((resolve) => {
-					const c = link.cloneNode();
-					['load', 'error'].forEach((evName) => c.addEventListener(evName, resolve));
-					document.head.append(c);
-				})
-		);
-		if (links.length) {
-			await Promise.all(links);
+		const links: Promise<any>[] = [];
+		for (const el of doc.querySelectorAll('head link[rel=stylesheet]')) {
+			// Do not preload links that are already on the page.
+			if (
+				!document.querySelector(
+					`[${PERSIST_ATTR}="${el.getAttribute(PERSIST_ATTR)}"], link[rel=stylesheet]`
+				)
+			) {
+				const c = document.createElement('link');
+				c.setAttribute('rel', 'preload');
+				c.setAttribute('as', 'style');
+				c.setAttribute('href', el.getAttribute('href')!);
+				links.push(
+					new Promise<any>((resolve) => {
+						['load', 'error'].forEach((evName) => c.addEventListener(evName, resolve));
+						document.head.append(c);
+					})
+				);
+			}
 		}
+		links.length && (await Promise.all(links));
 
 		if (fallback === 'animate') {
 			let isAnimating = false;
@@ -187,7 +240,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				transitionEnabledOnThisPage()
 			) {
 				ev.preventDefault();
-				navigate('forward', link.href);
+				navigate('forward', link.href, { index: currentHistoryIndex, scrollY: 0 });
 				currentHistoryIndex++;
 				const newState: State = { index: currentHistoryIndex, scrollY };
 				persistState({ index: currentHistoryIndex - 1, scrollY });

package/dist/@types/astro.d.ts

@@ -55,6 +55,7 @@ export interface AstroBuiltinAttributes {
     'is:raw'?: boolean;
     'transition:animate'?: 'morph' | 'slide' | 'fade' | TransitionDirectionalAnimations;
     'transition:name'?: string;
+    'transition:persist'?: boolean | string;
 }
 export interface AstroDefineVarsAttribute {
     'define:vars'?: any;

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

@@ -122,7 +122,7 @@ function assets({
         if (s) {
           return {
             code: s.toString(),
-            map: resolvedConfig.build.sourcemap ? s.generateMap({ hires: true }) : null
+            map: resolvedConfig.build.sourcemap ? s.generateMap({ hires: "boundary" }) : null
           };
         } else {
           return null;

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -168,7 +168,7 @@ function globWithUnderscoresIgnored(relContentDir, exts) {
   const contentDir = appendForwardSlash(relContentDir);
   return [
     `${contentDir}**/*${extGlob}`,
-    `!${contentDir}**/_*/**${extGlob}`,
+    `!${contentDir}**/_*/**/*${extGlob}`,
     `!${contentDir}**/_*${extGlob}`
   ];
 }

package/dist/core/app/index.js

@@ -2,9 +2,13 @@ import mime from "mime";
 import { attachToResponse, getSetCookiesFromResponse } from "../cookies/index.js";
 import { consoleLogDestination } from "../logger/console.js";
 import { error } from "../logger/core.js";
-import { prependForwardSlash, removeTrailingForwardSlash } from "../path.js";
+import {
+  collapseDuplicateSlashes,
+  prependForwardSlash,
+  removeTrailingForwardSlash
+} from "../path.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
-import { isResponse } from "../render/core";
+import { isResponse } from "../render/core.js";
 import {
   createEnvironment,
   createRenderContext,
@@ -98,13 +102,16 @@ class App {
     const url = new URL(request.url);
     if (this.#manifest.assets.has(url.pathname))
       return void 0;
-    let pathname = prependForwardSlash(this.removeBase(url.pathname));
-    let routeData = matchRoute(pathname, this.#manifestData);
+    const pathname = prependForwardSlash(this.removeBase(url.pathname));
+    const routeData = matchRoute(pathname, this.#manifestData);
     if (!routeData || routeData.prerender)
       return void 0;
     return routeData;
   }
   async render(request, routeData, locals) {
+    if (request.url !== collapseDuplicateSlashes(request.url)) {
+      request = new Request(collapseDuplicateSlashes(request.url), request);
+    }
     if (!routeData) {
       routeData = this.match(request);
     }
@@ -229,7 +236,7 @@ class App {
     }
   }
   /**
-   * If is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
+   * 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, { routeData, status, response: originalResponse }) {
@@ -272,8 +279,10 @@ class App {
       return newResponse;
     const { status, statusText, headers } = oldResponse;
     return new Response(newResponse.body, {
+      // If the original status was 200 (default), override it with the new status (probably 404 or 500)
+      // Otherwise, the user set a specific status while rendering and we should respect that one
       status: status === 200 ? newResponse.status : status,
-      statusText,
+      statusText: status === 200 ? newResponse.statusText : statusText,
       headers: new Headers(Array.from(headers))
     });
   }

package/dist/core/compile/compile.js

@@ -25,6 +25,7 @@ async function compile({
       scopedStyleStrategy: astroConfig.scopedStyleStrategy,
       resultScopedSlot: true,
       experimentalTransitions: astroConfig.experimental.viewTransitions,
+      experimentalPersistence: astroConfig.experimental.viewTransitions,
       transitionsAnimationURL: "astro/components/viewtransitions.css",
       preprocessStyle: createStylePreprocessor({
         filename,

package/dist/core/constants.js

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

package/dist/core/dev/container.d.ts

@@ -26,4 +26,3 @@ export interface CreateContainerParams {
 }
 export declare function createContainer({ isRestart, logging, inlineConfig, settings, fs, }: CreateContainerParams): Promise<Container>;
 export declare function startContainer({ settings, viteServer, logging, }: Container): Promise<AddressInfo>;
-export declare function isStarted(container: Container): boolean;

package/dist/core/dev/container.js

@@ -79,12 +79,7 @@ async function startContainer({
   });
   return devServerAddressInfo;
 }
-function isStarted(container) {
-  var _a;
-  return !!((_a = container.viteServer.httpServer) == null ? void 0 : _a.listening);
-}
 export {
   createContainer,
-  isStarted,
   startContainer
 };

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "2.9.7";
+  const currentVersion = "2.10.1";
   if (currentVersion.includes("-")) {
     warn(logging, null, msg.prerelease({ currentVersion }));
   }

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

@@ -1,3 +1,3 @@
-export { createContainer, isStarted, startContainer } from './container.js';
+export { createContainer, startContainer } from './container.js';
 export { default } from './dev.js';
 export { createContainerWithAutomaticRestart } from './restart.js';

package/dist/core/dev/index.js

@@ -1,10 +1,9 @@
-import { createContainer, isStarted, startContainer } from "./container.js";
+import { createContainer, startContainer } from "./container.js";
 import { default as default2 } from "./dev.js";
 import { createContainerWithAutomaticRestart } from "./restart.js";
 export {
   createContainer,
   createContainerWithAutomaticRestart,
   default2 as default,
-  isStarted,
   startContainer
 };

package/dist/core/dev/restart.d.ts

@@ -3,10 +3,7 @@ import nodeFs from 'node:fs';
 import type { AstroInlineConfig } from '../../@types/astro';
 import type { Container } from './container';
 export declare function shouldRestartContainer({ settings, inlineConfig, restartInFlight }: Container, changedFile: string): boolean;
-export declare function restartContainer(container: Container): Promise<{
-    container: Container;
-    error: Error | null;
-}>;
+export declare function restartContainer(container: Container): Promise<Container | Error>;
 export interface CreateContainerWithAutomaticRestart {
     inlineConfig?: AstroInlineConfig;
     fs: typeof nodeFs;

package/dist/core/dev/restart.js

@@ -7,8 +7,8 @@ import { isAstroConfigZodError } from "../errors/errors.js";
 import { createSafeError } from "../errors/index.js";
 import { info, error as logError } from "../logger/core.js";
 import { formatErrorMessage } from "../messages.js";
-import { createContainer, isStarted, startContainer } from "./container.js";
-async function createRestartedContainer(container, settings, needsStart) {
+import { createContainer, startContainer } from "./container.js";
+async function createRestartedContainer(container, settings) {
   const { logging, fs, inlineConfig } = container;
   const newContainer = await createContainer({
     isRestart: true,
@@ -17,9 +17,7 @@ async function createRestartedContainer(container, settings, needsStart) {
     inlineConfig,
     fs
   });
-  if (needsStart) {
-    await startContainer(newContainer);
-  }
+  await startContainer(newContainer);
   return newContainer;
 }
 function shouldRestartContainer({ settings, inlineConfig, restartInFlight }, changedFile) {
@@ -43,15 +41,11 @@ function shouldRestartContainer({ settings, inlineConfig, restartInFlight }, cha
 async function restartContainer(container) {
   const { logging, close, settings: existingSettings } = container;
   container.restartInFlight = true;
-  const needsStart = isStarted(container);
   try {
     const { astroConfig } = await resolveConfig(container.inlineConfig, "dev", container.fs);
     const settings = createSettings(astroConfig, fileURLToPath(existingSettings.config.root));
     await close();
-    return {
-      container: await createRestartedContainer(container, settings, needsStart),
-      error: null
-    };
+    return await createRestartedContainer(container, settings);
   } catch (_err) {
     const error = createSafeError(_err);
     if (!isAstroConfigZodError(_err)) {
@@ -64,12 +58,9 @@ async function restartContainer(container) {
         stack: error.stack || ""
       }
     });
-    await close();
+    container.restartInFlight = false;
     info(logging, "astro", "Continuing with previous valid configuration\n");
-    return {
-      container: await createRestartedContainer(container, existingSettings, needsStart),
-      error
-    };
+    return error;
   }
 }
 async function createContainerWithAutomaticRestart({
@@ -94,10 +85,14 @@ async function createContainerWithAutomaticRestart({
   async function handleServerRestart(logMsg) {
     info(logging, "astro", logMsg + "\n");
     const container = restart.container;
-    const { container: newContainer, error } = await restartContainer(container);
-    restart.container = newContainer;
-    addWatches();
-    resolveRestart(error);
+    const result = await restartContainer(container);
+    if (result instanceof Error) {
+      resolveRestart(result);
+    } else {
+      restart.container = result;
+      addWatches();
+      resolveRestart(null);
+    }
     restartComplete = new Promise((resolve) => {
       resolveRestart = resolve;
     });

package/dist/core/messages.js

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

package/dist/runtime/server/hydration.js

@@ -2,6 +2,10 @@ import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { escapeHTML } from "./escape.js";
 import { serializeProps } from "./serialize.js";
 import { serializeListValue } from "./util.js";
+const transitionDirectivesToCopyOnIsland = Object.freeze([
+  "data-astro-transition-scope",
+  "data-astro-transition-persist"
+]);
 function extractDirectives(inputProps, clientDirectives) {
   let extracted = {
     isPage: false,
@@ -104,6 +108,11 @@ async function generateHydrateScript(scriptOptions, metadata) {
       value: metadata.hydrateArgs || ""
     })
   );
+  transitionDirectivesToCopyOnIsland.forEach((name) => {
+    if (props[name]) {
+      island.props[name] = props[name];
+    }
+  });
   return island;
 }
 export {

package/dist/runtime/server/index.d.ts

@@ -5,7 +5,7 @@ export { escapeHTML, HTMLBytes, HTMLString, isHTMLString, markHTMLString, unesca
 export { renderJSX } from './jsx.js';
 export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderTemplate as render, renderComponent, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderSlotToString, renderTemplate, renderToString, renderUniqueStylesheet, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, AstroComponentInstance, ComponentSlots, RenderInstruction, } from './render/index.js';
-export { renderTransition } from './transition.js';
+export { createTransitionScope, renderTransition } from './transition.js';
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;
 /** @internal Associate JSX components with a specific renderer (see /src/vite-plugin-jsx/tag.ts) */
 export declare function __astro_tag_component__(Component: unknown, rendererName: string): void;

package/dist/runtime/server/index.js

@@ -30,7 +30,7 @@ import {
   renderUniqueStylesheet,
   voidElementNames
 } from "./render/index.js";
-import { renderTransition } from "./transition.js";
+import { createTransitionScope, renderTransition } from "./transition.js";
 import { markHTMLString as markHTMLString2 } from "./escape.js";
 import { addAttribute as addAttribute2, Renderer as Renderer2 } from "./render/index.js";
 function mergeSlots(...slotted) {
@@ -95,6 +95,7 @@ export {
   createAstro,
   createComponent,
   createHeadAndContent,
+  createTransitionScope,
   defineScriptVars,
   defineStyleVars,
   escapeHTML,

package/dist/runtime/server/transition.d.ts

@@ -1,2 +1,3 @@
 import type { SSRResult, TransitionAnimationValue } from '../../@types/astro';
+export declare function createTransitionScope(result: SSRResult, hash: string): string;
 export declare function renderTransition(result: SSRResult, hash: string, animationName: TransitionAnimationValue | undefined, transitionName: string): string;

package/dist/runtime/server/transition.js

@@ -129,5 +129,6 @@ function toTimeValue(num) {
   return typeof num === "number" ? num + "ms" : num;
 }
 export {
+  createTransitionScope,
   renderTransition
 };

package/dist/vite-plugin-astro-postprocess/index.js

@@ -37,7 +37,7 @@ function astro() {
       if (s) {
         return {
           code: s.toString(),
-          map: s.generateMap({ hires: true })
+          map: s.generateMap({ hires: "boundary" })
         };
       }
     }

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

@@ -2,7 +2,7 @@ import { collectErrorMetadata } from "../core/errors/dev/index.js";
 import { createSafeError } from "../core/errors/index.js";
 import { error } from "../core/logger/core.js";
 import * as msg from "../core/messages.js";
-import { removeTrailingForwardSlash } from "../core/path.js";
+import { collapseDuplicateSlashes, removeTrailingForwardSlash } from "../core/path.js";
 import { eventError, telemetry } from "../events/index.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
 import { runWithErrorHandling } from "./controller.js";
@@ -20,7 +20,7 @@ async function handleRequest({
   const { config } = settings;
   const origin = `${moduleLoader.isHttps() ? "https" : "http"}://${incomingRequest.headers.host}`;
   const buildingToSSR = isServerLikeOutput(config);
-  const url = new URL(origin + incomingRequest.url);
+  const url = new URL(collapseDuplicateSlashes(origin + incomingRequest.url));
   let pathname;
   if (config.trailingSlash === "never" && !incomingRequest.url) {
     pathname = "";

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

@@ -98,7 +98,7 @@ function envVitePlugin({ settings }) {
       if (s) {
         return {
           code: s.toString(),
-          map: s.generateMap({ hires: true })
+          map: s.generateMap({ hires: "boundary" })
         };
       }
     }

package/dist/vite-plugin-html/transform/index.js

@@ -13,7 +13,7 @@ async function transform(code, id) {
   s.append('`\n	}\nrender["astro:html"] = true;\nexport default render;');
   return {
     code: s.toString(),
-    map: s.generateMap()
+    map: s.generateMap({ hires: "boundary" })
   };
 }
 export {

package/dist/vite-plugin-scripts/page-ssr.js

@@ -29,7 +29,7 @@ function astroScriptsPostPlugin({
 `);
       return {
         code: s.toString(),
-        map: s.generateMap({ hires: true })
+        map: s.generateMap({ hires: "boundary" })
       };
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.9.7",
+  "version": "2.10.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -102,8 +102,8 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.6.3",
-    "@astrojs/internal-helpers": "^0.1.1",
+    "@astrojs/compiler": "^1.8.0",
+    "@astrojs/internal-helpers": "^0.1.2",
     "@astrojs/language-server": "^1.0.0",
     "@astrojs/markdown-remark": "^2.2.1",
     "@astrojs/telemetry": "^2.1.1",
@@ -137,7 +137,7 @@
     "html-escaper": "^3.0.3",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.4",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.30.2",
     "mime": "^3.0.0",
     "network-information-types": "^0.1.1",
     "ora": "^6.3.1",