@sveltejs/vite-plugin-svelte 1.0.0-next.30 → 1.0.0-next.31

package/dist/index.js

@@ -470,7 +470,7 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
     }
     if (!configFile.endsWith(".mjs")) {
       try {
-        const _require = import.meta.url ? esmRequire != null ? esmRequire : esmRequire = createRequire(import.meta.url) : __require;
+        const _require = import.meta.url ? esmRequire ?? (esmRequire = createRequire(import.meta.url)) : __require;
         delete _require.cache[_require.resolve(configFile)];
         const result = _require(configFile);
         if (result != null) {
@@ -687,18 +687,73 @@ import { createRequire as createRequire3 } from "module";
 // src/utils/esbuild.ts
 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;
+  const rollupError = {
+    name,
+    id: filename,
+    message: buildExtendedLogMessage(error),
+    frame: formatFrameForVite(frame),
+    code,
+    stack: ""
+  };
+  if (start) {
+    rollupError.loc = {
+      line: start.line,
+      column: start.column,
+      file: filename
+    };
+  }
+  return rollupError;
+}
+function toESBuildError(error) {
+  const { filename, frame, start } = error;
+  const partialMessage = {
+    text: buildExtendedLogMessage(error)
+  };
+  if (start) {
+    partialMessage.location = {
+      line: start.line,
+      column: start.column,
+      file: filename,
+      lineText: lineFromFrame(start.line, frame)
+    };
+  }
+  return partialMessage;
+}
+function lineFromFrame(lineNo, frame) {
+  if (!frame) {
+    return "";
+  }
+  const lines = frame.split("\n");
+  const errorLine = lines.find((line) => line.trimStart().startsWith(`${lineNo}: `));
+  return errorLine ? errorLine.substring(errorLine.indexOf(": ") + 3) : "";
+}
+function formatFrameForVite(frame) {
+  if (!frame) {
+    return "";
+  }
+  return frame.split("\n").map((line) => line.match(/^\s+\^/) ? "   " + line : " " + line.replace(":", " | ")).join("\n");
+}
+
+// src/utils/esbuild.ts
 function esbuildSveltePlugin(options) {
   return {
     name: "vite-plugin-svelte:optimize-svelte",
     setup(build) {
-      var _a;
       disableVitePrebundleSvelte(build);
-      const svelteExtensions = ((_a = options.extensions) != null ? _a : [".svelte"]).map((ext) => ext.slice(1));
+      const svelteExtensions = (options.extensions ?? [".svelte"]).map((ext) => ext.slice(1));
       const svelteFilter = new RegExp(`\\.(` + svelteExtensions.join("|") + `)(\\?.*)?$`);
       build.onLoad({ filter: svelteFilter }, async ({ path: filename }) => {
         const code = await fs4.readFile(filename, "utf8");
-        const contents = await compileSvelte(options, { filename, code });
-        return { contents };
+        try {
+          const contents = await compileSvelte(options, { filename, code });
+          return { contents };
+        } catch (e) {
+          return { errors: [toESBuildError(e)] };
+        }
       });
     }
   };
@@ -843,12 +898,11 @@ function mergeOptions(defaultOptions, svelteConfig, inlineOptions, viteConfig, v
   return merged;
 }
 async function resolveOptions(inlineOptions = {}, viteConfig, viteEnv) {
-  var _a;
   const viteConfigWithResolvedRoot = __spreadProps(__spreadValues({}, viteConfig), {
     root: resolveViteRoot(viteConfig)
   });
   const svelteConfig = await loadSvelteConfig(viteConfigWithResolvedRoot, inlineOptions) || {};
-  const defaultOptions = buildDefaultOptions(viteEnv.mode === "production", (_a = inlineOptions.emitCss) != null ? _a : svelteConfig.emitCss);
+  const defaultOptions = buildDefaultOptions(viteEnv.mode === "production", inlineOptions.emitCss ?? svelteConfig.emitCss);
   const resolvedOptions = mergeOptions(defaultOptions, svelteConfig, inlineOptions, viteConfigWithResolvedRoot, viteEnv);
   enforceOptionsForProduction(resolvedOptions);
   enforceOptionsForHmr(resolvedOptions);
@@ -1457,7 +1511,12 @@ function svelte(inlineOptions) {
         log.error("failed to transform tagged svelte request", svelteRequest);
         throw new Error(`failed to transform tagged svelte request for id ${id}`);
       }
-      const compileData = await compileSvelte2(svelteRequest, code, options);
+      let compileData;
+      try {
+        compileData = await compileSvelte2(svelteRequest, code, options);
+      } catch (e) {
+        throw toRollupError(e);
+      }
       logCompilerWarnings(compileData.compiled.warnings, options);
       cache.update(compileData);
       if (((_a = compileData.dependencies) == null ? void 0 : _a.length) && options.server) {