astro 2.0.1 → 2.0.4

package/client-base.d.ts

@@ -112,8 +112,6 @@ declare module '*.mdx' {
 	export const url: MDX['url'];
 	export const getHeadings: MDX['getHeadings'];
 	export const Content: MDX['Content'];
-	export const rawContent: MDX['rawContent'];
-	export const compiledContent: MDX['compiledContent'];
 
 	const load: MDX['default'];
 	export default load;

package/components/Code.astro

@@ -58,7 +58,6 @@ const highlighter = await getHighlighter({
 });
 const _html = highlighter.codeToHtml(code, {
 	lang: typeof lang === 'string' ? lang : lang.id,
-	theme,
 });
 const html = repairShikiTheme(_html);
 ---

package/components/Shiki.js

@@ -19,7 +19,9 @@ function stringify(opts) {
  */
 async function resolveHighlighter(opts) {
 	const resolvedThemes = [];
-	if (opts.theme && opts.theme in themes) {
+	if (Object.keys(opts.theme).length) {
+		resolvedThemes.push(opts.theme);
+	} else if (opts.theme && opts.theme in themes) {
 		resolvedThemes.push(await themes[opts.theme]());
 	}
 

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

@@ -16,6 +16,7 @@ import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/s
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
 export type { SSRManifest } from '../core/app/types';
+export type { AstroCookies } from '../core/cookies';
 export interface AstroBuiltinProps {
     'client:load'?: boolean;
     'client:idle'?: boolean;
@@ -1299,7 +1300,7 @@ export interface SSRResult {
     links: Set<SSRElement>;
     propagation: Map<string, PropagationHint>;
     propagators: Map<AstroComponentFactory, AstroComponentInstance>;
-    extraHead: Array<any>;
+    extraHead: Array<string>;
     cookies: AstroCookies | undefined;
     createAstro(Astro: AstroGlobalPartial, props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
     resolve: (s: string) => Promise<string>;

package/dist/content/consts.d.ts

@@ -1,7 +1,8 @@
 export declare const contentFileExts: string[];
-export declare const DELAYED_ASSET_FLAG = "astroAssetSsr";
+export declare const PROPAGATED_ASSET_FLAG = "astroPropagatedAssets";
 export declare const CONTENT_FLAG = "astroContent";
 export declare const VIRTUAL_MODULE_ID = "astro:content";
 export declare const LINKS_PLACEHOLDER = "@@ASTRO-LINKS@@";
 export declare const STYLES_PLACEHOLDER = "@@ASTRO-STYLES@@";
+export declare const SCRIPTS_PLACEHOLDER = "@@ASTRO-SCRIPTS@@";
 export declare const CONTENT_TYPES_FILE = "types.d.ts";

package/dist/content/consts.js

@@ -1,15 +1,17 @@
 const contentFileExts = [".md", ".mdx"];
-const DELAYED_ASSET_FLAG = "astroAssetSsr";
+const PROPAGATED_ASSET_FLAG = "astroPropagatedAssets";
 const CONTENT_FLAG = "astroContent";
 const VIRTUAL_MODULE_ID = "astro:content";
 const LINKS_PLACEHOLDER = "@@ASTRO-LINKS@@";
 const STYLES_PLACEHOLDER = "@@ASTRO-STYLES@@";
+const SCRIPTS_PLACEHOLDER = "@@ASTRO-SCRIPTS@@";
 const CONTENT_TYPES_FILE = "types.d.ts";
 export {
   CONTENT_FLAG,
   CONTENT_TYPES_FILE,
-  DELAYED_ASSET_FLAG,
   LINKS_PLACEHOLDER,
+  PROPAGATED_ASSET_FLAG,
+  SCRIPTS_PLACEHOLDER,
   STYLES_PLACEHOLDER,
   VIRTUAL_MODULE_ID,
   contentFileExts

package/dist/content/index.d.ts

@@ -1,5 +1,5 @@
 export { createContentTypesGenerator } from './types-generator.js';
 export { contentObservable, getContentPaths, getDotAstroTypeReference } from './utils.js';
-export { astroBundleDelayedAssetPlugin, astroDelayedAssetPlugin, } from './vite-plugin-content-assets.js';
+export { astroContentAssetPropagationPlugin, astroContentProdBundlePlugin, } from './vite-plugin-content-assets.js';
 export { astroContentServerPlugin } from './vite-plugin-content-server.js';
 export { astroContentVirtualModPlugin } from './vite-plugin-content-virtual-mod.js';

package/dist/content/index.js

@@ -1,16 +1,16 @@
 import { createContentTypesGenerator } from "./types-generator.js";
 import { contentObservable, getContentPaths, getDotAstroTypeReference } from "./utils.js";
 import {
-  astroBundleDelayedAssetPlugin,
-  astroDelayedAssetPlugin
+  astroContentAssetPropagationPlugin,
+  astroContentProdBundlePlugin
 } from "./vite-plugin-content-assets.js";
 import { astroContentServerPlugin } from "./vite-plugin-content-server.js";
 import { astroContentVirtualModPlugin } from "./vite-plugin-content-virtual-mod.js";
 export {
-  astroBundleDelayedAssetPlugin,
+  astroContentAssetPropagationPlugin,
+  astroContentProdBundlePlugin,
   astroContentServerPlugin,
   astroContentVirtualModPlugin,
-  astroDelayedAssetPlugin,
   contentObservable,
   createContentTypesGenerator,
   getContentPaths,

package/dist/content/internal.d.ts

@@ -7,7 +7,7 @@ export declare function createCollectionToGlobResultMap({ globResult, contentDir
 export declare function createGetCollection({ collectionToEntryMap, collectionToRenderEntryMap, }: {
     collectionToEntryMap: CollectionToEntryMap;
     collectionToRenderEntryMap: CollectionToEntryMap;
-}): (collection: string, filter?: () => boolean) => Promise<{
+}): (collection: string, filter?: ((entry: any) => unknown) | undefined) => Promise<{
     id: any;
     slug: any;
     body: any;

package/dist/content/internal.js

@@ -3,6 +3,7 @@ import {
   createComponent,
   createHeadAndContent,
   renderComponent,
+  renderScriptElement,
   renderStyleElement,
   renderTemplate,
   renderUniqueStylesheet,
@@ -102,7 +103,7 @@ async function render({
   const mod = await lazyImport();
   const Content = createComponent({
     factory(result, props, slots) {
-      let styles = "", links = "";
+      let styles = "", links = "", scripts = "";
       if (Array.isArray(mod == null ? void 0 : mod.collectedStyles)) {
         styles = mod.collectedStyles.map((style) => renderStyleElement(style)).join("");
       }
@@ -113,8 +114,11 @@ async function render({
           });
         }).join("");
       }
+      if (Array.isArray(mod == null ? void 0 : mod.collectedScripts)) {
+        scripts = mod.collectedScripts.map((script) => renderScriptElement(script)).join("");
+      }
       return createHeadAndContent(
-        unescapeHTML(styles + links),
+        unescapeHTML(styles + links + scripts),
         renderTemplate`${renderComponent(result, "Content", mod.Content, props, slots)}`
       );
     },

package/dist/content/vite-plugin-content-assets.d.ts

@@ -1,8 +1,8 @@
 import type { Plugin } from 'vite';
 import { BuildInternals } from '../core/build/internal.js';
-export declare function astroDelayedAssetPlugin({ mode }: {
+export declare function astroContentAssetPropagationPlugin({ mode }: {
     mode: string;
 }): Plugin;
-export declare function astroBundleDelayedAssetPlugin({ internals, }: {
+export declare function astroContentProdBundlePlugin({ internals }: {
     internals: BuildInternals;
 }): Plugin;

package/dist/content/vite-plugin-content-assets.js

@@ -3,20 +3,22 @@ import { moduleIsTopLevelPage, walkParentInfos } from "../core/build/graph.js";
 import { getPageDataByViteID } from "../core/build/internal.js";
 import { createViteLoader } from "../core/module-loader/vite.js";
 import { getStylesForURL } from "../core/render/dev/css.js";
+import { getScriptsForURL } from "../core/render/dev/scripts.js";
 import {
   contentFileExts,
-  DELAYED_ASSET_FLAG,
   LINKS_PLACEHOLDER,
+  PROPAGATED_ASSET_FLAG,
+  SCRIPTS_PLACEHOLDER,
   STYLES_PLACEHOLDER
 } from "./consts.js";
-function isDelayedAsset(viteId) {
+function isPropagatedAsset(viteId) {
   const url = new URL(viteId, "file://");
-  return url.searchParams.has(DELAYED_ASSET_FLAG) && contentFileExts.some((ext) => url.pathname.endsWith(ext));
+  return url.searchParams.has(PROPAGATED_ASSET_FLAG) && contentFileExts.some((ext) => url.pathname.endsWith(ext));
 }
-function astroDelayedAssetPlugin({ mode }) {
+function astroContentAssetPropagationPlugin({ mode }) {
   let devModuleLoader;
   return {
-    name: "astro-delayed-asset-plugin",
+    name: "astro:content-asset-propagation",
     enforce: "pre",
     configureServer(server) {
       if (mode === "dev") {
@@ -24,12 +26,13 @@ function astroDelayedAssetPlugin({ mode }) {
       }
     },
     load(id) {
-      if (isDelayedAsset(id)) {
+      if (isPropagatedAsset(id)) {
         const basePath = id.split("?")[0];
         const code = `
-					export { Content, getHeadings } from ${JSON.stringify(basePath)};
+					export { Content, getHeadings, frontmatter } from ${JSON.stringify(basePath)};
 					export const collectedLinks = ${JSON.stringify(LINKS_PLACEHOLDER)};
 					export const collectedStyles = ${JSON.stringify(STYLES_PLACEHOLDER)};
+					export const collectedScripts = ${JSON.stringify(SCRIPTS_PLACEHOLDER)};
 				`;
         return { code };
       }
@@ -38,7 +41,7 @@ function astroDelayedAssetPlugin({ mode }) {
       var _a;
       if (!(options == null ? void 0 : options.ssr))
         return;
-      if (devModuleLoader && isDelayedAsset(id)) {
+      if (devModuleLoader && isPropagatedAsset(id)) {
         const basePath = id.split("?")[0];
         if (!((_a = devModuleLoader.getModuleById(basePath)) == null ? void 0 : _a.ssrModule)) {
           await devModuleLoader.import(basePath);
@@ -48,18 +51,17 @@ function astroDelayedAssetPlugin({ mode }) {
           devModuleLoader,
           "development"
         );
+        const hoistedScripts = await getScriptsForURL(pathToFileURL(basePath), devModuleLoader);
         return {
-          code: code.replace(JSON.stringify(LINKS_PLACEHOLDER), JSON.stringify([...urls])).replace(JSON.stringify(STYLES_PLACEHOLDER), JSON.stringify([...stylesMap.values()]))
+          code: code.replace(JSON.stringify(LINKS_PLACEHOLDER), JSON.stringify([...urls])).replace(JSON.stringify(STYLES_PLACEHOLDER), JSON.stringify([...stylesMap.values()])).replace(JSON.stringify(SCRIPTS_PLACEHOLDER), JSON.stringify([...hoistedScripts]))
         };
       }
     }
   };
 }
-function astroBundleDelayedAssetPlugin({
-  internals
-}) {
+function astroContentProdBundlePlugin({ internals }) {
   return {
-    name: "astro-bundle-delayed-asset-plugin",
+    name: "astro:content-prod-bundle",
     async generateBundle(_options, bundle) {
       var _a;
       for (const [_, chunk] of Object.entries(bundle)) {
@@ -87,6 +89,6 @@ function astroBundleDelayedAssetPlugin({
   };
 }
 export {
-  astroBundleDelayedAssetPlugin,
-  astroDelayedAssetPlugin
+  astroContentAssetPropagationPlugin,
+  astroContentProdBundlePlugin
 };

package/dist/core/app/node.js

@@ -1,10 +1,12 @@
 import * as fs from "fs";
+import { TLSSocket } from "tls";
 import { deserializeManifest } from "./common.js";
 import { App } from "./index.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 function createRequestFromNodeRequest(req, body) {
   var _a;
-  let url = `http://${req.headers.host}${req.url}`;
+  const protocol = req.socket instanceof TLSSocket || req.headers["x-forwarded-proto"] === "https" ? "https" : "http";
+  let url = `${protocol}://${req.headers.host}${req.url}`;
   let rawHeaders = req.headers;
   const entries = Object.entries(rawHeaders);
   const method = req.method || "GET";

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

@@ -4,7 +4,7 @@ import fs from "fs";
 import { bgGreen, bgMagenta, black, dim } from "kleur/colors";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
-import { astroBundleDelayedAssetPlugin } from "../../content/index.js";
+import { astroContentProdBundlePlugin } from "../../content/index.js";
 import {
   createBuildInternals,
   eachPrerenderedPageData
@@ -131,7 +131,7 @@ async function ssrBuild(opts, internals, input) {
       }),
       vitePluginPrerender(opts, internals),
       ...viteConfig.plugins || [],
-      astroBundleDelayedAssetPlugin({ internals }),
+      astroContentProdBundlePlugin({ internals }),
       ssr && vitePluginSSR(internals, settings.adapter)
     ],
     envPrefix: viteConfig.envPrefix ?? "PUBLIC_",

package/dist/core/build/vite-plugin-css.js

@@ -2,7 +2,7 @@ import * as crypto from "node:crypto";
 import * as npath from "node:path";
 import { transformWithEsbuild } from "vite";
 import { isCSSRequest } from "../render/util.js";
-import { DELAYED_ASSET_FLAG } from "../../content/consts.js";
+import { PROPAGATED_ASSET_FLAG } from "../../content/consts.js";
 import * as assetName from "./css-asset-name.js";
 import { moduleIsTopLevelPage, walkParentInfos } from "./graph.js";
 import {
@@ -54,7 +54,7 @@ function rollupPluginAstroBuildCSS(options) {
             for (const [pageInfo] of walkParentInfos(id, {
               getModuleInfo: args[0].getModuleInfo
             })) {
-              if (new URL(pageInfo.id, "file://").searchParams.has(DELAYED_ASSET_FLAG)) {
+              if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
                 return createNameHash(id, [id]);
               }
             }
@@ -114,10 +114,10 @@ function rollupPluginAstroBuildCSS(options) {
                     id,
                     this,
                     function until(importer) {
-                      return new URL(importer, "file://").searchParams.has(DELAYED_ASSET_FLAG);
+                      return new URL(importer, "file://").searchParams.has(PROPAGATED_ASSET_FLAG);
                     }
                   )) {
-                    if (new URL(pageInfo.id, "file://").searchParams.has(DELAYED_ASSET_FLAG)) {
+                    if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
                       for (const parent of walkParentInfos(id, this)) {
                         const parentInfo = parent[0];
                         if (moduleIsTopLevelPage(parentInfo)) {

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -3,9 +3,9 @@ import { fileURLToPath } from "url";
 import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
 import {
+  astroContentAssetPropagationPlugin,
   astroContentServerPlugin,
-  astroContentVirtualModPlugin,
-  astroDelayedAssetPlugin
+  astroContentVirtualModPlugin
 } from "../content/index.js";
 import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.js";
 import { vitePluginAstroServer } from "../vite-plugin-astro-server/index.js";
@@ -74,7 +74,7 @@ async function createVite(commandConfig, { settings, logging, mode, fs = nodeFs
       astroInjectEnvTsPlugin({ settings, logging, fs }),
       astroContentVirtualModPlugin({ settings }),
       astroContentServerPlugin({ fs, settings, logging, mode }),
-      astroDelayedAssetPlugin({ mode })
+      astroContentAssetPropagationPlugin({ mode })
     ],
     publicDir: fileURLToPath(settings.config.publicDir),
     root: fileURLToPath(settings.config.root),

package/dist/core/dev/dev.js

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

package/dist/core/errors/errors-data.d.ts

@@ -359,6 +359,20 @@ export declare const AstroErrorData: {
         readonly message: (prefix: string, suffix: string) => string;
         readonly hint: "Mutable values declared at runtime are not supported. Please make sure to use exactly `export const prerender = true`.";
     };
+    /**
+     * @docs
+     * @message
+     * **Example error messages:**<br/>
+     * InvalidComponentArgs: Invalid arguments passed to <MyAstroComponent> component.
+     * @description
+     * Astro components cannot be rendered manually via a function call, such as `Component()` or `{items.map(Component)}`. Prefer the component syntax `<Component />` or `{items.map(item => <Component {...item} />)}`.
+     */
+    readonly InvalidComponentArgs: {
+        readonly title: "Invalid component arguments.";
+        readonly code: 3020;
+        readonly message: (name: string) => string;
+        readonly hint: "Astro components cannot be rendered directly via function call, such as `Component()` or `{items.map(Component)}`.";
+    };
     readonly UnknownViteError: {
         readonly title: "Unknown Vite Error.";
         readonly code: 4000;

package/dist/core/errors/errors-data.js

@@ -133,6 +133,12 @@ Expected \`true\` value but got \`${suffix}\`.`;
     },
     hint: "Mutable values declared at runtime are not supported. Please make sure to use exactly `export const prerender = true`."
   },
+  InvalidComponentArgs: {
+    title: "Invalid component arguments.",
+    code: 3020,
+    message: (name) => `Invalid arguments passed to${name ? ` <${name}>` : ""} component.`,
+    hint: "Astro components cannot be rendered directly via function call, such as `Component()` or `{items.map(Component)}`."
+  },
   UnknownViteError: {
     title: "Unknown Vite Error.",
     code: 4e3

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.1";
+  const version = "2.0.4";
   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.1"}`
+        `v${"2.0.4"}`
       )} ${headline}`
     );
   }

package/dist/core/render/core.js

@@ -25,7 +25,7 @@ async function getParamsAndProps(opts) {
       routeCache.set(route, routeCacheEntry);
     }
     const matchedStaticPath = findPathItemByKey(routeCacheEntry.staticPaths, params, route);
-    if (!matchedStaticPath && !ssr) {
+    if (!matchedStaticPath && (ssr ? mod.prerender : true)) {
       return 0 /* NoMatchingStaticPath */;
     }
     pageProps = (matchedStaticPath == null ? void 0 : matchedStaticPath.props) ? { ...matchedStaticPath.props } : {};

package/dist/core/render/dev/vite.js

@@ -1,5 +1,5 @@
 import npath from "path";
-import { DELAYED_ASSET_FLAG } from "../../../content/consts.js";
+import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
 import { unwrapId } from "../../util.js";
 import { STYLE_EXTENSIONS } from "../util.js";
@@ -8,7 +8,7 @@ const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;
 async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ new Set()) {
   const id = unwrapId(_id);
   const importedModules = /* @__PURE__ */ new Set();
-  if (new URL(id, "file://").searchParams.has(DELAYED_ASSET_FLAG))
+  if (new URL(id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG))
     return;
   const moduleEntriesForId = isRootFile ? loader.getModulesByFile(id) ?? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([loader.getModuleById(id)]);
   for (const entry of moduleEntriesForId) {

package/dist/runtime/server/astro-component.js

@@ -1,7 +1,27 @@
+import { AstroError, AstroErrorData } from "../../core/errors/index.js";
+function validateArgs(args) {
+  if (args.length !== 3)
+    return false;
+  if (!args[0] || typeof args[0] !== "object")
+    return false;
+  return true;
+}
 function baseCreateComponent(cb, moduleId) {
-  cb.isAstroComponentFactory = true;
-  cb.moduleId = moduleId;
-  return cb;
+  var _a;
+  const name = ((_a = moduleId == null ? void 0 : moduleId.split("/").pop()) == null ? void 0 : _a.replace(".astro", "")) ?? "";
+  const fn = (...args) => {
+    if (!validateArgs(args)) {
+      throw new AstroError({
+        ...AstroErrorData.InvalidComponentArgs,
+        message: AstroErrorData.InvalidComponentArgs.message(name)
+      });
+    }
+    return cb(...args);
+  };
+  Object.defineProperty(fn, "name", { value: name, writable: false });
+  fn.isAstroComponentFactory = true;
+  fn.moduleId = moduleId;
+  return fn;
 }
 function createComponentWithOptions(opts) {
   const cb = baseCreateComponent(opts.factory, opts.moduleId);

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

@@ -3,7 +3,7 @@ export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
 export { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from './escape.js';
 export { renderJSX } from './jsx.js';
-export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderSlot, renderStyleElement, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
+export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderStyleElement, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, AstroComponentInstance, AstroComponentSlots, AstroComponentSlotsWithValues, RenderInstruction, } from './render/index.js';
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;
 /** @internal Associate JSX components with a specific renderer (see /src/vite-plugin-jsx/tag.ts) */

package/dist/runtime/server/index.js

@@ -16,6 +16,7 @@ import {
   renderHead,
   renderHTMLElement,
   renderPage,
+  renderScriptElement,
   renderSlot,
   renderStyleElement,
   renderTemplate,
@@ -104,6 +105,7 @@ export {
   renderHead,
   renderJSX,
   renderPage,
+  renderScriptElement,
   renderSlot,
   renderStyleElement,
   renderTemplate2 as renderTemplate,

package/dist/runtime/server/render/astro/head-and-content.d.ts

@@ -2,9 +2,9 @@ import type { RenderTemplateResult } from './render-template';
 declare const headAndContentSym: unique symbol;
 export type HeadAndContent = {
     [headAndContentSym]: true;
-    head: string | RenderTemplateResult;
+    head: string;
     content: RenderTemplateResult;
 };
 export declare function isHeadAndContent(obj: unknown): obj is HeadAndContent;
-export declare function createHeadAndContent(head: string | RenderTemplateResult, content: RenderTemplateResult): HeadAndContent;
+export declare function createHeadAndContent(head: string, content: RenderTemplateResult): HeadAndContent;
 export {};

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

@@ -4,39 +4,48 @@ import {
   determinesIfNeedsDirectiveScript,
   getPrescripts
 } from "../scripts.js";
+import { renderAllHeadContent } from "./head.js";
 import { isSlotString } from "./slot.js";
 const Fragment = Symbol.for("astro:fragment");
 const Renderer = Symbol.for("astro:renderer");
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
 function stringifyChunk(result, chunk) {
-  switch (chunk.type) {
-    case "directive": {
-      const { hydration } = chunk;
-      let needsHydrationScript = hydration && determineIfNeedsHydrationScript(result);
-      let needsDirectiveScript = hydration && determinesIfNeedsDirectiveScript(result, hydration.directive);
-      let prescriptType = needsHydrationScript ? "both" : needsDirectiveScript ? "directive" : null;
-      if (prescriptType) {
-        let prescripts = getPrescripts(prescriptType, hydration.directive);
-        return markHTMLString(prescripts);
-      } else {
-        return "";
+  if (typeof chunk.type === "string") {
+    const instruction = chunk;
+    switch (instruction.type) {
+      case "directive": {
+        const { hydration } = instruction;
+        let needsHydrationScript = hydration && determineIfNeedsHydrationScript(result);
+        let needsDirectiveScript = hydration && determinesIfNeedsDirectiveScript(result, hydration.directive);
+        let prescriptType = needsHydrationScript ? "both" : needsDirectiveScript ? "directive" : null;
+        if (prescriptType) {
+          let prescripts = getPrescripts(prescriptType, hydration.directive);
+          return markHTMLString(prescripts);
+        } else {
+          return "";
+        }
+      }
+      case "head": {
+        if (result._metadata.hasRenderedHead) {
+          return "";
+        }
+        return renderAllHeadContent(result);
       }
     }
-    default: {
-      if (isSlotString(chunk)) {
-        let out = "";
-        const c = chunk;
-        if (c.instructions) {
-          for (const instr of c.instructions) {
-            out += stringifyChunk(result, instr);
-          }
+  } else {
+    if (isSlotString(chunk)) {
+      let out = "";
+      const c = chunk;
+      if (c.instructions) {
+        for (const instr of c.instructions) {
+          out += stringifyChunk(result, instr);
         }
-        out += chunk.toString();
-        return out;
       }
-      return chunk.toString();
+      out += chunk.toString();
+      return out;
     }
+    return chunk.toString();
   }
 }
 class HTMLParts {

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

@@ -25,12 +25,12 @@ function guessRenderers(componentUrl) {
       return ["@astrojs/vue"];
     case "jsx":
     case "tsx":
-      return ["@astrojs/react", "@astrojs/preact", "@astrojs/solid", "@astrojs/vue (jsx)"];
+      return ["@astrojs/react", "@astrojs/preact", "@astrojs/solid-js", "@astrojs/vue (jsx)"];
     default:
       return [
         "@astrojs/react",
         "@astrojs/preact",
-        "@astrojs/solid",
+        "@astrojs/solid-js",
         "@astrojs/vue",
         "@astrojs/svelte"
       ];

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

@@ -1,4 +1,10 @@
 import type { SSRResult } from '../../../@types/astro';
-export declare function createRenderHead(result: SSRResult): () => any;
-export declare const renderHead: typeof createRenderHead;
-export declare function maybeRenderHead(result: SSRResult): AsyncGenerator<any, void, unknown>;
+export declare function renderAllHeadContent(result: SSRResult): any;
+export declare function renderHead(result: SSRResult): Generator<{
+    readonly type: "head";
+    readonly result: SSRResult;
+}, void, unknown>;
+export declare function maybeRenderHead(result: SSRResult): Generator<{
+    readonly type: "head";
+    readonly result: SSRResult;
+}, void, unknown>;

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

@@ -1,44 +1,37 @@
 import { markHTMLString } from "../escape.js";
-import { renderChild } from "./any.js";
 import { renderElement } from "./util.js";
 const uniqueElements = (item, index, all) => {
   const props = JSON.stringify(item.props);
   const children = item.children;
   return index === all.findIndex((i) => JSON.stringify(i.props) === props && i.children == children);
 };
-async function* renderExtraHead(result, base) {
-  yield base;
-  for (const part of result.extraHead) {
-    yield* renderChild(part);
-  }
-}
 function renderAllHeadContent(result) {
+  result._metadata.hasRenderedHead = true;
   const styles = Array.from(result.styles).filter(uniqueElements).map((style) => renderElement("style", style));
   result.styles.clear();
   const scripts = Array.from(result.scripts).filter(uniqueElements).map((script, i) => {
     return renderElement("script", script, false);
   });
   const links = Array.from(result.links).filter(uniqueElements).map((link) => renderElement("link", link, false));
-  const baseHeadContent = markHTMLString(links.join("\n") + styles.join("\n") + scripts.join("\n"));
+  let content = links.join("\n") + styles.join("\n") + scripts.join("\n");
   if (result.extraHead.length > 0) {
-    return renderExtraHead(result, baseHeadContent);
-  } else {
-    return baseHeadContent;
+    for (const part of result.extraHead) {
+      content += part;
+    }
   }
+  return markHTMLString(content);
 }
-function createRenderHead(result) {
-  result._metadata.hasRenderedHead = true;
-  return renderAllHeadContent.bind(null, result);
+function* renderHead(result) {
+  yield { type: "head", result };
 }
-const renderHead = createRenderHead;
-async function* maybeRenderHead(result) {
+function* maybeRenderHead(result) {
   if (result._metadata.hasRenderedHead) {
     return;
   }
-  yield createRenderHead(result)();
+  yield { type: "head", result };
 }
 export {
-  createRenderHead,
   maybeRenderHead,
+  renderAllHeadContent,
   renderHead
 };

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

@@ -6,6 +6,6 @@ export { renderHTMLElement } from './dom.js';
 export { maybeRenderHead, renderHead } from './head.js';
 export { renderPage } from './page.js';
 export { renderSlot } from './slot.js';
-export { renderStyleElement, renderUniqueStylesheet } from './tags.js';
+export { renderScriptElement, renderStyleElement, renderUniqueStylesheet } from './tags.js';
 export type { RenderInstruction } from './types';
 export { addAttribute, defineScriptVars, voidElementNames } from './util.js';

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

@@ -10,7 +10,7 @@ import { renderHTMLElement } from "./dom.js";
 import { maybeRenderHead, renderHead } from "./head.js";
 import { renderPage } from "./page.js";
 import { renderSlot } from "./slot.js";
-import { renderStyleElement, renderUniqueStylesheet } from "./tags.js";
+import { renderScriptElement, renderStyleElement, renderUniqueStylesheet } from "./tags.js";
 import { addAttribute, defineScriptVars, voidElementNames } from "./util.js";
 export {
   Fragment,
@@ -25,6 +25,7 @@ export {
   renderHTMLElement,
   renderHead,
   renderPage,
+  renderScriptElement,
   renderSlot,
   renderStyleElement,
   renderTemplate,

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

@@ -18,7 +18,7 @@ async function renderSlot(_result, slotted, fallback) {
     let content = "";
     let instructions = null;
     for await (const chunk of iterator) {
-      if (chunk.type === "directive") {
+      if (typeof chunk.type === "string") {
         if (instructions === null) {
           instructions = [];
         }

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

@@ -1,5 +1,6 @@
-import { SSRResult } from '../../../@types/astro';
+import { SSRElement, SSRResult } from '../../../@types/astro';
 export declare function renderStyleElement(children: string): string;
+export declare function renderScriptElement({ props, children }: SSRElement): string;
 export declare function renderStylesheet({ href }: {
     href: string;
 }): string;

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

@@ -6,6 +6,12 @@ function renderStyleElement(children) {
     children
   });
 }
+function renderScriptElement({ props, children }) {
+  return renderElement("script", {
+    props,
+    children
+  });
+}
 function renderStylesheet({ href }) {
   return renderElement(
     "link",
@@ -28,6 +34,7 @@ function renderUniqueStylesheet(result, link) {
   return renderStylesheet(link);
 }
 export {
+  renderScriptElement,
   renderStyleElement,
   renderStylesheet,
   renderUniqueStylesheet

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

@@ -1,7 +1,12 @@
 import type { SSRResult } from '../../../@types/astro';
 import type { HydrationMetadata } from '../hydration.js';
-export interface RenderInstruction {
+export type RenderDirectiveInstruction = {
     type: 'directive';
     result: SSRResult;
     hydration: HydrationMetadata;
-}
+};
+export type RenderHeadInstruction = {
+    type: 'head';
+    result: SSRResult;
+};
+export type RenderInstruction = RenderDirectiveInstruction | RenderHeadInstruction;

package/dist/vite-plugin-astro/compile.js

@@ -65,10 +65,15 @@ async function enhanceCompileError({
   config,
   logging
 }) {
+  var _a;
+  const lineText = (_a = err.loc) == null ? void 0 : _a.lineText;
   const scannedFrontmatter = FRONTMATTER_PARSE_REGEXP.exec(source);
   if (scannedFrontmatter) {
+    const frontmatter = scannedFrontmatter[1].replace(/\breturn\b/g, "throw");
+    if (lineText && !frontmatter.includes(lineText))
+      throw err;
     try {
-      await transformWithEsbuild(scannedFrontmatter[1], id, {
+      await transformWithEsbuild(frontmatter, id, {
         loader: "ts",
         target: "esnext",
         sourcemap: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -87,7 +87,7 @@
   "dependencies": {
     "@astrojs/compiler": "^1.0.1",
     "@astrojs/language-server": "^0.28.3",
-    "@astrojs/markdown-remark": "^2.0.0",
+    "@astrojs/markdown-remark": "^2.0.1",
     "@astrojs/telemetry": "^2.0.0",
     "@astrojs/webapi": "^2.0.0",
     "@babel/core": "^7.18.2",

package/src/content/template/types.d.ts

@@ -44,9 +44,13 @@ declare module 'astro:content' {
 	): E extends ValidEntrySlug<C>
 		? Promise<CollectionEntry<C>>
 		: Promise<CollectionEntry<C> | undefined>;
+	export function getCollection<C extends keyof typeof entryMap, E extends CollectionEntry<C>>(
+		collection: C,
+		filter?: (entry: CollectionEntry<C>) => entry is E
+	): Promise<E[]>;
 	export function getCollection<C extends keyof typeof entryMap>(
 		collection: C,
-		filter?: (data: CollectionEntry<C>) => boolean
+		filter?: (entry: CollectionEntry<C>) => unknown
 	): Promise<CollectionEntry<C>[]>;
 
 	type InferEntrySchema<C extends keyof typeof entryMap> = import('astro/zod').infer<

package/src/content/template/virtual-mod.mjs

@@ -22,7 +22,7 @@ const collectionToEntryMap = createCollectionToGlobResultMap({
 });
 
 const renderEntryGlob = import.meta.glob('@@RENDER_ENTRY_GLOB_PATH@@', {
-	query: { astroAssetSsr: true },
+	query: { astroPropagatedAssets: true },
 });
 const collectionToRenderEntryMap = createCollectionToGlobResultMap({
 	globResult: renderEntryGlob,