@sveltejs/vite-plugin-svelte 1.0.0-next.35 → 1.0.0-next.36

package/dist/index.js

@@ -164,7 +164,10 @@ function buildExtendedLogMessage(w) {
     parts.push(":", w.start.line, ":", w.start.column);
   }
   if (w.message) {
-    parts.push(" ", w.message);
+    if (parts.length > 0) {
+      parts.push(" ");
+    }
+    parts.push(w.message);
   }
   return parts.join("");
 }
@@ -292,7 +295,12 @@ var _createCompileSvelte = (makeHot) => async function compileSvelte2(svelteRequ
   }
   let preprocessed;
   if (options.preprocess) {
-    preprocessed = await preprocess(code, options.preprocess, { filename });
+    try {
+      preprocessed = await preprocess(code, options.preprocess, { filename });
+    } catch (e) {
+      e.message = `Error while preprocessing ${filename}${e.message ? ` - ${e.message}` : ""}`;
+      throw e;
+    }
     if (preprocessed.dependencies)
       dependencies.push(...preprocessed.dependencies);
     if (preprocessed.map)
@@ -691,15 +699,15 @@ import { promises as fs4 } from "fs";
 import { compile as compile2, preprocess as preprocess2 } from "svelte/compiler";
 
 // src/utils/error.ts
-function toRollupError(error) {
-  const { filename, frame, start, code, name } = error;
+function toRollupError(error, options) {
+  const { filename, frame, start, code, name, stack } = error;
   const rollupError = {
     name,
     id: filename,
     message: buildExtendedLogMessage(error),
     frame: formatFrameForVite(frame),
     code,
-    stack: ""
+    stack: options.isBuild || options.isDebug || !frame ? stack : ""
   };
   if (start) {
     rollupError.loc = {
@@ -710,8 +718,8 @@ function toRollupError(error) {
   }
   return rollupError;
 }
-function toESBuildError(error) {
-  const { filename, frame, start } = error;
+function toESBuildError(error, options) {
+  const { filename, frame, start, stack } = error;
   const partialMessage = {
     text: buildExtendedLogMessage(error)
   };
@@ -723,6 +731,9 @@ function toESBuildError(error) {
       lineText: lineFromFrame(start.line, frame)
     };
   }
+  if (options.isBuild || options.isDebug || !frame) {
+    partialMessage.detail = stack;
+  }
   return partialMessage;
 }
 function lineFromFrame(lineNo, frame) {
@@ -755,7 +766,7 @@ function esbuildSveltePlugin(options) {
           const contents = await compileSvelte(options, { filename, code });
           return { contents };
         } catch (e) {
-          return { errors: [toESBuildError(e)] };
+          return { errors: [toESBuildError(e, options)] };
         }
       });
     }
@@ -788,7 +799,12 @@ async function compileSvelte(options, { filename, code }) {
   });
   let preprocessed;
   if (options.preprocess) {
-    preprocessed = await preprocess2(code, options.preprocess, { filename });
+    try {
+      preprocessed = await preprocess2(code, options.preprocess, { filename });
+    } catch (e) {
+      e.message = `Error while preprocessing ${filename}${e.message ? ` - ${e.message}` : ""}`;
+      throw e;
+    }
     if (preprocessed.map)
       compileOptions.sourcemap = preprocessed.map;
   }
@@ -1073,7 +1089,8 @@ async function preResolveOptions(inlineOptions = {}, viteUserConfig, viteEnv) {
     experimental: __spreadValues(__spreadValues(__spreadValues({}, defaultOptions == null ? void 0 : defaultOptions.experimental), svelteConfig == null ? void 0 : svelteConfig.experimental), inlineOptions == null ? void 0 : inlineOptions.experimental),
     root: viteConfigWithResolvedRoot.root,
     isBuild: viteEnv.command === "build",
-    isServe: viteEnv.command === "serve"
+    isServe: viteEnv.command === "serve",
+    isDebug: process.env.DEBUG != null
   });
   if (svelteConfig == null ? void 0 : svelteConfig.configFile) {
     merged.configFile = svelteConfig.configFile;
@@ -1581,7 +1598,7 @@ function svelte(inlineOptions) {
       try {
         compileData = await compileSvelte2(svelteRequest, code, options);
       } catch (e) {
-        throw toRollupError(e);
+        throw toRollupError(e, options);
       }
       logCompilerWarnings(compileData.compiled.warnings, options);
       cache.update(compileData);