astro 1.2.7 → 1.3.0

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

@@ -1043,6 +1043,9 @@ export interface AstroIntegration {
             target: 'client' | 'server';
             updateConfig: (newConfig: ViteConfigWithSSR) => void;
         }) => void | Promise<void>;
+        'astro:build:generated'?: (options: {
+            dir: URL;
+        }) => void | Promise<void>;
         'astro:build:done'?: (options: {
             pages: {
                 pathname: string;

package/dist/cli/check/index.js

@@ -2,6 +2,7 @@ import { AstroCheck, DiagnosticSeverity } from "@astrojs/language-server";
 import glob from "fast-glob";
 import * as fs from "fs";
 import { bold, dim, red, yellow } from "kleur/colors";
+import { createRequire } from "module";
 import ora from "ora";
 import { fileURLToPath, pathToFileURL } from "url";
 import { printDiagnostic } from "./print.js";
@@ -9,7 +10,11 @@ async function check(settings) {
   console.log(bold("astro check"));
   const root = settings.config.root;
   const spinner = ora(` Getting diagnostics for Astro files in ${fileURLToPath(root)}\u2026`).start();
-  let checker = new AstroCheck(root.toString());
+  const require2 = createRequire(import.meta.url);
+  let checker = new AstroCheck(
+    root.toString(),
+    require2.resolve("typescript/lib/tsserverlibrary.js", { paths: [root.toString()] })
+  );
   const filesCount = await openAllDocuments(root, [], checker);
   let diagnostics = await checker.getDiagnostics();
   spinner.succeed();
@@ -20,7 +25,7 @@ async function check(settings) {
   };
   diagnostics.forEach((diag) => {
     diag.diagnostics.forEach((d) => {
-      console.log(printDiagnostic(diag.filePath, diag.text, d));
+      console.log(printDiagnostic(diag.fileUri, diag.text, d));
       switch (d.severity) {
         case DiagnosticSeverity.Error: {
           result.errors++;

package/dist/cli/check/print.js

@@ -17,8 +17,7 @@ function printDiagnostic(filePath, text, diag) {
   let result = [];
   const realStartLine = diag.range.start.line + 1;
   const realStartCharacter = diag.range.start.character + 1;
-  const normalizedFilePath = fileURLToPath(new URL(filePath, "file://"));
-  const IDEFilePath = `${bold(cyan(normalizedFilePath))}:${bold(yellow(realStartLine))}:${bold(
+  const IDEFilePath = `${bold(cyan(fileURLToPath(filePath)))}:${bold(yellow(realStartLine))}:${bold(
     yellow(realStartCharacter)
   )}`;
   result.push(

package/dist/core/add/index.js

@@ -256,7 +256,7 @@ async function parseAstroConfig(configURL) {
   return result;
 }
 const toIdent = (name) => {
-  const ident = name.trim().replace(/[-_\.]?astro(?:js)?[-_\.]?/g, "").replace(/\.js/, "").replace(/(?:[\.\-\_\/]+)([a-zA-Z])/g, (_, w) => w.toUpperCase()).replace(/^[^a-zA-Z$_]+/, "");
+  const ident = name.trim().replace(/[-_\.\/]?astro(?:js)?[-_\.]?/g, "").replace(/\.js/, "").replace(/(?:[\.\-\_\/]+)([a-zA-Z])/g, (_, w) => w.toUpperCase()).replace(/^[^a-zA-Z$_]+/, "");
   return `${ident[0].toLowerCase()}${ident.slice(1)}`;
 };
 function createPrettyError(err) {

package/dist/core/build/generate.js

@@ -9,6 +9,7 @@ import {
   removeLeadingForwardSlash,
   removeTrailingForwardSlash
 } from "../../core/path.js";
+import { runHookBuildGenerated } from "../../integrations/index.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { call as callEndpoint } from "../endpoint/index.js";
 import { debug, info } from "../logger/core.js";
@@ -72,6 +73,11 @@ ${bgGreen(black(" generating static routes "))}`);
   for (const pageData of eachPageData(internals)) {
     await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
   }
+  await runHookBuildGenerated({
+    config: opts.settings.config,
+    buildConfig: opts.buildConfig,
+    logging: opts.logging
+  });
   info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.
 `));
 }

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

@@ -85,6 +85,7 @@ async function ssrBuild(opts, internals, input) {
     logLevel: opts.viteConfig.logLevel ?? "error",
     mode: "production",
     build: {
+      target: "esnext",
       ...viteConfig.build,
       emptyOutDir: false,
       manifest: false,
@@ -101,7 +102,6 @@ async function ssrBuild(opts, internals, input) {
         }
       },
       ssr: true,
-      target: "esnext",
       minify: false,
       polyfillModulePreload: false,
       reportCompressedSize: false
@@ -150,9 +150,9 @@ ${bgGreen(black(" building client "))}`);
     logLevel: "info",
     mode: "production",
     build: {
+      target: "esnext",
       ...viteConfig.build,
       emptyOutDir: false,
-      minify: "esbuild",
       outDir: fileURLToPath(out),
       rollupOptions: {
         ...(_a = viteConfig.build) == null ? void 0 : _a.rollupOptions,
@@ -165,8 +165,7 @@ ${bgGreen(black(" building client "))}`);
           ...(_c = (_b = viteConfig.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.output
         },
         preserveEntrySignatures: "exports-only"
-      },
-      target: "esnext"
+      }
     },
     plugins: [
       vitePluginInternals(input, internals),

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

@@ -158,15 +158,16 @@ function rollupPluginAstroBuildCSS(options) {
       name: "astro:rollup-plugin-build-css-minify",
       enforce: "post",
       async generateBundle(_outputOptions, bundle) {
-        var _a, _b;
+        var _a, _b, _c;
         if (options.target === "server") {
           for (const [, output] of Object.entries(bundle)) {
             if (output.type === "asset") {
               if (((_a = output.name) == null ? void 0 : _a.endsWith(".css")) && typeof output.source === "string") {
                 const cssTarget = (_b = settings.config.vite.build) == null ? void 0 : _b.cssTarget;
+                const minify = ((_c = settings.config.vite.build) == null ? void 0 : _c.minify) !== false;
                 const { code: minifiedCSS } = await esbuild.transform(output.source, {
                   loader: "css",
-                  minify: true,
+                  minify,
                   ...cssTarget ? { target: cssTarget } : {}
                 });
                 output.source = minifiedCSS;

package/dist/core/config/schema.d.ts

@@ -85,11 +85,11 @@ export declare const AstroConfigSchema: z.ZodObject<{
             wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
         }, "strip", z.ZodTypeAny, {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: string | import("shiki").IShikiTheme;
             wrap: boolean | null;
         }, {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: string | import("shiki").IShikiTheme | undefined;
             wrap?: boolean | null | undefined;
         }>>;
         remarkPlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodTuple<[z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodAny], null>]>, "many">>;
@@ -101,7 +101,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: string | import("shiki").IShikiTheme;
             wrap: boolean | null;
         };
         remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
@@ -113,7 +113,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: string | import("shiki").IShikiTheme | undefined;
             wrap?: boolean | null | undefined;
         } | undefined;
         remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;
@@ -141,7 +141,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: string | import("shiki").IShikiTheme;
             wrap: boolean | null;
         };
         remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
@@ -184,7 +184,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: string | import("shiki").IShikiTheme | undefined;
             wrap?: boolean | null | undefined;
         } | undefined;
         remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;
@@ -301,11 +301,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
             wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
         }, "strip", z.ZodTypeAny, {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: string | import("shiki").IShikiTheme;
             wrap: boolean | null;
         }, {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: string | import("shiki").IShikiTheme | undefined;
             wrap?: boolean | null | undefined;
         }>>;
         remarkPlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodTuple<[z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodAny], null>]>, "many">>;
@@ -317,7 +317,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: string | import("shiki").IShikiTheme;
             wrap: boolean | null;
         };
         remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
@@ -329,7 +329,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: string | import("shiki").IShikiTheme | undefined;
             wrap?: boolean | null | undefined;
         } | undefined;
         remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;
@@ -401,7 +401,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: string | import("shiki").IShikiTheme;
             wrap: boolean | null;
         };
         remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
@@ -445,7 +445,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: string | import("shiki").IShikiTheme | undefined;
             wrap?: boolean | null | undefined;
         } | undefined;
         remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;

package/dist/core/dev/index.js

@@ -12,7 +12,7 @@ import { info, warn } from "../logger/core.js";
 import * as msg from "../messages.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 async function dev(settings, options) {
-  var _a, _b, _c;
+  var _a, _b;
   const devStart = performance.now();
   applyPolyfill();
   await options.telemetry.record([]);
@@ -34,27 +34,26 @@ async function dev(settings, options) {
   const viteServer = await vite.createServer(viteConfig);
   runHookServerSetup({ config: settings.config, server: viteServer, logging: options.logging });
   await viteServer.listen(port);
-  const devServerAddressInfo = viteServer.httpServer.address();
   const site = settings.config.site ? new URL(settings.config.base, settings.config.site) : void 0;
   info(
     options.logging,
     null,
-    msg.devStart({
+    msg.serverStart({
       startupTime: performance.now() - devStart,
-      config: settings.config,
-      devServerAddressInfo,
+      resolvedUrls: viteServer.resolvedUrls || { local: [], network: [] },
+      host: settings.config.server.host,
       site,
-      https: !!((_a = viteConfig.server) == null ? void 0 : _a.https),
       isRestart
     })
   );
-  const currentVersion = "1.2.7";
+  const currentVersion = "1.3.0";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }
-  if (((_c = (_b = viteConfig.server) == null ? void 0 : _b.fs) == null ? void 0 : _c.strict) === false) {
+  if (((_b = (_a = viteConfig.server) == null ? void 0 : _a.fs) == null ? void 0 : _b.strict) === false) {
     warn(options.logging, null, msg.fsStrictWarning());
   }
+  const devServerAddressInfo = viteServer.httpServer.address();
   await runHookServerStart({
     config: settings.config,
     address: devServerAddressInfo,

package/dist/core/messages.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { AddressInfo } from 'net';
+import { ResolvedServerUrls } from 'vite';
 import { ZodError } from 'zod';
-import type { AstroConfig } from '../@types/astro';
 import { ErrorWithMetadata } from './errors.js';
 /** Display  */
 export declare function req({ url, statusCode, reqTime, }: {
@@ -16,15 +16,19 @@ export declare function hmr({ file, style }: {
     file: string;
     style?: boolean;
 }): string;
-/** Display dev server host and startup time */
-export declare function devStart({ startupTime, devServerAddressInfo, config, https, site, isRestart, }: {
+/** Display server host and startup time */
+export declare function serverStart({ startupTime, resolvedUrls, host, site, isRestart, }: {
     startupTime: number;
-    devServerAddressInfo: AddressInfo;
-    config: AstroConfig;
-    https: boolean;
+    resolvedUrls: ResolvedServerUrls;
+    host: string | boolean;
     site: URL | undefined;
     isRestart?: boolean;
 }): string;
+export declare function resolveServerUrls({ address, host, https, }: {
+    address: AddressInfo;
+    host: string | boolean;
+    https: boolean;
+}): ResolvedServerUrls;
 export declare function telemetryNotice(): string;
 export declare function telemetryEnabled(): string;
 export declare function telemetryDisabled(): string;

package/dist/core/messages.js

@@ -15,6 +15,7 @@ import {
   yellow
 } from "kleur/colors";
 import os from "os";
+import { removeTrailingForwardSlash } from "./path.js";
 import { emoji, getLocalAddress, padMultilineString } from "./util.js";
 const PREFIX_PADDING = 6;
 function req({
@@ -39,41 +40,34 @@ function reload({ file }) {
 function hmr({ file, style = false }) {
   return `${green("update".padStart(PREFIX_PADDING))} ${file}${style ? ` ${dim("style")}` : ""}`;
 }
-function devStart({
+function serverStart({
   startupTime,
-  devServerAddressInfo,
-  config,
-  https,
+  resolvedUrls,
+  host,
   site,
   isRestart = false
 }) {
-  const version = "1.2.7";
+  const version = "1.3.0";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
-  const { address: networkAddress, port } = devServerAddressInfo;
-  const localAddress = getLocalAddress(networkAddress, config.server.host);
-  const networkLogging = getNetworkLogging(config.server.host);
-  const toDisplayUrl = (hostname) => `${https ? "https" : "http"}://${hostname}:${port}${rootPath}`;
-  let local = `${localPrefix}${bold(cyan(toDisplayUrl(localAddress)))}`;
-  let network = null;
-  if (networkLogging === "host-to-expose") {
-    network = `${networkPrefix}${dim("use --host to expose")}`;
-  } else if (networkLogging === "visible") {
-    const nodeVersion = Number(process.version.substring(1, process.version.indexOf(".", 5)));
-    const ipv4Networks = Object.values(os.networkInterfaces()).flatMap((networkInterface) => networkInterface ?? []).filter(
-      (networkInterface) => (networkInterface == null ? void 0 : networkInterface.address) && (networkInterface == null ? void 0 : networkInterface.family) === (nodeVersion < 18 || nodeVersion >= 18.4 ? "IPv4" : 4)
-    );
-    for (let { address } of ipv4Networks) {
-      if (address.includes("127.0.0.1")) {
-        const displayAddress = address.replace("127.0.0.1", localAddress);
-        local = `${localPrefix}${bold(cyan(toDisplayUrl(displayAddress)))}`;
-      } else {
-        network = `${networkPrefix}${bold(cyan(toDisplayUrl(address)))}`;
-      }
-    }
-    if (!network) {
-      network = `${networkPrefix}${dim("unable to find network to expose")}`;
+  const emptyPrefix = " ".repeat(11);
+  const localUrlMessages = resolvedUrls.local.map((url, i) => {
+    return `${i === 0 ? localPrefix : emptyPrefix}${bold(
+      cyan(removeTrailingForwardSlash(url) + rootPath)
+    )}`;
+  });
+  const networkUrlMessages = resolvedUrls.network.map((url, i) => {
+    return `${i === 0 ? networkPrefix : emptyPrefix}${bold(
+      cyan(removeTrailingForwardSlash(url) + rootPath)
+    )}`;
+  });
+  if (networkUrlMessages.length === 0) {
+    const networkLogging = getNetworkLogging(host);
+    if (networkLogging === "host-to-expose") {
+      networkUrlMessages.push(`${networkPrefix}${dim("use --host to expose")}`);
+    } else if (networkLogging === "visible") {
+      networkUrlMessages.push(`${networkPrefix}${dim("unable to find network to expose")}`);
     }
   }
   const messages = [
@@ -81,12 +75,42 @@ function devStart({
       `${isRestart ? "re" : ""}started in ${Math.round(startupTime)}ms`
     )}`,
     "",
-    local,
-    network,
+    ...localUrlMessages,
+    ...networkUrlMessages,
     ""
   ];
   return messages.filter((msg) => typeof msg === "string").map((msg) => `  ${msg}`).join("\n");
 }
+function resolveServerUrls({
+  address,
+  host,
+  https
+}) {
+  const { address: networkAddress, port } = address;
+  const localAddress = getLocalAddress(networkAddress, host);
+  const networkLogging = getNetworkLogging(host);
+  const toDisplayUrl = (hostname) => `${https ? "https" : "http"}://${hostname}:${port}`;
+  let local = toDisplayUrl(localAddress);
+  let network = null;
+  if (networkLogging === "visible") {
+    const nodeVersion = Number(process.version.substring(1, process.version.indexOf(".", 5)));
+    const ipv4Networks = Object.values(os.networkInterfaces()).flatMap((networkInterface) => networkInterface ?? []).filter(
+      (networkInterface) => (networkInterface == null ? void 0 : networkInterface.address) && (networkInterface == null ? void 0 : networkInterface.family) === (nodeVersion < 18 || nodeVersion >= 18.4 ? "IPv4" : 4)
+    );
+    for (let { address: address2 } of ipv4Networks) {
+      if (address2.includes("127.0.0.1")) {
+        const displayAddress = address2.replace("127.0.0.1", localAddress);
+        local = toDisplayUrl(displayAddress);
+      } else {
+        network = toDisplayUrl(address2);
+      }
+    }
+  }
+  return {
+    local: [local],
+    network: network ? [network] : []
+  };
+}
 function telemetryNotice() {
   const headline = yellow(`Astro now collects ${bold("anonymous")} usage data.`);
   const why = `This ${bold("optional program")} will help shape our roadmap.`;
@@ -226,7 +250,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.2.7"}`
+        `v${"1.3.0"}`
       )} ${headline}`
     );
   }
@@ -251,7 +275,6 @@ function printHelp({
 }
 export {
   cancelled,
-  devStart,
   failure,
   formatConfigErrorMessage,
   formatErrorMessage,
@@ -263,6 +286,8 @@ export {
   printHelp,
   reload,
   req,
+  resolveServerUrls,
+  serverStart,
   success,
   telemetryDisabled,
   telemetryEnabled,

package/dist/core/preview/index.js

@@ -73,15 +73,18 @@ async function preview(settings, { logging }) {
       const listen = () => {
         httpServer = server.listen(port, host, async () => {
           if (!showedListenMsg) {
-            const devServerAddressInfo = server.address();
+            const resolvedUrls = msg.resolveServerUrls({
+              address: server.address(),
+              host: settings.config.server.host,
+              https: false
+            });
             info(
               logging,
               null,
-              msg.devStart({
+              msg.serverStart({
                 startupTime: performance.now() - timerStart,
-                config: settings.config,
-                devServerAddressInfo,
-                https: false,
+                resolvedUrls,
+                host: settings.config.server.host,
                 site: baseURL
               })
             );

package/dist/core/render/core.js

@@ -88,7 +88,6 @@ async function render(opts) {
     site,
     scripts,
     ssr,
-    streaming,
     status
   });
   if (typeof mod.components === "object") {

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

@@ -4,7 +4,6 @@ import { LogOptions } from '../logger/core.js';
 export interface CreateResultArgs {
     adapterName: string | undefined;
     ssr: boolean;
-    streaming: boolean;
     logging: LogOptions;
     origin: string;
     markdown: MarkdownRenderingOptions;

package/dist/core/render/result.js

@@ -112,12 +112,7 @@ function createResult(args) {
   const { markdown, params, pathname, props: pageProps, renderers, request, resolve } = args;
   const url = new URL(request.url);
   const headers = new Headers();
-  if (args.streaming) {
-    headers.set("Transfer-Encoding", "chunked");
-    headers.set("Content-Type", "text/html");
-  } else {
-    headers.set("Content-Type", "text/html");
-  }
+  headers.set("Content-Type", "text/html");
   const response = {
     status: args.status,
     statusText: "OK",

package/dist/core/util.d.ts

@@ -53,7 +53,7 @@ export declare const AggregateError: AggregateErrorConstructor | {
         name: string;
         message: string;
         stack?: string | undefined;
-        cause?: Error | undefined;
+        cause?: unknown;
     };
     captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
     prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;

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.2.7";
+const ASTRO_VERSION = "1.3.0";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/integrations/index.d.ts

@@ -46,6 +46,11 @@ export declare function runHookBuildSsr({ config, manifest, logging, }: {
     manifest: SerializedSSRManifest;
     logging: LogOptions;
 }): Promise<void>;
+export declare function runHookBuildGenerated({ config, buildConfig, logging, }: {
+    config: AstroConfig;
+    buildConfig: BuildConfig;
+    logging: LogOptions;
+}): Promise<void>;
 export declare function runHookBuildDone({ config, buildConfig, pages, routes, logging, }: {
     config: AstroConfig;
     buildConfig: BuildConfig;

package/dist/integrations/index.js

@@ -198,6 +198,23 @@ async function runHookBuildSsr({
     }
   }
 }
+async function runHookBuildGenerated({
+  config,
+  buildConfig,
+  logging
+}) {
+  var _a;
+  const dir = config.output === "server" ? buildConfig.client : config.outDir;
+  for (const integration of config.integrations) {
+    if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:build:generated"]) {
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:build:generated"]({ dir }),
+        logging
+      });
+    }
+  }
+}
 async function runHookBuildDone({
   config,
   buildConfig,
@@ -223,6 +240,7 @@ async function runHookBuildDone({
 }
 export {
   runHookBuildDone,
+  runHookBuildGenerated,
   runHookBuildSetup,
   runHookBuildSsr,
   runHookBuildStart,

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

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

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

@@ -8,7 +8,10 @@ var _a;
     4: (value) => new Map(JSON.parse(value, reviver)),
     5: (value) => new Set(JSON.parse(value, reviver)),
     6: (value) => BigInt(value),
-    7: (value) => new URL(value)
+    7: (value) => new URL(value),
+    8: (value) => new Uint8Array(JSON.parse(value)),
+    9: (value) => new Uint16Array(JSON.parse(value)),
+    10: (value) => new Uint32Array(JSON.parse(value))
   };
   const reviver = (propKey, raw) => {
     if (propKey === "" || !Array.isArray(raw))

package/dist/runtime/server/astro-island.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,s)=>{if(t===\"\"||!Array.isArray(s))return s;const[e,n]=s;return e in c?c[e](n):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest(\"astro-island[ssr]\"))return;const s=this.querySelectorAll(\"astro-slot\"),e={},n=this.querySelectorAll(\"template[data-astro-template]\");for(const r of n){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"data-astro-template\")||\"default\"]=r.innerHTML,r.remove())}for(const r of s){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"name\")||\"default\"]=r.innerHTML)}const a=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate);let s=this.getAttribute(\"before-hydration-url\");s&&await import(s),this.start()}start(){const s=JSON.parse(this.getAttribute(\"opts\")),e=this.getAttribute(\"client\");if(Astro[e]===void 0){window.addEventListener(`astro:${e}`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute(\"renderer-url\"),[a,{default:r}]=await Promise.all([import(this.getAttribute(\"component-url\")),n?import(n):()=>()=>{}]),i=this.getAttribute(\"component-export\")||\"default\";if(!i.includes(\".\"))this.Component=a[i];else{this.Component=a;for(const d of i.split(\".\"))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=[\"props\"],l))}";
+declare const _default: "var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(JSON.parse(t)),9:t=>new Uint16Array(JSON.parse(t)),10:t=>new Uint32Array(JSON.parse(t))},o=(t,s)=>{if(t===\"\"||!Array.isArray(s))return s;const[e,n]=s;return e in c?c[e](n):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest(\"astro-island[ssr]\"))return;const s=this.querySelectorAll(\"astro-slot\"),e={},n=this.querySelectorAll(\"template[data-astro-template]\");for(const r of n){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"data-astro-template\")||\"default\"]=r.innerHTML,r.remove())}for(const r of s){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"name\")||\"default\"]=r.innerHTML)}const a=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate);let s=this.getAttribute(\"before-hydration-url\");s&&await import(s),this.start()}start(){const s=JSON.parse(this.getAttribute(\"opts\")),e=this.getAttribute(\"client\");if(Astro[e]===void 0){window.addEventListener(`astro:${e}`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute(\"renderer-url\"),[a,{default:r}]=await Promise.all([import(this.getAttribute(\"component-url\")),n?import(n):()=>()=>{}]),i=this.getAttribute(\"component-export\")||\"default\";if(!i.includes(\".\"))this.Component=a[i];else{this.Component=a;for(const d of i.split(\".\"))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=[\"props\"],l))}";
 export default _default;

package/dist/runtime/server/astro-island.prebuilt.js

@@ -1,4 +1,4 @@
-var astro_island_prebuilt_default = `var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,s)=>{if(t===""||!Array.isArray(s))return s;const[e,n]=s;return e in c?c[e](n):void 0};customElements.get("astro-island")||customElements.define("astro-island",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest("astro-island[ssr]"))return;const s=this.querySelectorAll("astro-slot"),e={},n=this.querySelectorAll("template[data-astro-template]");for(const r of n){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("data-astro-template")||"default"]=r.innerHTML,r.remove())}for(const r of s){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("name")||"default"]=r.innerHTML)}const a=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate);let s=this.getAttribute("before-hydration-url");s&&await import(s),this.start()}start(){const s=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute("renderer-url"),[a,{default:r}]=await Promise.all([import(this.getAttribute("component-url")),n?import(n):()=>()=>{}]),i=this.getAttribute("component-export")||"default";if(!i.includes("."))this.Component=a[i];else{this.Component=a;for(const d of i.split("."))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=["props"],l))}`;
+var astro_island_prebuilt_default = `var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(JSON.parse(t)),9:t=>new Uint16Array(JSON.parse(t)),10:t=>new Uint32Array(JSON.parse(t))},o=(t,s)=>{if(t===""||!Array.isArray(s))return s;const[e,n]=s;return e in c?c[e](n):void 0};customElements.get("astro-island")||customElements.define("astro-island",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest("astro-island[ssr]"))return;const s=this.querySelectorAll("astro-slot"),e={},n=this.querySelectorAll("template[data-astro-template]");for(const r of n){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("data-astro-template")||"default"]=r.innerHTML,r.remove())}for(const r of s){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("name")||"default"]=r.innerHTML)}const a=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate);let s=this.getAttribute("before-hydration-url");s&&await import(s),this.start()}start(){const s=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute("renderer-url"),[a,{default:r}]=await Promise.all([import(this.getAttribute("component-url")),n?import(n):()=>()=>{}]),i=this.getAttribute("component-export")||"default";if(!i.includes("."))this.Component=a[i];else{this.Component=a;for(const d of i.split("."))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=["props"],l))}`;
 export {
   astro_island_prebuilt_default as default
 };

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

@@ -1,14 +1,23 @@
 import { escape } from 'html-escaper';
 export declare const escapeHTML: typeof escape;
+export declare class HTMLBytes extends Uint8Array {
+    get [Symbol.toStringTag](): string;
+}
 /**
  * A "blessed" extension of String that tells Astro that the string
  * has already been escaped. This helps prevent double-escaping of HTML.
  */
 export declare class HTMLString extends String {
+    get [Symbol.toStringTag](): string;
 }
+declare type BlessedType = string | HTMLBytes;
 /**
  * markHTMLString marks a string as raw or "already escaped" by returning
  * a `HTMLString` instance. This is meant for internal use, and should not
  * be returned through any public JS API.
  */
 export declare const markHTMLString: (value: any) => any;
+export declare function isHTMLString(value: any): value is HTMLString;
+export declare function isHTMLBytes(value: any): value is HTMLBytes;
+export declare function unescapeHTML(str: any): BlessedType | Promise<BlessedType | AsyncGenerator<BlessedType, void, unknown>> | AsyncGenerator<BlessedType, void, unknown>;
+export {};

package/dist/runtime/server/escape.js

@@ -1,6 +1,14 @@
 import { escape } from "html-escaper";
 const escapeHTML = escape;
+class HTMLBytes extends Uint8Array {
+  get [Symbol.toStringTag]() {
+    return "HTMLBytes";
+  }
+}
 class HTMLString extends String {
+  get [Symbol.toStringTag]() {
+    return "HTMLString";
+  }
 }
 const markHTMLString = (value) => {
   if (value instanceof HTMLString) {
@@ -11,8 +19,50 @@ const markHTMLString = (value) => {
   }
   return value;
 };
+function isHTMLString(value) {
+  return Object.prototype.toString.call(value) === "[object HTMLString]";
+}
+function markHTMLBytes(bytes) {
+  return new HTMLBytes(bytes);
+}
+function isHTMLBytes(value) {
+  return Object.prototype.toString.call(value) === "[object HTMLBytes]";
+}
+async function* unescapeChunksAsync(iterable) {
+  for await (const chunk of iterable) {
+    yield unescapeHTML(chunk);
+  }
+}
+function* unescapeChunks(iterable) {
+  for (const chunk of iterable) {
+    yield unescapeHTML(chunk);
+  }
+}
+function unescapeHTML(str) {
+  if (!!str && typeof str === "object") {
+    if (str instanceof Uint8Array) {
+      return markHTMLBytes(str);
+    } else if (str instanceof Response && str.body) {
+      const body = str.body;
+      return unescapeChunksAsync(body);
+    } else if (typeof str.then === "function") {
+      return Promise.resolve(str).then((value) => {
+        return unescapeHTML(value);
+      });
+    } else if (Symbol.iterator in str) {
+      return unescapeChunks(str);
+    } else if (Symbol.asyncIterator in str) {
+      return unescapeChunksAsync(str);
+    }
+  }
+  return markHTMLString(str);
+}
 export {
+  HTMLBytes,
   HTMLString,
   escapeHTML,
-  markHTMLString
+  isHTMLBytes,
+  isHTMLString,
+  markHTMLString,
+  unescapeHTML
 };

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

@@ -1,6 +1,6 @@
 export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
-export { escapeHTML, HTMLString, markHTMLString, markHTMLString as unescapeHTML, } from './escape.js';
+export { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from './escape.js';
 export type { Metadata } from './metadata';
 export { createMetadata } from './metadata.js';
 export { addAttribute, defineScriptVars, Fragment, maybeRenderHead, renderAstroComponent, renderComponent, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderSlot, renderTemplate as render, renderTemplate, renderToString, stringifyChunk, voidElementNames, } from './render/index.js';

package/dist/runtime/server/index.js

@@ -1,11 +1,6 @@
 import { createAstro } from "./astro-global.js";
 import { renderEndpoint } from "./endpoint.js";
-import {
-  escapeHTML,
-  HTMLString,
-  markHTMLString,
-  markHTMLString as markHTMLString2
-} from "./escape.js";
+import { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from "./escape.js";
 import { createMetadata } from "./metadata.js";
 import {
   addAttribute,
@@ -25,7 +20,7 @@ import {
   stringifyChunk,
   voidElementNames
 } from "./render/index.js";
-import { markHTMLString as markHTMLString3 } from "./escape.js";
+import { markHTMLString as markHTMLString2 } from "./escape.js";
 import { Renderer as Renderer2 } from "./render/index.js";
 import { addAttribute as addAttribute2 } from "./render/index.js";
 function createComponent(cb) {
@@ -70,7 +65,7 @@ function spreadAttributes(values, _name, { class: scopedClassName } = {}) {
   for (const [key, value] of Object.entries(values)) {
     output += addAttribute2(value, key, true);
   }
-  return markHTMLString3(output);
+  return markHTMLString2(output);
 }
 function defineStyleVars(defs) {
   let output = "";
@@ -82,10 +77,11 @@ function defineStyleVars(defs) {
       }
     }
   }
-  return markHTMLString3(output);
+  return markHTMLString2(output);
 }
 export {
   Fragment,
+  HTMLBytes,
   HTMLString,
   Renderer,
   __astro_tag_component__,
@@ -111,6 +107,6 @@ export {
   renderToString,
   spreadAttributes,
   stringifyChunk,
-  markHTMLString2 as unescapeHTML,
+  unescapeHTML,
   voidElementNames
 };

package/dist/runtime/server/jsx.js

@@ -6,9 +6,9 @@ import {
   renderComponent,
   renderToString,
   spreadAttributes,
-  stringifyChunk,
   voidElementNames
 } from "./index.js";
+import { HTMLParts } from "./render/common.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 const skipAstroJSXCheck = /* @__PURE__ */ new WeakSet();
 let originalConsoleError;
@@ -131,12 +131,11 @@ async function renderJSX(result, vnode) {
         );
       }
       if (typeof output !== "string" && Symbol.asyncIterator in output) {
-        let body = "";
+        let parts = new HTMLParts();
         for await (const chunk of output) {
-          let html = stringifyChunk(result, chunk);
-          body += html;
+          parts.append(chunk, result);
         }
-        return markHTMLString(body);
+        return markHTMLString(parts.toString());
       } else {
         return markHTMLString(output);
       }

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

@@ -16,7 +16,9 @@ async function* renderChild(child) {
   } else if (!child && child !== 0) {
   } else if (child instanceof AstroComponent || Object.prototype.toString.call(child) === "[object AstroComponent]") {
     yield* renderAstroComponent(child);
-  } else if (typeof child === "object" && Symbol.asyncIterator in child) {
+  } else if (ArrayBuffer.isView(child)) {
+    yield child;
+  } else if (typeof child === "object" && (Symbol.asyncIterator in child || Symbol.iterator in child)) {
     yield* child;
   } else {
     yield child;

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

@@ -1,6 +1,7 @@
 import type { SSRResult } from '../../../@types/astro';
 import type { AstroComponentFactory } from './index';
 import type { RenderInstruction } from './types';
+import { HTMLBytes } from '../escape.js';
 export declare class AstroComponent {
     private htmlParts;
     private expressions;
@@ -10,7 +11,7 @@ export declare class AstroComponent {
 }
 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 renderAstroComponent(component: InstanceType<typeof AstroComponent>): AsyncIterable<string | HTMLBytes | 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>>;
+export declare function renderToIterable(result: SSRResult, componentFactory: AstroComponentFactory, displayName: string, props: any, children: any): Promise<AsyncIterable<string | HTMLBytes | RenderInstruction>>;
 export declare function renderTemplate(htmlParts: TemplateStringsArray, ...expressions: any[]): Promise<AstroComponent>;

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

@@ -1,7 +1,7 @@
 import { markHTMLString } from "../escape.js";
 import { HydrationDirectiveProps } from "../hydration.js";
 import { renderChild } from "./any.js";
-import { stringifyChunk } from "./common.js";
+import { HTMLParts } from "./common.js";
 function validateComponentProps(props, displayName) {
   var _a;
   if (((_a = import.meta.env) == null ? void 0 : _a.DEV) && props != null) {
@@ -62,11 +62,11 @@ async function renderToString(result, componentFactory, props, children) {
     const response = Component;
     throw response;
   }
-  let html = "";
+  let parts = new HTMLParts();
   for await (const chunk of renderAstroComponent(Component)) {
-    html += stringifyChunk(result, chunk);
+    parts.append(chunk, result);
   }
-  return html;
+  return parts.toString();
 }
 async function renderToIterable(result, componentFactory, displayName, props, children) {
   validateComponentProps(props, displayName);

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

@@ -1,5 +1,17 @@
 import type { SSRResult } from '../../../@types/astro';
 import type { RenderInstruction } from './types.js';
+import { HTMLBytes } from '../escape.js';
 export declare const Fragment: unique symbol;
 export declare const Renderer: unique symbol;
+export declare const encoder: TextEncoder;
+export declare const decoder: TextDecoder;
 export declare function stringifyChunk(result: SSRResult, chunk: string | RenderInstruction): any;
+export declare class HTMLParts {
+    parts: Array<HTMLBytes | string>;
+    constructor();
+    append(part: string | HTMLBytes | RenderInstruction, result: SSRResult): void;
+    toString(): string;
+    toArrayBuffer(): Uint8Array;
+}
+export declare function chunkToByteArray(result: SSRResult, chunk: string | HTMLBytes | RenderInstruction): Uint8Array;
+export declare function concatUint8Arrays(arrays: Array<Uint8Array>): Uint8Array;

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

@@ -6,6 +6,8 @@ import {
 } from "../scripts.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": {
@@ -25,8 +27,61 @@ function stringifyChunk(result, chunk) {
     }
   }
 }
+class HTMLParts {
+  constructor() {
+    this.parts = [];
+  }
+  append(part, result) {
+    if (ArrayBuffer.isView(part)) {
+      this.parts.push(part);
+    } else {
+      this.parts.push(stringifyChunk(result, part));
+    }
+  }
+  toString() {
+    let html = "";
+    for (const part of this.parts) {
+      if (ArrayBuffer.isView(part)) {
+        html += decoder.decode(part);
+      } else {
+        html += part;
+      }
+    }
+    return html;
+  }
+  toArrayBuffer() {
+    this.parts.forEach((part, i) => {
+      if (typeof part === "string") {
+        this.parts[i] = encoder.encode(String(part));
+      }
+    });
+    return concatUint8Arrays(this.parts);
+  }
+}
+function chunkToByteArray(result, chunk) {
+  if (chunk instanceof Uint8Array) {
+    return chunk;
+  }
+  return encoder.encode(stringifyChunk(result, chunk));
+}
+function concatUint8Arrays(arrays) {
+  let len = 0;
+  arrays.forEach((arr) => len += arr.length);
+  let merged = new Uint8Array(len);
+  let offset = 0;
+  arrays.forEach((arr) => {
+    merged.set(arr, offset);
+    offset += arr.length;
+  });
+  return merged;
+}
 export {
   Fragment,
+  HTMLParts,
   Renderer,
+  chunkToByteArray,
+  concatUint8Arrays,
+  decoder,
+  encoder,
   stringifyChunk
 };

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

@@ -1,3 +1,4 @@
 import type { SSRResult } from '../../../@types/astro';
 import type { RenderInstruction } from './types.js';
-export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<string | AsyncIterable<string | RenderInstruction>>;
+import { HTMLBytes } from '../escape.js';
+export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<string | AsyncIterable<string | HTMLBytes | RenderInstruction>>;

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

@@ -1,9 +1,9 @@
+import { isHTMLString } from "../escape.js";
 import { createResponse } from "../response.js";
 import { isAstroComponent, isAstroComponentFactory, renderAstroComponent } from "./astro.js";
-import { stringifyChunk } from "./common.js";
+import { chunkToByteArray, encoder, HTMLParts } 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];
@@ -50,13 +50,15 @@ async function renderPage(result, componentFactory, props, children, streaming)
             let i = 0;
             try {
               for await (const chunk of iterable) {
-                let html = stringifyChunk(result, chunk);
-                if (i === 0) {
-                  if (!/<!doctype html/i.test(html)) {
-                    controller.enqueue(encoder.encode("<!DOCTYPE html>\n"));
+                if (isHTMLString(chunk)) {
+                  if (i === 0) {
+                    if (!/<!doctype html/i.test(String(chunk))) {
+                      controller.enqueue(encoder.encode("<!DOCTYPE html>\n"));
+                    }
                   }
                 }
-                controller.enqueue(encoder.encode(String(html)));
+                let bytes = chunkToByteArray(result, chunk);
+                controller.enqueue(bytes);
                 i++;
               }
               controller.close();
@@ -68,20 +70,21 @@ async function renderPage(result, componentFactory, props, children, streaming)
         }
       });
     } else {
-      body = "";
+      let parts = new HTMLParts();
       let i = 0;
       for await (const chunk of iterable) {
-        let html = stringifyChunk(result, chunk);
-        if (i === 0) {
-          if (!/<!doctype html/i.test(html)) {
-            body += "<!DOCTYPE html>\n";
+        if (isHTMLString(chunk)) {
+          if (i === 0) {
+            if (!/<!doctype html/i.test(String(chunk))) {
+              parts.append("<!DOCTYPE html>\n", result);
+            }
           }
         }
-        body += html;
+        parts.append(chunk, result);
         i++;
       }
-      const bytes = encoder.encode(body);
-      headers.set("Content-Length", bytes.byteLength.toString());
+      body = parts.toArrayBuffer();
+      headers.set("Content-Length", body.byteLength.toString());
     }
     let response = createResponse(body, { ...init, headers });
     return response;

package/dist/runtime/server/response.js

@@ -67,7 +67,7 @@ function createResponseClass() {
   return StreamingCompatibleResponse;
 }
 const createResponse = isNodeJS ? (body, init) => {
-  if (typeof body === "string") {
+  if (typeof body === "string" || ArrayBuffer.isView(body)) {
     return new Response(body, init);
   }
   if (typeof StreamingCompatibleResponse === "undefined") {

package/dist/runtime/server/serialize.js

@@ -6,7 +6,10 @@ const PROP_TYPE = {
   Map: 4,
   Set: 5,
   BigInt: 6,
-  URL: 7
+  URL: 7,
+  Uint8Array: 8,
+  Uint16Array: 9,
+  Uint32Array: 10
 };
 function serializeArray(value, metadata = {}, parents = /* @__PURE__ */ new WeakSet()) {
   if (parents.has(value)) {
@@ -66,6 +69,15 @@ function convertToSerializedForm(value, metadata = {}, parents = /* @__PURE__ */
     case "[object Array]": {
       return [PROP_TYPE.JSON, JSON.stringify(serializeArray(value, metadata, parents))];
     }
+    case "[object Uint8Array]": {
+      return [PROP_TYPE.Uint8Array, JSON.stringify(Array.from(value))];
+    }
+    case "[object Uint16Array]": {
+      return [PROP_TYPE.Uint16Array, JSON.stringify(Array.from(value))];
+    }
+    case "[object Uint32Array]": {
+      return [PROP_TYPE.Uint32Array, JSON.stringify(Array.from(value))];
+    }
     default: {
       if (value !== null && typeof value === "object") {
         return [PROP_TYPE.Value, serializeObject(value, metadata, parents)];

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

@@ -1 +1,2 @@
 export declare function serializeListValue(value: any): string;
+export declare function isPromise<T = any>(value: any): value is Promise<T>;

package/dist/runtime/server/util.js

@@ -1,9 +1,3 @@
-function formatList(values) {
-  if (values.length === 1) {
-    return values[0];
-  }
-  return `${values.slice(0, -1).join(", ")} or ${values[values.length - 1]}`;
-}
 function serializeListValue(value) {
   const hash = {};
   push(value);
@@ -26,6 +20,10 @@ function serializeListValue(value) {
     }
   }
 }
+function isPromise(value) {
+  return !!value && typeof value === "object" && typeof value.then === "function";
+}
 export {
+  isPromise,
   serializeListValue
 };

package/dist/vite-plugin-jsx/tag.js

@@ -36,27 +36,59 @@ function tagExportsWithRenderer({
           }
         }
       },
-      ExportDeclaration(path, state) {
-        var _a, _b;
-        const node = path.node;
-        if (node.exportKind === "type")
-          return;
-        if (node.type === "ExportAllDeclaration")
-          return;
-        if (node.type === "ExportNamedDeclaration") {
-          if (t.isFunctionDeclaration(node.declaration)) {
-            if ((_a = node.declaration.id) == null ? void 0 : _a.name) {
-              const id = node.declaration.id.name;
-              const tags = state.get("astro:tags") ?? [];
-              state.set("astro:tags", [...tags, id]);
-            }
+      ExportDeclaration: {
+        enter(path) {
+          var _a, _b, _c;
+          const node = path.node;
+          if (node.type !== "ExportDefaultDeclaration")
+            return;
+          if (((_a = node.declaration) == null ? void 0 : _a.type) === "ArrowFunctionExpression") {
+            const uidIdentifier = path.scope.generateUidIdentifier("_arrow_function");
+            path.insertBefore(
+              t.variableDeclaration("const", [
+                t.variableDeclarator(uidIdentifier, node.declaration)
+              ])
+            );
+            node.declaration = uidIdentifier;
+          } else if (((_b = node.declaration) == null ? void 0 : _b.type) === "FunctionDeclaration" && !((_c = node.declaration.id) == null ? void 0 : _c.name)) {
+            const uidIdentifier = path.scope.generateUidIdentifier("_function");
+            node.declaration.id = uidIdentifier;
           }
-        } else if (node.type === "ExportDefaultDeclaration") {
-          if (t.isFunctionDeclaration(node.declaration)) {
-            if ((_b = node.declaration.id) == null ? void 0 : _b.name) {
-              const id = node.declaration.id.name;
-              const tags = state.get("astro:tags") ?? [];
-              state.set("astro:tags", [...tags, id]);
+        },
+        exit(path, state) {
+          var _a, _b, _c;
+          const node = path.node;
+          if (node.exportKind === "type")
+            return;
+          if (node.type === "ExportAllDeclaration")
+            return;
+          const addTag = (id) => {
+            const tags = state.get("astro:tags") ?? [];
+            state.set("astro:tags", [...tags, id]);
+          };
+          if (node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration") {
+            if (t.isIdentifier(node.declaration)) {
+              addTag(node.declaration.name);
+            } else if (t.isFunctionDeclaration(node.declaration) && ((_a = node.declaration.id) == null ? void 0 : _a.name)) {
+              addTag(node.declaration.id.name);
+            } else if (t.isVariableDeclaration(node.declaration)) {
+              (_b = node.declaration.declarations) == null ? void 0 : _b.forEach((declaration) => {
+                if (t.isArrowFunctionExpression(declaration.init) && t.isIdentifier(declaration.id)) {
+                  addTag(declaration.id.name);
+                }
+              });
+            } else if (t.isObjectExpression(node.declaration)) {
+              (_c = node.declaration.properties) == null ? void 0 : _c.forEach((property) => {
+                if (t.isProperty(property) && t.isIdentifier(property.key)) {
+                  addTag(property.key.name);
+                }
+              });
+            } else if (t.isExportNamedDeclaration(node)) {
+              node.specifiers.forEach((specifier) => {
+                if (t.isExportSpecifier(specifier) && t.isIdentifier(specifier.exported)) {
+                  addTag(specifier.local.name);
+                }
+              });
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.2.7",
+  "version": "1.3.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -83,8 +83,8 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^0.24.0",
-    "@astrojs/language-server": "^0.23.0",
-    "@astrojs/markdown-remark": "^1.1.1",
+    "@astrojs/language-server": "^0.26.2",
+    "@astrojs/markdown-remark": "^1.1.2",
     "@astrojs/telemetry": "^1.0.0",
     "@astrojs/webapi": "^1.0.0",
     "@babel/core": "^7.18.2",
@@ -134,6 +134,7 @@
     "strip-ansi": "^7.0.1",
     "supports-esm": "^1.0.0",
     "tsconfig-resolver": "^3.0.1",
+    "typescript": "*",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
     "vite": "~3.1.3",