astro 1.0.0-beta.45 → 1.0.0-beta.48

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.45";
+  const version = "1.0.0-beta.48";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.45" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.48" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.45",
+          astroVersion: "1.0.0-beta.48",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -108,7 +108,7 @@ async function cli(args) {
     case "dev": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.45", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.48", cliCommand: "dev" }, userConfig, flags));
         await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
@@ -119,7 +119,7 @@ async function cli(args) {
     case "build": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.45", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.48", cliCommand: "build" }, userConfig, flags));
         return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
@@ -127,14 +127,14 @@ async function cli(args) {
     }
     case "check": {
       const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.45", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.48", cliCommand: "check" }, userConfig, flags));
       const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.45", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.48", cliCommand: "preview" }, userConfig, flags));
         const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.45",
+          astroVersion: "1.0.0-beta.48",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/build/generate.js

@@ -34,6 +34,9 @@ function* throttle(max, inPaths) {
     yield tmp;
   }
 }
+function shouldSkipDraft(pageModule, astroConfig) {
+  return !astroConfig.markdown.drafts && "frontmatter" in pageModule && pageModule.frontmatter.draft === true;
+}
 function rootRelativeFacadeId(facadeId, astroConfig) {
   return facadeId.slice(fileURLToPath(astroConfig.root).length);
 }
