astro 4.8.5 → 4.8.7

package/astro-jsx.d.ts

@@ -22,7 +22,7 @@ declare namespace astroHTML.JSX {
 		extends AstroBuiltinProps,
 			AstroBuiltinAttributes,
 			AstroClientDirectives {
-		slot?: string;
+		slot?: string | undefined | null;
 		children?: Children;
 	}
 

package/dist/actions/runtime/middleware.js

@@ -1,9 +1,16 @@
+import { yellow } from "kleur/colors";
 import { defineMiddleware } from "../../core/middleware/index.js";
 import { ApiContextStorage } from "./store.js";
 import { formContentTypes, getAction, hasContentType } from "./utils.js";
 import { callSafely } from "./virtual/shared.js";
 const onRequest = defineMiddleware(async (context, next) => {
   const locals = context.locals;
+  if (context.request.method === "GET") {
+    return nextWithLocalsStub(next, locals);
+  }
+  if (context.request.method === "POST" && context.request.body === null) {
+    return nextWithStaticStub(next, locals);
+  }
   if (locals._actionsInternal) return next();
   const { request, url } = context;
   const contentType = request.headers.get("Content-Type");
@@ -25,8 +32,31 @@ const onRequest = defineMiddleware(async (context, next) => {
     }
   };
   Object.defineProperty(locals, "_actionsInternal", { writable: false, value: actionsInternal });
-  return next();
+  const response = await next();
+  if (result.error) {
+    return new Response(response.body, {
+      status: result.error.status,
+      statusText: result.error.name,
+      headers: response.headers
+    });
+  }
+  return response;
 });
+function nextWithStaticStub(next, locals) {
+  Object.defineProperty(locals, "_actionsInternal", {
+    writable: false,
+    value: {
+      getActionResult: () => {
+        console.warn(
+          yellow("[astro:actions]"),
+          "`getActionResult()` should not be called on prerendered pages. Astro can only handle actions for pages rendered on-demand."
+        );
+        return void 0;
+      }
+    }
+  });
+  return next();
+}
 function nextWithLocalsStub(next, locals) {
   Object.defineProperty(locals, "_actionsInternal", {
     writable: false,

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

@@ -1 +1,2 @@
 export declare const CHUNKS_PATH = "chunks/";
+export declare const CONTENT_PATH = "content/";

package/dist/core/build/consts.js

@@ -1,4 +1,6 @@
 const CHUNKS_PATH = "chunks/";
+const CONTENT_PATH = "content/";
 export {
-  CHUNKS_PATH
+  CHUNKS_PATH,
+  CONTENT_PATH
 };

package/dist/core/build/index.js

@@ -129,8 +129,8 @@ class AstroBuilder {
       teardownCompiler: this.teardownCompiler,
       viteConfig
     };
-    const { internals, ssrOutputChunkNames } = await viteBuild(opts);
-    await staticBuild(opts, internals, ssrOutputChunkNames);
+    const { internals, ssrOutputChunkNames, contentFileNames } = await viteBuild(opts);
+    await staticBuild(opts, internals, ssrOutputChunkNames, contentFileNames);
     this.timer.assetsStart = performance.now();
     Object.keys(assets).map((k) => {
       if (!assets[k]) return;

package/dist/core/build/plugins/plugin-analyzer.js

@@ -31,7 +31,12 @@ function vitePluginAnalyzer(options, internals) {
         if (hoistedScripts.size) {
           for (const parentInfo of getParentModuleInfos(from, this, isPropagatedAsset)) {
             if (isPropagatedAsset(parentInfo.id)) {
-              internals.propagatedScriptsMap.set(parentInfo.id, hoistedScripts);
+              for (const hid of hoistedScripts) {
+                if (!internals.propagatedScriptsMap.has(parentInfo.id)) {
+                  internals.propagatedScriptsMap.set(parentInfo.id, /* @__PURE__ */ new Set());
+                }
+                internals.propagatedScriptsMap.get(parentInfo.id)?.add(hid);
+              }
             } else if (moduleIsTopLevelPage(parentInfo)) {
               for (const hid of hoistedScripts) {
                 if (!pageScripts.has(parentInfo.id)) {

package/dist/core/build/plugins/plugin-content.d.ts

@@ -1,5 +1,5 @@
 import { type BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types.js';
-export declare function copyContentToCache(opts: StaticBuildOptions): Promise<void>;
+export declare function copyContentToCache(opts: StaticBuildOptions): Promise<string[]>;
 export declare function pluginContent(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/plugins/plugin-content.js

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
 import fsMod from "node:fs";
 import { fileURLToPath } from "node:url";
+import glob from "fast-glob";
 import pLimit from "p-limit";
 import { normalizePath } from "vite";
 import { CONTENT_RENDER_FLAG, PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
@@ -19,12 +20,12 @@ import {
 } from "../../path.js";
 import { isContentCollectionsCacheEnabled } from "../../util.js";
 import { addRollupInput } from "../add-rollup-input.js";
-import { CHUNKS_PATH } from "../consts.js";
+import { CHUNKS_PATH, CONTENT_PATH } from "../consts.js";
 import {} from "../internal.js";
 import { copyFiles } from "../static-build.js";
 import { encodeName } from "../util.js";
 import { extendManualChunks } from "./util.js";
-const CONTENT_CACHE_DIR = "./content/";
+const CONTENT_CACHE_DIR = "./" + CONTENT_PATH;
 const CONTENT_MANIFEST_FILE = "./manifest.json";
 const CONTENT_MANIFEST_VERSION = 1;
 const virtualEmptyModuleId = `virtual:empty-content`;
@@ -340,7 +341,17 @@ async function copyContentToCache(opts) {
   await fsMod.promises.mkdir(cacheTmp, { recursive: true });
   await copyFiles(distContentRoot, cacheTmp, true);
   await copyFiles(cacheTmp, contentCacheDir);
+  let files = [];
+  await Promise.all([
+    glob(`**/*.{mjs,json}`, {
+      cwd: fileURLToPath(cacheTmp)
+    }).then((f) => files.push(...f.map((file) => CONTENT_PATH + file))),
+    glob(`**/*.{mjs,json}`, {
+      cwd: fileURLToPath(new URL("./" + CHUNKS_PATH, config.outDir))
+    }).then((f) => files.push(...f.map((file) => CHUNKS_PATH + file)))
+  ]);
   await fsMod.promises.rm(cacheTmp, { recursive: true, force: true });
+  return files;
 }
 function pluginContent(opts, internals) {
   const { cacheDir, outDir } = opts.settings.config;

package/dist/core/build/static-build.d.ts

@@ -4,8 +4,9 @@ import type { StaticBuildOptions } from './types.js';
 export declare function viteBuild(opts: StaticBuildOptions): Promise<{
     internals: BuildInternals;
     ssrOutputChunkNames: string[];
+    contentFileNames: string[] | undefined;
 }>;
-export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[]): Promise<void>;
+export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[], contentFileNames?: string[]): Promise<void>;
 export declare function copyFiles(fromFolder: URL, toFolder: URL, includeDotfiles?: boolean): Promise<void[] | undefined>;
 /**
  * This function takes the virtual module name of any page entrypoint and

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

@@ -75,8 +75,9 @@ async function viteBuild(opts) {
   const ssrOutputs = viteBuildReturnToRollupOutputs(ssrOutput);
   const clientOutputs = viteBuildReturnToRollupOutputs(clientOutput ?? []);
   await runPostBuildHooks(container, ssrOutputs, clientOutputs);
+  let contentFileNames = void 0;
   if (opts.settings.config.experimental.contentCollectionCache) {
-    await copyContentToCache(opts);
+    contentFileNames = await copyContentToCache(opts);
   }
   settings.timer.end("Client build");
   internals.ssrEntryChunk = void 0;
@@ -91,15 +92,15 @@ async function viteBuild(opts) {
       }
     }
   }
-  return { internals, ssrOutputChunkNames };
+  return { internals, ssrOutputChunkNames, contentFileNames };
 }
-async function staticBuild(opts, internals, ssrOutputChunkNames) {
+async function staticBuild(opts, internals, ssrOutputChunkNames, contentFileNames) {
   const { settings } = opts;
   switch (true) {
     case settings.config.output === "static": {
       settings.timer.start("Static generate");
       await generatePages(opts, internals);
-      await cleanServerOutput(opts, ssrOutputChunkNames, internals);
+      await cleanServerOutput(opts, ssrOutputChunkNames, contentFileNames, internals);
       settings.timer.end("Static generate");
       return;
     }
@@ -325,9 +326,9 @@ export const ${e.n} = noop;`;
     removeEmptyDirs(out);
   }
 }
-async function cleanServerOutput(opts, ssrOutputChunkNames, internals) {
+async function cleanServerOutput(opts, ssrOutputChunkNames, contentFileNames, internals) {
   const out = getOutDirWithinCwd(opts.settings.config.outDir);
-  const files = ssrOutputChunkNames.filter((f) => f.endsWith(".mjs"));
+  const files = ssrOutputChunkNames.filter((f) => f.endsWith(".mjs")).concat(contentFileNames ?? []);
   if (internals.manifestFileName) {
     files.push(internals.manifestFileName);
   }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.8.5";
+const ASTRO_VERSION = "4.8.7";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404";

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

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

package/dist/i18n/utils.d.ts

@@ -4,7 +4,7 @@ type BrowserLocale = {
     qualityValue: number | undefined;
 };
 /**
- * Parses the value of the `Accept-Header` language:
+ * Parses the value of the `Accept-Language` header:
  *
  * More info: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Language
  *

package/dist/runtime/client/dev-toolbar/apps/utils/highlight.js

@@ -50,6 +50,8 @@ function attachTooltipToHighlight(highlight, tooltip, originalElement) {
       }
       if (dialogRect.right > document.documentElement.clientWidth) {
         tooltip.style.right = "0px";
+      } else if (dialogRect.left < 0) {
+        tooltip.style.left = "0px";
       }
     });
   });

package/dist/runtime/server/jsx.js

@@ -84,6 +84,7 @@ Did you forget to import the component or is it possible there is a typo?`);
       }
       if (typeof vnode.type === "function") {
         if (vnode.props[hasTriedRenderComponentSymbol]) {
+          delete vnode.props[hasTriedRenderComponentSymbol];
           const output2 = await vnode.type(vnode.props ?? {});
           if (output2?.[AstroJSX] || !output2) {
             return await renderJSXVNode(result, output2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.8.5",
+  "version": "4.8.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",