astro 2.0.5 → 2.0.6

package/dist/@types/astro.d.ts

@@ -1305,6 +1305,7 @@ export interface SSRResult {
     createAstro(Astro: AstroGlobalPartial, props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
     resolve: (s: string) => Promise<string>;
     response: ResponseInit;
+    scope: number;
     _metadata: SSRMetadata;
 }
 export interface PreviewServer {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.0.5";
+const ASTRO_VERSION = "2.0.6";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -29,7 +29,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.0.5";
+  const currentVersion = "2.0.6";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.5";
+  const version = "2.0.6";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.0.5"}`
+        `v${"2.0.6"}`
       )} ${headline}`
     );
   }

package/dist/core/render/result.js

@@ -126,6 +126,7 @@ function createResult(args) {
     propagation: args.propagation ?? /* @__PURE__ */ new Map(),
     propagators: /* @__PURE__ */ new Map(),
     extraHead: [],
+    scope: 0,
     cookies,
     createAstro(astroGlobal, props, slots) {
       const astroSlots = new Slots(result, slots, args.logging);

package/dist/runtime/server/jsx.js

@@ -9,6 +9,7 @@ import {
   voidElementNames
 } from "./index.js";
 import { HTMLParts } from "./render/common.js";
+import { ScopeFlags } from "./render/util.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 class Skip {
   constructor(vnode) {
@@ -77,6 +78,7 @@ Did you forget to import the component or is it possible there is a typo?`);
             props[key] = value;
           }
         }
+        result.scope |= ScopeFlags.JSX;
         return markHTMLString(await renderToString(result, vnode.type, props, slots));
       }
       case (!vnode.type && vnode.type !== 0):

package/dist/runtime/server/render/astro/factory.js

@@ -1,10 +1,12 @@
 import { HTMLParts } from "../common.js";
+import { ScopeFlags } from "../util.js";
 import { isHeadAndContent } from "./head-and-content.js";
 import { renderAstroTemplateResult } from "./render-template.js";
 function isAstroComponentFactory(obj) {
   return obj == null ? false : obj.isAstroComponentFactory === true;
 }
 async function renderToString(result, componentFactory, props, children) {
+  result.scope |= ScopeFlags.Astro;
   const factoryResult = await componentFactory(result, props, children);
   if (factoryResult instanceof Response) {
     const response = factoryResult;

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

@@ -1,5 +1,5 @@
 import { markHTMLString } from "../escape.js";
-import { renderElement } from "./util.js";
+import { renderElement, ScopeFlags } from "./util.js";
 const uniqueElements = (item, index, all) => {
   const props = JSON.stringify(item.props);
   const children = item.children;
@@ -28,6 +28,11 @@ function* maybeRenderHead(result) {
   if (result._metadata.hasRenderedHead) {
     return;
   }
+  switch (result.scope) {
+    case ScopeFlags.JSX | ScopeFlags.Slot | ScopeFlags.Astro: {
+      return;
+    }
+  }
   yield { type: "head", result };
 }
 export {

package/dist/runtime/server/render/slot.d.ts

@@ -8,7 +8,7 @@ export declare class SlotString extends HTMLString {
     constructor(content: string, instructions: null | RenderInstruction[]);
 }
 export declare function isSlotString(str: string): str is any;
-export declare function renderSlot(_result: any, slotted: string, fallback?: any): Promise<string>;
+export declare function renderSlot(result: SSRResult, slotted: string, fallback?: any): Promise<string>;
 interface RenderSlotsResult {
     slotInstructions: null | RenderInstruction[];
     children: Record<string, string>;

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

@@ -1,5 +1,6 @@
 import { HTMLString, markHTMLString } from "../escape.js";
 import { renderChild } from "./any.js";
+import { ScopeFlags } from "./util.js";
 const slotString = Symbol.for("astro:slot-string");
 class SlotString extends HTMLString {
   constructor(content, instructions) {
@@ -12,8 +13,9 @@ slotString;
 function isSlotString(str) {
   return !!str[slotString];
 }
-async function renderSlot(_result, slotted, fallback) {
+async function renderSlot(result, slotted, fallback) {
   if (slotted) {
+    result.scope |= ScopeFlags.Slot;
     let iterator = renderChild(slotted);
     let content = "";
     let instructions = null;
@@ -27,6 +29,7 @@ async function renderSlot(_result, slotted, fallback) {
         content += chunk;
       }
     }
+    result.scope &= ~ScopeFlags.Slot;
     return markHTMLString(new SlotString(content, instructions));
   }
   return fallback;

package/dist/runtime/server/render/util.d.ts

@@ -6,3 +6,8 @@ export declare function formatList(values: string[]): string;
 export declare function addAttribute(value: any, key: string, shouldEscape?: boolean): any;
 export declare function internalSpreadAttributes(values: Record<any, any>, shouldEscape?: boolean): any;
 export declare function renderElement(name: string, { props: _props, children }: SSRElement, shouldEscape?: boolean): string;
+export declare const ScopeFlags: {
+    Astro: number;
+    JSX: number;
+    Slot: number;
+};

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

@@ -86,7 +86,13 @@ function renderElement(name, { props: _props, children = "" }, shouldEscape = tr
   }
   return `<${name}${internalSpreadAttributes(props, shouldEscape)}>${children}</${name}>`;
 }
+const ScopeFlags = {
+  Astro: 1 << 0,
+  JSX: 1 << 1,
+  Slot: 1 << 2
+};
 export {
+  ScopeFlags,
   addAttribute,
   defineScriptVars,
   formatList,

package/package.json

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