@sveltejs/vite-plugin-svelte 1.0.0-next.29 → 1.0.0-next.32

package/README.md

@@ -6,6 +6,7 @@ The official [Svelte](https://svelte.dev) plugin for [Vite](https://vitejs.dev).
 
 ```js
 // vite.config.js
+import { defineConfig } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 
 export default defineConfig({

package/dist/index.cjs

@@ -44,8 +44,8 @@ __export(exports, {
   svelte: () => svelte
 });
 
-// ../../node_modules/.pnpm/tsup@5.4.0_typescript@4.4.4/node_modules/tsup/assets/cjs_shims.js
-var importMetaUrlShim = typeof document === "undefined" ? new (require("url")).URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
+// ../../node_modules/.pnpm/tsup@5.10.1_typescript@4.5.2/node_modules/tsup/assets/cjs_shims.js
+var importMetaUrlShim = typeof document === "undefined" ? new URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 
 // src/index.ts
 var import_fs6 = __toModule(require("fs"));
@@ -488,7 +488,7 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
     }
     if (!configFile.endsWith(".mjs")) {
       try {
-        const _require = importMetaUrlShim ? esmRequire != null ? esmRequire : esmRequire = (0, import_module.createRequire)(importMetaUrlShim) : require;
+        const _require = importMetaUrlShim ? esmRequire ?? (esmRequire = (0, import_module.createRequire)(importMetaUrlShim)) : require;
         delete _require.cache[_require.resolve(configFile)];
         const result = _require(configFile);
         if (result != null) {
@@ -705,18 +705,73 @@ var import_module3 = __toModule(require("module"));
 // src/utils/esbuild.ts
 var import_fs3 = __toModule(require("fs"));
 var import_compiler2 = __toModule(require("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 import_fs3.promises.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)] };
+        }
       });
     }
   };
@@ -853,7 +908,8 @@ function mergeOptions(defaultOptions, svelteConfig, inlineOptions, viteConfig, v
     root: viteConfig.root,
     isProduction: viteEnv.mode === "production",
     isBuild: viteEnv.command === "build",
-    isServe: viteEnv.command === "serve"
+    isServe: viteEnv.command === "serve",
+    isSvelteKit: !!(svelteConfig == null ? void 0 : svelteConfig.kit)
   });
   if (svelteConfig == null ? void 0 : svelteConfig.configFile) {
     merged.configFile = svelteConfig.configFile;
@@ -861,12 +917,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);
@@ -1036,7 +1091,7 @@ function setupWatchers(options, cache, requestParser) {
     return;
   }
   const { watcher, ws } = server;
-  const { configFile: viteConfigFile, root, server: serverConfig } = server.config;
+  const { root, server: serverConfig } = server.config;
   const emitChangeEventOnDependants = (filename) => {
     const dependants = cache.getDependants(filename);
     dependants.forEach((dependant) => {
@@ -1056,16 +1111,17 @@ function setupWatchers(options, cache, requestParser) {
     }
   };
   const triggerViteRestart = (filename) => {
-    if (!!viteConfigFile && !serverConfig.middlewareMode) {
-      log.info(`svelte config changed: restarting vite server. - file: ${filename}`);
-      watcher.emit("change", viteConfigFile);
-    } else {
+    var _a;
+    if (serverConfig.middlewareMode || options.isSvelteKit) {
       const message = "Svelte config change detected, restart your dev process to apply the changes.";
       log.info(message, filename);
       ws.send({
         type: "error",
         err: { message, stack: "", plugin: "vite-plugin-svelte", id: filename }
       });
+    } else {
+      log.info(`svelte config changed: restarting vite server. - file: ${filename}`);
+      server.restart(!!((_a = options.experimental) == null ? void 0 : _a.prebundleSvelteLibraries));
     }
   };
   const possibleSvelteConfigs = knownSvelteConfigNames.map((cfg) => import_path4.default.join(root, cfg));
@@ -1116,7 +1172,7 @@ function resolveViaPackageJsonSvelte(importee, importer) {
   }
 }
 function isBareImport(importee) {
-  if (!importee || importee[0] === "." || importee[0] === "\0" || import_path5.default.isAbsolute(importee)) {
+  if (!importee || importee[0] === "." || importee[0] === "\0" || importee.includes(":") || import_path5.default.isAbsolute(importee)) {
     return false;
   }
   const parts = importee.split("/");
@@ -1413,9 +1469,9 @@ function svelte(inlineOptions) {
         }
       }
     },
-    async resolveId(importee, importer, opts, _ssr) {
-      const ssr = _ssr === true || opts.ssr;
-      const svelteRequest = requestParser(importee, !!ssr);
+    async resolveId(importee, importer, opts) {
+      const ssr = !!(opts == null ? void 0 : opts.ssr);
+      const svelteRequest = requestParser(importee, ssr);
       if (svelteRequest == null ? void 0 : svelteRequest.query.svelte) {
         if (svelteRequest.query.type === "style") {
           log.debug(`resolveId resolved virtual css module ${svelteRequest.cssId}`);
@@ -1456,8 +1512,8 @@ function svelte(inlineOptions) {
     },
     async transform(code, id, opts) {
       var _a;
-      const ssr = opts === true || (opts == null ? void 0 : opts.ssr);
-      const svelteRequest = requestParser(id, !!ssr);
+      const ssr = !!(opts == null ? void 0 : opts.ssr);
+      const svelteRequest = requestParser(id, ssr);
       if (!svelteRequest) {
         return;
       }
@@ -1473,7 +1529,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) {