astro 0.25.2 → 0.26.0

package/dist/core/messages.js

@@ -1,7 +1,7 @@
-import stripAnsi from "strip-ansi";
 import { bold, dim, red, green, underline, yellow, bgYellow, cyan, bgGreen, black, bgRed, bgWhite } from "kleur/colors";
-import { pad, emoji, getLocalAddress, getNetworkLogging } from "./dev/util.js";
 import os from "os";
+import { collectErrorMetadata, cleanErrorStack } from "./errors.js";
+import { emoji, getLocalAddress, padMultilineString } from "./util.js";
 const PREFIX_PADDING = 6;
 function req({ url, statusCode, reqTime }) {
   let color = dim;
@@ -13,13 +13,13 @@ function req({ url, statusCode, reqTime }) {
     color = dim;
   else if (statusCode >= 200)
     color = green;
-  return `${bold(color(pad(`${statusCode}`, PREFIX_PADDING)))} ${pad(url, 40)} ${reqTime ? dim(Math.round(reqTime) + "ms") : ""}`.trim();
+  return `${bold(color(`${statusCode}`.padStart(PREFIX_PADDING)))} ${url.padStart(40)} ${reqTime ? dim(Math.round(reqTime) + "ms") : ""}`.trim();
 }
 function reload({ file }) {
-  return `${green(pad("reload", PREFIX_PADDING))} ${file}`;
+  return `${green("reload".padStart(PREFIX_PADDING))} ${file}`;
 }
 function hmr({ file }) {
-  return `${green(pad("update", PREFIX_PADDING))} ${file}`;
+  return `${green("update".padStart(PREFIX_PADDING))} ${file}`;
 }
 function devStart({
   startupTime,
@@ -28,13 +28,13 @@ function devStart({
   https,
   site
 }) {
-  const version = "0.25.2";
+  const version = "0.26.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);
-  const networkLogging = getNetworkLogging(config);
+  const localAddress = getLocalAddress(networkAddress, config.server.host);
+  const networkLogging = getNetworkLogging(config.server.host);
   const toDisplayUrl = (hostname) => `${https ? "https" : "http"}://${hostname}:${port}${rootPath}`;
   let addresses = [];
   if (networkLogging === "none") {
@@ -66,35 +66,59 @@ function success(message, tip) {
   const headline = green(message);
   const footer = tip ? `
   \u25B6 ${tip}` : void 0;
-  return ["", badge, headline, footer].filter((v) => v !== void 0).map((msg) => `  ${msg}`).join("\n");
+  return ["", `${badge} ${headline}`, footer].filter((v) => v !== void 0).map((msg) => `  ${msg}`).join("\n");
 }
 function failure(message, tip) {
   const badge = bgRed(black(` error `));
   const headline = red(message);
   const footer = tip ? `
   \u25B6 ${tip}` : void 0;
-  return ["", badge, headline, footer].filter((v) => v !== void 0).map((msg) => `  ${msg}`).join("\n");
+  return ["", `${badge} ${headline}`, footer].filter((v) => v !== void 0).map((msg) => `  ${msg}`).join("\n");
 }
 function cancelled(message, tip) {
   const badge = bgYellow(black(` cancelled `));
   const headline = yellow(message);
   const footer = tip ? `
   \u25B6 ${tip}` : void 0;
-  return ["", badge, headline, footer].filter((v) => v !== void 0).map((msg) => `  ${msg}`).join("\n");
+  return ["", `${badge} ${headline}`, footer].filter((v) => v !== void 0).map((msg) => `  ${msg}`).join("\n");
 }
 function portInUse({ port }) {
   return `Port ${port} in use. Trying a new one\u2026`;
 }
-function err(error) {
-  if (!error.stack)
-    return stripAnsi(error.message);
-  let message = stripAnsi(error.message);
-  let stack = stripAnsi(error.stack);
-  const split = stack.indexOf(message) + message.length;
-  message = stack.slice(0, split);
-  stack = stack.slice(split).replace(/^\n+/, "");
-  return `${message}
-${dim(stack)}`;
+const LOCAL_IP_HOSTS = /* @__PURE__ */ new Set(["localhost", "127.0.0.1"]);
+function getNetworkLogging(host) {
+  if (host === false) {
+    return "host-to-expose";
+  } else if (typeof host === "string" && LOCAL_IP_HOSTS.has(host)) {
+    return "none";
+  } else {
+    return "visible";
+  }
+}
+function formatConfigErrorMessage(err) {
+  const errorList = err.issues.map((issue) => `  ! ${bold(issue.path.join("."))}  ${red(issue.message + ".")}`);
+  return `${red("[config]")} Astro found issue(s) with your configuration:
+${errorList.join("\n")}`;
+}
+function formatErrorMessage(_err, args = []) {
+  const err = collectErrorMetadata(_err);
+  args.push(`${bgRed(black(` error `))}${red(bold(padMultilineString(err.message)))}`);
+  if (err.id) {
+    args.push(`  ${bold("File:")}`);
+    args.push(red(`    ${err.id}`));
+  }
+  if (err.frame) {
+    args.push(`  ${bold("Code:")}`);
+    args.push(red(padMultilineString(err.frame, 4)));
+  }
+  if (args.length === 1 && err.stack) {
+    args.push(dim(cleanErrorStack(err.stack)));
+  } else if (err.stack) {
+    args.push(`  ${bold("Stacktrace:")}`);
+    args.push(dim(cleanErrorStack(err.stack)));
+    args.push(``);
+  }
+  return args.join("\n");
 }
 function printHelp({
   commandName,
@@ -112,7 +136,7 @@ function printHelp({
     });
     let raw = "";
     for (const row of rows) {
-      raw += `${opts.prefix}${bold(pad(`${row[0]}`, opts.padding - opts.prefix.length))}`;
+      raw += `${opts.prefix}${bold(`${row[0]}`.padStart(opts.padding - opts.prefix.length))}`;
       if (split)
         raw += "\n    ";
       raw += dim(row[1]) + "\n";
@@ -121,7 +145,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"0.25.2"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"0.26.0"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);
@@ -137,8 +161,10 @@ function printHelp({
 export {
   cancelled,
   devStart,
-  err,
   failure,
+  formatConfigErrorMessage,
+  formatErrorMessage,
+  getNetworkLogging,
   hmr,
   portInUse,
   prerelease,

package/dist/core/preview/index.js

@@ -3,16 +3,16 @@ import sirv from "sirv";
 import { performance } from "perf_hooks";
 import { fileURLToPath } from "url";
 import * as msg from "../messages.js";
-import { error, info } from "../logger.js";
+import { error, info } from "../logger/core.js";
 import { subpathNotUsedTemplate, notFoundTemplate } from "../../template/4xx.js";
 import { getResolvedHostForHttpServer } from "./util.js";
 const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
 async function preview(config, { logging }) {
   const startServerTime = performance.now();
   const defaultOrigin = "http://localhost";
-  const trailingSlash = config.devOptions.trailingSlash;
-  let baseURL = new URL(config.buildOptions.site || "/", defaultOrigin);
-  const staticFileServer = sirv(fileURLToPath(config.dist), {
+  const trailingSlash = config.trailingSlash;
+  let baseURL = new URL(config.base, new URL(config.site || "/", defaultOrigin));
+  const staticFileServer = sirv(fileURLToPath(config.outDir), {
     dev: true,
     etag: true,
     maxAge: 0
@@ -34,10 +34,10 @@ async function preview(config, { logging }) {
     }
     switch (true) {
       case (hasTrailingSlash && trailingSlash == "never" && !isRoot):
-        sendError('Not Found (devOptions.trailingSlash is set to "never")');
+        sendError('Not Found (trailingSlash is set to "never")');
         return;
       case (!hasTrailingSlash && trailingSlash == "always" && !isRoot && !HAS_FILE_EXTENSION_REGEXP.test(pathname)):
-        sendError('Not Found (devOptions.trailingSlash is set to "always")');
+        sendError('Not Found (trailingSlash is set to "always")');
         return;
       default: {
         req.url = "/" + ((_a = req.url) == null ? void 0 : _a.replace(baseURL.pathname, ""));
@@ -46,8 +46,8 @@ async function preview(config, { logging }) {
       }
     }
   });
-  let { port } = config.devOptions;
-  const host = getResolvedHostForHttpServer(config);
+  let { port } = config.server;
+  const host = getResolvedHostForHttpServer(config.server.host);
   let httpServer;
   function startServer(timerStart) {
     let showedPortTakenMsg = false;

package/dist/core/preview/util.js

@@ -1,13 +1,10 @@
-function getResolvedHostForHttpServer(config) {
-  const { host, hostname } = config.devOptions;
-  if (host === false && hostname === "localhost") {
+function getResolvedHostForHttpServer(host) {
+  if (host === false) {
     return "127.0.0.1";
   } else if (host === true) {
     return void 0;
-  } else if (typeof host === "string") {
-    return host;
   } else {
-    return hostname;
+    return host;
   }
 }
 export {

package/dist/core/render/core.js

@@ -15,7 +15,7 @@ var __spreadValues = (a, b) => {
   return a;
 };
 import { renderHead, renderPage } from "../../runtime/server/index.js";
-import { getParams } from "../routing/index.js";
+import { getParams } from "../routing/params.js";
 import { createResult } from "./result.js";
 import { findPathItemByKey, callGetStaticPaths } from "./route-cache.js";
 var GetParamsAndPropsError = /* @__PURE__ */ ((GetParamsAndPropsError2) => {
@@ -49,7 +49,7 @@ async function getParamsAndProps(opts) {
   return [params, pageProps];
 }
 async function render(opts) {
-  const { headers, legacyBuild, links, logging, origin, markdownRender, method, mod, pathname, scripts, renderers, resolve, route, routeCache, site, ssr } = opts;
+  const { legacyBuild, links, logging, origin, markdownRender, mod, pathname, scripts, renderers, request, resolve, route, routeCache, site, ssr } = opts;
   const paramsAndPropsRes = await getParamsAndProps({
     logging,
     mod,
@@ -77,11 +77,10 @@ async function render(opts) {
     pathname,
     resolve,
     renderers,
+    request,
     site,
     scripts,
-    ssr,
-    method,
-    headers
+    ssr
   });
   let page = await renderPage(result, Component, pageProps, null);
   if (page.type === "response") {
@@ -92,7 +91,7 @@ async function render(opts) {
     html = await renderHead(result) + html;
   }
   html = html.replace("<!--astro:head:injected-->", "");
-  if (!legacyBuild && !/<!doctype html/i.test(html)) {
+  if (!/<!doctype html/i.test(html)) {
     html = "<!DOCTYPE html>\n" + html;
   }
   return {

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

@@ -1,8 +1,6 @@
 import path from "path";
 import { unwrapId, viteID } from "../../util.js";
-const STYLE_EXTENSIONS = /* @__PURE__ */ new Set([".css", ".pcss", ".postcss", ".scss", ".sass", ".styl", ".stylus", ".less"]);
-const cssRe = new RegExp(`\\.(${Array.from(STYLE_EXTENSIONS).map((s) => s.slice(1)).join("|")})($|\\?)`);
-const isCSSRequest = (request) => cssRe.test(request);
+import { STYLE_EXTENSIONS } from "../util.js";
 function getStylesForURL(filePath, viteServer) {
   const importedCssUrls = /* @__PURE__ */ new Set();
   function crawlCSS(_id, isFile, scanned = /* @__PURE__ */ new Set()) {
@@ -10,6 +8,9 @@ function getStylesForURL(filePath, viteServer) {
     const importedModules = /* @__PURE__ */ new Set();
     const moduleEntriesForId = isFile ? viteServer.moduleGraph.getModulesByFile(id) ?? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([viteServer.moduleGraph.getModuleById(id)]);
     for (const entry of moduleEntriesForId) {
+      if (!entry) {
+        continue;
+      }
       if (id === entry.id) {
         scanned.add(id);
         for (const importedModule of entry.importedModules) {
@@ -32,7 +33,5 @@ function getStylesForURL(filePath, viteServer) {
   return importedCssUrls;
 }
 export {
-  STYLE_EXTENSIONS,
-  getStylesForURL,
-  isCSSRequest
+  getStylesForURL
 };

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

@@ -17,14 +17,15 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import astroRemark from "@astrojs/markdown-remark";
 import { fileURLToPath } from "url";
 import { render as coreRender } from "../core.js";
 import { prependForwardSlash } from "../../../core/path.js";
 import { createModuleScriptElementWithSrcSet } from "../ssr-element.js";
 import { getStylesForURL } from "./css.js";
-import { errorHandler } from "./error.js";
 import { getHmrScript } from "./hmr.js";
 import { injectTags } from "./html.js";
+import { isBuildingToSSR } from "../../util.js";
 const svelteStylesRE = /svelte\?svelte&type=style/;
 async function loadRenderer(viteServer, renderer) {
   var _a;
@@ -41,10 +42,10 @@ async function preload({ astroConfig, filePath, viteServer }) {
   return [renderers, mod];
 }
 async function render(renderers, mod, ssrOpts) {
-  const { astroConfig, filePath, logging, mode, origin, pathname, method, headers, route, routeCache, viteServer } = ssrOpts;
-  const legacy = astroConfig.buildOptions.legacyBuild;
-  const scripts = createModuleScriptElementWithSrcSet(!legacy && mod.hasOwnProperty("$$metadata") ? Array.from(mod.$$metadata.hoistedScriptPaths()) : []);
-  if (mod.hasOwnProperty("$$metadata") && mode === "development" && !legacy) {
+  const { astroConfig, filePath, logging, mode, origin, pathname, request, route, routeCache, viteServer } = ssrOpts;
+  const isLegacyBuild = false;
+  const scripts = createModuleScriptElementWithSrcSet(!isLegacyBuild && mod.hasOwnProperty("$$metadata") ? Array.from(mod.$$metadata.hoistedScriptPaths()) : []);
+  if (mod.hasOwnProperty("$$metadata") && mode === "development" && !isLegacyBuild) {
     scripts.add({
       props: { type: "module", src: "/@vite/client" },
       children: ""
@@ -63,7 +64,7 @@ async function render(renderers, mod, ssrOpts) {
     }
   }
   let links = /* @__PURE__ */ new Set();
-  if (!legacy) {
+  if (!isLegacyBuild) {
     [...getStylesForURL(filePath, viteServer)].forEach((href) => {
       if (mode === "development" && svelteStylesRE.test(href)) {
         scripts.add({
@@ -83,41 +84,36 @@ async function render(renderers, mod, ssrOpts) {
     });
   }
   let content = await coreRender({
-    legacyBuild: astroConfig.buildOptions.legacyBuild,
+    legacyBuild: isLegacyBuild,
     links,
     logging,
-    markdownRender: astroConfig.markdownOptions.render,
+    markdownRender: [astroRemark, astroConfig.markdown],
     mod,
     origin,
     pathname,
     scripts,
     async resolve(s) {
-      if (!astroConfig.buildOptions.legacyBuild) {
-        const [resolvedUrl, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s);
-        if (resolvedPath.includes("node_modules/.vite")) {
-          return resolvedPath.replace(/.*?node_modules\/\.vite/, "/node_modules/.vite");
-        }
-        if (!resolvedUrl.startsWith(".") && !resolvedUrl.startsWith("/")) {
-          return "/@id" + prependForwardSlash(resolvedUrl);
-        }
-        return "/@fs" + prependForwardSlash(resolvedPath);
-      } else {
-        return s;
+      const [resolvedUrl, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s);
+      if (resolvedPath.includes("node_modules/.vite")) {
+        return resolvedPath.replace(/.*?node_modules\/\.vite/, "/node_modules/.vite");
+      }
+      if (!resolvedUrl.startsWith(".") && !resolvedUrl.startsWith("/")) {
+        return "/@id" + prependForwardSlash(resolvedUrl);
       }
+      return "/@fs" + prependForwardSlash(resolvedPath);
     },
     renderers,
+    request,
     route,
     routeCache,
-    site: astroConfig.buildOptions.site,
-    ssr: astroConfig.buildOptions.experimentalSsr,
-    method,
-    headers
+    site: astroConfig.site ? new URL(astroConfig.base, astroConfig.site).toString() : void 0,
+    ssr: isBuildingToSSR(astroConfig)
   });
   if ((route == null ? void 0 : route.type) === "endpoint" || content.type === "response") {
     return content;
   }
   const tags = [];
-  if (mode === "development" && legacy) {
+  if (mode === "development" && isLegacyBuild) {
     tags.push({
       tag: "script",
       attrs: { type: "module" },
@@ -125,7 +121,7 @@ async function render(renderers, mod, ssrOpts) {
       injectTo: "head"
     });
   }
-  if (legacy) {
+  if (isLegacyBuild) {
     [...getStylesForURL(filePath, viteServer)].forEach((href) => {
       if (mode === "development" && svelteStylesRE.test(href)) {
         tags.push({
@@ -147,10 +143,6 @@ async function render(renderers, mod, ssrOpts) {
     });
   }
   let html = injectTags(content.html, tags);
-  if (mode === "development" && astroConfig.buildOptions.legacyBuild) {
-    const relativeURL = filePath.href.replace(astroConfig.projectRoot.href, "/");
-    html = await viteServer.transformIndexHtml(relativeURL, html, pathname);
-  }
   if (!/<!doctype html/i.test(html)) {
     html = "<!DOCTYPE html>\n" + content;
   }
@@ -160,13 +152,8 @@ async function render(renderers, mod, ssrOpts) {
   };
 }
 async function ssr(preloadedComponent, ssrOpts) {
-  try {
-    const [renderers, mod] = preloadedComponent;
-    return await render(renderers, mod, ssrOpts);
-  } catch (e) {
-    await errorHandler(e, { viteServer: ssrOpts.viteServer, filePath: ssrOpts.filePath });
-    throw e;
-  }
+  const [renderers, mod] = preloadedComponent;
+  return await render(renderers, mod, ssrOpts);
 }
 export {
   loadRenderers,