astro 1.0.5 → 1.0.6

package/dist/core/dev/index.js

@@ -46,7 +46,7 @@ async function dev(config, options) {
       https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
     })
   );
-  const currentVersion = "1.0.5";
+  const currentVersion = "1.0.6";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.5";
+  const version = "1.0.6";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -226,7 +226,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.0.5"}`
+        `v${"1.0.6"}`
       )} ${headline}`
     );
   }

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.0.5";
+const ASTRO_VERSION = "1.0.6";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

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

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.0.5";
+const ASTRO_VERSION = "1.0.6";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

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

@@ -35,6 +35,9 @@ class AstroComponent {
 function isAstroComponent(obj) {
   return typeof obj === "object" && Object.prototype.toString.call(obj) === "[object AstroComponent]";
 }
+function isAstroComponentFactory(obj) {
+  return obj == null ? false : !!obj.isAstroComponentFactory;
+}
 async function* renderAstroComponent(component) {
   for await (const value of component) {
     if (value || value === 0) {
@@ -83,6 +86,7 @@ async function renderTemplate(htmlParts, ...expressions) {
 export {
   AstroComponent,
   isAstroComponent,
+  isAstroComponentFactory,
   renderAstroComponent,
   renderTemplate,
   renderToIterable,

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

@@ -3,7 +3,12 @@ import { extractDirectives, generateHydrateScript } from "../hydration.js";
 import { serializeProps } from "../serialize.js";
 import { shorthash } from "../shorthash.js";
 import { renderSlot } from "./any.js";
-import { renderAstroComponent, renderTemplate, renderToIterable } from "./astro.js";
+import {
+  isAstroComponentFactory,
+  renderAstroComponent,
+  renderTemplate,
+  renderToIterable
+} from "./astro.js";
 import { Fragment, Renderer } from "./common.js";
 import { componentIsHTMLElement, renderHTMLElement } from "./dom.js";
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from "./util.js";
@@ -29,7 +34,7 @@ function getComponentType(Component) {
   if (Component && typeof Component === "object" && Component["astro:html"]) {
     return "html";
   }
-  if (Component && Component.isAstroComponentFactory) {
+  if (isAstroComponentFactory(Component)) {
     return "astro-factory";
   }
   return "unknown";

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

@@ -1,11 +1,15 @@
 import { createResponse } from "../response.js";
-import { isAstroComponent, renderAstroComponent } from "./astro.js";
+import { isAstroComponent, isAstroComponentFactory, renderAstroComponent } from "./astro.js";
 import { stringifyChunk } from "./common.js";
 import { renderComponent } from "./component.js";
 import { maybeRenderHead } from "./head.js";
 const encoder = new TextEncoder();
+const needsHeadRenderingSymbol = Symbol.for("astro.needsHeadRendering");
+function nonAstroPageNeedsHeadInjection(pageComponent) {
+  return needsHeadRenderingSymbol in pageComponent && !!pageComponent[needsHeadRenderingSymbol];
+}
 async function renderPage(result, componentFactory, props, children, streaming) {
-  if (!componentFactory.isAstroComponentFactory) {
+  if (!isAstroComponentFactory(componentFactory)) {
     const pageProps = { ...props ?? {}, "server:root": true };
     const output = await renderComponent(
       result,
@@ -18,15 +22,18 @@ async function renderPage(result, componentFactory, props, children, streaming)
     if (!/<!doctype html/i.test(html)) {
       let rest = html;
       html = `<!DOCTYPE html>`;
-      for await (let chunk of maybeRenderHead(result)) {
-        html += chunk;
+      if (nonAstroPageNeedsHeadInjection(componentFactory)) {
+        for await (let chunk of maybeRenderHead(result)) {
+          html += chunk;
+        }
       }
       html += rest;
     }
-    return new Response(html, {
+    const bytes = encoder.encode(html);
+    return new Response(bytes, {
       headers: new Headers([
         ["Content-Type", "text/html; charset=utf-8"],
-        ["Content-Length", Buffer.byteLength(html, "utf-8").toString()]
+        ["Content-Length", bytes.byteLength.toString()]
       ])
     });
   }

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

@@ -799,8 +799,7 @@ export interface MarkdownLayoutProps<T extends Record<string, any>> {
     rawContent: MarkdownInstance<T>['rawContent'];
     compiledContent: MarkdownInstance<T>['compiledContent'];
 }
-export interface MDXLayoutProps<T> extends Omit<MarkdownLayoutProps<T>, 'rawContent' | 'compiledContent'> {
-}
+export declare type MDXLayoutProps<T> = Omit<MarkdownLayoutProps<T>, 'rawContent' | 'compiledContent'>;
 export declare type GetHydrateCallback = () => Promise<() => void | Promise<void>>;
 /**
  * getStaticPaths() options

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

@@ -9,6 +9,7 @@ export declare class AstroComponent {
     [Symbol.asyncIterator](): AsyncGenerator<any, void, undefined>;
 }
 export declare function isAstroComponent(obj: any): obj is AstroComponent;
+export declare function isAstroComponentFactory(obj: any): obj is AstroComponentFactory;
 export declare function renderAstroComponent(component: InstanceType<typeof AstroComponent>): AsyncIterable<string | RenderInstruction>;
 export declare function renderToString(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<string>;
 export declare function renderToIterable(result: SSRResult, componentFactory: AstroComponentFactory, displayName: string, props: any, children: any): Promise<AsyncIterable<string | RenderInstruction>>;

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

@@ -1,3 +1,9 @@
 import type { SSRResult } from '../../../@types/astro';
 import type { AstroComponentFactory } from './index';
-export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any, streaming: boolean): Promise<Response>;
+declare const needsHeadRenderingSymbol: unique symbol;
+declare type NonAstroPageComponent = {
+    name: string;
+    [needsHeadRenderingSymbol]: boolean;
+};
+export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory | NonAstroPageComponent, props: any, children: any, streaming: boolean): Promise<Response>;
+export {};

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

@@ -176,12 +176,6 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
   });
   async function matchRoute() {
     const matches = matchAllRoutes(pathname, manifest);
-    if (config.output === "server" && matches.length > 1) {
-      throw new Error(`Found multiple matching routes for "${pathname}"! When using \`output: 'server'\`, only one route in \`src/pages\` can match a given URL. Found:
-
-${matches.map(({ component }) => `- ${component}`).join("\n")}
-`);
-    }
     for await (const maybeRoute of matches) {
       const filePath2 = new URL(`./${maybeRoute.component}`, config.root);
       const preloadedComponent = await preload({ astroConfig: config, filePath: filePath2, viteServer });

package/dist/vite-plugin-markdown/index.js

@@ -94,6 +94,7 @@ function markdown({ config, logging }) {
 									children: contentFragment
 								})` : `contentFragment`};
 				}
+				Content[Symbol.for('astro.needsHeadRendering')] = ${layout ? "false" : "true"};
 				export default Content;
 				`);
         return {

package/package.json

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