astro 4.6.0 → 4.6.2

package/components/Picture.astro

@@ -45,7 +45,7 @@ let resultFallbackFormat = fallbackFormat ?? defaultFallbackFormat;
 if (
 	!fallbackFormat &&
 	isESMImportedImage(originalSrc) &&
-	originalSrc.format in specialFormatsFallback
+	(specialFormatsFallback as ReadonlyArray<string>).includes(originalSrc.format)
 ) {
 	resultFallbackFormat = originalSrc.format;
 }

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/assets/endpoint/generic.js

@@ -4,9 +4,12 @@ import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
 import { isRemoteAllowed } from "../utils/remotePattern.js";
 import { imageConfig } from "astro:assets";
-async function loadRemoteImage(src) {
+async function loadRemoteImage(src, headers) {
   try {
-    const res = await fetch(src);
+    const res = await fetch(src, {
+      // Forward all headers from the original request
+      headers
+    });
     if (!res.ok) {
       return void 0;
     }
@@ -27,11 +30,12 @@ const GET = async ({ request }) => {
       throw new Error("Incorrect transform returned by `parseURL`");
     }
     let inputBuffer = void 0;
-    const sourceUrl = isRemotePath(transform.src) ? new URL(transform.src) : new URL(transform.src, url.origin);
-    if (isRemotePath(transform.src) && isRemoteAllowed(transform.src, imageConfig) === false) {
+    const isRemoteImage = isRemotePath(transform.src);
+    const sourceUrl = isRemoteImage ? new URL(transform.src) : new URL(transform.src, url.origin);
+    if (isRemoteImage && isRemoteAllowed(transform.src, imageConfig) === false) {
       return new Response("Forbidden", { status: 403 });
     }
-    inputBuffer = await loadRemoteImage(sourceUrl);
+    inputBuffer = await loadRemoteImage(sourceUrl, isRemoteImage ? new Headers() : request.headers);
     if (!inputBuffer) {
       return new Response("Not Found", { status: 404 });
     }

package/dist/assets/utils/vendor/image-size/types/svg.js

@@ -41,7 +41,6 @@ function parseAttributes(root) {
   const viewbox = root.match(extractorRegExps.viewbox);
   return {
     height: height && parseLength(height[2]),
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     viewbox: viewbox && parseViewbox(viewbox[2]),
     width: width && parseLength(width[2])
   };

package/dist/cli/add/index.js

@@ -823,14 +823,14 @@ async function updateTSConfig(cwd = process.cwd(), logger, integrationsInfo, fla
     inputConfig = {
       tsconfig: defaultTSConfig,
       tsconfigFile: path.join(cwd, "tsconfig.json"),
-      rawConfig: { tsconfig: defaultTSConfig, tsconfigFile: path.join(cwd, "tsconfig.json") }
+      rawConfig: defaultTSConfig
     };
   } else {
-    inputConfigText = JSON.stringify(inputConfig.rawConfig.tsconfig, null, 2);
+    inputConfigText = JSON.stringify(inputConfig.rawConfig, null, 2);
   }
   const configFileName = path.basename(inputConfig.tsconfigFile);
   const outputConfig = updateTSConfigForFramework(
-    inputConfig.rawConfig.tsconfig,
+    inputConfig.rawConfig,
     firstIntegrationWithTSSettings
   );
   const output = JSON.stringify(outputConfig, null, 2);

package/dist/cli/install-package.js

@@ -76,7 +76,7 @@ function getInstallCommand(packages, packageManager) {
 }
 async function installPackage(packageNames, options, logger) {
   const cwd = options.cwd ?? process.cwd();
-  const packageManager = (await whichPm(cwd)).name ?? "npm";
+  const packageManager = (await whichPm(cwd))?.name ?? "npm";
   const installCommand = getInstallCommand(packageNames, packageManager);
   if (!installCommand) {
     return false;

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/build/generate.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import os from "node:os";
 import { fileURLToPath } from "node:url";
-import { bgGreen, black, blue, bold, dim, green, magenta, red } from "kleur/colors";
+import { bgGreen, black, blue, bold, dim, green, magenta } from "kleur/colors";
 import PQueue from "p-queue";
 import {
   generateImagesForPath,

package/dist/core/build/pipeline.js

@@ -37,7 +37,7 @@ class BuildPipeline extends Pipeline {
       return assetLink;
     }
     const serverLike = isServerLikeOutput(config);
-    const streaming = true;
+    const streaming = serverLike;
     super(
       options.logger,
       manifest,

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

@@ -10,7 +10,7 @@ type TSConfigResult<T = {}> = Promise<(TSConfckParseResult & T) | 'invalid-confi
  * @param findUp Whether to search for the config file in parent directories, by default only the root directory is searched.
  */
 export declare function loadTSConfig(root: string | undefined, findUp?: boolean): Promise<TSConfigResult<{
-    rawConfig: TSConfckParseResult;
+    rawConfig: TSConfig;
 }>>;
 export declare function updateTSConfigForFramework(target: TSConfig, framework: frameworkWithTSSettings): TSConfig;
 export type StripEnums<T extends Record<string, any>> = {

package/dist/core/config/tsconfig.js

@@ -1,8 +1,10 @@
+import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import {
   TSConfckParseError,
   find,
-  parse
+  parse,
+  toJson
 } from "tsconfck";
 const defaultTSConfig = { extends: "astro/tsconfigs/base" };
 const presets = /* @__PURE__ */ new Map([
@@ -64,14 +66,16 @@ async function loadTSConfig(root, findUp = false) {
     if (typeof parsedConfig === "string") {
       return parsedConfig;
     }
-    return { ...parsedConfig, rawConfig: parsedConfig.extended?.[0] ?? parsedConfig.tsconfig };
+    const rawConfig = await readFile(tsconfig, "utf-8").then(toJson).then((content) => JSON.parse(content));
+    return { ...parsedConfig, rawConfig };
   }
   if (jsconfig) {
     const parsedConfig = await safeParse(jsconfig, { root });
     if (typeof parsedConfig === "string") {
       return parsedConfig;
     }
-    return { ...parsedConfig, rawConfig: parsedConfig.extended?.[0] ?? parsedConfig.tsconfig };
+    const rawConfig = await readFile(jsconfig, "utf-8").then(toJson).then((content) => JSON.parse(content));
+    return { ...parsedConfig, rawConfig };
   }
   return "missing-config";
 }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.6.0";
+const ASTRO_VERSION = "4.6.2";
 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/create-vite.js

@@ -180,7 +180,8 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     ssr: {
       noExternal: [...ALWAYS_NOEXTERNAL, ...astroPkgsConfig.ssr.noExternal],
       external: [...mode === "dev" ? ONLY_DEV_EXTERNAL : [], ...astroPkgsConfig.ssr.external]
-    }
+    },
+    build: { assetsDir: settings.config.build.assets }
   };
   const assetsPrefix = settings.config.build.assetsPrefix;
   if (assetsPrefix) {

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.2";
   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.2";
   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.2"}`
       )} ${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/dist/runtime/server/render/astro/render.js

@@ -16,6 +16,9 @@ async function renderToString(result, componentFactory, props, children, isPage
     return templateResult;
   let str = "";
   let renderedFirstPageChunk = false;
+  if (isPage) {
+    await bufferHeadContent(result);
+  }
   const destination = {
     write(chunk) {
       if (isPage && !renderedFirstPageChunk) {

package/dist/transitions/router.js

@@ -267,6 +267,7 @@ async function updateDOM(preparationEvent, options, historyState, fallback) {
       return style.animationIterationCount === "infinite";
     }
     const currentAnimations = document.getAnimations();
+    await new Promise((r) => setTimeout(r));
     document.documentElement.setAttribute(OLD_NEW_ATTR, phase);
     const nextAnimations = document.getAnimations();
     const newAnimations = nextAnimations.filter(

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

@@ -39,6 +39,11 @@ function markdown({ settings, logger }) {
         const rawFile = await fs.promises.readFile(fileId, "utf-8");
         const raw = safeParseFrontmatter(rawFile, id);
         const fileURL = pathToFileURL(fileId);
+        if (!processor) {
+          return this.error(
+            "MDX processor is not initialized. This is an internal error. Please file an issue."
+          );
+        }
         const renderResult = await processor.render(raw.content, {
           // @ts-expect-error passing internal prop
           fileURL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -110,6 +110,7 @@
     "@babel/traverse": "^7.23.3",
     "@babel/types": "^7.23.3",
     "@types/babel__core": "^7.20.4",
+    "@types/cookie": "^0.5.4",
     "acorn": "^8.11.2",
     "aria-query": "^5.3.0",
     "axobject-query": "^4.0.0",
@@ -177,7 +178,6 @@
     "@types/chai": "^4.3.10",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/connect": "^3.4.38",
-    "@types/cookie": "^0.5.4",
     "@types/cssesc": "^3.0.2",
     "@types/debug": "^4.1.12",
     "@types/diff": "^5.0.8",