astro 4.6.0 → 4.6.1

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

@@ -1725,7 +1725,7 @@ export interface AstroUserConfig {
          * });
          * ```
          *
-         * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
+         * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/reference/api-reference/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/reference/api-reference/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
          *
          * See the [Internationalization Guide](https://docs.astro.build/en/guides/internationalization/#domains-experimental) for more details, including the limitations of this experimental feature.
          */

package/dist/content/runtime.js

@@ -1,3 +1,4 @@
+import pLimit from "p-limit";
 import { ZodIssueCode, string as zodString } from "zod";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { prependForwardSlash } from "../core/path.js";
@@ -58,28 +59,31 @@ function createGetCollection({
     if (!import.meta.env?.DEV && cacheEntriesByCollection.has(collection)) {
       entries = [...cacheEntriesByCollection.get(collection)];
     } else {
+      const limit = pLimit(10);
       entries = await Promise.all(
-        lazyImports.map(async (lazyImport) => {
-          const entry = await lazyImport();
-          return type === "content" ? {
-            id: entry.id,
-            slug: entry.slug,
-            body: entry.body,
-            collection: entry.collection,
-            data: entry.data,
-            async render() {
-              return render({
-                collection: entry.collection,
-                id: entry.id,
-                renderEntryImport: await getRenderEntryImport(collection, entry.slug)
-              });
-            }
-          } : {
-            id: entry.id,
-            collection: entry.collection,
-            data: entry.data
-          };
-        })
+        lazyImports.map(
+          (lazyImport) => limit(async () => {
+            const entry = await lazyImport();
+            return type === "content" ? {
+              id: entry.id,
+              slug: entry.slug,
+              body: entry.body,
+              collection: entry.collection,
+              data: entry.data,
+              async render() {
+                return render({
+                  collection: entry.collection,
+                  id: entry.id,
+                  renderEntryImport: await getRenderEntryImport(collection, entry.slug)
+                });
+              }
+            } : {
+              id: entry.id,
+              collection: entry.collection,
+              data: entry.data
+            };
+          })
+        )
       );
       cacheEntriesByCollection.set(collection, entries);
     }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.6.0";
+const ASTRO_VERSION = "4.6.1";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404";

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.6.0";
+  const currentVersion = "4.6.1";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/errors-data.js

@@ -340,7 +340,7 @@ const MissingIndexForInternationalization = {
 const IncorrectStrategyForI18n = {
   name: "IncorrectStrategyForI18n",
   title: "You can't use the current function with the current strategy",
-  message: (functionName) => `The function \`${functionName}' can only be used when the \`i18n.routing.strategy\` is set to \`"manual"\`.`
+  message: (functionName) => `The function \`${functionName}\` can only be used when the \`i18n.routing.strategy\` is set to \`"manual"\`.`
 };
 const NoPrerenderedRoutesWithDomains = {
   name: "NoPrerenderedRoutesWithDomains",

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.6.0";
+  const version = "4.6.1";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.6.0"}`
+        `v${"4.6.1"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -216,7 +216,8 @@ class RenderContext {
     };
     const slots = new Slots(result, slotValues, pipeline.logger);
     const astroGlobalCombined = {
-      ...astroGlobalPartial,
+      generator: astroGlobalPartial.generator,
+      glob: astroGlobalPartial.glob,
       cookies,
       get clientAddress() {
         return renderContext.clientAddress();

package/dist/i18n/index.d.ts

@@ -95,6 +95,6 @@ export type MiddlewarePayload = {
 export declare function redirectToDefaultLocale({ trailingSlash, format, base, defaultLocale, }: MiddlewarePayload): (context: APIContext, statusCode?: ValidRedirectStatus) => Response;
 export declare function notFound({ base, locales }: MiddlewarePayload): (context: APIContext, response?: Response) => Response | undefined;
 export type RedirectToFallback = (context: APIContext, response: Response) => Response;
-export declare function redirectToFallback({ fallback, locales, defaultLocale, strategy, }: MiddlewarePayload): (context: APIContext, response: Response) => Response;
+export declare function redirectToFallback({ fallback, locales, defaultLocale, strategy, base, }: MiddlewarePayload): (context: APIContext, response: Response) => Response;
 export declare function createMiddleware(i18nManifest: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash'], format: SSRManifest['buildFormat']): import("../@types/astro.js").MiddlewareHandler;
 export {};

package/dist/i18n/index.js

@@ -210,7 +210,8 @@ function redirectToFallback({
   fallback,
   locales,
   defaultLocale,
-  strategy
+  strategy,
+  base
 }) {
   return function(context, response) {
     if (response.status >= 300 && fallback) {
@@ -233,7 +234,11 @@ function redirectToFallback({
         const pathFallbackLocale = getPathByLocale(fallbackLocale, locales);
         let newPathname;
         if (pathFallbackLocale === defaultLocale && strategy === "pathname-prefix-other-locales") {
-          newPathname = context.url.pathname.replace(`/${urlLocale}`, ``);
+          if (context.url.pathname.includes(`${base}`)) {
+            newPathname = context.url.pathname.replace(`/${urlLocale}`, ``);
+          } else {
+            newPathname = context.url.pathname.replace(`/${urlLocale}`, `/`);
+          }
         } else {
           newPathname = context.url.pathname.replace(`/${urlLocale}`, `/${pathFallbackLocale}`);
         }

package/dist/i18n/middleware.js

@@ -1,6 +1,5 @@
 import { ROUTE_TYPE_HEADER } from "../core/constants.js";
 import {
-  getPathByLocale,
   normalizeTheLocale,
   notFound,
   redirectToDefaultLocale,

package/package.json

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