astro 5.13.7 → 5.13.8

package/dist/assets/endpoint/generic.js

@@ -44,7 +44,7 @@ const GET = async ({ request }) => {
       transform,
       imageConfig
     );
-    return new Response(Buffer.from(data), {
+    return new Response(data, {
       status: 200,
       headers: {
         "Content-Type": mime.lookup(format) ?? `image/${format}`,

package/dist/assets/endpoint/node.js

@@ -84,7 +84,7 @@ const GET = async ({ request }) => {
       return new Response("Internal Server Error", { status: 500 });
     }
     const { data, format } = await imageService.transform(inputBuffer, transform, imageConfig);
-    return new Response(Buffer.from(data), {
+    return new Response(data, {
       status: 200,
       headers: {
         "Content-Type": mime.lookup(format) ?? `image/${format}`,

package/dist/assets/utils/node/emitAsset.js

@@ -15,7 +15,7 @@ function keyFor(hash) {
   return key;
 }
 async function handleSvgDeduplication(fileData, filename, fileEmitter) {
-  const contentHash = await generateContentHash(Uint8Array.from(fileData).buffer);
+  const contentHash = await generateContentHash(fileData.buffer);
   const key = keyFor(contentHash);
   const existing = svgContentCache.get(key);
   if (existing) {

package/dist/cli/info/index.js

@@ -1,4 +1,4 @@
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { arch, platform } from "node:os";
 import * as colors from "kleur/colors";
 import prompts from "prompts";
@@ -10,23 +10,50 @@ async function getInfoOutput({
   userConfig,
   print
 }) {
+  const packageManager = getPackageManager();
   const rows = [
     ["Astro", `v${ASTRO_VERSION}`],
     ["Node", process.version],
     ["System", getSystem()],
-    ["Package Manager", getPackageManager()]
+    ["Package Manager", packageManager]
   ];
+  if (print) {
+    const viteVersion = await getVersion(packageManager, "vite");
+    if (viteVersion) {
+      rows.splice(1, 0, ["Vite", viteVersion]);
+    }
+  }
+  const hasAdapter = "adapter" in userConfig && userConfig.adapter?.name;
+  let adapterVersion = void 0;
+  if (print && hasAdapter) {
+    adapterVersion = await getVersion(packageManager, userConfig.adapter.name);
+  }
+  const adatperOutputString = hasAdapter ? `${userConfig.adapter.name}${adapterVersion ? ` (${adapterVersion})` : ""}` : "none";
   try {
-    rows.push(["Output", userConfig.output ?? "static"]);
-    rows.push(["Adapter", userConfig.adapter?.name ?? "none"]);
-    const integrations = (userConfig?.integrations ?? []).filter(Boolean).flat().map((i) => i?.name).filter(Boolean);
-    rows.push(["Integrations", integrations.length > 0 ? integrations : "none"]);
+    rows.push([
+      "Output",
+      "adapter" in userConfig && userConfig.output ? userConfig.output : "static"
+    ]);
+    rows.push(["Adapter", adatperOutputString]);
+    const integrations = (userConfig?.integrations ?? []).filter(Boolean).flat().map(async (i) => {
+      if (!i.name) return;
+      if (!print) return i.name;
+      const version = await getVersion(packageManager, i.name);
+      return `${i.name}${version ? ` (${version})` : ""}`;
+    });
+    const awaitedIntegrations = (await Promise.all(integrations)).filter(Boolean);
+    rows.push(["Integrations", awaitedIntegrations.length > 0 ? awaitedIntegrations : "none"]);
   } catch {
   }
   let output = "";
   for (const [label, value] of rows) {
     output += printRow(label, value, print);
   }
+  if (packageManager === "bun") {
+    console.warn(
+      "Bun is not officially supported by Astro. Unable to retreive certain version information."
+    );
+  }
   return output.trim();
 }
 async function printInfo({ flags }) {
@@ -162,6 +189,85 @@ ${" ".repeat(MAX_PADDING)}${colors.green(entry)}`;
   }
   return plaintext;
 }
+function formatPnpmVersionOutput(versionOutput) {
+  return versionOutput.startsWith("link:") ? "Local" : `v${versionOutput}`;
+}
+async function spawnAsync(executable, opts) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(executable, opts, { shell: true });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (d) => stdout += d);
+    child.stderr.on("data", (d) => stderr += d);
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (code !== 0) reject(new Error(stderr));
+      else resolve(stdout);
+    });
+  });
+}
+async function getVersionUsingPNPM(dependency) {
+  const output = await spawnAsync("pnpm", ["why", dependency, "--json"]);
+  const parsedOutput = JSON.parse(output);
+  const deps = parsedOutput[0].dependencies;
+  if (parsedOutput.length === 0 || !deps) {
+    return void 0;
+  }
+  const userProvidedDependency = deps[dependency];
+  if (userProvidedDependency) {
+    return userProvidedDependency.version.startsWith("link:") ? "Local" : `v${userProvidedDependency.version}`;
+  }
+  const astroDependency = deps.astro?.dependencies[dependency];
+  return astroDependency ? formatPnpmVersionOutput(astroDependency.version) : void 0;
+}
+async function getVersionUsingNPM(dependency) {
+  const output = await spawnAsync("npm", ["ls", dependency, "--json", "--depth=1"]);
+  const parsedNpmOutput = JSON.parse(output);
+  if (!parsedNpmOutput.dependencies) {
+    return void 0;
+  }
+  if (parsedNpmOutput.dependencies[dependency]) {
+    return `v${parsedNpmOutput.dependencies[dependency].version}`;
+  }
+  const astro = parsedNpmOutput.dependencies.astro;
+  return astro ? `v${astro.dependencies[dependency].version}` : void 0;
+}
+function getYarnOutputDepVersion(dependency, outputLine) {
+  const parsed = JSON.parse(outputLine);
+  for (const [key, value] of Object.entries(parsed.children)) {
+    if (key.startsWith(`${dependency}@`)) {
+      return `v${value.locator.split(":").pop()}`;
+    }
+  }
+}
+async function getVersionUsingYarn(dependency) {
+  const yarnOutput = await spawnAsync("yarn", ["why", dependency, "--json"]);
+  const hasUserDefinition = yarnOutput.includes("workspace:.");
+  for (const line of yarnOutput.split("\n")) {
+    if (hasUserDefinition && line.includes("workspace:."))
+      return getYarnOutputDepVersion(dependency, line);
+    if (!hasUserDefinition && line.includes("astro@"))
+      return getYarnOutputDepVersion(dependency, line);
+  }
+}
+async function getVersion(packageManager, dependency) {
+  try {
+    switch (packageManager) {
+      case "pnpm":
+        return await getVersionUsingPNPM(dependency);
+      case "npm":
+        return getVersionUsingNPM(dependency);
+      case "yarn":
+        return getVersionUsingYarn(dependency);
+      case "bun":
+        return void 0;
+    }
+    return void 0;
+  } catch (err) {
+    console.error(err);
+    return void 0;
+  }
+}
 export {
   getInfoOutput,
   printInfo,

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.13.7") {
+    if (previousAstroVersion && previousAstroVersion !== "5.13.8") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.13.7") {
-      await this.#store.metaStore().set("astro-version", "5.13.7");
+    if ("5.13.8") {
+      await this.#store.metaStore().set("astro-version", "5.13.8");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/utils.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { parseFrontmatter } from "@astrojs/markdown-remark";
 import { slug as githubSlug } from "github-slugger";
-import { green } from "kleur/colors";
+import { green, red } from "kleur/colors";
 import xxhash from "xxhash-wasm";
 import { z } from "zod";
 import { AstroError, AstroErrorData, errorMap, MarkdownError } from "../core/errors/index.js";
@@ -381,6 +381,27 @@ async function loadContentConfig({
     const digest = await hasher.h64ToString(await fs.promises.readFile(configPathname, "utf-8"));
     return { ...config.data, digest };
   } else {
+    const message = config.error.issues.map((issue) => `  \u2192 ${green(issue.path.join("."))}: ${red(issue.message)}`).join("\n");
+    console.error(
+      `${green("[content]")} There was a problem with your content config:
+
+${message}
+`
+    );
+    if (settings.config.experimental.liveContentCollections) {
+      const liveCollections = Object.entries(unparsedConfig.collections ?? {}).filter(
+        ([, collection]) => collection?.type === LIVE_CONTENT_TYPE
+      );
+      if (liveCollections.length > 0) {
+        throw new AstroError({
+          ...AstroErrorData.LiveContentConfigError,
+          message: AstroErrorData.LiveContentConfigError.message(
+            "Live collections must be defined in a `src/live.config.ts` file.",
+            path.relative(fileURLToPath(settings.config.root), configPathname)
+          )
+        });
+      }
+    }
     return void 0;
   }
 }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.13.7";
+const ASTRO_VERSION = "5.13.8";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.13.7";
+  const currentVersion = "5.13.8";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/encryption.js

@@ -35,7 +35,7 @@ async function encodeKey(key) {
 }
 async function decodeKey(encoded) {
   const bytes = decodeBase64(encoded);
-  return crypto.subtle.importKey("raw", Buffer.from(bytes), ALGORITHM, true, [
+  return crypto.subtle.importKey("raw", bytes.buffer, ALGORITHM, true, [
     "encrypt",
     "decrypt"
   ]);
@@ -62,10 +62,10 @@ async function decryptString(key, encoded) {
   const decryptedBuffer = await crypto.subtle.decrypt(
     {
       name: ALGORITHM,
-      iv: Buffer.from(iv)
+      iv
     },
     key,
-    Buffer.from(dataArray)
+    dataArray
   );
   const decryptedString = decoder.decode(decryptedBuffer);
   return decryptedString;

package/dist/core/messages.js

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

package/dist/transitions/swap-functions.js

@@ -51,6 +51,19 @@ function swapBodyElement(newElement, oldElement) {
       }
     }
   }
+  attachShadowRoots(newElement);
+}
+function attachShadowRoots(root) {
+  root.querySelectorAll("template[shadowrootmode]").forEach((template) => {
+    const mode = template.getAttribute("shadowrootmode");
+    const parent = template.parentNode;
+    if ((mode === "closed" || mode === "open") && parent instanceof HTMLElement) {
+      const shadowRoot = parent.attachShadow({ mode });
+      shadowRoot.appendChild(template.content);
+      template.remove();
+      attachShadowRoots(shadowRoot);
+    }
+  });
 }
 const saveFocus = () => {
   const activeElement = document.activeElement;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.13.7",
+  "version": "5.13.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -114,7 +114,7 @@
     "cssesc": "^3.0.0",
     "debug": "^4.4.1",
     "deterministic-object-hash": "^2.0.2",
-    "devalue": "^5.1.1",
+    "devalue": "^5.3.2",
     "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.4",
@@ -222,6 +222,7 @@
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
     "test": "pnpm run test:unit && pnpm run test:integration && pnpm run test:types",
     "test:match": "astro-scripts test \"test/**/*.test.js\" --match",
+    "test:cli": "astro-scripts test \"test/**/cli.test.js\"",
     "test:e2e": "pnpm test:e2e:chrome && pnpm test:e2e:firefox",
     "test:e2e:match": "playwright test -g",
     "test:e2e:chrome": "playwright test",