@@ -73,6 +76,10 @@ async function generatePage(opts, internals, pageData, ssrEntry) {
   if (!pageModule) {
     throw new Error(`Unable to find the module for ${pageData.component}. This is unexpected and likely a bug in Astro, please report.`);
   }
+  if (shouldSkipDraft(pageModule, opts.astroConfig)) {
+    info(opts.logging, null, `${magenta("\u26A0\uFE0F")}  Skipping draft ${pageData.route.component}`);
+    return;
+  }
   const generationOptions = {
     pageData,
     internals,

package/dist/core/build/graph.js

@@ -0,0 +1,27 @@
+import { resolvedPagesVirtualModuleId } from "../app/index.js";
+function* walkParentInfos(id, ctx, seen = /* @__PURE__ */ new Set()) {
+  seen.add(id);
+  const info = ctx.getModuleInfo(id);
+  if (info) {
+    yield info;
+  }
+  const importers = ((info == null ? void 0 : info.importers) || []).concat((info == null ? void 0 : info.dynamicImporters) || []);
+  for (const imp of importers) {
+    if (seen.has(imp)) {
+      continue;
+    }
+    yield* walkParentInfos(imp, ctx, seen);
+  }
+}
+function* getTopLevelPages(id, ctx) {
+  for (const info of walkParentInfos(id, ctx)) {
+    const importers = ((info == null ? void 0 : info.importers) || []).concat((info == null ? void 0 : info.dynamicImporters) || []);
+    if (importers.length <= 2 && importers[0] === resolvedPagesVirtualModuleId) {
+      yield info.id;
+    }
+  }
+}
+export {
+  getTopLevelPages,
+  walkParentInfos
+};

package/dist/core/build/index.js

@@ -33,7 +33,7 @@ class AstroBuilder {
     this.logging = options.logging;
     this.routeCache = new RouteCache(this.logging);
     this.origin = config.site ? new URL(config.site).origin : `http://localhost:${config.server.port}`;
-    this.manifest = createRouteManifest({ config }, this.logging);
+    this.manifest = { routes: [] };
     this.timer = {};
   }
   async setup() {
@@ -42,6 +42,7 @@ class AstroBuilder {
     this.timer.init = performance.now();
     this.timer.viteStart = performance.now();
     this.config = await runHookConfigSetup({ config: this.config, command: "build" });
+    this.manifest = createRouteManifest({ config: this.config }, this.logging);
     const viteConfig = await createVite({
       mode: this.mode,
       server: {
@@ -78,15 +79,6 @@ class AstroBuilder {
       viteServer,
       ssr: isBuildingToSSR(this.config)
     });
-    Object.entries(allPages).forEach(([page, data]) => {
-      if ("frontmatter" in data.preload[1]) {
-        const frontmatter = data.preload[1].frontmatter;
-        if (Boolean(frontmatter.draft) && !this.config.markdown.drafts) {
-          debug("build", timerMessage(`Skipping draft page ${page}`, this.timer.loadStart));
-          delete allPages[page];
-        }
-      }
-    });
     debug("build", timerMessage("All pages loaded", this.timer.loadStart));
     const pageNames = [];
     this.timer.buildStart = performance.now();

package/dist/core/build/internal.js

@@ -14,7 +14,11 @@ function createBuildInternals() {
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
     pagesByComponent: /* @__PURE__ */ new Map(),
     pagesByViteID: /* @__PURE__ */ new Map(),
-    pagesByClientOnly: /* @__PURE__ */ new Map()
+    pagesByClientOnly: /* @__PURE__ */ new Map(),
+    discoveredHydratedComponents: /* @__PURE__ */ new Set(),
+    discoveredClientOnlyComponents: /* @__PURE__ */ new Set(),
+    discoveredScripts: /* @__PURE__ */ new Set(),
+    staticFiles: /* @__PURE__ */ new Set()
   };
 }
 function trackPageData(internals, component, pageData, componentModuleId, componentURL) {

package/dist/core/build/page-data.js

@@ -3,7 +3,6 @@ import * as colors from "kleur/colors";
 import { fileURLToPath } from "url";
 import { debug } from "../logger/core.js";
 import { removeTrailingForwardSlash } from "../path.js";
-import { preload as ssrPreload } from "../render/dev/index.js";
 import { callGetStaticPaths } from "../render/route-cache.js";
 import { matchRoute } from "../routing/match.js";
 import { isBuildingToSSR } from "../util.js";
@@ -31,26 +30,15 @@ async function collectPagesData(opts) {
         moduleSpecifier: "",
         css: /* @__PURE__ */ new Set(),
         hoistedScript: void 0,
-        scripts: /* @__PURE__ */ new Set(),
-        preload: await ssrPreload({
-          astroConfig,
-          filePath: new URL(`./${route.component}`, astroConfig.root),
-          viteServer
-        }).then((routes) => {
-          clearInterval(routeCollectionLogTimeout);
-          if (buildMode === "static") {
-            const html = `${route.pathname}`.replace(/\/?$/, "/index.html");
-            debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component} \u2192 ${colors.yellow(html)}`);
-          } else {
-            debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component}`);
-          }
-          return routes;
-        }).catch((err) => {
-          clearInterval(routeCollectionLogTimeout);
-          debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.red("\u2718"))} ${route.component}`);
-          throw err;
-        })
+        scripts: /* @__PURE__ */ new Set()
       };
+      clearInterval(routeCollectionLogTimeout);
+      if (buildMode === "static") {
+        const html = `${route.pathname}`.replace(/\/?$/, "/index.html");
+        debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component} \u2192 ${colors.yellow(html)}`);
+      } else {
+        debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component}`);
+      }
       continue;
     }
     const result = await getStaticPathsForRoute(opts, route).then((_result) => {
@@ -79,12 +67,7 @@ async function collectPagesData(opts) {
       moduleSpecifier: "",
       css: /* @__PURE__ */ new Set(),
       hoistedScript: void 0,
-      scripts: /* @__PURE__ */ new Set(),
-      preload: await ssrPreload({
-        astroConfig,
-        filePath: new URL(`./${route.component}`, astroConfig.root),
-        viteServer
-      })
+      scripts: /* @__PURE__ */ new Set()
     };
   }
   clearInterval(dataCollectionLogTimeout);

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

@@ -22,10 +22,7 @@ import fs from "fs";
 import { bgGreen, bgMagenta, black, dim } from "kleur/colors";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
-import {
-  createBuildInternals,
-  trackClientOnlyPageDatas
-} from "../../core/build/internal.js";
+import { createBuildInternals } from "../../core/build/internal.js";
 import { prependForwardSlash } from "../../core/path.js";
 import { emptyDir, removeDir } from "../../core/util.js";
 import { runHookBuildSetup } from "../../integrations/index.js";
@@ -35,67 +32,38 @@ import { isBuildingToSSR } from "../util.js";
 import { generatePages } from "./generate.js";
 import { trackPageData } from "./internal.js";
 import { getTimeStat } from "./util.js";
+import { vitePluginAnalyzer } from "./vite-plugin-analyzer.js";
 import { vitePluginHoistedScripts } from "./vite-plugin-hoisted-scripts.js";
 import { vitePluginInternals } from "./vite-plugin-internals.js";
 import { vitePluginPages } from "./vite-plugin-pages.js";
-import { vitePluginSSR } from "./vite-plugin-ssr.js";
+import { injectManifest, vitePluginSSR } from "./vite-plugin-ssr.js";
 async function staticBuild(opts) {
   const { allPages, astroConfig } = opts;
   const pageInput = /* @__PURE__ */ new Set();
-  const jsInput = /* @__PURE__ */ new Set();
   const facadeIdToPageDataMap = /* @__PURE__ */ new Map();
   const internals = createBuildInternals();
-  const uniqueHoistedIds = /* @__PURE__ */ new Map();
   const timer = {};
   timer.buildStart = performance.now();
   for (const [component, pageData] of Object.entries(allPages)) {
     const astroModuleURL = new URL("./" + component, astroConfig.root);
     const astroModuleId = prependForwardSlash(component);
     trackPageData(internals, component, pageData, astroModuleId, astroModuleURL);
-    if (pageData.route.type === "page") {
-      const [renderers, mod] = pageData.preload;
-      const metadata = mod.$$metadata;
-      const clientOnlys = Array.from(metadata.clientOnlyComponentPaths());
-      trackClientOnlyPageDatas(internals, pageData, clientOnlys);
-      const topLevelImports = /* @__PURE__ */ new Set([
-        ...metadata.hydratedComponentPaths(),
-        ...clientOnlys,
-        ...metadata.hydrationDirectiveSpecifiers(),
-        ...renderers.filter((renderer) => !!renderer.clientEntrypoint).map((renderer) => renderer.clientEntrypoint)
-      ]);
-      const hoistedScripts = new Set(metadata.hoistedScriptPaths());
-      if (hoistedScripts.size) {
-        const uniqueHoistedId = JSON.stringify(Array.from(hoistedScripts).sort());
-        let moduleId;
-        if (uniqueHoistedIds.has(uniqueHoistedId)) {
-          moduleId = uniqueHoistedIds.get(uniqueHoistedId);
-        } else {
-          moduleId = `/astro/hoisted.js?q=${uniqueHoistedIds.size}`;
-          uniqueHoistedIds.set(uniqueHoistedId, moduleId);
-        }
-        topLevelImports.add(moduleId);
-        if (internals.hoistedScriptIdToPagesMap.has(moduleId)) {
-          const pages = internals.hoistedScriptIdToPagesMap.get(moduleId);
-          pages.add(astroModuleId);
-        } else {
-          internals.hoistedScriptIdToPagesMap.set(moduleId, /* @__PURE__ */ new Set([astroModuleId]));
-          internals.hoistedScriptIdToHoistedMap.set(moduleId, hoistedScripts);
-        }
-      }
-      for (const specifier of topLevelImports) {
-        jsInput.add(specifier);
-      }
-    }
     pageInput.add(astroModuleId);
     facadeIdToPageDataMap.set(fileURLToPath(astroModuleURL), pageData);
   }
   emptyDir(astroConfig.outDir, new Set(".git"));
-  timer.clientBuild = performance.now();
-  await clientBuild(opts, internals, jsInput);
   timer.ssr = performance.now();
   info(opts.logging, "build", isBuildingToSSR(astroConfig) ? "Building SSR entrypoints..." : "Building entrypoints for prerendering...");
   const ssrResult = await ssrBuild(opts, internals, pageInput);
   info(opts.logging, "build", dim(`Completed in ${getTimeStat(timer.ssr, performance.now())}.`));
+  const clientInput = /* @__PURE__ */ new Set([
+    ...internals.discoveredHydratedComponents,
+    ...internals.discoveredClientOnlyComponents,
+    ...astroConfig._ctx.renderers.map((r) => r.clientEntrypoint).filter((a) => a),
+    ...internals.discoveredScripts
+  ]);
+  timer.clientBuild = performance.now();
+  await clientBuild(opts, internals, clientInput);
   timer.generate = performance.now();
   if (opts.buildConfig.staticMode) {
     try {
@@ -104,6 +72,7 @@ async function staticBuild(opts) {
       await cleanSsrOutput(opts);
     }
   } else {
+    await injectManifest(opts, internals);
     info(opts.logging, null, `
 ${bgMagenta(black(" finalizing server assets "))}
 `);
@@ -150,7 +119,8 @@ async function ssrBuild(opts, internals, input) {
         target: "server"
       }),
       ...viteConfig.plugins || [],
-      isBuildingToSSR(opts.astroConfig) && vitePluginSSR(opts, internals, opts.astroConfig._ctx.adapter)
+      isBuildingToSSR(opts.astroConfig) && vitePluginSSR(opts, internals, opts.astroConfig._ctx.adapter),
+      vitePluginAnalyzer(opts.astroConfig, internals)
     ],
     publicDir: ssr ? false : viteConfig.publicDir,
     root: viteConfig.root,

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

@@ -0,0 +1,91 @@
+import { prependForwardSlash } from "../../core/path.js";
+import { getTopLevelPages } from "./graph.js";
+import { getPageDataByViteID, trackClientOnlyPageDatas } from "./internal.js";
+function vitePluginAnalyzer(astroConfig, internals) {
+  function hoistedScriptScanner() {
+    const uniqueHoistedIds = /* @__PURE__ */ new Map();
+    const pageScripts = /* @__PURE__ */ new Map();
+    return {
+      scan(scripts, from) {
+        var _a;
+        const hoistedScripts = /* @__PURE__ */ new Set();
+        for (let i = 0; i < scripts.length; i++) {
+          const hid = `${from.replace("/@fs", "")}?astro&type=script&index=${i}`;
+          hoistedScripts.add(hid);
+        }
+        if (hoistedScripts.size) {
+          for (const pageId of getTopLevelPages(from, this)) {
+            for (const hid of hoistedScripts) {
+              if (pageScripts.has(pageId)) {
+                (_a = pageScripts.get(pageId)) == null ? void 0 : _a.add(hid);
+              } else {
+                pageScripts.set(pageId, /* @__PURE__ */ new Set([hid]));
+              }
+            }
+          }
+        }
+      },
+      finalize() {
+        for (const [pageId, hoistedScripts] of pageScripts) {
+          const pageData = getPageDataByViteID(internals, pageId);
+          if (!pageData)
+            continue;
+          const { component } = pageData;
+          const astroModuleId = prependForwardSlash(component);
+          const uniqueHoistedId = JSON.stringify(Array.from(hoistedScripts).sort());
+          let moduleId;
+          if (uniqueHoistedIds.has(uniqueHoistedId)) {
+            moduleId = uniqueHoistedIds.get(uniqueHoistedId);
+          } else {
+            moduleId = `/astro/hoisted.js?q=${uniqueHoistedIds.size}`;
+            uniqueHoistedIds.set(uniqueHoistedId, moduleId);
+          }
+          internals.discoveredScripts.add(moduleId);
+          if (internals.hoistedScriptIdToPagesMap.has(moduleId)) {
+            const pages = internals.hoistedScriptIdToPagesMap.get(moduleId);
+            pages.add(astroModuleId);
+          } else {
+            internals.hoistedScriptIdToPagesMap.set(moduleId, /* @__PURE__ */ new Set([astroModuleId]));
+            internals.hoistedScriptIdToHoistedMap.set(moduleId, hoistedScripts);
+          }
+        }
+      }
+    };
+  }
+  return {
+    name: "@astro/rollup-plugin-astro-analyzer",
+    generateBundle() {
+      var _a;
+      const hoistScanner = hoistedScriptScanner();
+      const ids = this.getModuleIds();
+      for (const id of ids) {
+        const info = this.getModuleInfo(id);
+        if (!info || !((_a = info.meta) == null ? void 0 : _a.astro))
+          continue;
+        const astro = info.meta.astro;
+        for (const c of astro.hydratedComponents) {
+          internals.discoveredHydratedComponents.add(c.resolvedPath || c.specifier);
+        }
+        hoistScanner.scan.call(this, astro.scripts, id);
+        if (astro.clientOnlyComponents.length) {
+          const clientOnlys = [];
+          for (const c of astro.clientOnlyComponents) {
+            const cid = c.resolvedPath || c.specifier;
+            internals.discoveredClientOnlyComponents.add(cid);
+            clientOnlys.push(cid);
+          }
+          for (const pageId of getTopLevelPages(id, this)) {
+            const pageData = getPageDataByViteID(internals, pageId);
+            if (!pageData)
+              continue;
+            trackClientOnlyPageDatas(internals, pageData, clientOnlys);
+          }
+        }
+      }
+      hoistScanner.finalize();
+    }
+  };
+}
+export {
+  vitePluginAnalyzer
+};

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

@@ -1,4 +1,5 @@
 import glob from "fast-glob";
+import * as fs from "fs";
 import { fileURLToPath } from "url";
 import { runHookBuildSsr } from "../../integrations/index.js";
 import { BEFORE_HYDRATION_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
@@ -51,30 +52,42 @@ if(_start in adapter) {
       return void 0;
     },
     async generateBundle(_opts, bundle) {
-      const staticFiles = new Set(await glob("**/*", {
+      internals.staticFiles = new Set(await glob("**/*", {
         cwd: fileURLToPath(buildOpts.buildConfig.client)
       }));
       for (const [_chunkName, chunk] of Object.entries(bundle)) {
         if (chunk.type === "asset") {
-          staticFiles.add(chunk.fileName);
+          internals.staticFiles.add(chunk.fileName);
         }
       }
-      const manifest = buildManifest(buildOpts, internals, Array.from(staticFiles));
-      await runHookBuildSsr({ config: buildOpts.astroConfig, manifest });
-      for (const [_chunkName, chunk] of Object.entries(bundle)) {
+      for (const [chunkName, chunk] of Object.entries(bundle)) {
         if (chunk.type === "asset") {
           continue;
         }
         if (chunk.modules[resolvedVirtualModuleId]) {
-          const code = chunk.code;
-          chunk.code = code.replace(replaceExp, () => {
-            return JSON.stringify(manifest);
-          });
+          internals.ssrEntryChunk = chunk;
+          delete bundle[chunkName];
         }
       }
     }
   };
 }
+async function injectManifest(buildOpts, internals) {
+  if (!internals.ssrEntryChunk) {
+    throw new Error(`Did not generate an entry chunk for SSR`);
+  }
+  const staticFiles = internals.staticFiles;
+  const manifest = buildManifest(buildOpts, internals, Array.from(staticFiles));
+  await runHookBuildSsr({ config: buildOpts.astroConfig, manifest });
+  const chunk = internals.ssrEntryChunk;
+  const code = chunk.code;
+  chunk.code = code.replace(replaceExp, () => {
+    return JSON.stringify(manifest);
+  });
+  const serverEntryURL = new URL(buildOpts.buildConfig.serverEntry, buildOpts.buildConfig.server);
+  await fs.promises.mkdir(new URL("./", serverEntryURL), { recursive: true });
+  await fs.promises.writeFile(serverEntryURL, chunk.code, "utf-8");
+}
 function buildManifest(opts, internals, staticFiles) {
   const { astroConfig } = opts;
   const routes = [];
@@ -108,6 +121,7 @@ function buildManifest(opts, internals, staticFiles) {
   return ssrManifest;
 }
 export {
+  injectManifest,
   virtualModuleId,
   vitePluginSSR
 };

package/dist/core/config.js

@@ -205,7 +205,13 @@ See https://astro.build/config for more information.`);
     }).optional().default({})
   });
   const result = __spreadProps(__spreadValues({}, await AstroConfigRelativeSchema.parseAsync(userConfig)), {
-    _ctx: { scripts: [], renderers: [], adapter: void 0 }
+    _ctx: {
+      pageExtensions: [],
+      scripts: [],
+      renderers: [],
+      injectedRoutes: [],
+      adapter: void 0
+    }
   });
   if (!((_a = result.experimental) == null ? void 0 : _a.integrations) && !result.integrations.every((int) => int.name.startsWith("@astrojs/"))) {
     throw new Error([

package/dist/core/create-vite.js

@@ -16,7 +16,6 @@ const ALWAYS_EXTERNAL = /* @__PURE__ */ new Set([
   "@sveltejs/vite-plugin-svelte",
   "micromark-util-events-to-acorn",
   "@astrojs/markdown-remark",
-  "serialize-javascript",
   "node-fetch",
   "prismjs",
   "shiki",

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.45";
+  const currentVersion = "1.0.0-beta.48";
   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.45";
+  const version = "1.0.0-beta.48";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -60,7 +60,7 @@ function devStart({
   if (networkLogging === "host-to-expose") {
     network = `${networkPrefix}${dim("use --host to expose")}`;
   } else if (networkLogging === "visible") {
-    const ipv4Networks = Object.values(os.networkInterfaces()).flatMap((networkInterface) => networkInterface ?? []).filter((networkInterface) => (networkInterface == null ? void 0 : networkInterface.address) && (networkInterface == null ? void 0 : networkInterface.family) === "IPv4");
+    const ipv4Networks = Object.values(os.networkInterfaces()).flatMap((networkInterface) => networkInterface ?? []).filter((networkInterface) => (networkInterface == null ? void 0 : networkInterface.address) && (networkInterface == null ? void 0 : networkInterface.family) === (Number(process.version.substring(1, 5)) < 18.1 ? "IPv4" : 4));
     for (let { address } of ipv4Networks) {
       if (address.includes("127.0.0.1")) {
         const displayAddress = address.replace("127.0.0.1", localAddress);
@@ -207,7 +207,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.45"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.48"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/core/render/core.js

@@ -1,4 +1,6 @@
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -14,7 +16,8 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-import { renderHead, renderPage } from "../../runtime/server/index.js";
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { renderComponent, renderHead, renderPage } from "../../runtime/server/index.js";
 import { getParams } from "../routing/params.js";
 import { createResult } from "./result.js";
 import { callGetStaticPaths, findPathItemByKey } from "./route-cache.js";
@@ -81,8 +84,6 @@ async function render(opts) {
   const Component = await mod.default;
   if (!Component)
     throw new Error(`Expected an exported Astro component but received typeof ${typeof Component}`);
-  if (!Component.isAstroComponentFactory)
-    throw new Error(`Unable to SSR non-Astro component (${route == null ? void 0 : route.component})`);
   const result = createResult({
     links,
     styles,
@@ -99,7 +100,17 @@ async function render(opts) {
     scripts,
     ssr
   });
-  let page = await renderPage(result, Component, pageProps, null);
+  let page;
+  if (!Component.isAstroComponentFactory) {
+    const props = __spreadProps(__spreadValues({}, pageProps ?? {}), { "server:root": true });
+    const html2 = await renderComponent(result, Component.name, Component, props, null);
+    page = {
+      type: "html",
+      html: html2.toString()
+    };
+  } else {
+    page = await renderPage(result, Component, pageProps, null);
+  }
   if (page.type === "response") {
     return page;
   }

package/dist/core/render/result.js

@@ -190,6 +190,7 @@ ${extra}`);
     },
     resolve,
     _metadata: {
+      needsHydrationStyles: false,
       renderers,
       pathname
     },