astro 6.1.6 → 6.1.8

package/dist/assets/endpoint/shared.js

@@ -4,6 +4,7 @@ import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
+import { inferSourceFormat } from "../utils/inferSourceFormat.js";
 async function loadRemoteImage(src) {
   try {
     const res = await fetch(src, { redirect: "manual" });
@@ -31,6 +32,12 @@ const handleImageRequest = async ({
   if (!transform?.src) {
     return new Response("Invalid request", { status: 400 });
   }
+  if (transform.format === "svg") {
+    const sourceFormat = inferSourceFormat(transform.src);
+    if (sourceFormat !== "svg") {
+      return new Response("Cannot convert non-SVG source to SVG format", { status: 403 });
+    }
+  }
   let inputBuffer = void 0;
   if (isRemotePath(transform.src)) {
     if (!isRemoteAllowed(transform.src, imageConfig)) {

package/dist/assets/internal.d.ts

@@ -2,6 +2,7 @@ import type { AstroConfig } from '../types/public/config.js';
 import type { AstroAdapterClientConfig } from '../types/public/integrations.js';
 import { type ImageService } from './services/service.js';
 import { type GetImageResult, type UnresolvedImageTransform } from './types.js';
+export { verifyOptions } from './services/service.js';
 export declare const cssFitValues: string[];
 export declare function getConfiguredImageService(): Promise<ImageService>;
 export declare function getImage(options: UnresolvedImageTransform, imageConfig: AstroConfig['image'] & AstroAdapterClientConfig): Promise<GetImageResult>;

package/dist/assets/internal.js

@@ -15,6 +15,7 @@ import {
 import { isESMImportedImage, isRemoteImage, resolveSrc } from "./utils/imageKind.js";
 import { inferRemoteSize } from "./utils/remoteProbe.js";
 import { createPlaceholderURL, stringifyPlaceholderURL } from "./utils/url.js";
+import { verifyOptions } from "./services/service.js";
 const cssFitValues = ["fill", "contain", "cover", "scale-down"];
 async function getConfiguredImageService() {
   if (!globalThis?.astroAsset?.imageService) {
@@ -190,5 +191,6 @@ async function getImage(options, imageConfig) {
 export {
   cssFitValues,
   getConfiguredImageService,
-  getImage
+  getImage,
+  verifyOptions
 };

package/dist/assets/utils/inferSourceFormat.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Infer the image format from a source path or URL by examining
+ * the file extension. For data: URIs, the MIME type is extracted.
+ * Returns undefined if the format cannot be determined.
+ */
+export declare function inferSourceFormat(src: string): string | undefined;

package/dist/assets/utils/inferSourceFormat.js

@@ -0,0 +1,21 @@
+import { removeQueryString } from "@astrojs/internal-helpers/path";
+const DATA_PREFIX = "data:";
+function inferSourceFormat(src) {
+  if (src.startsWith(DATA_PREFIX)) {
+    const mime = src.slice(DATA_PREFIX.length, src.indexOf(";"));
+    if (mime === "image/svg+xml") return "svg";
+    const sub = mime.split("/")[1];
+    return sub || void 0;
+  }
+  try {
+    const cleanSrc = removeQueryString(src).split("#")[0];
+    const lastDot = cleanSrc.lastIndexOf(".");
+    if (lastDot === -1) return void 0;
+    return cleanSrc.slice(lastDot + 1).toLowerCase();
+  } catch {
+    return void 0;
+  }
+}
+export {
+  inferSourceFormat
+};

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.6";
+  version = "6.1.8";
 }
 export {
   BuildTimeAstroVersionProvider

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.6") {
+    if (previousAstroVersion && previousAstroVersion !== "6.1.8") {
       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.6") {
-      this.#store.metaStore().set("astro-version", "6.1.6");
+    if ("6.1.8") {
+      this.#store.metaStore().set("astro-version", "6.1.8");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/build/plugins/plugin-chunk-imports.js

@@ -27,7 +27,8 @@ function pluginChunkImports(options) {
       let rewritten = code;
       for (let i = relativeImports.length - 1; i >= 0; i--) {
         const imp = relativeImports[i];
-        rewritten = rewritten.slice(0, imp.e) + "?" + queryString + rewritten.slice(imp.e);
+        const insertAt = imp.d > -1 ? imp.e - 1 : imp.e;
+        rewritten = rewritten.slice(0, insertAt) + "?" + queryString + rewritten.slice(insertAt);
       }
       return { code: rewritten, map: null };
     }

package/dist/core/build/static-build.js

@@ -30,7 +30,7 @@ import {
   RESOLVED_LEGACY_SSR_ENTRY_VIRTUAL_MODULE
 } from "./plugins/plugin-ssr.js";
 import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
-import { encodeName, getTimeStat, viteBuildReturnToRollupOutputs } from "./util.js";
+import { cleanChunkName, getTimeStat, viteBuildReturnToRollupOutputs } from "./util.js";
 import { NOOP_MODULE_ID } from "./plugins/plugin-noop.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../constants.js";
 import { getSSRAssets } from "./internal.js";
@@ -178,14 +178,13 @@ async function buildEnvironments(opts, internals) {
             let suffix = "_[hash].mjs";
             if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
               const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
-              return [prefix, sanitizedName, suffix].join("");
+              return [prefix, cleanChunkName(sanitizedName), suffix].join("");
             }
             if (name.startsWith("pages/")) {
               const sanitizedName = name.split(".")[0];
-              return [prefix, sanitizedName, suffix].join("");
+              return [prefix, cleanChunkName(sanitizedName), suffix].join("");
             }
-            const encoded = encodeName(name);
-            return [prefix, encoded, suffix].join("");
+            return [prefix, cleanChunkName(name), suffix].join("");
           },
           assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
           ...viteConfig.build?.rollupOptions?.output,
@@ -244,9 +243,8 @@ async function buildEnvironments(opts, internals) {
         if (!internals.clientInput.size) {
           internals.clientInput.add(NOOP_MODULE_ID);
         }
-        builder2.environments.client.config.build.rollupOptions.input = Array.from(
-          internals.clientInput
-        );
+        const sortedClientInput = Array.from(internals.clientInput).sort();
+        builder2.environments.client.config.build.rollupOptions.input = sortedClientInput;
         settings.timer.start("Client build");
         await builder2.build(builder2.environments.client);
         settings.timer.end("Client build");
@@ -285,8 +283,12 @@ async function buildEnvironments(opts, internals) {
           rollupOptions: {
             preserveEntrySignatures: "exports-only",
             output: {
-              entryFileNames: `${settings.config.build.assets}/[name].[hash].js`,
-              chunkFileNames: `${settings.config.build.assets}/[name].[hash].js`,
+              entryFileNames(chunkInfo) {
+                return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
+              },
+              chunkFileNames(chunkInfo) {
+                return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
+              },
               assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
               ...viteConfig.environments?.client?.build?.rollupOptions?.output
             }

package/dist/core/build/util.d.ts

@@ -6,5 +6,10 @@ export declare function getTimeStat(timeStart: number, timeEnd: number): string;
  * Given the Astro configuration, it tells if a slash should be appended or not
  */
 export declare function shouldAppendForwardSlash(trailingSlash: AstroConfig['trailingSlash'], buildFormat: AstroConfig['build']['format']): boolean;
-export declare function encodeName(name: string): string;
+/**
+ * Replaces characters in a chunk name that are not safe for filesystem paths or URLs.
+ * Characters like `!` and `~` can leak from Vite module IDs into Rollup chunk names
+ * and break deploys on platforms like Netlify.
+ */
+export declare function cleanChunkName(name: string): string;
 export declare function viteBuildReturnToRollupOutputs(viteBuildReturn: ViteBuildReturn): Rollup.RollupOutput[];

package/dist/core/build/util.js

@@ -19,6 +19,10 @@ function shouldAppendForwardSlash(trailingSlash, buildFormat) {
     }
   }
 }
+const UNSAFE_CHUNK_CHAR_RE = /[^\w.\-/]/g;
+function cleanChunkName(name) {
+  return encodeName(name.replace(UNSAFE_CHUNK_CHAR_RE, "_"));
+}
 function encodeName(name) {
   for (let i = 0; i < name.length; i++) {
     if (name[i] === "%") {
@@ -40,7 +44,7 @@ function viteBuildReturnToRollupOutputs(viteBuildReturn) {
   return result;
 }
 export {
-  encodeName,
+  cleanChunkName,
   getTimeStat,
   shouldAppendForwardSlash,
   viteBuildReturnToRollupOutputs

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.1.6";
+const ASTRO_VERSION = "6.1.8";
 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/create-vite.d.ts

@@ -14,6 +14,11 @@ type CreateViteOptions = {
 } | {
     command: 'build';
 });
+/**
+ * Clear the crawlFrameworkPkgs cache. Call this when node_modules may have
+ * changed (e.g. after a dev server restart triggered by config/lockfile change).
+ */
+export declare function clearCrawlCache(): void;
 /** Return a base vite config as a common starting point for all Vite commands. */
 export declare function createVite(commandConfig: vite.InlineConfig, { settings, logger, mode, command, fs, sync, routesList }: CreateViteOptions): Promise<vite.InlineConfig>;
 export {};

package/dist/core/create-vite.js

@@ -52,31 +52,55 @@ import { vitePluginEnvironment } from "../vite-plugin-environment/index.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "./constants.js";
 import { vitePluginChromedevtools } from "../vite-plugin-chromedevtools/index.js";
 import { vitePluginAstroServerClient } from "../vite-plugin-overlay/index.js";
-async function createVite(commandConfig, { settings, logger, mode, command, fs = nodeFs, sync, routesList }) {
-  const astroPkgsConfig = await crawlFrameworkPkgs({
-    root: fileURLToPath(settings.config.root),
-    isBuild: command === "build",
-    viteUserConfig: settings.config.vite,
-    isFrameworkPkgByJson(pkgJson) {
-      if (pkgJson?.astro?.external === true) {
-        return false;
-      }
-      return (
-        // Attempt: package relies on `astro`. ✅ Definitely an Astro package
-        pkgJson.peerDependencies?.astro || pkgJson.dependencies?.astro || // Attempt: package is tagged with `astro` or `astro-component`. ✅ Likely a community package
-        pkgJson.keywords?.includes("astro") || pkgJson.keywords?.includes("astro-component") || // Attempt: package is named `astro-something` or `@scope/astro-something`. ✅ Likely a community package
-        /^(?:@[^/]+\/)?astro-/.test(pkgJson.name)
-      );
+const _crawlCache = /* @__PURE__ */ new Map();
+function cloneCrawlResult(result) {
+  return {
+    optimizeDeps: {
+      include: [...result.optimizeDeps.include],
+      exclude: [...result.optimizeDeps.exclude]
     },
-    isFrameworkPkgByName(pkgName) {
-      const isNotAstroPkg = isCommonNotAstro(pkgName);
-      if (isNotAstroPkg) {
-        return false;
-      } else {
-        return void 0;
-      }
+    ssr: {
+      noExternal: [...result.ssr.noExternal],
+      external: [...result.ssr.external]
     }
-  });
+  };
+}
+function clearCrawlCache() {
+  _crawlCache.clear();
+}
+async function createVite(commandConfig, { settings, logger, mode, command, fs = nodeFs, sync, routesList }) {
+  const root = fileURLToPath(settings.config.root);
+  const isBuild = command === "build";
+  const crawlCacheKey = `${root}:${isBuild}`;
+  let astroPkgsConfig = _crawlCache.get(crawlCacheKey);
+  if (!astroPkgsConfig) {
+    astroPkgsConfig = await crawlFrameworkPkgs({
+      root,
+      isBuild,
+      viteUserConfig: settings.config.vite,
+      isFrameworkPkgByJson(pkgJson) {
+        if (pkgJson?.astro?.external === true) {
+          return false;
+        }
+        return (
+          // Attempt: package relies on `astro`. ✅ Definitely an Astro package
+          pkgJson.peerDependencies?.astro || pkgJson.dependencies?.astro || // Attempt: package is tagged with `astro` or `astro-component`. ✅ Likely a community package
+          pkgJson.keywords?.includes("astro") || pkgJson.keywords?.includes("astro-component") || // Attempt: package is named `astro-something` or `@scope/astro-something`. ✅ Likely a community package
+          /^(?:@[^/]+\/)?astro-/.test(pkgJson.name)
+        );
+      },
+      isFrameworkPkgByName(pkgName) {
+        const isNotAstroPkg = isCommonNotAstro(pkgName);
+        if (isNotAstroPkg) {
+          return false;
+        } else {
+          return void 0;
+        }
+      }
+    });
+    _crawlCache.set(crawlCacheKey, astroPkgsConfig);
+  }
+  astroPkgsConfig = cloneCrawlResult(astroPkgsConfig);
   const envLoader = createEnvLoader({
     mode,
     config: settings.config
@@ -278,5 +302,6 @@ function stringifyForDefine(value) {
   return typeof value === "string" || isObject(value) ? JSON.stringify(value) : "undefined";
 }
 export {
+  clearCrawlCache,
   createVite
 };

package/dist/core/dev/container.js

@@ -26,7 +26,7 @@ async function createContainer({
   });
   const {
     base,
-    server: { host, headers, open: serverOpen, allowedHosts }
+    server: { host, headers, open: serverOpen, allowedHosts, port }
   } = settings.config;
   const isServerOpenURL = typeof serverOpen === "string" && !isRestart;
   const isServerOpenBoolean = serverOpen && !isRestart;
@@ -50,7 +50,7 @@ async function createContainer({
   );
   const viteConfig = await createVite(
     {
-      server: { host, headers, open, allowedHosts },
+      server: { host, headers, open, allowedHosts, port },
       optimizeDeps: {
         include: rendererClientEntries
       }

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.6";
+  const currentVersion = "6.1.8";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/dev/restart.js

@@ -7,7 +7,7 @@ import { runHookConfigDone, runHookConfigSetup } from "../../integrations/hooks.
 import { SETTINGS_FILE } from "../../preferences/constants.js";
 import { getPrerenderDefault } from "../../prerender/utils.js";
 import { createSettings, resolveConfig } from "../config/index.js";
-import { createVite } from "../create-vite.js";
+import { clearCrawlCache, createVite } from "../create-vite.js";
 import { collectErrorMetadata } from "../errors/dev/utils.js";
 import { isAstroConfigZodError } from "../errors/errors.js";
 import { createSafeError } from "../errors/index.js";
@@ -42,6 +42,7 @@ function shouldRestartContainer({ settings, inlineConfig, restartInFlight }, cha
 async function restartContainerInPlace(container) {
   const { logger, settings: existingSettings, inlineConfig, fs } = container;
   container.restartInFlight = true;
+  clearCrawlCache();
   try {
     const { astroConfig } = await resolveConfig(inlineConfig, "dev", fs);
     warnIfCspWithShiki(astroConfig, logger);

package/dist/core/messages/runtime.js

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

package/dist/manifest/serialized.js

@@ -170,6 +170,7 @@ async function createSerializedManifest(settings, encodedKey) {
     inlinedScripts: [],
     i18n: i18nManifest,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
+    allowedDomains: settings.config.security?.allowedDomains,
     actionBodySizeLimit: settings.config.security?.actionBodySizeLimit ? settings.config.security.actionBodySizeLimit : 1024 * 1024,
     // 1mb default
     serverIslandBodySizeLimit: settings.config.security?.serverIslandBodySizeLimit ? settings.config.security.serverIslandBodySizeLimit : 1024 * 1024,

package/dist/transitions/swap-functions.d.ts

@@ -10,6 +10,7 @@ export declare function swapHeadElements(doc: Document): void;
 export declare function swapBodyElement(newElement: Element, oldElement: Element): void;
 export declare const saveFocus: () => (() => void);
 export declare const restoreFocus: ({ activeElement, start, end }: SavedFocus) => void;
+export declare const vueScopedStyleId: (el: HTMLStyleElement) => string;
 export declare const swapFunctions: {
     deselectScripts: typeof deselectScripts;
     swapRootAttributes: typeof swapRootAttributes;

package/dist/transitions/swap-functions.js

@@ -1,5 +1,6 @@
 const PERSIST_ATTR = "data-astro-transition-persist";
 const NON_OVERRIDABLE_ASTRO_ATTRS = ["data-astro-transition", "data-astro-transition-fallback"];
+const knownVueScopedStyles = /* @__PURE__ */ new Map();
 const scriptsAlreadyRan = /* @__PURE__ */ new Set();
 function detectScriptExecuted(script) {
   const key = script.src ? new URL(script.src, location.href).href : script.textContent;
@@ -33,10 +34,20 @@ function swapHeadElements(doc) {
     if (newEl) {
       newEl.remove();
     } else {
+      if (import.meta.env.DEV && el instanceof HTMLStyleElement) {
+        const viteDevId = vueScopedStyleId(el);
+        viteDevId && knownVueScopedStyles.set(viteDevId, el);
+      }
       el.remove();
     }
   }
-  document.head.append(...doc.head.children);
+  if (import.meta.env.DEV) {
+    [...doc.head.children].forEach((child) => {
+      document.head.append(knownVueScopedStyles.get(child.dataset?.viteDevId) || child);
+    });
+  } else {
+    document.head.append(...doc.head.children);
+  }
 }
 function swapBodyElement(newElement, oldElement) {
   const persistPairs = [];
@@ -106,6 +117,11 @@ const restoreFocus = ({ activeElement, start, end }) => {
     }
   }
 };
+const vueScopedStyleId = (el) => {
+  const viteDevId = el.dataset.viteDevId || "";
+  const url = new URL(viteDevId, location.href);
+  return url.searchParams.get("vue") !== null && url.searchParams.get("type") === "style" && url.searchParams.has("scoped") ? viteDevId : "";
+};
 const persistedHeadElement = (el, newDoc) => {
   const id = el.getAttribute(PERSIST_ATTR);
   const newEl = id && newDoc.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
@@ -116,9 +132,9 @@ const persistedHeadElement = (el, newDoc) => {
     const href = el.getAttribute("href");
     return newDoc.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
   }
-  if (import.meta.env.DEV && el.tagName === "STYLE") {
-    const viteDevId = el.getAttribute("data-vite-dev-id");
-    if (/\?vue&type=style&.*lang.css$/.test(viteDevId || "")) {
+  if (import.meta.env.DEV && el instanceof HTMLStyleElement) {
+    const viteDevId = vueScopedStyleId(el);
+    if (viteDevId) {
       return newDoc.head.querySelector(`style[data-vite-dev-id="${viteDevId}"]`);
     }
   }
@@ -167,5 +183,6 @@ export {
   swapBodyElement,
   swapFunctions,
   swapHeadElements,
-  swapRootAttributes
+  swapRootAttributes,
+  vueScopedStyleId
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.1.6",
+  "version": "6.1.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -153,8 +153,8 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.8.0",
-    "@astrojs/telemetry": "3.3.0",
-    "@astrojs/markdown-remark": "7.1.0"
+    "@astrojs/markdown-remark": "7.1.0",
+    "@astrojs/telemetry": "3.3.1"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -188,8 +188,8 @@
     "undici": "^7.22.0",
     "unified": "^11.0.5",
     "vitest": "^4.1.0",
-    "@astrojs/check": "0.9.8",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "@astrojs/check": "0.9.8"
   },
   "engines": {
     "node": ">=22.12.0",
@@ -215,11 +215,9 @@
     "test:e2e:match": "playwright test -g",
     "test:e2e:chrome": "playwright test",
     "test:e2e:firefox": "playwright test --config playwright.firefox.config.js",
-    "test:types": "tsc --project test/types/tsconfig.json",
-    "typecheck:tests": "tsc --project tsconfig.test.json",
-    "test:unit": "pnpm run test:unit:js && pnpm run test:unit:ts",
-    "test:unit:js": "astro-scripts test \"test/units/**/*.test.js\" --teardown ./test/units/teardown.js",
-    "test:unit:ts": "astro-scripts test \"test/units/**/*.test.ts\" --strip-types --teardown ./test/units/teardown.js",
+    "test:types": "tsc --build test/types/tsconfig.json",
+    "typecheck:tests": "tsc --build tsconfig.test.json",
+    "test:unit": "astro-scripts test \"test/units/**/*.test.ts\" --strip-types --teardown ./test/units/teardown.ts",
     "test:integration": "pnpm run test:integration:js && pnpm run test:integration:ts",
     "test:integration:js": "astro-scripts test \"test/*.test.js\"",
     "test:integration:ts": "astro-scripts test \"test/*.test.ts\" --strip-types"