astro 2.10.0 → 2.10.2

package/components/ViewTransitions.astro

@@ -168,13 +168,18 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 			// Trigger the animations
 			document.documentElement.dataset.astroTransitionFallback = 'old';
-			doc.documentElement.dataset.astroTransitionFallback = 'new';
+			const fallbackSwap = () => {
+				removeEventListener('animationend', fallbackSwap);
+				clearTimeout(timeout);
+				swap();
+				document.documentElement.dataset.astroTransitionFallback = 'new';
+			};
 			// If there are any animations, want for the animationend event.
-			addEventListener('animationend', swap, { once: true });
+			addEventListener('animationend', fallbackSwap, { once: true });
 			// If there are no animations, go ahead and swap on next tick
 			// This is necessary because we do not know if there are animations.
 			// The setTimeout is a fallback in case there are none.
-			setTimeout(() => !isAnimating && swap());
+			let timeout = setTimeout(() => !isAnimating && fallbackSwap());
 		} else {
 			swap();
 		}

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

@@ -1216,15 +1216,18 @@ export interface AstroUserConfig {
  * - "page-ssr": Injected into the frontmatter of every Astro page. Processed & resolved by Vite.
  */
 export type InjectedScriptStage = 'before-hydration' | 'head-inline' | 'page' | 'page-ssr';
-/**
- * Resolved Astro Config
- * Config with user settings along with all defaults filled in.
- */
 export interface InjectedRoute {
     pattern: string;
     entryPoint: string;
     prerender?: boolean;
 }
+export interface ResolvedInjectedRoute extends InjectedRoute {
+    resolvedEntryPoint?: URL;
+}
+/**
+ * Resolved Astro Config
+ * Config with user settings along with all defaults filled in.
+ */
 export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
     integrations: AstroIntegration[];
 }
@@ -1304,6 +1307,7 @@ export interface AstroSettings {
     config: AstroConfig;
     adapter: AstroAdapter | undefined;
     injectedRoutes: InjectedRoute[];
+    resolvedInjectedRoutes: ResolvedInjectedRoute[];
     pageExtensions: string[];
     contentEntryTypes: ContentEntryType[];
     dataEntryTypes: DataEntryType[];

package/dist/content/types-generator.js

@@ -3,8 +3,8 @@ import { cyan } from "kleur/colors";
 import * as path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
-import { AstroErrorData } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
+import { AstroErrorData } from "../core/errors/index.js";
 import { info, warn } from "../core/logger/core.js";
 import { isRelativePath } from "../core/path.js";
 import { CONTENT_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";

package/dist/content/vite-plugin-content-imports.js

@@ -1,8 +1,8 @@
 import * as devalue from "devalue";
 import { extname } from "node:path";
 import { pathToFileURL } from "node:url";
-import { AstroErrorData } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
+import { AstroErrorData } from "../core/errors/index.js";
 import { escapeViteEnvReferences } from "../vite-plugin-utils/index.js";
 import { CONTENT_FLAG, DATA_FLAG } from "./consts.js";
 import {
@@ -277,6 +277,7 @@ function stringifyEntryData(data) {
       });
     } else {
       throw new AstroError({
+        name: "PluginContentImportsError",
         message: "Unexpected error processing content collection data."
       });
     }

package/dist/core/app/index.js

@@ -2,7 +2,11 @@ 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.js";
 import {
@@ -98,18 +102,21 @@ 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);
     }
     if (!routeData) {
-      return this.#renderError(request, { routeData, status: 404 });
+      return this.#renderError(request, { status: 404 });
     }
     Reflect.set(request, clientLocalsSymbol, locals ?? {});
     const defaultStatus = this.#getDefaultStatusCode(routeData.route);
