astro 5.9.0 → 5.9.2

package/dist/content/content-layer.js

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

package/dist/core/app/index.js

@@ -346,7 +346,7 @@ class App {
         );
         if (statusURL.toString() !== request.url) {
           const response2 = await prerenderedErrorPageFetch(statusURL.toString());
-          const override = { status };
+          const override = { status, removeContentEncodingHeaders: true };
           return this.#mergeResponses(response2, originalResponse, override);
         }
       }
@@ -387,12 +387,18 @@ class App {
     return response;
   }
   #mergeResponses(newResponse, originalResponse, override) {
+    let newResponseHeaders = newResponse.headers;
+    if (override?.removeContentEncodingHeaders) {
+      newResponseHeaders = new Headers(newResponseHeaders);
+      newResponseHeaders.delete("Content-Encoding");
+      newResponseHeaders.delete("Content-Length");
+    }
     if (!originalResponse) {
       if (override !== void 0) {
         return new Response(newResponse.body, {
           status: override.status,
           statusText: newResponse.statusText,
-          headers: newResponse.headers
+          headers: newResponseHeaders
         });
       }
       return newResponse;
@@ -403,7 +409,7 @@ class App {
     } catch {
     }
     const mergedHeaders = new Map([
-      ...Array.from(newResponse.headers),
+      ...Array.from(newResponseHeaders),
       ...Array.from(originalResponse.headers)
     ]);
     const newHeaders = new Headers();

package/dist/core/config/merge.js

@@ -7,7 +7,7 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
     if (value == null) {
       continue;
     }
-    let existing = merged[key];
+    const existing = merged[key];
     if (existing == null) {
       merged[key] = value;
       continue;
@@ -29,11 +29,6 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
     if (key === "allowedHosts" && rootPath === "server" && typeof existing === "boolean") {
       continue;
     }
-    if (key === "data" && rootPath === "db") {
-      if (!Array.isArray(existing) && !Array.isArray(value)) {
-        existing = [existing];
-      }
-    }
     if (Array.isArray(existing) || Array.isArray(value)) {
       merged[key] = [...arraify(existing ?? []), ...arraify(value ?? [])];
       continue;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.9.0";
+const ASTRO_VERSION = "5.9.2";
 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.9.0";
+  const currentVersion = "5.9.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.9.0";
+  const version = "5.9.2";
   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.9.0"}`
+        `v${"5.9.2"}`
       )} ${headline}`
     );
   }

package/dist/core/util.d.ts

@@ -33,6 +33,7 @@ export declare function parseNpmName(spec: string): {
 export declare function viteID(filePath: URL): string;
 export declare const VALID_ID_PREFIX = "/@id/";
 export declare function unwrapId(id: string): string;
+export declare function wrapId(id: string): string;
 export declare function resolvePages(config: AstroConfig): URL;
 export declare function isPage(file: URL, settings: AstroSettings): boolean;
 export declare function isEndpoint(file: URL, settings: AstroSettings): boolean;

package/dist/core/util.js

@@ -67,9 +67,13 @@ function viteID(filePath) {
 }
 const VALID_ID_PREFIX = `/@id/`;
 const NULL_BYTE_PLACEHOLDER = `__x00__`;
+const NULL_BYTE_REGEX = /^\0/;
 function unwrapId(id) {
   return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length).replace(NULL_BYTE_PLACEHOLDER, "\0") : id;
 }
+function wrapId(id) {
+  return id.replace(NULL_BYTE_REGEX, `${VALID_ID_PREFIX}${NULL_BYTE_PLACEHOLDER}`);
+}
 function resolvePages(config) {
   return new URL("./pages", config.srcDir);
 }
@@ -141,5 +145,6 @@ export {
   resolveJsToTs,
   resolvePages,
   unwrapId,
-  viteID
+  viteID,
+  wrapId
 };

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

@@ -19,15 +19,15 @@ function renderCspContent(result) {
   }
   let scriptResources = "'self'";
   if (result.scriptResources.length > 0) {
-    scriptResources = result.scriptResources.map((r) => `'${r}'`).join(" ");
+    scriptResources = result.scriptResources.map((r) => `${r}`).join(" ");
   }
   let styleResources = "'self'";
   if (result.styleResources.length > 0) {
-    styleResources = result.styleResources.map((r) => `'${r}'`).join(" ");
+    styleResources = result.styleResources.map((r) => `${r}`).join(" ");
   }
   const strictDynamic = result.isStrictDynamic ? ` strict-dynamic` : "";
-  const scriptSrc = `style-src ${styleResources} ${Array.from(finalStyleHashes).join(" ")}${strictDynamic};`;
-  const styleSrc = `script-src ${scriptResources} ${Array.from(finalScriptHashes).join(" ")};`;
+  const scriptSrc = `script-src ${scriptResources} ${Array.from(finalScriptHashes).join(" ")}${strictDynamic};`;
+  const styleSrc = `style-src ${styleResources} ${Array.from(finalStyleHashes).join(" ")};`;
   return `${directives} ${scriptSrc} ${styleSrc}`;
 }
 export {

package/dist/runtime/server/render/server-islands.js

@@ -111,13 +111,13 @@ let response = await fetch('${serverIslandUrl}', {
     return createThinHead();
   }
   async render(destination) {
+    destination.write(createRenderInstruction({ type: "server-island-runtime" }));
+    destination.write("<!--[if astro]>server-island-start<![endif]-->");
     for (const name in this.slots) {
       if (name === "fallback") {
         await renderChild(destination, this.slots.fallback(this.result));
       }
     }
-    destination.write(createRenderInstruction({ type: "server-island-runtime" }));
-    destination.write("<!--[if astro]>server-island-start<![endif]-->");
     destination.write(
       `<script type="module" data-astro-rerun data-island-id="${this.hostId}">${this.islandContent}</script>`
     );

package/dist/runtime/server/transition.d.ts

@@ -1,7 +1,7 @@
 import type { SSRResult } from '../../types/public/internal.js';
 import type { TransitionAnimationPair, TransitionAnimationValue } from '../../types/public/view-transitions.js';
 export declare function createTransitionScope(result: SSRResult, hash: string): string;
-export declare function renderTransition(result: SSRResult, hash: string, animationName: TransitionAnimationValue | undefined, transitionName: string): Promise<string>;
+export declare function renderTransition(result: SSRResult, hash: string, animationName: TransitionAnimationValue | undefined, transitionName: string): string;
 export declare function createAnimationScope(transitionName: string, animations: Record<string, TransitionAnimationPair>): {
     scope: string;
     styles: string;

package/dist/runtime/server/transition.js

@@ -1,5 +1,4 @@
 import cssesc from "cssesc";
-import { generateCspDigest } from "../../core/encryption.js";
 import { fade, slide } from "../../transitions/index.js";
 import { markHTMLString } from "./escape.js";
 const transitionNameMap = /* @__PURE__ */ new WeakMap();
@@ -40,7 +39,7 @@ function reEncode(s) {
   }
   return reEncodeInValidStart[result.codePointAt(0) ?? 0] ? "_" + result : result;
 }
-async function renderTransition(result, hash, animationName, transitionName) {
+function renderTransition(result, hash, animationName, transitionName) {
   if (typeof (transitionName ?? "") !== "string") {
     throw new Error(`Invalid transition name {${transitionName}}`);
   }
@@ -58,9 +57,6 @@ async function renderTransition(result, hash, animationName, transitionName) {
     sheet.addModern("group", "animation: none");
   }
   const css = sheet.toString();
-  if (result.shouldInjectCspMetaTags) {
-    result._metadata.extraStyleHashes.push(await generateCspDigest(css, result.cspAlgorithm));
-  }
   result._metadata.extraHead.push(markHTMLString(`<style>${css}</style>`));
   return scope;
 }

package/dist/types/public/config.d.ts

@@ -1749,8 +1749,6 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          */
         domains?: [TLocales] extends [never] ? Record<string, string> : Partial<Record<NormalizeLocales<NoInfer<TLocales>>, string>>;
     };
-    /** ! WARNING: SUBJECT TO CHANGE */
-    db?: Config.Database;
     /**
      * @docs
      * @kind heading
@@ -2217,7 +2215,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
                  *     csp: {
                  *       styleDirective: {
                  *         resources: [
-                 *           "self",
+                 *           "'self'",
                  *           "https://styles.cdn.example.com"
                  *         ]
                  *       }
@@ -2292,7 +2290,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
                  *     csp: {
                  *       scriptDirective: {
                  *         resources: [
-                 *           "self",
+                 *           "'self'",
                  *           "https://cdn.example.com"
                  *         ]
                  *       }
@@ -2452,8 +2450,3 @@ export interface AstroInlineOnlyConfig {
      */
     force?: boolean;
 }
-declare global {
-    namespace Config {
-        type Database = Record<string, any>;
-    }
-}

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

@@ -1,4 +1,4 @@
-import { viteID } from "../core/util.js";
+import { viteID, wrapId } from "../core/util.js";
 import { isBuildableCSSRequest } from "./util.js";
 import { crawlGraph } from "./vite.js";
 const inlineQueryRE = /(?:\?|&)inline(?:$|&)/;
@@ -31,8 +31,8 @@ async function getStylesForURL(filePath, loader) {
         }
       }
       importedStylesMap.set(importedModule.url, {
-        id: importedModule.id ?? importedModule.url,
-        url: importedModule.url,
+        id: wrapId(importedModule.id ?? importedModule.url),
+        url: wrapId(importedModule.url),
         content: css
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.9.0",
+  "version": "5.9.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -98,7 +98,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.12.0",
+    "@astrojs/compiler": "^2.12.2",
     "@capsizecss/unpack": "^2.4.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.1.4",
@@ -157,8 +157,8 @@
     "zod-to-json-schema": "^3.24.5",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.6.1",
-    "@astrojs/markdown-remark": "6.3.2",
-    "@astrojs/telemetry": "3.3.0"
+    "@astrojs/telemetry": "3.3.0",
+    "@astrojs/markdown-remark": "6.3.2"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"