astro 5.16.6 → 5.16.8

package/dist/vite-plugin-astro-server/base.js

@@ -6,8 +6,9 @@ import { notFoundTemplate, subpathNotUsedTemplate } from "../template/4xx.js";
 import { writeHtmlResponse } from "./response.js";
 function baseMiddleware(settings, logger) {
   const { config } = settings;
-  const site = config.site ? new URL(config.base, config.site) : void 0;
-  const devRootURL = new URL(config.base, "http://localhost");
+  const base = config.base || "/";
+  const site = config.site ? new URL(base, config.site) : void 0;
+  const devRootURL = new URL(base, "http://localhost");
   const devRoot = site ? site.pathname : devRootURL.pathname;
   const devRootReplacement = devRoot.endsWith("/") ? "/" : "";
   return function devBaseMiddleware(req, res, next) {

package/dist/vite-plugin-astro-server/request.js

@@ -27,6 +27,9 @@ async function handleRequest({
       return;
     }
   }
+  if (config.trailingSlash === "never" && pathname === "/" && config.base !== "/") {
+    pathname = "";
+  }
   url.pathname = removeTrailingForwardSlash(config.base) + pathname;
   if (config.trailingSlash === "never") {
     url.pathname = removeTrailingForwardSlash(url.pathname);

package/dist/vite-plugin-astro-server/response.js

@@ -43,13 +43,11 @@ function writeRedirectResponse(res, statusCode, location) {
 }
 async function writeWebResponse(res, webResponse) {
   const { status, headers, body, statusText } = webResponse;
-  const setCookieHeaders = Array.from(getSetCookiesFromResponse(webResponse));
-  if (setCookieHeaders.length) {
-    res.setHeader("set-cookie", setCookieHeaders);
-  }
+  const setCookiesFromResponse = Array.from(getSetCookiesFromResponse(webResponse));
+  const setCookieHeaders = [...setCookiesFromResponse, ...headers.getSetCookie()];
   const _headers = Object.fromEntries(headers.entries());
-  if (headers.has("set-cookie")) {
-    _headers["set-cookie"] = headers.getSetCookie();
+  if (setCookieHeaders.length) {
+    _headers["set-cookie"] = setCookieHeaders;
   }
   if (!(res instanceof Http2ServerResponse)) {
     res.statusMessage = statusText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.16.6",
+  "version": "5.16.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -95,7 +95,7 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^2.13.0",
-    "@capsizecss/unpack": "^3.0.1",
+    "@capsizecss/unpack": "^4.0.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.3.0",
     "acorn": "^8.15.0",
@@ -105,11 +105,11 @@
     "ci-info": "^4.3.1",
     "clsx": "^2.1.1",
     "common-ancestor-path": "^1.0.1",
-    "cookie": "^1.0.2",
+    "cookie": "^1.1.1",
     "cssesc": "^3.0.0",
     "debug": "^4.4.3",
     "deterministic-object-hash": "^2.0.2",
-    "devalue": "^5.5.0",
+    "devalue": "^5.6.1",
     "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.4",
@@ -117,7 +117,7 @@
     "esbuild": "^0.25.0",
     "estree-walker": "^3.0.3",
     "flattie": "^1.1.1",
-    "fontace": "~0.3.1",
+    "fontace": "~0.4.0",
     "github-slugger": "^2.0.0",
     "html-escaper": "3.0.3",
     "http-cache-semantics": "^4.2.0",
@@ -129,20 +129,20 @@
     "neotraverse": "^0.6.18",
     "p-limit": "^6.2.0",
     "p-queue": "^8.1.1",
-    "package-manager-detector": "^1.5.0",
+    "package-manager-detector": "^1.6.0",
     "piccolore": "^0.1.3",
     "picomatch": "^4.0.3",
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
     "semver": "^7.7.3",
-    "shiki": "^3.15.0",
-    "smol-toml": "^1.5.2",
+    "shiki": "^3.20.0",
+    "smol-toml": "^1.6.0",
     "svgo": "^4.0.0",
     "tinyexec": "^1.0.2",
     "tinyglobby": "^0.2.15",
     "tsconfck": "^3.1.6",
     "ultrahtml": "^1.6.0",
-    "unifont": "~0.6.0",
+    "unifont": "~0.7.1",
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.17.3",
     "vfile": "^6.0.3",
@@ -152,7 +152,7 @@
     "yargs-parser": "^21.1.1",
     "yocto-spinner": "^0.2.3",
     "zod": "^3.25.76",
-    "zod-to-json-schema": "^3.25.0",
+    "zod-to-json-schema": "^3.25.1",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.7.5",
     "@astrojs/markdown-remark": "6.3.10",
@@ -162,7 +162,7 @@
     "sharp": "^0.34.0"
   },
   "devDependencies": {
-    "@playwright/test": "1.56.1",
+    "@playwright/test": "1.57.0",
     "@types/aria-query": "^5.0.4",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
@@ -179,7 +179,7 @@
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.1.2",
     "eol": "^0.10.0",
-    "expect-type": "^1.2.2",
+    "expect-type": "^1.3.0",
     "fs-fixture": "^2.11.0",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.2.0",
@@ -189,8 +189,8 @@
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.53.3",
-    "sass": "^1.94.2",
+    "rollup": "^4.54.0",
+    "sass": "^1.97.1",
     "typescript": "^5.9.3",
     "undici": "^6.22.0",
     "unified": "^11.0.5",

package/dist/assets/fonts/core/dedupe-font-faces.d.ts

@@ -1,2 +0,0 @@
-import type * as unifont from 'unifont';
-export declare function dedupeFontFaces(current: Array<unifont.FontFaceData>, incoming: Array<unifont.FontFaceData>): Array<unifont.FontFaceData>;

package/dist/assets/fonts/core/dedupe-font-faces.js

@@ -1,30 +0,0 @@
-import { sortObjectByKey } from "../utils.js";
-function computeIdFromSource(source) {
-  return "name" in source ? source.name : source.url;
-}
-function dedupeFontFaces(current, incoming) {
-  const result = [...current];
-  for (const font of incoming) {
-    const existing = result.find(({ src: _src, ...rest }) => {
-      const a = JSON.stringify(sortObjectByKey(rest));
-      const { src: __src, ..._rest } = font;
-      const b = JSON.stringify(sortObjectByKey(_rest));
-      return a === b;
-    });
-    if (!existing) {
-      result.push(font);
-      continue;
-    }
-    const ids = new Set(existing.src.map((source) => computeIdFromSource(source)));
-    existing.src.push(
-      ...font.src.filter((source) => {
-        const id = computeIdFromSource(source);
-        return !ids.has(id) && ids.add(id);
-      })
-    );
-  }
-  return result;
-}
-export {
-  dedupeFontFaces
-};

package/dist/assets/fonts/core/extract-unifont-providers.d.ts

@@ -1,10 +0,0 @@
-import type * as unifont from 'unifont';
-import type { Hasher } from '../definitions.js';
-import type { ResolvedFontFamily } from '../types.js';
-export declare function extractUnifontProviders({ families, hasher, }: {
-    families: Array<ResolvedFontFamily>;
-    hasher: Hasher;
-}): {
-    families: Array<ResolvedFontFamily>;
-    providers: Array<unifont.Provider>;
-};

package/dist/assets/fonts/core/extract-unifont-providers.js

@@ -1,28 +0,0 @@
-import { LOCAL_PROVIDER_NAME } from "../constants.js";
-function extractUnifontProviders({
-  families,
-  hasher
-}) {
-  const hashes = /* @__PURE__ */ new Set();
-  const providers = [];
-  for (const { provider } of families) {
-    if (provider === LOCAL_PROVIDER_NAME) {
-      continue;
-    }
-    const unifontProvider = provider.provider(provider.config);
-    const hash = hasher.hashObject({
-      name: unifontProvider._name,
-      ...provider.config
-    });
-    unifontProvider._name += `-${hash}`;
-    provider.name = unifontProvider._name;
-    if (!hashes.has(hash)) {
-      hashes.add(hash);
-      providers.push(unifontProvider);
-    }
-  }
-  return { families, providers };
-}
-export {
-  extractUnifontProviders
-};

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

@@ -1 +0,0 @@
-export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from '@astrojs/internal-helpers/remote';

package/dist/assets/utils/remotePattern.js

@@ -1,16 +0,0 @@
-import {
-  isRemoteAllowed,
-  matchHostname,
-  matchPathname,
-  matchPattern,
-  matchPort,
-  matchProtocol
-} from "@astrojs/internal-helpers/remote";
-export {
-  isRemoteAllowed,
-  matchHostname,
-  matchPathname,
-  matchPattern,
-  matchPort,
-  matchProtocol
-};