astro 3.5.1 → 3.5.3

package/components/ViewTransitions.astro

@@ -89,7 +89,8 @@ const { fallback = 'animate', handleForms } = Astro.props;
 
 				const form = el as HTMLFormElement;
 				const formData = new FormData(form);
-				let action = form.action;
+				// Use the form action, if defined, otherwise fallback to current path.
+				let action = form.action ?? location.pathname;
 				const options: Options = {};
 				if (form.method === 'get') {
 					const params = new URLSearchParams(formData as any);

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

@@ -464,67 +464,6 @@ export interface AstroUserConfig {
      * ```
      */
     redirects?: Record<string, RedirectConfig>;
-    /**
-     * @docs
-     * @name prefetch
-     * @type {boolean | object}
-     * @description
-     * Enable prefetching for links on your site to provide faster page transitions.
-     * (Enabled by default on pages using the `<ViewTransitions />` router. Set `prefetch: false` to opt out of this behaviour.)
-     *
-     * This configuration automatically adds a prefetch script to every page in the project
-     * giving you access to the `data-astro-prefetch` attribute.
-     * Add this attribute to any `<a />` link on your page to enable prefetching for that page.
-     *
-     * ```html
-     * <a href="/about" data-astro-prefetch>About</a>
-     * ```
-     * Further customize the default prefetching behavior using the [`prefetch.defaultStrategy`](#prefetchdefaultstrategy) and [`prefetch.prefetchAll`](#prefetchprefetchall) options.
-     *
-     * See the [Prefetch guide](https://docs.astro.build/en/guides/prefetch/) for more information.
-     */
-    prefetch?: boolean | {
-        /**
-         * @docs
-         * @name prefetch.prefetchAll
-         * @type {boolean}
-         * @description
-         * Enable prefetching for all links, including those without the `data-astro-prefetch` attribute.
-         * This value defaults to `true` when using the `<ViewTransitions />` router. Otherwise, the default value is `false`.
-         *
-         * ```js
-         * prefetch: {
-         * 	prefetchAll: true
-         * }
-         * ```
-         *
-         * When set to `true`, you can disable prefetching individually by setting `data-astro-prefetch="false"` on any individual links.
-         *
-         * ```html
-         * <a href="/about" data-astro-prefetch="false">About</a>
-         *```
-         */
-        prefetchAll?: boolean;
-        /**
-         * @docs
-         * @name prefetch.defaultStrategy
-         * @type {'tap' | 'hover' | 'viewport'}
-         * @default `'hover'`
-         * @description
-         * The default prefetch strategy to use when the `data-astro-prefetch` attribute is set on a link with no value.
-         *
-         * - `'tap'`: Prefetch just before you click on the link.
-         * - `'hover'`: Prefetch when you hover over or focus on the link. (default)
-         * - `'viewport'`: Prefetch as the links enter the viewport.
-         *
-         * You can override this default value and select a different strategy for any individual link by setting a value on the attribute.
-         *
-         * ```html
-         * <a href="/about" data-astro-prefetch="viewport">About</a>
-         * ```
-         */
-        defaultStrategy?: 'tap' | 'hover' | 'viewport';
-    };
     /**
      * @docs
      * @name site
@@ -893,6 +832,68 @@ export interface AstroUserConfig {
          */
         excludeMiddleware?: boolean;
     };
+    /**
+     * @docs
+     * @kind heading
+     * @name Prefetch Options
+     * @type {boolean | object}
+     * @description
+     * Enable prefetching for links on your site to provide faster page transitions.
+     * (Enabled by default on pages using the `<ViewTransitions />` router. Set `prefetch: false` to opt out of this behaviour.)
+     *
+     * This configuration automatically adds a prefetch script to every page in the project
+     * giving you access to the `data-astro-prefetch` attribute.
+     * Add this attribute to any `<a />` link on your page to enable prefetching for that page.
+     *
+     * ```html
+     * <a href="/about" data-astro-prefetch>About</a>
+     * ```
+     * Further customize the default prefetching behavior using the [`prefetch.defaultStrategy`](#prefetchdefaultstrategy) and [`prefetch.prefetchAll`](#prefetchprefetchall) options.
+     *
+     * See the [Prefetch guide](https://docs.astro.build/en/guides/prefetch/) for more information.
+     */
+    prefetch?: boolean | {
+        /**
+         * @docs
+         * @name prefetch.prefetchAll
+         * @type {boolean}
+         * @description
+         * Enable prefetching for all links, including those without the `data-astro-prefetch` attribute.
+         * This value defaults to `true` when using the `<ViewTransitions />` router. Otherwise, the default value is `false`.
+         *
+         * ```js
+         * prefetch: {
+         * 	prefetchAll: true
+         * }
+         * ```
+         *
+         * When set to `true`, you can disable prefetching individually by setting `data-astro-prefetch="false"` on any individual links.
+         *
+         * ```html
+         * <a href="/about" data-astro-prefetch="false">About</a>
+         *```
+         */
+        prefetchAll?: boolean;
+        /**
+         * @docs
+         * @name prefetch.defaultStrategy
+         * @type {'tap' | 'hover' | 'viewport'}
+         * @default `'hover'`
+         * @description
+         * The default prefetch strategy to use when the `data-astro-prefetch` attribute is set on a link with no value.
+         *
+         * - `'tap'`: Prefetch just before you click on the link.
+         * - `'hover'`: Prefetch when you hover over or focus on the link. (default)
+         * - `'viewport'`: Prefetch as the links enter the viewport.
+         *
+         * You can override this default value and select a different strategy for any individual link by setting a value on the attribute.
+         *
+         * ```html
+         * <a href="/about" data-astro-prefetch="viewport">About</a>
+         * ```
+         */
+        defaultStrategy?: 'tap' | 'hover' | 'viewport';
+    };
     /**
      * @docs
      * @kind heading
@@ -1351,6 +1352,7 @@ export interface AstroUserConfig {
         i18n?: {
             /**
              * @docs
+             * @kind h4
              * @name experimental.i18n.defaultLocale
              * @type {string}
              * @version 3.5.0
@@ -1363,6 +1365,7 @@ export interface AstroUserConfig {
             defaultLocale: string;
             /**
              * @docs
+             * @kind h4
              * @name experimental.i18n.locales
              * @type {string[]}
              * @version 3.5.0
@@ -1375,6 +1378,7 @@ export interface AstroUserConfig {
             locales: string[];
             /**
              * @docs
+             * @kind h4
              * @name experimental.i18n.fallback
              * @type {Record<string, string>}
              * @version 3.5.0
@@ -1384,7 +1388,7 @@ export interface AstroUserConfig {
              *
              * Use this object to declare a fallback `locale` route for each language you support. If no fallback is specified, then unavailable pages will return a 404.
              *
-             * #### Example
+             * ##### Example
              *
              * 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.
              *
@@ -1406,6 +1410,7 @@ export interface AstroUserConfig {
             fallback?: Record<string, string>;
             /**
              * @docs
+             * @kind h4
              * @name experimental.i18n.routingStrategy
              * @type {'prefix-always' | 'prefix-other-locales'}
              * @default 'prefix-other-locales'

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

@@ -139,7 +139,7 @@ function astroConfigBuildPlugin(options, internals) {
                     const pageData = getPageDataByViteID(internals, pageViteID);
                     if (!pageData)
                       continue;
-                    const _entryCss = internals.propagatedStylesMap?.get(id);
+                    const _entryCss = pageData.propagatedStyles?.get(id);
                     const _entryScripts = pageData.propagatedScripts?.get(id);
                     if (_entryCss) {
                       for (const value of _entryCss) {

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

@@ -65,7 +65,7 @@ function astroContentVirtualModPlugin({
               hydratedComponents: [],
               clientOnlyComponents: [],
               scripts: [],
-              containsHead: true,
+              containsHead: false,
               propagation: "in-tree",
               pageOptions: {}
             }

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

@@ -34,6 +34,7 @@ function rollupPluginAstroBuildCSS(options) {
   let resolvedConfig;
   const pagesToCss = {};
   const pagesToPropagatedCss = {};
+  const isContentCollectionCache = options.buildOptions.settings.config.output === "static" && options.buildOptions.settings.config.experimental.contentCollectionCache;
   const cssBuildPlugin = {
     name: "astro:rollup-plugin-build-css",
     outputOptions(outputOptions) {
@@ -52,7 +53,7 @@ function rollupPluginAstroBuildCSS(options) {
               if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
                 const chunkId2 = assetName.createNameHash(id, [id]);
                 internals.cssModuleToChunkIdMap.set(id, chunkId2);
-                if (options.buildOptions.settings.config.output === "static" && options.buildOptions.settings.config.experimental.contentCollectionCache) {
+                if (isContentCollectionCache) {
                   const propagatedStyles = internals.propagatedStylesMap.get(pageInfo.id) ?? /* @__PURE__ */ new Set();
                   propagatedStyles.add({ type: "external", src: chunkId2 });
                   internals.propagatedStylesMap.set(pageInfo.id, propagatedStyles);
@@ -174,7 +175,12 @@ function rollupPluginAstroBuildCSS(options) {
               return;
             if (pageData.styles.some((s) => s.sheet === sheet))
               return;
-            const propagatedStyles = internals.propagatedStylesMap.get(pageInfoId) ?? internals.propagatedStylesMap.set(pageInfoId, /* @__PURE__ */ new Set()).get(pageInfoId);
+            let propagatedStyles;
+            if (isContentCollectionCache) {
+              propagatedStyles = internals.propagatedStylesMap.get(pageInfoId) ?? internals.propagatedStylesMap.set(pageInfoId, /* @__PURE__ */ new Set()).get(pageInfoId);
+            } else {
+              propagatedStyles = pageData.propagatedStyles.get(pageInfoId) ?? pageData.propagatedStyles.set(pageInfoId, /* @__PURE__ */ new Set()).get(pageInfoId);
+            }
             propagatedStyles.add(sheet);
             sheetAddedToPage = true;
           });

package/dist/core/constants.js

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

package/dist/core/middleware/vite-plugin.js

@@ -8,6 +8,7 @@ function vitePluginMiddleware({ settings }) {
   let isCommandBuild = false;
   let resolvedMiddlewareId = void 0;
   const hasIntegrationMiddleware = settings.middlewares.pre.length > 0 || settings.middlewares.post.length > 0;
+  let userMiddlewareIsPresent = false;
   return {
     name: "@astro/plugin-middleware",
     config(opts, { command }) {
@@ -19,6 +20,7 @@ function vitePluginMiddleware({ settings }) {
         const middlewareId = await this.resolve(
           `${decodeURI(settings.config.srcDir.pathname)}${MIDDLEWARE_PATH_SEGMENT_NAME}`
         );
+        userMiddlewareIsPresent = !!middlewareId;
         if (middlewareId) {
           resolvedMiddlewareId = middlewareId.id;
           return MIDDLEWARE_MODULE_ID;
@@ -47,13 +49,13 @@ function vitePluginMiddleware({ settings }) {
         const preMiddleware = createMiddlewareImports(settings.middlewares.pre, "pre");
         const postMiddleware = createMiddlewareImports(settings.middlewares.post, "post");
         const source = `
-import { onRequest as userOnRequest } from '${resolvedMiddlewareId}';
+				${userMiddlewareIsPresent ? `import { onRequest as userOnRequest } from '${resolvedMiddlewareId}';` : ""}
 import { sequence } from 'astro:middleware';
 ${preMiddleware.importsCode}${postMiddleware.importsCode}
 
 export const onRequest = sequence(
 	${preMiddleware.sequenceCode}${preMiddleware.sequenceCode ? "," : ""}
-	userOnRequest${postMiddleware.sequenceCode ? "," : ""}
+	${userMiddlewareIsPresent ? `userOnRequest${postMiddleware.sequenceCode ? "," : ""}` : ""}
 	${postMiddleware.sequenceCode}
 );
 `.trim();

package/dist/transitions/router.js

@@ -312,7 +312,7 @@ function navigate(href, options) {
     return;
   }
   const toLocation = new URL(href, location.href);
-  if (location.origin === toLocation.origin && samePage(toLocation)) {
+  if (location.origin === toLocation.origin && samePage(toLocation) && !options?.formData) {
     moveToLocation(toLocation, options?.history === "replace", true);
   } else {
     transition("forward", toLocation, options ?? {});

package/package.json

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