@@ -134,12 +141,11 @@ class App {
       );
     } catch (err) {
       error(this.#logging, "ssr", err.stack || err.message || String(err));
-      return this.#renderError(request, { routeData, status: 500 });
+      return this.#renderError(request, { status: 500 });
     }
     if (isResponse(response, routeData.type)) {
       if (STATUS_CODES.has(response.status)) {
         return this.#renderError(request, {
-          routeData,
           response,
           status: response.status
         });
@@ -150,7 +156,6 @@ class App {
       if (response.type === "response") {
         if (response.response.headers.get("X-Astro-Response") === "Not-Found") {
           return this.#renderError(request, {
-            routeData,
             response: response.response,
             status: 404
           });
@@ -232,7 +237,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, { routeData, status, response: originalResponse }) {
+  async #renderError(request, { status, response: originalResponse }) {
     const errorRouteData = matchRoute("/" + status, this.#manifestData);
     const url = new URL(request.url);
     if (errorRouteData) {
@@ -241,13 +246,12 @@ class App {
         const response2 = await fetch(statusURL.toString());
         return this.#mergeResponses(response2, originalResponse);
       }
-      const finalRouteData = routeData ?? errorRouteData;
       const mod = await this.#getModuleForRoute(errorRouteData);
       try {
         const newRenderContext = await this.#createRenderContext(
           url,
           request,
-          finalRouteData,
+          errorRouteData,
           mod,
           status
         );

package/dist/core/build/static-build.js

@@ -328,20 +328,9 @@ async function ssrMoveAssets(opts) {
 }
 function makeAstroPageEntryPointFileName(prefix, facadeModuleId, routes) {
   const pageModuleId = facadeModuleId.replace(prefix, "").replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".");
-  let route = routes.find((routeData) => {
-    return routeData.route === pageModuleId;
-  });
-  let name = pageModuleId;
-  if (route) {
-    name = route.route;
-  }
-  if (name.endsWith("/"))
-    name += "index";
-  const fileName = `${name.replaceAll("[", "_").replaceAll("]", "_").replaceAll("...", "---")}.mjs`;
-  if (name.startsWith("..")) {
-    return `pages${fileName}`;
-  }
-  return fileName;
+  const route = routes.find((routeData) => routeData.component === pageModuleId);
+  const name = (route == null ? void 0 : route.route) ?? pageModuleId;
+  return `pages${name.replace(/\/$/, "/index").replaceAll(/[\[\]]/g, "_").replaceAll("...", "---")}.astro.mjs`;
 }
 function makeSplitEntryPointFileName(facadeModuleId, routes) {
   const filePath = `${makeAstroPageEntryPointFileName(

package/dist/core/compile/compile.js

@@ -58,6 +58,7 @@ function handleCompileResultErrors(result, cssTransformErrors) {
   const compilerError = result.diagnostics.find((diag) => diag.severity === 1);
   if (compilerError) {
     throw new CompilerError({
+      name: "CompilerError",
       message: compilerError.text,
       location: {
         line: compilerError.location.line,

package/dist/core/compile/style.js

@@ -68,6 +68,7 @@ function enhanceCSSError(err, filename, cssContent) {
   const errorPosition = positionAt(styleTagBeginning, fileContent);
   errorPosition.line += 1;
   return new CSSError({
+    name: "CSSError",
     message: err.message,
     location: {
       file: filename,

package/dist/core/config/config.d.ts

@@ -20,5 +20,11 @@ interface ResolveConfigResult {
     userConfig: AstroUserConfig;
     astroConfig: AstroConfig;
 }
+/**
+ * Resolves the Astro config with a given inline config.
+ *
+ * @param inlineConfig An inline config that takes highest priority when merging and resolving the final config.
+ * @param command The running command that uses this config. Usually 'dev' or 'build'.
+ */
 export declare function resolveConfig(inlineConfig: AstroInlineConfig, command: string, fsMod?: typeof fs): Promise<ResolveConfigResult>;
 export {};

package/dist/core/config/config.js

@@ -163,6 +163,9 @@ function splitInlineConfig(inlineConfig) {
 async function resolveConfig(inlineConfig, command, fsMod = fs) {
   const root = resolveRoot(inlineConfig.root);
   const { inlineUserConfig, inlineOnlyConfig } = splitInlineConfig(inlineConfig);
+  if (inlineConfig.root) {
+    inlineUserConfig.root = root;
+  }
   const userConfig = await loadConfig(root, inlineOnlyConfig.configFile, fsMod);
   const mergedConfig = mergeConfig(userConfig, inlineUserConfig);
   const astroConfig = await validateConfig(mergedConfig, root, command);

package/dist/core/config/settings.js

@@ -18,6 +18,7 @@ function createBaseSettings(config) {
     tsConfigPath: void 0,
     adapter: void 0,
     injectedRoutes: [],
+    resolvedInjectedRoutes: [],
     pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
     contentEntryTypes: [markdownContentEntryType],
     dataEntryTypes: [

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

package/dist/core/errors/dev/vite.js

@@ -1,7 +1,7 @@
 import * as fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import { getHighlighter } from "shiki";
-import { AstroErrorData } from "../errors-data.js";
+import { FailedToLoadModuleSSR, InvalidGlob, MdxIntegrationMissingError } from "../errors-data.js";
 import { AstroError } from "../errors.js";
 import { createSafeError } from "../utils.js";
 import { renderErrorMarkdown } from "./utils.js";
@@ -25,10 +25,10 @@ function enhanceViteSSRError({
     const lns = content.split("\n");
     let importName;
     if (importName = (_a = safeError.message.match(/Failed to load url (.*?) \(resolved id:/)) == null ? void 0 : _a[1]) {
-      safeError.title = AstroErrorData.FailedToLoadModuleSSR.title;
+      safeError.title = FailedToLoadModuleSSR.title;
       safeError.name = "FailedToLoadModuleSSR";
-      safeError.message = AstroErrorData.FailedToLoadModuleSSR.message(importName);
-      safeError.hint = AstroErrorData.FailedToLoadModuleSSR.hint;
+      safeError.message = FailedToLoadModuleSSR.message(importName);
+      safeError.hint = FailedToLoadModuleSSR.hint;
       const line = lns.findIndex((ln) => ln.includes(importName));
       if (line !== -1) {
         const column = (_b = lns[line]) == null ? void 0 : _b.indexOf(importName);
@@ -42,8 +42,8 @@ function enhanceViteSSRError({
     const fileId = safeError.id ?? ((_c = safeError.loc) == null ? void 0 : _c.file);
     if (!(renderers == null ? void 0 : renderers.find((r) => r.name === "@astrojs/mdx")) && safeError.message.match(/Syntax error/) && (fileId == null ? void 0 : fileId.match(/\.mdx$/))) {
       safeError = new AstroError({
-        ...AstroErrorData.MdxIntegrationMissingError,
-        message: AstroErrorData.MdxIntegrationMissingError.message(JSON.stringify(fileId)),
+        ...MdxIntegrationMissingError,
+        message: MdxIntegrationMissingError.message(JSON.stringify(fileId)),
         location: safeError.loc,
         stack: safeError.stack
       });
@@ -51,10 +51,10 @@ function enhanceViteSSRError({
     if (/Invalid glob/.test(safeError.message)) {
       const globPattern = (_d = safeError.message.match(/glob: "(.+)" \(/)) == null ? void 0 : _d[1];
       if (globPattern) {
-        safeError.message = AstroErrorData.InvalidGlob.message(globPattern);
+        safeError.message = InvalidGlob.message(globPattern);
         safeError.name = "InvalidGlob";
-        safeError.hint = AstroErrorData.InvalidGlob.hint;
-        safeError.title = AstroErrorData.InvalidGlob.title;
+        safeError.hint = InvalidGlob.hint;
+        safeError.title = InvalidGlob.title;
         const line = lns.findIndex((ln) => ln.includes(globPattern));
         if (line !== -1) {
           const column = (_e = lns[line]) == null ? void 0 : _e.indexOf(globPattern);
@@ -79,7 +79,7 @@ async function getViteErrorPayload(err) {
   }
   const message = renderErrorMarkdown(err.message.trim(), "html");
   const hint = err.hint ? renderErrorMarkdown(err.hint.trim(), "html") : void 0;
-  const hasDocs = err.name in AstroErrorData;
+  const hasDocs = !!err.name;
   const docslink = hasDocs ? `https://docs.astro.build/en/reference/errors/${getKebabErrorName(err.name)}/` : void 0;
   const highlighter = await getHighlighter({ theme: "css-variables" });
   let highlighterLang = (_b = (_a = err.loc) == null ? void 0 : _a.file) == null ? void 0 : _b.split(".").pop();