astro 1.6.5 → 1.6.7

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

@@ -920,6 +920,7 @@ export interface MarkdownInstance<T extends Record<string, any>> {
     getHeaders(): void;
     default: AstroComponentFactory;
 }
+declare type MD = MarkdownInstance<Record<string, any>>;
 export interface MDXInstance<T extends Record<string, any>> extends Omit<MarkdownInstance<T>, 'rawContent' | 'compiledContent'> {
     /** MDX does not support rawContent! If you need to read the Markdown contents to calculate values (ex. reading time), we suggest injecting frontmatter via remark plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins */
     rawContent: never;
@@ -978,9 +979,7 @@ export interface ManifestData {
     routes: RouteData[];
 }
 export interface MarkdownParserResponse extends MarkdownRenderingResult {
-    frontmatter: {
-        [key: string]: any;
-    };
+    frontmatter: MD['frontmatter'];
 }
 /**
  * The `content` prop given to a Layout
@@ -1275,7 +1274,7 @@ export interface SSRResult {
     _metadata: SSRMetadata;
 }
 export declare type MarkdownAstroData = {
-    frontmatter: object;
+    frontmatter: MD['frontmatter'];
 };
 export interface PreviewServer {
     host?: string;

package/dist/cli/index.js

@@ -1,5 +1,4 @@
 import * as colors from "kleur/colors";
-import { pathToFileURL } from "url";
 import yargs from "yargs-parser";
 import { z } from "zod";
 import {
@@ -73,9 +72,7 @@ async function handleConfigError(e, { cwd, flags, logging }) {
       error(logging, "astro", `Unable to load ${colors.bold(path)}
 `);
     }
-    console.error(
-      formatErrorMessage(collectErrorMetadata(e, path ? pathToFileURL(path) : void 0)) + "\n"
-    );
+    console.error(formatErrorMessage(collectErrorMetadata(e)) + "\n");
   }
 }
 async function runCommand(cmd, flags) {

package/dist/core/build/css-asset-name.d.ts

@@ -0,0 +1,8 @@
+import type { GetModuleInfo } from 'rollup';
+import { AstroSettings } from '../../@types/astro';
+export declare function shortHashedName(id: string, ctx: {
+    getModuleInfo: GetModuleInfo;
+}): string;
+export declare function createSlugger(settings: AstroSettings): (id: string, ctx: {
+    getModuleInfo: GetModuleInfo;
+}) => string;

package/dist/core/build/css-asset-name.js

@@ -0,0 +1,61 @@
+import crypto from "crypto";
+import npath from "path";
+import { viteID } from "../util.js";
+import { getTopLevelPages } from "./graph.js";
+function shortHashedName(id, ctx) {
+  var _a;
+  const parents = Array.from(getTopLevelPages(id, ctx));
+  const firstParentId = (_a = parents[0]) == null ? void 0 : _a[0].id;
+  const firstParentName = firstParentId ? npath.parse(firstParentId).name : "index";
+  const hash = crypto.createHash("sha256");
+  for (const [page] of parents) {
+    hash.update(page.id, "utf-8");
+  }
+  const h = hash.digest("hex").slice(0, 8);
+  const proposedName = firstParentName + "." + h;
+  return proposedName;
+}
+function createSlugger(settings) {
+  const pagesDir = viteID(new URL("./pages", settings.config.srcDir));
+  const map = /* @__PURE__ */ new Map();
+  const sep = "-";
+  return function(id, ctx) {
+    var _a;
+    const parents = Array.from(getTopLevelPages(id, ctx));
+    const allParentsKey = parents.map(([page]) => page.id).sort().join("-");
+    const firstParentId = ((_a = parents[0]) == null ? void 0 : _a[0].id) || "index";
+    let dir = firstParentId;
+    let key = "";
+    let i = 0;
+    while (i < 2) {
+      if (dir === pagesDir) {
+        break;
+      }
+      const name2 = npath.parse(npath.basename(dir)).name;
+      key = key.length ? name2 + sep + key : name2;
+      dir = npath.dirname(dir);
+      i++;
+    }
+    let name = key;
+    if (!map.has(key)) {
+      map.set(key, /* @__PURE__ */ new Map([[allParentsKey, 0]]));
+    } else {
+      const inner = map.get(key);
+      if (inner.has(allParentsKey)) {
+        const num = inner.get(allParentsKey);
+        if (num > 0) {
+          name = name + sep + num;
+        }
+      } else {
+        const num = inner.size;
+        inner.set(allParentsKey, num);
+        name = name + sep + num;
+      }
+    }
+    return name;
+  };
+}
+export {
+  createSlugger,
+  shortHashedName
+};

