astro 4.6.1 → 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/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/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.1";
+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.1";
+  const currentVersion = "4.6.2";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.6.1";
+  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.1"}`
+        `v${"4.6.2"}`
       )} ${headline}`
     );
   }

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.1",
+  "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",