astro 3.5.3 → 3.5.5

package/components/Code.astro

@@ -10,8 +10,7 @@ import type {
 	ThemeRegistration,
 	ThemeRegistrationRaw,
 } from 'shikiji';
-import { visit } from 'unist-util-visit';
-import { getCachedHighlighter, replaceCssVariables } from '../dist/core/shiki.js';
+import { getCachedHighlighter } from '../dist/core/shiki.js';
 
 interface Props {
 	/** The code to highlight. Required. */
@@ -94,60 +93,13 @@ if (typeof lang === 'object') {
 
 const highlighter = await getCachedHighlighter({
 	langs: [lang],
-	themes: Object.values(experimentalThemes).length ? Object.values(experimentalThemes) : [theme],
+	theme,
+	experimentalThemes,
+	wrap,
 });
 
-const themeOptions = Object.values(experimentalThemes).length
-	? { themes: experimentalThemes }
-	: { theme };
-const html = highlighter.codeToHtml(code, {
-	lang: typeof lang === 'string' ? lang : lang.name,
-	...themeOptions,
-	transforms: {
-		pre(node) {
-			// Swap to `code` tag if inline
-			if (inline) {
-				node.tagName = 'code';
-			}
-
-			// Cast to string as shikiji will always pass them as strings instead of any other types
-			const classValue = (node.properties.class as string) ?? '';
-			const styleValue = (node.properties.style as string) ?? '';
-
-			// Replace "shiki" class naming with "astro-code"
-			node.properties.class = classValue.replace(/shiki/g, 'astro-code');
-
-			// Handle code wrapping
-			// if wrap=null, do nothing.
-			if (wrap === false) {
-				node.properties.style = styleValue + '; overflow-x: auto;';
-			} else if (wrap === true) {
-				node.properties.style =
-					styleValue + '; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;';
-			}
-		},
-		code(node) {
-			if (inline) {
-				return node.children[0] as typeof node;
-			}
-		},
-		root(node) {
-			if (Object.values(experimentalThemes).length) {
-				return;
-			}
-
-			// theme.id for shiki -> shikiji compat
-			const themeName = typeof theme === 'string' ? theme : theme.name;
-			if (themeName === 'css-variables') {
-				// Replace special color tokens to CSS variables
-				visit(node as any, 'element', (child) => {
-					if (child.properties?.style) {
-						child.properties.style = replaceCssVariables(child.properties.style);
-					}
-				});
-			}
-		},
-	},
+const html = highlighter.highlight(code, typeof lang === 'string' ? lang : lang.name, {
+	inline,
 });
 ---
 

package/components/ViewTransitions.astro

@@ -88,11 +88,14 @@ const { fallback = 'animate', handleForms } = Astro.props;
 				}
 
 				const form = el as HTMLFormElement;
+				const submitter = ev.submitter;
 				const formData = new FormData(form);
 				// Use the form action, if defined, otherwise fallback to current path.
-				let action = form.action ?? location.pathname;
+				let action = submitter?.getAttribute('formaction') ?? form.action ?? location.pathname;
+				const method = submitter?.getAttribute('formmethod') ?? form.method;
+
 				const options: Options = {};
-				if (form.method === 'get') {
+				if (method === 'get') {
 					const params = new URLSearchParams(formData as any);
 					const url = new URL(action);
 					url.search = params.toString();

package/config.d.ts

@@ -16,12 +16,12 @@ export function getViteConfig(config: ViteUserConfig): ViteUserConfigFn;
 
 /**
  * Return the configuration needed to use the Sharp-based image service
- * See: https://docs.astro.build/en/guides/assets/#using-sharp
  */
 export function sharpImageService(): ImageServiceConfig;
 
 /**
  * Return the configuration needed to use the Squoosh-based image service
+ * See: https://docs.astro.build/en/guides/images/#configure-squoosh
  */
 export function squooshImageService(): ImageServiceConfig;
 
@@ -29,5 +29,6 @@ export function squooshImageService(): ImageServiceConfig;
  * Return the configuration needed to use the passthrough image service. This image services does not perform
  * any image transformations, and is mainly useful when your platform does not support other image services, or you are
  * not using Astro's built-in image processing.
+ * See: https://docs.astro.build/en/guides/images/#configure-no-op-passthrough-service
  */
 export function passthroughImageService(): ImageServiceConfig;

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

@@ -19,6 +19,7 @@ import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger
 import type { AstroDevOverlay, DevOverlayCanvas } from '../runtime/client/dev-overlay/overlay.js';
 import type { DevOverlayHighlight } from '../runtime/client/dev-overlay/ui-library/highlight.js';
 import type { Icon } from '../runtime/client/dev-overlay/ui-library/icons.js';
+import type { DevOverlayToggle } from '../runtime/client/dev-overlay/ui-library/toggle.js';
 import type { DevOverlayTooltip } from '../runtime/client/dev-overlay/ui-library/tooltip.js';
 import type { DevOverlayWindow } from '../runtime/client/dev-overlay/ui-library/window.js';
 import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server/index.js';
@@ -1393,7 +1394,7 @@ export interface AstroUserConfig {
              * The following example configures your content fallback strategy to redirect unavailable pages in `/pt-br/` to their `es` version, and unavailable pages in `/fr/` to their `en` version. Unavailable `/es/` pages will return a 404.
              *
              * ```js
-             * export defualt defineConfig({
+             * export default defineConfig({
              * 	experimental: {
              * 		i18n: {
              * 			defaultLocale: "en",
@@ -2299,5 +2300,6 @@ declare global {
         'astro-dev-overlay-plugin-canvas': DevOverlayCanvas;
         'astro-dev-overlay-tooltip': DevOverlayTooltip;
         'astro-dev-overlay-highlight': DevOverlayHighlight;
+        'astro-dev-overlay-toggle': DevOverlayToggle;
     }
 }

package/dist/assets/services/noop.js

@@ -1,5 +1,6 @@
 import { baseService } from "./service.js";
 const noopService = {
+  propertiesToHash: ["src"],
   validateOptions: baseService.validateOptions,
   getURL: baseService.getURL,
   parseURL: baseService.parseURL,

package/dist/core/app/index.js

@@ -1,4 +1,4 @@
-import { createI18nMiddleware } from "../../i18n/middleware.js";
+import { createI18nMiddleware, i18nPipelineHook } from "../../i18n/middleware.js";
 import { getSetCookiesFromResponse } from "../cookies/index.js";
 import { consoleLogDestination } from "../logger/console.js";
 import { AstroIntegrationLogger, Logger } from "../logger/core.js";
@@ -130,7 +130,11 @@ class App {
     );
     let response;
     try {
-      let i18nMiddleware = createI18nMiddleware(this.#manifest.i18n, this.#manifest.base);
+      let i18nMiddleware = createI18nMiddleware(
+        this.#manifest.i18n,
+        this.#manifest.base,
+        this.#manifest.trailingSlash
+      );
       if (i18nMiddleware) {
         if (mod.onRequest) {
           this.#pipeline.setMiddlewareFunction(
@@ -139,6 +143,7 @@ class App {
         } else {
           this.#pipeline.setMiddlewareFunction(i18nMiddleware);
         }
+        this.#pipeline.onBeforeRenderRoute(i18nPipelineHook);
       } else {
         if (mod.onRequest) {
           this.#pipeline.setMiddlewareFunction(mod.onRequest);

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

@@ -30,6 +30,7 @@ export type SSRManifest = {
     routes: RouteInfo[];
     site?: string;
     base: string;
+    trailingSlash: 'always' | 'never' | 'ignore';
     compressHTML: boolean;
     assetsPrefix?: string;
     renderers: SSRLoadedRenderer[];

package/dist/core/build/generate.js

@@ -17,7 +17,7 @@ import {
   removeLeadingForwardSlash,
   removeTrailingForwardSlash
 } from "../../core/path.js";
-import { createI18nMiddleware } from "../../i18n/middleware.js";
+import { createI18nMiddleware, i18nPipelineHook } from "../../i18n/middleware.js";
 import { runHookBuildGenerated } from "../../integrations/index.js";
 import { getOutputDirectory, isServerLikeOutput } from "../../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
@@ -205,7 +205,8 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
   const onRequest = ssrEntry.onRequest;
   const i18nMiddleware = createI18nMiddleware(
     pipeline.getManifest().i18n,
-    pipeline.getManifest().base
+    pipeline.getManifest().base,
+    pipeline.getManifest().trailingSlash
   );
   if (config.experimental.i18n && i18nMiddleware) {
     if (onRequest) {
@@ -215,6 +216,7 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     } else {
       pipeline.setMiddlewareFunction(i18nMiddleware);
     }
+    pipeline.onBeforeRenderRoute(i18nPipelineHook);
   } else if (onRequest) {
     pipeline.setMiddlewareFunction(onRequest);
   }
@@ -468,6 +470,7 @@ function createBuildManifest(settings, internals, renderers) {
     };
   }
   return {
+    trailingSlash: settings.config.trailingSlash,
     assets: /* @__PURE__ */ new Set(),
     entryModules: Object.fromEntries(internals.entrySpecifierToBundleMap.entries()),
     routes: [],

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

@@ -196,6 +196,7 @@ function buildManifest(opts, internals, staticFiles) {
     routes,
     site: settings.config.site,
     base: settings.config.base,
+    trailingSlash: settings.config.trailingSlash,
     compressHTML: settings.config.compressHTML,
     assetsPrefix: settings.config.build.assetsPrefix,
     componentMetadata: Array.from(internals.componentMetadata),

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

@@ -6,7 +6,10 @@ function vitePluginPrerender(opts, internals) {
     name: "astro:rollup-plugin-prerender",
     outputOptions(outputOptions) {
       extendManualChunks(outputOptions, {
-        before(id, meta) {
+        after(id, meta) {
+          if (id.includes("astro/dist/runtime")) {
+            return "astro";
+          }
           const pageInfo = internals.pagesByViteID.get(id);
           if (pageInfo) {
             if (getPrerenderMetadata(meta.getModuleInfo(id))) {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.5.3";
+const ASTRO_VERSION = "3.5.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.5.3";
+  const currentVersion = "3.5.5";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

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

@@ -1,7 +1,7 @@
+import { replaceCssVariables } from "@astrojs/markdown-remark";
 import * as fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import { codeToHtml } from "shikiji";
-import { replaceCssVariables } from "../../shiki.js";
 import { FailedToLoadModuleSSR, InvalidGlob, MdxIntegrationMissingError } from "../errors-data.js";
 import { AstroError } from "../errors.js";
 import { createSafeError } from "../utils.js";

package/dist/core/logger/core.d.ts

@@ -33,7 +33,7 @@ export declare class Logger {
     info(label: string | null, message: string): void;
     warn(label: string | null, message: string): void;
     error(label: string | null, message: string): void;
-    debug(label: string | null, message: string, ...args: any[]): void;
+    debug(label: string | null, ...messages: any[]): void;
     level(): LoggerLevel;
     forkIntegrationLogger(label: string): AstroIntegrationLogger;
 }

package/dist/core/logger/core.js

@@ -89,8 +89,8 @@ class Logger {
   error(label, message) {
     error(this.options, label, message);
   }
-  debug(label, message, ...args) {
-    debug(this.options, label, message, args);
+  debug(label, ...messages) {
+    debug(label, ...messages);
   }
   level() {
     return this.options.level;
@@ -122,7 +122,7 @@ class AstroIntegrationLogger {
     error(this.options, this.label, message);
   }
   debug(message) {
-    debug(this.options, this.label, message);
+    debug(this.label, message);
   }
 }
 export {

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.5.3";
+  const version = "3.5.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.5.3"}`
+        `v${"3.5.5"}`
       )} ${headline}`
     );
   }

package/dist/core/pipeline.d.ts

@@ -1,6 +1,7 @@
 import type { ComponentInstance, MiddlewareEndpointHandler } from '../@types/astro.js';
 import { type Environment, type RenderContext } from './render/index.js';
 type EndpointResultHandler = (originalRequest: Request, result: Response) => Promise<Response> | Response;
+export type PipelineHookFunction = (ctx: RenderContext, mod: ComponentInstance | undefined) => void;
 /**
  * This is the basic class of a pipeline.
  *
@@ -37,5 +38,10 @@ export declare class Pipeline {
      * The main function of the pipeline. Use this function to render any route known to Astro;
      */
     renderRoute(renderContext: RenderContext, componentInstance: ComponentInstance | undefined): Promise<Response>;
+    /**
+     * Store a function that will be called before starting the rendering phase.
+     * @param fn
+     */
+    onBeforeRenderRoute(fn: PipelineHookFunction): void;
 }
 export {};

package/dist/core/pipeline.js

@@ -5,6 +5,9 @@ import {} from "./render/index.js";
 class Pipeline {
   env;
   #onRequest;
+  #hooks = {
+    before: []
+  };
   /**
    * The handler accepts the *original* `Request` and result returned by the endpoint.
    * It must return a `Response`.
@@ -49,6 +52,9 @@ class Pipeline {
    * The main function of the pipeline. Use this function to render any route known to Astro;
    */
   async renderRoute(renderContext, componentInstance) {
+    for (const hook of this.#hooks.before) {
+      hook(renderContext, componentInstance);
+    }
     const result = await this.#tryRenderRoute(
       renderContext,
       this.env,
@@ -125,6 +131,13 @@ class Pipeline {
         throw new Error(`Couldn't find route of type [${renderContext.route.type}]`);
     }
   }
+  /**
+   * Store a function that will be called before starting the rendering phase.
+   * @param fn
+   */
+  onBeforeRenderRoute(fn) {
+    this.#hooks.before.push(fn);
+  }
 }
 export {
   Pipeline

package/dist/core/preview/vite-plugin-astro-preview.js

@@ -17,7 +17,8 @@ function vitePluginAstroPreview(settings) {
           res.end(subpathNotUsedTemplate(base, req.url));
           return;
         }
-        const pathname = stripBase(req.url, base);
+        const strippedPathname = stripBase(req.url, base);
+        const pathname = new URL(strippedPathname, "https://a.b").pathname;
         const isRoot = pathname === "/";
         if (!isRoot) {
           const hasTrailingSlash = pathname.endsWith("/");

package/dist/core/shiki.d.ts

@@ -1,8 +1,2 @@
-import { getHighlighter, type Highlighter } from 'shikiji';
-type HighlighterOptions = NonNullable<Parameters<typeof getHighlighter>[0]>;
-/**
- * shiki -> shikiji compat as we need to manually replace it
- */
-export declare function replaceCssVariables(str: string): string;
-export declare function getCachedHighlighter(opts: HighlighterOptions): Promise<Highlighter>;
-export {};
+import { type ShikiConfig, type ShikiHighlighter } from '@astrojs/markdown-remark';
+export declare function getCachedHighlighter(opts: ShikiConfig): Promise<ShikiHighlighter>;

package/dist/core/shiki.js

@@ -1,35 +1,16 @@
-import { getHighlighter } from "shikiji";
-const ASTRO_COLOR_REPLACEMENTS = {
-  "#000001": "var(--astro-code-color-text)",
-  "#000002": "var(--astro-code-color-background)",
-  "#000004": "var(--astro-code-token-constant)",
-  "#000005": "var(--astro-code-token-string)",
-  "#000006": "var(--astro-code-token-comment)",
-  "#000007": "var(--astro-code-token-keyword)",
-  "#000008": "var(--astro-code-token-parameter)",
-  "#000009": "var(--astro-code-token-function)",
-  "#000010": "var(--astro-code-token-string-expression)",
-  "#000011": "var(--astro-code-token-punctuation)",
-  "#000012": "var(--astro-code-token-link)"
-};
-const COLOR_REPLACEMENT_REGEX = new RegExp(
-  `(${Object.keys(ASTRO_COLOR_REPLACEMENTS).join("|")})`,
-  "g"
-);
+import {
+  createShikiHighlighter
+} from "@astrojs/markdown-remark";
 const cachedHighlighters = /* @__PURE__ */ new Map();
-function replaceCssVariables(str) {
-  return str.replace(COLOR_REPLACEMENT_REGEX, (match) => ASTRO_COLOR_REPLACEMENTS[match] || match);
-}
 function getCachedHighlighter(opts) {
   const key = JSON.stringify(opts, Object.keys(opts).sort());
   if (cachedHighlighters.has(key)) {
     return cachedHighlighters.get(key);
   }
-  const highlighter = getHighlighter(opts);
+  const highlighter = createShikiHighlighter(opts);
   cachedHighlighters.set(key, highlighter);
   return highlighter;
 }
 export {
-  getCachedHighlighter,
-  replaceCssVariables
+  getCachedHighlighter
 };

package/dist/i18n/middleware.d.ts

@@ -1,2 +1,7 @@
 import type { MiddlewareEndpointHandler, SSRManifest } from '../@types/astro.js';
-export declare function createI18nMiddleware(i18n: SSRManifest['i18n'], base: SSRManifest['base']): MiddlewareEndpointHandler | undefined;
+import type { PipelineHookFunction } from '../core/pipeline.js';
+export declare function createI18nMiddleware(i18n: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash']): MiddlewareEndpointHandler | undefined;
+/**
+ * This pipeline hook attaches a `RouteData` object to the `Request`
+ */
+export declare const i18nPipelineHook: PipelineHookFunction;

package/dist/i18n/middleware.js

@@ -1,4 +1,5 @@
-import { joinPaths } from "@astrojs/internal-helpers/path";
+import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
+const routeDataSymbol = Symbol.for("astro.routeData");
 function checkIsLocaleFree(pathname, locales) {
   for (const locale of locales) {
     if (pathname.includes(`/${locale}`)) {
@@ -7,7 +8,7 @@ function checkIsLocaleFree(pathname, locales) {
   }
   return true;
 }
-function createI18nMiddleware(i18n, base) {
+function createI18nMiddleware(i18n, base, trailingSlash) {
   if (!i18n) {
     return void 0;
   }
@@ -15,8 +16,14 @@ function createI18nMiddleware(i18n, base) {
     if (!i18n) {
       return await next();
     }
-    const { locales, defaultLocale, fallback } = i18n;
+    const routeData = Reflect.get(context.request, routeDataSymbol);
+    if (routeData) {
+      if (routeData.type !== "page" && routeData.type !== "fallback") {
+        return await next();
+      }
+    }
     const url = context.url;
+    const { locales, defaultLocale, fallback } = i18n;
     const response = await next();
     if (response instanceof Response) {
       const separators = url.pathname.split("/");
@@ -30,8 +37,12 @@ function createI18nMiddleware(i18n, base) {
           headers: response.headers
         });
       } else if (i18n.routingStrategy === "prefix-always") {
-        if (url.pathname === base || url.pathname === base + "/") {
-          return context.redirect(`${joinPaths(base, i18n.defaultLocale)}`);
+        if (url.pathname === base + "/" || url.pathname === base) {
+          if (trailingSlash === "always") {
+            return context.redirect(`${appendForwardSlash(joinPaths(base, i18n.defaultLocale))}`);
+          } else {
+            return context.redirect(`${joinPaths(base, i18n.defaultLocale)}`);
+          }
         } else if (isLocaleFree) {
           return new Response(null, {
             status: 404,
@@ -57,6 +68,10 @@ function createI18nMiddleware(i18n, base) {
     return response;
   };
 }
+const i18nPipelineHook = (ctx) => {
+  Reflect.set(ctx.request, routeDataSymbol, ctx.route);
+};
 export {
-  createI18nMiddleware
+  createI18nMiddleware,
+  i18nPipelineHook
 };