astro 6.1.4 → 6.1.5

package/dist/assets/consts.d.ts

@@ -1,6 +1,8 @@
 export declare const VIRTUAL_MODULE_ID = "astro:assets";
 export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
 export declare const VIRTUAL_SERVICE_ID = "virtual:image-service";
+export declare const VIRTUAL_GET_IMAGE_ID = "virtual:astro:get-image";
+export declare const RESOLVED_VIRTUAL_GET_IMAGE_ID: string;
 export declare const VIRTUAL_IMAGE_STYLES_ID = "virtual:astro:image-styles.css";
 export declare const RESOLVED_VIRTUAL_IMAGE_STYLES_ID: string;
 export declare const VALID_INPUT_FORMATS: readonly ["jpeg", "jpg", "png", "tiff", "webp", "gif", "svg", "avif"];

package/dist/assets/consts.js

@@ -1,6 +1,8 @@
 const VIRTUAL_MODULE_ID = "astro:assets";
 const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 const VIRTUAL_SERVICE_ID = "virtual:image-service";
+const VIRTUAL_GET_IMAGE_ID = "virtual:astro:get-image";
+const RESOLVED_VIRTUAL_GET_IMAGE_ID = "\0" + VIRTUAL_GET_IMAGE_ID;
 const VIRTUAL_IMAGE_STYLES_ID = "virtual:astro:image-styles.css";
 const RESOLVED_VIRTUAL_IMAGE_STYLES_ID = "\0" + VIRTUAL_IMAGE_STYLES_ID;
 const VALID_INPUT_FORMATS = [
@@ -38,11 +40,13 @@ const DEFAULT_HASH_PROPS = [
 export {
   DEFAULT_HASH_PROPS,
   DEFAULT_OUTPUT_FORMAT,
+  RESOLVED_VIRTUAL_GET_IMAGE_ID,
   RESOLVED_VIRTUAL_IMAGE_STYLES_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
   VALID_INPUT_FORMATS,
   VALID_OUTPUT_FORMATS,
   VALID_SUPPORTED_FORMATS,
+  VIRTUAL_GET_IMAGE_ID,
   VIRTUAL_IMAGE_STYLES_ID,
   VIRTUAL_MODULE_ID,
   VIRTUAL_SERVICE_ID

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

@@ -13,9 +13,11 @@ import { normalizePath } from "../core/viteUtils.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../core/constants.js";
 import { isAstroServerEnvironment } from "../environments.js";
 import {
+  RESOLVED_VIRTUAL_GET_IMAGE_ID,
   RESOLVED_VIRTUAL_IMAGE_STYLES_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
   VALID_INPUT_FORMATS,
+  VIRTUAL_GET_IMAGE_ID,
   VIRTUAL_IMAGE_STYLES_ID,
   VIRTUAL_MODULE_ID,
   VIRTUAL_SERVICE_ID
@@ -99,7 +101,7 @@ function assets({ fs, settings, sync, logger }) {
       },
       resolveId: {
         filter: {
-          id: new RegExp(`^(${VIRTUAL_SERVICE_ID}|${VIRTUAL_MODULE_ID})$`)
+          id: new RegExp(`^(${VIRTUAL_SERVICE_ID}|${VIRTUAL_MODULE_ID}|${VIRTUAL_GET_IMAGE_ID})$`)
         },
         async handler(id) {
           if (id === VIRTUAL_SERVICE_ID) {
@@ -111,13 +113,41 @@ function assets({ fs, settings, sync, logger }) {
           if (id === VIRTUAL_MODULE_ID) {
             return RESOLVED_VIRTUAL_MODULE_ID;
           }
+          if (id === VIRTUAL_GET_IMAGE_ID) {
+            return RESOLVED_VIRTUAL_GET_IMAGE_ID;
+          }
         }
       },
       load: {
         filter: {
-          id: new RegExp(`^(${RESOLVED_VIRTUAL_MODULE_ID})$`)
+          id: new RegExp(`^(${RESOLVED_VIRTUAL_MODULE_ID}|${RESOLVED_VIRTUAL_GET_IMAGE_ID})$`)
         },
-        handler() {
+        handler(id) {
+          if (id === RESOLVED_VIRTUAL_GET_IMAGE_ID) {
+            const isServerEnvironment2 = isAstroServerEnvironment(this.environment);
+            const getImageExport2 = isServerEnvironment2 ? `import { getImage as getImageInternal } from "astro/assets";
+								export const getImage = async (options) => await getImageInternal(options, imageConfig);` : `import { AstroError, AstroErrorData } from "astro/errors";
+								export const getImage = async () => {
+									throw new AstroError(
+										AstroErrorData.GetImageNotUsedOnServer.message,
+										AstroErrorData.GetImageNotUsedOnServer.hint,
+									);
+								};`;
+            const assetQueryParams = settings.adapter?.client?.assetQueryParams ? `new URLSearchParams(${JSON.stringify(
+              Array.from(settings.adapter.client.assetQueryParams.entries())
+            )})` : "undefined";
+            return {
+              code: `
+								export const imageConfig = ${JSON.stringify(settings.config.image)};
+								Object.defineProperty(imageConfig, 'assetQueryParams', {
+									value: ${assetQueryParams},
+									enumerable: false,
+									configurable: true,
+								});
+								${getImageExport2}
+							`
+            };
+          }
           const isServerEnvironment = isAstroServerEnvironment(this.environment);
           const getImageExport = isServerEnvironment ? `import { getImage as getImageInternal } from "astro/assets";
 							export const getImage = async (options) => await getImageInternal(options, imageConfig);` : `import { AstroError, AstroErrorData } from "astro/errors";

package/dist/cli/add/index.js

@@ -1,5 +1,4 @@
 import fsMod, { existsSync, promises as fs } from "node:fs";
-import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import * as clack from "@clack/prompts";
@@ -182,16 +181,7 @@ async function add(names, { flags }) {
           );
           if (await askToContinue({ flags, logger })) {
             const data = await getPackageJson();
-            let compatibilityDate;
-            try {
-              const require2 = createRequire(root);
-              const { getLocalWorkerdCompatibilityDate } = await import(require2.resolve("@astrojs/cloudflare/info"));
-              ({ date: compatibilityDate } = getLocalWorkerdCompatibilityDate({
-                projectPath: rootPath
-              }));
-            } catch {
-              compatibilityDate = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-            }
+            let compatibilityDate = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
             await fs.writeFile(
               wranglerConfigURL,
               STUBS.CLOUDFLARE_WRANGLER_CONFIG(data?.name ?? "example", compatibilityDate),

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.1.4";
+  version = "6.1.5";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/cli/preferences/index.js

@@ -1,6 +1,5 @@
 import { fileURLToPath } from "node:url";
 import { formatWithOptions } from "node:util";
-import dlv from "dlv";
 import { flattie } from "flattie";
 import colors from "piccolore";
 import { resolveConfig } from "../../core/config/config.js";
@@ -8,6 +7,7 @@ import { createSettings } from "../../core/config/settings.js";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
 import * as msg from "../../core/messages/runtime.js";
 import { DEFAULT_PREFERENCES } from "../../preferences/defaults.js";
+import dlv from "../../preferences/dlv.js";
 import { coerce, isValidKey } from "../../preferences/index.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 const { bgGreen, black, bold, dim, yellow } = colors;

package/dist/content/content-layer.js

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

package/dist/content/runtime.js

@@ -318,7 +318,7 @@ const CONTENT_LAYER_IMAGE_REGEX = /__ASTRO_IMAGE_="([^"]+)"/g;
 async function updateImageReferencesInBody(html, fileName) {
   const { default: imageAssetMap } = await import("astro:asset-imports");
   const imageObjects = /* @__PURE__ */ new Map();
-  const { getImage } = await import("astro:assets");
+  const { getImage } = await import("virtual:astro:get-image");
   for (const [_full, imagePath] of html.matchAll(CONTENT_LAYER_IMAGE_REGEX)) {
     try {
       const decodedImagePath = JSON.parse(imagePath.replaceAll(""", '"'));

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.1.4";
+const ASTRO_VERSION = "6.1.5";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

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

package/dist/core/messages/runtime.js

@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.1.4"}`
+        `v${"6.1.5"}`
       )} ${headline}`
     );
   }

package/dist/env/validators.d.ts

@@ -1,6 +1,6 @@
 import type { AstroConfig } from '../types/public/index.js';
 import type { EnvFieldType } from './schema.js';
-export type ValidationResultValue = EnvFieldType['default'];
+type ValidationResultValue = EnvFieldType['default'];
 export type ValidationResultErrors = ['missing'] | ['type'] | Array<string>;
 interface ValidationResultValid {
     ok: true;

package/dist/preferences/dlv.d.ts

@@ -0,0 +1 @@
+export default function dlv(obj: Record<string, unknown>, key: string): any;

package/dist/preferences/dlv.js

@@ -0,0 +1,9 @@
+function dlv(obj, key) {
+  for (const k of key.split(".")) {
+    obj = obj?.[k];
+  }
+  return obj;
+}
+export {
+  dlv as default
+};

package/dist/preferences/index.js

@@ -2,8 +2,8 @@ import os from "node:os";
 import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-import dget from "dlv";
 import { DEFAULT_PREFERENCES } from "./defaults.js";
+import dget from "./dlv.js";
 import { PreferenceStore } from "./store.js";
 function isValidKey(key) {
   return dget(DEFAULT_PREFERENCES, key) !== void 0;

package/dist/preferences/store.js

@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
-import dget from "dlv";
 import { dset } from "dset";
 import { SETTINGS_FILE } from "./constants.js";
+import dget from "./dlv.js";
 class PreferenceStore {
   dir;
   file;

package/dist/runtime/server/render/component.js

@@ -18,7 +18,7 @@ import { componentIsHTMLElement, renderHTMLElement } from "./dom.js";
 import { maybeRenderHead } from "./head.js";
 import { createRenderInstruction } from "./instruction.js";
 import { containsServerDirective, ServerIslandComponent } from "./server-islands.js";
-import { renderSlots, renderSlotToString } from "./slot.js";
+import { renderSlot, renderSlots, renderSlotToString } from "./slot.js";
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from "./util.js";
 const needsHeadRenderingSymbol = /* @__PURE__ */ Symbol.for("astro.needsHeadRendering");
 const rendererAliases = /* @__PURE__ */ new Map([["solid", "solid-js"]]);
@@ -331,12 +331,12 @@ function sanitizeElementName(tag) {
   if (!unsafe.test(tag)) return tag;
   return tag.trim().split(unsafe)[0].trim();
 }
-async function renderFragmentComponent(result, slots = {}) {
-  const children = await renderSlotToString(result, slots?.default);
+function renderFragmentComponent(result, slots = {}) {
+  const slot = slots?.default;
   return {
     render(destination) {
-      if (children == null) return;
-      destination.write(children);
+      if (slot == null) return;
+      return renderSlot(result, slot).render(destination);
     }
   };
 }
@@ -370,7 +370,7 @@ function renderComponent(result, displayName, Component, props, slots = {}) {
     });
   }
   if (isFragmentComponent(Component)) {
-    return renderFragmentComponent(result, slots).catch(handleCancellation);
+    return renderFragmentComponent(result, slots);
   }
   props = normalizeProps(props);
   if (isHTMLComponent(Component)) {

package/dist/transitions/swap-functions.js

@@ -118,7 +118,7 @@ const persistedHeadElement = (el, newDoc) => {
   }
   if (import.meta.env.DEV && el.tagName === "STYLE") {
     const viteDevId = el.getAttribute("data-vite-dev-id");
-    if (viteDevId) {
+    if (/\?vue&type=style&.*lang.css$/.test(viteDevId || "")) {
       return newDoc.head.querySelector(`style[data-vite-dev-id="${viteDevId}"]`);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.1.4",
+  "version": "6.1.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -114,7 +114,6 @@
     "cookie": "^1.1.1",
     "devalue": "^5.6.3",
     "diff": "^8.0.3",
-    "dlv": "^1.1.3",
     "dset": "^3.1.4",
     "es-module-lexer": "^2.0.0",
     "esbuild": "^0.27.3",
@@ -153,9 +152,9 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
-    "@astrojs/internal-helpers": "0.8.0",
     "@astrojs/markdown-remark": "7.1.0",
-    "@astrojs/telemetry": "3.3.0"
+    "@astrojs/telemetry": "3.3.0",
+    "@astrojs/internal-helpers": "0.8.0"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -164,7 +163,6 @@
     "@astrojs/compiler-rs": "^0.1.6",
     "@playwright/test": "1.58.2",
     "@types/aria-query": "^5.0.4",
-    "@types/dlv": "^1.1.5",
     "@types/hast": "^3.0.4",
     "@types/html-escaper": "3.0.4",
     "@types/http-cache-semantics": "^4.2.0",