package/dist/core/build/index.js

@@ -8,7 +8,6 @@ import {
   runHookConfigSetup
 } from "../../integrations/index.js";
 import { createVite } from "../create-vite.js";
-import { enhanceViteSSRError } from "../errors/dev/index.js";
 import { debug, info, levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { RouteCache } from "../render/route-cache.js";
@@ -127,7 +126,7 @@ class AstroBuilder {
     try {
       await this.build(setupData);
     } catch (_err) {
-      throw enhanceViteSSRError(_err);
+      throw _err;
     }
   }
   validateConfig() {

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

@@ -10,6 +10,7 @@ import { prependForwardSlash } from "../../core/path.js";
 import { isModeServerWithNoAdapter } from "../../core/util.js";
 import { runHookBuildSetup } from "../../integrations/index.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 import { info } from "../logger/core.js";
 import { getOutDirWithinCwd } from "./common.js";
 import { generatePages } from "./generate.js";
@@ -24,17 +25,7 @@ import { injectManifest, vitePluginSSR } from "./vite-plugin-ssr.js";
 async function staticBuild(opts) {
   const { allPages, settings } = opts;
   if (isModeServerWithNoAdapter(opts.settings)) {
-    throw new Error(`Cannot use \`output: 'server'\` without an adapter.
-Install and configure the appropriate server adapter for your final deployment.
-Learn more: https://docs.astro.build/en/guides/server-side-rendering/
-
-  // Example: astro.config.js
-  import netlify from '@astrojs/netlify';
-  export default {
-    output: 'server',
-    adapter: netlify(),
-  }
-`);
+    throw new AstroError(AstroErrorData.NoAdapterInstalled);
   }
   const pageInput = /* @__PURE__ */ new Set();
   const facadeIdToPageDataMap = /* @__PURE__ */ new Map();

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

@@ -1,8 +1,7 @@
-import crypto from "crypto";
 import esbuild from "esbuild";
-import npath from "path";
 import { isCSSRequest } from "../render/util.js";
-import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "./graph.js";
+import * as assetName from "./css-asset-name.js";
+import { moduleIsTopLevelPage, walkParentInfos } from "./graph.js";
 import {
   eachPageData,
   getPageDataByViteID,
@@ -14,19 +13,6 @@ function rollupPluginAstroBuildCSS(options) {
   const { internals, buildOptions } = options;
   const { settings } = buildOptions;
   let resolvedConfig;
-  function createNameForParentPages(id, ctx) {
-    var _a;
-    const parents = Array.from(getTopLevelPages(id, ctx));
-    const firstParentId = (_a = parents[0]) == null ? void 0 : _a[0].id;
-    const firstParentName = firstParentId ? npath.parse(firstParentId).name : "index";
-    const hash = crypto.createHash("sha256");
-    for (const [page] of parents) {
-      hash.update(page.id, "utf-8");
-    }
-    const h = hash.digest("hex").slice(0, 8);
-    const proposedName = firstParentName + "." + h;
-    return proposedName;
-  }
   function* getParentClientOnlys(id, ctx) {
     for (const [info] of walkParentInfos(id, ctx)) {
       yield* getPageDatasByClientOnlyID(internals, info.id);
@@ -37,6 +23,9 @@ function rollupPluginAstroBuildCSS(options) {
       name: "astro:rollup-plugin-build-css",
       outputOptions(outputOptions) {
         const manualChunks = outputOptions.manualChunks || Function.prototype;
+        const assetFileNames = outputOptions.assetFileNames;
+        const namingIncludesHash = assetFileNames == null ? void 0 : assetFileNames.toString().includes("[hash]");
+        const createNameForParentPages = namingIncludesHash ? assetName.shortHashedName : assetName.createSlugger(settings);
         outputOptions.manualChunks = function(id, ...args) {
           if (typeof manualChunks == "object") {
             if (id in manualChunks) {

package/dist/core/compile/compile.js

@@ -1,6 +1,6 @@
 import { transform } from "@astrojs/compiler";
-import { AstroErrorCodes } from "../errors/codes.js";
 import { AggregateError, CompilerError } from "../errors/errors.js";
+import { AstroErrorData } from "../errors/index.js";
 import { prependForwardSlash } from "../path.js";
 import { resolvePath, viteID } from "../util.js";
 import { createStylePreprocessor } from "./style.js";
@@ -35,7 +35,7 @@ async function compile({
     }
   }).catch((err) => {
     throw new CompilerError({
-      errorCode: AstroErrorCodes.UnknownCompilerError,
+      ...AstroErrorData.UnknownCompilerError,
       message: err.message ?? "Unknown compiler error",
       stack: err.stack,
       location: {
@@ -43,19 +43,17 @@ async function compile({
       }
     });
   }).then((result) => {
-    const compilerError = result.diagnostics.find(
-      (diag) => diag.severity === 1 && diag.code < 2e3
-    );
+    const compilerError = result.diagnostics.find((diag) => diag.severity === 1);
     if (compilerError) {
       throw new CompilerError({
-        errorCode: compilerError.code,
+        code: compilerError.code,
         message: compilerError.text,
         location: {
           line: compilerError.location.line,
           column: compilerError.location.column,
           file: compilerError.location.file
         },
-        hint: compilerError.hint ? compilerError.hint : void 0
+        hint: compilerError.hint
       });
     }
     switch (cssTransformErrors.length) {
@@ -63,8 +61,8 @@ async function compile({
         return result;
       case 1: {
         let error = cssTransformErrors[0];
-        if (!error.errorCode) {
-          error.errorCode = AstroErrorCodes.UnknownCompilerCSSError;
+        if (!error.code) {
+          error.code = AstroErrorData.UnknownCSSError.code;
         }
         throw cssTransformErrors[0];
       }

package/dist/core/compile/style.js

@@ -1,8 +1,6 @@
 import fs from "fs";
 import { preprocessCSS } from "vite";
-import { AstroErrorCodes } from "../errors/codes.js";
-import { CSSError } from "../errors/errors.js";
-import { positionAt } from "../errors/index.js";
+import { AstroErrorData, CSSError, positionAt } from "../errors/index.js";
 function createStylePreprocessor({
   filename,
   viteConfig,
@@ -44,7 +42,7 @@ function enhanceCSSError(err, filename) {
   if (err.name === "CssSyntaxError") {
     const errorLine = positionAt(styleTagBeginning, fileContent).line + (err.line ?? 0);
     return new CSSError({
-      errorCode: AstroErrorCodes.CssSyntaxError,
+      ...AstroErrorData.CSSSyntaxError,
       message: err.reason,
       location: {
         file: filename,
@@ -56,7 +54,7 @@ function enhanceCSSError(err, filename) {
   if (err.line && err.column) {
     const errorLine = positionAt(styleTagBeginning, fileContent).line + (err.line ?? 0);
     return new CSSError({
-      errorCode: AstroErrorCodes.CssUnknownError,
+      ...AstroErrorData.UnknownCSSError,
       message: err.message,
       location: {
         file: filename,
@@ -69,7 +67,7 @@ function enhanceCSSError(err, filename) {
   const errorPosition = positionAt(styleTagBeginning, fileContent);
   errorPosition.line += 1;
   return new CSSError({
-    errorCode: AstroErrorCodes.CssUnknownError,
+    code: AstroErrorData.UnknownCSSError.code,
     message: err.message,
     location: {
       file: filename,

package/dist/core/config/config.js

@@ -6,6 +6,7 @@ import path from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 import * as vite from "vite";
 import { mergeConfig as mergeViteConfig } from "vite";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 import { arraify, isObject, isURL } from "../util.js";
 import { createRelativeSchema } from "./schema.js";
 load.use([loadTypeScript]);
@@ -58,11 +59,10 @@ async function validateConfig(userConfig, root, cmd) {
     }
   }
   if (legacyConfigKey) {
-    throw new Error(
-      `Legacy configuration detected: "${legacyConfigKey}".
-Please update your configuration to the new format!
-See https://astro.build/config for more information.`
-    );
+    throw new AstroError({
+      ...AstroErrorData.ConfigLegacyKey,
+      message: AstroErrorData.ConfigLegacyKey.message(legacyConfigKey)
+    });
   }
   const AstroConfigRelativeSchema = createRelativeSchema(cmd, fileProtocolRoot);
   const result = await AstroConfigRelativeSchema.parseAsync(userConfig);
@@ -119,7 +119,10 @@ async function resolveConfigPath(configOptions) {
     return configPath;
   } catch (e) {
     if (e instanceof ProloadError && flags.config) {
-      throw new Error(`Unable to resolve --config "${flags.config}"! Does the file exist?`);
+      throw new AstroError({
+        ...AstroErrorData.ConfigNotFound,
+        message: AstroErrorData.ConfigNotFound.message(flags.config)
+      });
     }
     throw e;
   }
@@ -174,7 +177,10 @@ async function tryLoadConfig(configOptions, flags, root) {
     return config;
   } catch (e) {
     if (e instanceof ProloadError && flags.config) {
-      throw new Error(`Unable to resolve --config "${flags.config}"! Does the file exist?`);
+      throw new AstroError({
+        ...AstroErrorData.ConfigNotFound,
+        message: AstroErrorData.ConfigNotFound.message(flags.config)
+      });
     }
     const configPath = await resolveConfigPath(configOptions);
     if (!configPath) {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.6.5";
+const ASTRO_VERSION = "1.6.7";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -30,7 +30,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "1.6.5";
+  const currentVersion = "1.6.7";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/endpoint/index.js

@@ -1,6 +1,7 @@
 import { renderEndpoint } from "../../runtime/server/index.js";
 import { ASTRO_VERSION } from "../constants.js";
 import { AstroCookies, attachToResponse } from "../cookies/index.js";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 import { getParamsAndProps, GetParamsAndPropsError } from "../render/core.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 function createAPIContext({
@@ -29,13 +30,12 @@ function createAPIContext({
     get clientAddress() {
       if (!(clientAddressSymbol in request)) {
         if (adapterName) {
-          throw new Error(
-            `clientAddress is not available in the ${adapterName} adapter. File an issue with the adapter to add support.`
-          );
+          throw new AstroError({
+            ...AstroErrorData.SSRClientAddressNotAvailableInAdapter,
+            message: AstroErrorData.SSRClientAddressNotAvailableInAdapter.message(adapterName)
+          });
         } else {
-          throw new Error(
-            `clientAddress is not available in your environment. Ensure that you are using an SSR adapter that supports this feature.`
-          );
+          throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
         }
       }
       return Reflect.get(request, clientAddressSymbol);
@@ -43,6 +43,7 @@ function createAPIContext({
   };
 }
 async function call(mod, env, ctx) {
+  var _a, _b;
   const paramsAndPropsResp = await getParamsAndProps({
     mod,
     route: ctx.route,
@@ -52,9 +53,11 @@ async function call(mod, env, ctx) {
     ssr: env.ssr
   });
   if (paramsAndPropsResp === GetParamsAndPropsError.NoMatchingStaticPath) {
-    throw new Error(
-      `[getStaticPath] route pattern matched, but no matching static path found. (${ctx.pathname})`
-    );
+    throw new AstroError({
+      ...AstroErrorData.NoMatchingStaticPathFound,
+      message: AstroErrorData.NoMatchingStaticPathFound.message(ctx.pathname),
+      hint: ((_a = ctx.route) == null ? void 0 : _a.component) ? AstroErrorData.NoMatchingStaticPathFound.hint([(_b = ctx.route) == null ? void 0 : _b.component]) : ""
+    });
   }
   const [params, props] = paramsAndPropsResp;
   const context = createAPIContext({
@@ -84,9 +87,7 @@ function isRedirect(statusCode) {
 }
 function throwIfRedirectNotAllowed(response, config) {
   if (config.output !== "server" && isRedirect(response.status)) {
-    throw new Error(
-      `Redirects are only available when using output: 'server'. Update your Astro config if you need SSR features.`
-    );
+    throw new AstroError(AstroErrorData.StaticRedirectNotAllowed);
   }
 }
 export {

package/dist/core/errors/dev/utils.d.ts

@@ -7,4 +7,4 @@ export declare const incompatPackageExp: RegExp;
  * Takes any error-like object and returns a standardized Error + metadata object.
  * Useful for consistent reporting regardless of where the error surfaced from.
  */
-export declare function collectErrorMetadata(e: any, filePath?: URL): ErrorWithMetadata;
+export declare function collectErrorMetadata(e: any, rootFolder?: URL | undefined): ErrorWithMetadata;

package/dist/core/errors/dev/utils.js

@@ -1,17 +1,24 @@
 import * as fs from "node:fs";
+import { join } from "node:path";
+import { fileURLToPath } from "node:url";
+import stripAnsi from "strip-ansi";
 import { AggregateError } from "../errors.js";
 import { codeFrame } from "../printer.js";
-import { collectInfoFromStacktrace } from "../utils.js";
+import { normalizeLF } from "../utils.js";
 const incompatiblePackages = {
   "react-spectrum": `@adobe/react-spectrum is not compatible with Vite's server-side rendering mode at the moment. You can still use React Spectrum from the client. Create an island React component and use the client:only directive. From there you can use React Spectrum.`
 };
 const incompatPackageExp = new RegExp(`(${Object.keys(incompatiblePackages).join("|")})`);
-function collectErrorMetadata(e, filePath) {
+function collectErrorMetadata(e, rootFolder) {
   const err = AggregateError.is(e) ? e.errors : [e];
   err.forEach((error) => {
+    var _a;
     if (error.stack) {
       error = collectInfoFromStacktrace(e);
     }
+    if (((_a = error.loc) == null ? void 0 : _a.file) && rootFolder && !error.loc.file.startsWith("/")) {
+      error.loc.file = join(fileURLToPath(rootFolder), error.loc.file);
+    }
     if (!error.frame && error.loc) {
       try {
         const fileContents = fs.readFileSync(error.loc.file, "utf8");
@@ -20,17 +27,23 @@ function collectErrorMetadata(e, filePath) {
       } catch {
       }
     }
-    if (!error.hint) {
-      error.hint = generateHint(e, filePath);
-    }
+    error.hint = generateHint(e);
   });
   if (!AggregateError.is(e) && Array.isArray(e.errors)) {
     e.errors.forEach((buildError, i) => {
-      const { location, pluginName } = buildError;
+      var _a;
+      const { location, pluginName, text } = buildError;
+      err[i].message = text;
       if (location) {
         err[i].loc = { file: location.file, line: location.line, column: location.column };
         err[i].id = err[0].id || (location == null ? void 0 : location.file);
       }
+      if (err[i].frame) {
+        const errorLines = (_a = err[i].frame) == null ? void 0 : _a.trim().split("\n");
+        if (errorLines) {
+          err[i].frame = !/^\d/.test(errorLines[0]) ? errorLines == null ? void 0 : errorLines.slice(1).join("\n") : err[i].frame;
+        }
+      }
       const possibleFilePath = err[i].pluginCode || err[i].id || (location == null ? void 0 : location.file);
       if (possibleFilePath && !err[i].frame) {
         try {
@@ -42,17 +55,23 @@ function collectErrorMetadata(e, filePath) {
       if (pluginName) {
         err[i].plugin = pluginName;
       }
-      err[i].hint = generateHint(err[0], filePath);
+      err[i].hint = generateHint(err[0]);
     });
   }
   return err[0];
 }
-function generateHint(err, filePath) {
+function generateHint(err) {
   var _a, _b;
   if (/Unknown file extension \"\.(jsx|vue|svelte|astro|css)\" for /.test(err.message)) {
     return "You likely need to add this package to `vite.ssr.noExternal` in your astro config file.";
-  } else if (err.toString().startsWith("ReferenceError") && ((_b = ((_a = err.loc) == null ? void 0 : _a.file) ?? (filePath == null ? void 0 : filePath.pathname)) == null ? void 0 : _b.endsWith(".astro"))) {
-    return "export statements in `.astro` files do not have access to local variable declarations, only imported values.";
+  } else if (err.toString().includes("document")) {
+    const hint = `Browser APIs are not available on the server.
+
+${((_b = (_a = err.loc) == null ? void 0 : _a.file) == null ? void 0 : _b.endsWith(".astro")) ? "Move your code to a <script> tag outside of the frontmatter, so the code runs on the client" : "If the code is in a framework component, try to access these objects after rendering using lifecycle methods or use a `client:only` directive to make the component exclusively run on the client"}
+
+See https://docs.astro.build/en/guides/troubleshooting/#document-or-window-is-not-defined for more information.
+		`;
+    return hint;
   } else {
     const res = incompatPackageExp.exec(err.stack);
     if (res) {
@@ -60,7 +79,41 @@ function generateHint(err, filePath) {
       return incompatiblePackages[key];
     }
   }
-  return void 0;
+  return err.hint;
+}
+function collectInfoFromStacktrace(error) {
+  var _a, _b, _c;
+  if (!error.stack)
+    return error;
+  error.stack = normalizeLF(error.stack);
+  const stackText = stripAnsi(error.stack);
+  if (!error.loc || !error.loc.column && !error.loc.line) {
+    const possibleFilePath = ((_a = error.loc) == null ? void 0 : _a.file) || error.pluginCode || error.id || stackText.split("\n").find((ln) => ln.includes("src") || ln.includes("node_modules"));
+    const source = possibleFilePath == null ? void 0 : possibleFilePath.replace(/^[^(]+\(([^)]+).*$/, "$1").replace(/^\s+at\s+/, "");
+    let file = source == null ? void 0 : source.replace(/(:[0-9]+)/g, "");
+    const location = /:([0-9]+):([0-9]+)/g.exec(source) ?? [];
+    const line = location[1];
+    const column = location[2];
+    if (file && line && column) {
+      try {
+        file = fileURLToPath(file);
+      } catch {
+      }
+      error.loc = {
+        file,
+        line: Number.parseInt(line),
+        column: Number.parseInt(column)
+      };
+    }
+  }
+  if (!error.plugin) {
+    error.plugin = ((_b = /withastro\/astro\/packages\/integrations\/([\w-]+)/gim.exec(stackText)) == null ? void 0 : _b.at(1)) || ((_c = /(@astrojs\/[\w-]+)\/(server|client|index)/gim.exec(stackText)) == null ? void 0 : _c.at(1)) || void 0;
+  }
+  error.stack = cleanErrorStack(error.stack);
+  return error;
+}
+function cleanErrorStack(stack) {
+  return stack.split(/\n/g).map((l) => l.replace(/\/@fs\//g, "/")).join("\n");
 }
 export {
   collectErrorMetadata,

package/dist/core/errors/dev/vite.d.ts

@@ -1,11 +1,11 @@
 import { type ErrorPayload, type Logger, type LogLevel } from 'vite';
 import type { ModuleLoader } from '../../module-loader/index.js';
-import { AstroError, type ErrorWithMetadata } from '../errors.js';
+import { type ErrorWithMetadata } from '../errors.js';
 /**
  * Custom logger with better error reporting for incompatible packages
  */
 export declare function createCustomViteLogger(logLevel: LogLevel): Logger;
-export declare function enhanceViteSSRError(error: Error, filePath?: URL, loader?: ModuleLoader): AstroError;
+export declare function enhanceViteSSRError(error: unknown, filePath?: URL, loader?: ModuleLoader): Error;
 /**
  * Generate a payload for Vite's error overlay
  */

package/dist/core/errors/dev/vite.js

@@ -1,8 +1,8 @@
 import * as fs from "fs";
 import { fileURLToPath } from "url";
 import { createLogger } from "vite";
-import { AstroErrorCodes } from "../codes.js";
-import { AstroError } from "../errors.js";
+import { AstroErrorData } from "../errors-data.js";
+import { createSafeError } from "../utils.js";
 import { incompatPackageExp } from "./utils.js";
 function createCustomViteLogger(logLevel) {
   const viteLogger = createLogger(logLevel);
@@ -17,41 +17,54 @@ function createCustomViteLogger(logLevel) {
   return logger;
 }
 function enhanceViteSSRError(error, filePath, loader) {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  const safeError = createSafeError(error);
   if (loader) {
     try {
-      loader.fixStacktrace(error);
+      loader.fixStacktrace(safeError);
     } catch {
     }
   }
-  const newError = new AstroError({
-    name: error.name,
-    message: error.message,
-    location: error.loc,
-    stack: error.stack,
-    errorCode: error.errorCode ? error.errorCode : AstroErrorCodes.UnknownViteSSRError
-  });
-  if (filePath && /failed to load module for ssr:/.test(error.message)) {
-    const importName = (_a = error.message.split("for ssr:").at(1)) == null ? void 0 : _a.trim();
-    if (importName) {
-      newError.setMessage(`Could not import "${importName}"`);
-      newError.setHint("Make sure the file exists");
-      newError.setErrorCode(AstroErrorCodes.FailedToLoadModuleSSR);
-      const path = fileURLToPath(filePath);
-      const content = fs.readFileSync(path).toString();
-      const lns = content.split("\n");
-      const line = lns.findIndex((ln) => ln.includes(importName));
-      if (line !== -1) {
-        const column = (_b = lns[line]) == null ? void 0 : _b.indexOf(importName);
-        newError.setLocation({
-          file: path,
-          line: line + 1,
-          column
-        });
+  if (filePath) {
+    const path = fileURLToPath(filePath);
+    const content = fs.readFileSync(path).toString();
+    const lns = content.split("\n");
+    if (/failed to load module for ssr:/.test(safeError.message)) {
+      const importName = (_a = safeError.message.split("for ssr:").at(1)) == null ? void 0 : _a.trim();
+      if (importName) {
+        safeError.message = AstroErrorData.FailedToLoadModuleSSR.message(importName);
+        safeError.hint = AstroErrorData.FailedToLoadModuleSSR.hint;
+        safeError.code = AstroErrorData.FailedToLoadModuleSSR.code;
+        const line = lns.findIndex((ln) => ln.includes(importName));
+        if (line !== -1) {
+          const column = (_b = lns[line]) == null ? void 0 : _b.indexOf(importName);
+          safeError.loc = {
+            file: path,
+            line: line + 1,
+            column
+          };
+        }
+      }
+    }
+    if (/Invalid glob/.test(safeError.message)) {
+      const globPattern = (_c = safeError.message.match(/glob: "(.+)" \(/)) == null ? void 0 : _c[1];
+      if (globPattern) {
+        safeError.message = AstroErrorData.InvalidGlob.message(globPattern);
+        safeError.hint = AstroErrorData.InvalidGlob.hint;
+        safeError.code = AstroErrorData.InvalidGlob.code;
+        const line = lns.findIndex((ln) => ln.includes(globPattern));
+        if (line !== -1) {
+          const column = (_d = lns[line]) == null ? void 0 : _d.indexOf(globPattern);
+          safeError.loc = {
+            file: path,
+            line: line + 1,
+            column
+          };
+        }
       }
     }
   }
-  return newError;
+  return safeError;
 }
 function getViteErrorPayload(err) {
   var _a, _b, _c, _d;