astro 1.2.8 → 1.3.1

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/cli/index.js

@@ -187,7 +187,7 @@ async function runCommand(cmd, flags) {
       });
     }
     case "build": {
-      return await build(settings, { logging, telemetry });
+      return await build(settings, { ...flags, logging, telemetry });
     }
     case "check": {
       const ret = await check(settings);

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/index.js

@@ -64,6 +64,7 @@ class AstroBuilder {
       serverEntry: "entry.mjs"
     };
     await runHookBuildStart({ config: this.settings.config, buildConfig, logging: this.logging });
+    this.validateConfig();
     info(this.logging, "build", `output target: ${colors.green(this.settings.config.output)}`);
     if (this.settings.adapter) {
       info(this.logging, "build", `deploy adapter: ${colors.green(this.settings.adapter.name)}`);
@@ -129,6 +130,14 @@ class AstroBuilder {
       throw fixViteErrorMessage(_err);
     }
   }
+  validateConfig() {
+    const { config } = this.settings;
+    if (config.outDir.toString() === config.root.toString()) {
+      throw new Error(
+        `the outDir cannot be the root folder. Please build to a folder such as dist.`
+      );
+    }
+  }
   async printStats({
     logging,
     timeStart,

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

@@ -1,6 +1,7 @@
 import glob from "fast-glob";
 import fs from "fs";
 import { bgGreen, bgMagenta, black, dim } from "kleur/colors";
+import path from "path";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
 import { createBuildInternals } from "../../core/build/internal.js";
@@ -82,8 +83,8 @@ async function ssrBuild(opts, internals, input) {
   const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir);
   const viteBuildConfig = {
     ...viteConfig,
+    mode: viteConfig.mode || "production",
     logLevel: opts.viteConfig.logLevel ?? "error",
-    mode: "production",
     build: {
       target: "esnext",
       ...viteConfig.build,
@@ -147,8 +148,8 @@ async function clientBuild(opts, internals, input) {
 ${bgGreen(black(" building client "))}`);
   const viteBuildConfig = {
     ...viteConfig,
+    mode: viteConfig.mode || "production",
     logLevel: "info",
-    mode: "production",
     build: {
       target: "esnext",
       ...viteConfig.build,
@@ -194,19 +195,38 @@ ${bgGreen(black(" building client "))}`);
 }
 async function cleanSsrOutput(opts) {
   const out = getOutDirWithinCwd(opts.settings.config.outDir);
+  const files = await glob("**/*.mjs", {
+    cwd: fileURLToPath(out)
+  });
+  if (files.length) {
+    await Promise.all(
+      files.map(async (filename) => {
+        const url = new URL(filename, out);
+        await fs.promises.rm(url);
+      })
+    );
+    const directories = /* @__PURE__ */ new Set();
+    files.forEach((i) => {
+      const splitFilePath = i.split(path.sep);
+      if (splitFilePath.length > 1) {
+        directories.add(splitFilePath[0]);
+      }
+    });
+    await Promise.all(
+      Array.from(directories).map(async (filename) => {
+        const url = new URL(filename, out);
+        const folder = await fs.promises.readdir(url);
+        if (!folder.length) {
+          await fs.promises.rmdir(url, { recursive: true });
+        }
+      })
+    );
+  }
   if (out.toString() !== opts.settings.config.outDir.toString()) {
+    copyFiles(out, opts.settings.config.outDir);
     await fs.promises.rm(out, { recursive: true });
     return;
   }
-  const files = await glob("**/*.mjs", {
-    cwd: fileURLToPath(out)
-  });
-  await Promise.all(
-    files.map(async (filename) => {
-      const url = new URL(filename, out);
-      await fs.promises.rm(url);
-    })
-  );
 }
 async function copyFiles(fromFolder, toFolder) {
   const files = await glob("**/*", {

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.8";
+  const currentVersion = "1.3.1";
   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/endpoint/index.js

@@ -8,7 +8,7 @@ async function call(mod, opts) {
     );
   }
   const [params] = paramsAndPropsResp;
-  const response = await renderEndpoint(mod, opts.request, params);
+  const response = await renderEndpoint(mod, opts.request, params, opts.ssr);
   if (response instanceof Response) {
     return {
       type: "response",

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.8";
+  const version = "1.3.1";
   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: ipv4Address } of ipv4Networks) {
+      if (ipv4Address.includes("127.0.0.1")) {
+        const displayAddress = ipv4Address.replace("127.0.0.1", localAddress);
+        local = toDisplayUrl(displayAddress);
+      } else {
+        network = toDisplayUrl(ipv4Address);
+      }
+    }
+  }
+  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.8"}`
+        `v${"1.3.1"}`
       )} ${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/path.d.ts

@@ -1,3 +1,4 @@
+export declare function appendExtension(path: string, extension: string): string;
 export declare function appendForwardSlash(path: string): string;
 export declare function prependForwardSlash(path: string): string;
 export declare function removeTrailingForwardSlash(path: string): string;

package/dist/core/path.js

@@ -1,3 +1,6 @@
+function appendExtension(path, extension) {
+  return path + "." + extension;
+}
 function appendForwardSlash(path) {
   return path.endsWith("/") ? path : path + "/";
 }
@@ -41,6 +44,7 @@ function removeFileExtension(path) {
   return idx === -1 ? path : path.slice(0, idx);
 }
 export {
+  appendExtension,
   appendForwardSlash,
   isRelativePath,
   joinPaths,

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/route-cache.js

@@ -62,14 +62,11 @@ class RouteCache {
 }
 function findPathItemByKey(staticPaths, params) {
   const paramsKey = stringifyParams(params);
-  let matchedStaticPath = staticPaths.keyed.get(paramsKey);
+  const matchedStaticPath = staticPaths.keyed.get(paramsKey);
   if (matchedStaticPath) {
     return matchedStaticPath;
   }
   debug("findPathItemByKey", `Unexpected cache miss looking for ${paramsKey}`);
-  matchedStaticPath = staticPaths.find(
-    ({ params: _params }) => JSON.stringify(_params) === paramsKey
-  );
 }
 export {
   RouteCache,

package/dist/core/routing/params.js

@@ -17,7 +17,7 @@ function stringifyParams(params) {
   const validatedParams = Object.entries(params).reduce((acc, next) => {
     validateGetStaticPathsParameter(next);
     const [key, value] = next;
-    acc[key] = `${value}`;
+    acc[key] = typeof value === "undefined" ? void 0 : `${value}`;
     return acc;
   }, {});
   return JSON.stringify(validatedParams, Object.keys(params).sort());

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.8";
+const ASTRO_VERSION = "1.3.1";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -87,7 +87,7 @@ function resolveDependency(dep, projectRoot) {
   return pathToFileURL(resolved).toString();
 }
 function viteID(filePath) {
-  return slash(fileURLToPath(filePath) + filePath.search);
+  return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, "/");
 }
 const VALID_ID_PREFIX = `/@id/`;
 function unwrapId(id) {

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;