astro 1.0.0-beta.60 → 1.0.0-beta.63

package/dist/core/app/index.js

@@ -20,7 +20,7 @@ var __privateMethod = (obj, member, method) => {
   __accessCheck(obj, member, "access private method");
   return method;
 };
-var _manifest, _manifestData, _routeDataToRouteInfo, _routeCache, _encoder, _logging, _renderPage, renderPage_fn, _callEndpoint, callEndpoint_fn;
+var _manifest, _manifestData, _routeDataToRouteInfo, _routeCache, _encoder, _logging, _streaming, _renderPage, renderPage_fn, _callEndpoint, callEndpoint_fn;
 import mime from "mime";
 import { call as callEndpoint } from "../endpoint/index.js";
 import { consoleLogDestination } from "../logger/console.js";
@@ -36,7 +36,7 @@ import { deserializeManifest } from "./common.js";
 const pagesVirtualModuleId = "@astrojs-pages-virtual-entry";
 const resolvedPagesVirtualModuleId = "\0" + pagesVirtualModuleId;
 class App {
-  constructor(manifest) {
+  constructor(manifest, streaming = true) {
     __privateAdd(this, _renderPage);
     __privateAdd(this, _callEndpoint);
     __privateAdd(this, _manifest, void 0);
@@ -48,12 +48,14 @@ class App {
       dest: consoleLogDestination,
       level: "info"
     });
+    __privateAdd(this, _streaming, void 0);
     __privateSet(this, _manifest, manifest);
     __privateSet(this, _manifestData, {
       routes: manifest.routes.map((route) => route.routeData)
     });
     __privateSet(this, _routeDataToRouteInfo, new Map(manifest.routes.map((route) => [route.routeData, route])));
     __privateSet(this, _routeCache, new RouteCache(__privateGet(this, _logging)));
+    __privateSet(this, _streaming, streaming);
   }
   match(request) {
     const url = new URL(request.url);
@@ -85,6 +87,7 @@ _routeDataToRouteInfo = new WeakMap();
 _routeCache = new WeakMap();
 _encoder = new WeakMap();
 _logging = new WeakMap();
+_streaming = new WeakMap();
 _renderPage = new WeakSet();
 renderPage_fn = async function(request, routeData, mod) {
   const url = new URL(request.url);
@@ -125,7 +128,8 @@ renderPage_fn = async function(request, routeData, mod) {
     routeCache: __privateGet(this, _routeCache),
     site: __privateGet(this, _manifest).site,
     ssr: true,
-    request
+    request,
+    streaming: __privateGet(this, _streaming)
   });
   return response;
 };

package/dist/core/build/generate.js

@@ -145,7 +145,8 @@ async function generatePath(pathname, opts, gopts) {
     route: pageData.route,
     routeCache,
     site: astroConfig.site ? new URL(astroConfig.base, astroConfig.site).toString() : astroConfig.site,
-    ssr
+    ssr,
+    streaming: true
   };
   let body;
   if (pageData.route.type === "endpoint") {

package/dist/core/config.js

@@ -20,7 +20,8 @@ const ASTRO_CONFIG_DEFAULTS = {
   build: { format: "directory" },
   server: {
     host: false,
-    port: 3e3
+    port: 3e3,
+    streaming: true
   },
   style: { postcss: { options: {}, plugins: [] } },
   integrations: [],
@@ -176,7 +177,8 @@ See https://astro.build/config for more information.`);
     outDir: z.string().default(ASTRO_CONFIG_DEFAULTS.outDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
     server: z.preprocess((val) => typeof val === "function" ? val({ command: cmd === "dev" ? "dev" : "preview" }) : val, z.object({
       host: z.union([z.string(), z.boolean()]).optional().default(ASTRO_CONFIG_DEFAULTS.server.host),
-      port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port)
+      port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port),
+      streaming: z.boolean().optional().default(true)
     }).optional().default({})),
     style: z.object({
       postcss: z.preprocess((val) => resolvePostcssConfig(val, fileProtocolRoot), z.object({

package/dist/core/dev/index.js

@@ -47,7 +47,7 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.60";
+  const currentVersion = "1.0.0-beta.63";
   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.0-beta.60";
+  const version = "1.0.0-beta.63";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -206,7 +206,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.60"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.63"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/core/render/core.js

@@ -48,7 +48,8 @@ async function render(opts) {
     route,
     routeCache,
     site,
-    ssr
+    ssr,
+    streaming
   } = opts;
   const paramsAndPropsRes = await getParamsAndProps({
     logging,
@@ -79,12 +80,13 @@ async function render(opts) {
     request,
     site,
     scripts,
-    ssr
+    ssr,
+    streaming
   });
   if (typeof mod.components === "object") {
     Object.assign(pageProps, { components: mod.components });
   }
-  return await renderPage(result, Component, pageProps, null);
+  return await renderPage(result, Component, pageProps, null, streaming);
 }
 export {
   GetParamsAndPropsError,

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

@@ -108,7 +108,8 @@ async function render(renderers, mod, ssrOpts) {
     route,
     routeCache,
     site: astroConfig.site ? new URL(astroConfig.base, astroConfig.site).toString() : void 0,
-    ssr: isBuildingToSSR(astroConfig)
+    ssr: isBuildingToSSR(astroConfig),
+    streaming: true
   });
   return response;
 }

package/dist/core/render/result.js

@@ -99,7 +99,11 @@ function createResult(args) {
   const url = new URL(request.url);
   const canonicalURL = createCanonicalURL("." + pathname, site ?? url.origin, paginated);
   const headers = new Headers();
-  headers.set("Transfer-Encoding", "chunked");
+  if (args.streaming) {
+    headers.set("Transfer-Encoding", "chunked");
+  } else {
+    headers.set("Content-Type", "text/html");
+  }
   const response = {
     status: 200,
     statusText: "OK",

package/dist/core/util.js

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

package/dist/jsx-runtime/index.js

@@ -1,5 +1,5 @@
 import { Fragment, markHTMLString } from "../runtime/server/index.js";
-const AstroJSX = Symbol("@astrojs/jsx");
+const AstroJSX = "astro:jsx";
 const Empty = Symbol("empty");
 const toSlotName = (str) => str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase());
 function isVNode(vnode) {

package/dist/runtime/server/index.js

@@ -447,7 +447,7 @@ async function renderToIterable(result, componentFactory, props, children) {
   return renderAstroComponent(Component);
 }
 const encoder = new TextEncoder();
-async function renderPage(result, componentFactory, props, children) {
+async function renderPage(result, componentFactory, props, children, streaming) {
   let iterable;
   if (!componentFactory.isAstroComponentFactory) {
     const pageProps = { ...props ?? {}, "server:root": true };
@@ -466,28 +466,47 @@ ${await maybeRenderHead(result)}${html}`;
   }
   const factoryReturnValue = await componentFactory(result, props, children);
   if (isAstroComponent(factoryReturnValue)) {
-    iterable = renderAstroComponent(factoryReturnValue);
-    let stream = new ReadableStream({
-      start(controller) {
-        async function read() {
-          let i = 0;
-          for await (const chunk of iterable) {
-            let html = chunk.toString();
-            if (i === 0) {
-              if (!/<!doctype html/i.test(html)) {
-                controller.enqueue(encoder.encode("<!DOCTYPE html>\n"));
+    let iterable2 = renderAstroComponent(factoryReturnValue);
+    let init = result.response;
+    let headers = new Headers(init.headers);
+    let body;
+    if (streaming) {
+      body = new ReadableStream({
+        start(controller) {
+          async function read() {
+            let i = 0;
+            for await (const chunk of iterable2) {
+              let html = chunk.toString();
+              if (i === 0) {
+                if (!/<!doctype html/i.test(html)) {
+                  controller.enqueue(encoder.encode("<!DOCTYPE html>\n"));
+                }
               }
+              controller.enqueue(encoder.encode(html));
+              i++;
             }
-            controller.enqueue(encoder.encode(html));
-            i++;
+            controller.close();
+          }
+          read();
+        }
+      });
+    } else {
+      body = "";
+      let i = 0;
+      for await (const chunk of iterable2) {
+        let html = chunk.toString();
+        if (i === 0) {
+          if (!/<!doctype html/i.test(html)) {
+            body += "<!DOCTYPE html>\n";
           }
-          controller.close();
         }
-        read();
+        body += chunk;
+        i++;
       }
-    });
-    let init = result.response;
-    let response = createResponse(stream, init);
+      const bytes = encoder.encode(body);
+      headers.set("Content-Length", `${bytes.byteLength}`);
+    }
+    let response = createResponse(body, { ...init, headers });
     return response;
   } else {
     return factoryReturnValue;

package/dist/runtime/server/response.js

@@ -59,6 +59,9 @@ function createResponseClass() {
   return StreamingCompatibleResponse;
 }
 const createResponse = isNodeJS ? (body, init) => {
+  if (typeof body === "string") {
+    return new Response(body, init);
+  }
   if (typeof StreamingCompatibleResponse === "undefined") {
     return new (createResponseClass())(body, init);
   }

package/dist/types/core/app/index.d.ts

@@ -5,7 +5,7 @@ export declare const pagesVirtualModuleId = "@astrojs-pages-virtual-entry";
 export declare const resolvedPagesVirtualModuleId: string;
 export declare class App {
     #private;
-    constructor(manifest: Manifest);
+    constructor(manifest: Manifest, streaming?: boolean);
     match(request: Request): RouteData | undefined;
     render(request: Request, routeData?: RouteData): Promise<Response>;
 }

package/dist/types/core/render/core.d.ts

@@ -29,6 +29,7 @@ export interface RenderOptions {
     routeCache: RouteCache;
     site?: string;
     ssr: boolean;
+    streaming: boolean;
     request: Request;
 }
 export declare function render(opts: RenderOptions): Promise<Response>;

package/dist/types/core/render/result.d.ts

@@ -3,6 +3,7 @@ import type { Params, Props, SSRElement, SSRLoadedRenderer, SSRResult } from '..
 import { LogOptions } from '../logger/core.js';
 export interface CreateResultArgs {
     ssr: boolean;
+    streaming: boolean;
     logging: LogOptions;
     origin: string;
     markdown: MarkdownRenderingOptions;

package/dist/types/jsx-runtime/index.d.ts

@@ -1,5 +1,5 @@
 import { Fragment } from '../runtime/server/index.js';
-declare const AstroJSX: unique symbol;
+declare const AstroJSX = "astro:jsx";
 interface AstroVNode {
     [AstroJSX]: boolean;
     type: string | ((...args: any) => any) | typeof Fragment;

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

@@ -30,7 +30,7 @@ export declare function defineScriptVars(vars: Record<any, any>): any;
 export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params): Promise<Response | import("../../@types/astro").EndpointOutput>;
 export declare function renderToString(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<string>;
 export declare function renderToIterable(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<AsyncIterable<string>>;
-export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<Response>;
+export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any, streaming: boolean): Promise<Response>;
 export declare function renderHead(result: SSRResult): Promise<string>;
 export declare function maybeRenderHead(result: SSRResult): string | Promise<string>;
 export declare function renderAstroComponent(component: InstanceType<typeof AstroComponent>): AsyncIterable<string>;

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

@@ -60,6 +60,8 @@ async function writeWebResponse(res, webResponse) {
     } else if (body instanceof Readable) {
       body.pipe(res);
       return;
+    } else if (typeof body === "string") {
+      res.write(body);
     } else {
       const reader = body.getReader();
       while (true) {
@@ -136,7 +138,7 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
   const url = new URL(origin + ((_a = req.url) == null ? void 0 : _a.replace(/(index)?\.html$/, "")));
   const pathname = decodeURI(url.pathname);
   const rootRelativeUrl = pathname.substring(devRoot.length - 1);
-  if (!buildingToSSR) {
+  if (!buildingToSSR && rootRelativeUrl !== "/_image") {
     const allSearchParams = Array.from(url.searchParams);
     for (const [key] of allSearchParams) {
       url.searchParams.delete(key);

package/package.json

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