@sveltejs/vite-plugin-svelte 1.0.0-next.48 → 1.0.0-next.49

package/dist/index.cjs

@@ -139,18 +139,42 @@ var log = {
   error: createLogger("error"),
   setLevel
 };
-function logCompilerWarnings(warnings, options) {
+function logCompilerWarnings(svelteRequest, warnings, options) {
+  var _a, _b, _c;
   const { emitCss, onwarn, isBuild } = options;
-  const warn = isBuild ? warnBuild : warnDev;
-  const notIgnoredWarnings = warnings == null ? void 0 : warnings.filter((w) => !ignoreCompilerWarning(w, isBuild, emitCss));
-  const extraWarnings = buildExtraWarnings(warnings, isBuild);
-  [...notIgnoredWarnings, ...extraWarnings].forEach((warning) => {
+  const sendViaWS = !isBuild && ((_a = options.experimental) == null ? void 0 : _a.sendWarningsToBrowser);
+  let warn = isBuild ? warnBuild : warnDev;
+  const handledByDefaultWarn = [];
+  const notIgnored = warnings == null ? void 0 : warnings.filter((w) => !ignoreCompilerWarning(w, isBuild, emitCss));
+  const extra = buildExtraWarnings(warnings, isBuild);
+  const allWarnings = [...notIgnored, ...extra];
+  if (sendViaWS) {
+    const _warn = warn;
+    warn = (w) => {
+      handledByDefaultWarn.push(w);
+      _warn(w);
+    };
+  }
+  allWarnings.forEach((warning) => {
     if (onwarn) {
       onwarn(warning, warn);
     } else {
       warn(warning);
     }
   });
+  if (sendViaWS) {
+    const message = {
+      id: svelteRequest.id,
+      filename: svelteRequest.filename,
+      normalizedFilename: svelteRequest.normalizedFilename,
+      timestamp: svelteRequest.timestamp,
+      warnings: handledByDefaultWarn,
+      allWarnings,
+      rawWarnings: warnings
+    };
+    log.debug(`sending svelte:warnings message for ${svelteRequest.normalizedFilename}`);
+    (_c = (_b = options.server) == null ? void 0 : _b.ws) == null ? void 0 : _c.send("svelte:warnings", message);
+  }
 }
 function ignoreCompilerWarning(warning, isBuild, emitCss) {
   return !emitCss && warning.code === "css-unused-selector" || !isBuild && isNoScopableElementWarning(warning);
@@ -197,31 +221,37 @@ function buildExtendedLogMessage(w) {
 
 // src/handle-hot-update.ts
 async function handleHotUpdate(compileSvelte2, ctx, svelteRequest, cache, options) {
-  const { read, server } = ctx;
-  const cachedJS = cache.getJS(svelteRequest);
-  if (!cachedJS) {
-    log.debug(`handleHotUpdate first call ${svelteRequest.id}`);
+  if (!cache.has(svelteRequest)) {
+    log.debug(`handleHotUpdate called before initial transform for ${svelteRequest.id}`);
     return;
   }
+  const { read, server } = ctx;
+  const cachedJS = cache.getJS(svelteRequest);
   const cachedCss = cache.getCSS(svelteRequest);
   const content = await read();
-  const compileData = await compileSvelte2(svelteRequest, content, options);
-  cache.update(compileData);
+  let compileData;
+  try {
+    compileData = await compileSvelte2(svelteRequest, content, options);
+    cache.update(compileData);
+  } catch (e) {
+    cache.setError(svelteRequest, e);
+    throw e;
+  }
   const affectedModules = /* @__PURE__ */ new Set();
   const cssModule = server.moduleGraph.getModuleById(svelteRequest.cssId);
   const mainModule = server.moduleGraph.getModuleById(svelteRequest.id);
   const cssUpdated = cssModule && cssChanged(cachedCss, compileData.compiled.css);
   if (cssUpdated) {
-    log.debug("handleHotUpdate css changed");
+    log.debug(`handleHotUpdate css changed for ${svelteRequest.cssId}`);
     affectedModules.add(cssModule);
   }
   const jsUpdated = mainModule && jsChanged(cachedJS, compileData.compiled.js, svelteRequest.filename);
   if (jsUpdated) {
-    log.debug("handleHotUpdate js changed");
+    log.debug(`handleHotUpdate js changed for ${svelteRequest.id}`);
     affectedModules.add(mainModule);
   }
   if (!jsUpdated) {
-    logCompilerWarnings(compileData.compiled.warnings, options);
+    logCompilerWarnings(svelteRequest, compileData.compiled.warnings, options);
   }
   const result = [...affectedModules].filter(Boolean);
   const ssrModulesToInvalidate = result.filter((m) => !!m.ssrTransformResult);
@@ -1327,12 +1357,22 @@ var VitePluginSvelteCache = class {
     this._dependencies = /* @__PURE__ */ new Map();
     this._dependants = /* @__PURE__ */ new Map();
     this._resolvedSvelteFields = /* @__PURE__ */ new Map();
+    this._errors = /* @__PURE__ */ new Map();
   }
   update(compileData) {
+    this._errors.delete(compileData.normalizedFilename);
     this.updateCSS(compileData);
     this.updateJS(compileData);
     this.updateDependencies(compileData);
   }
+  has(svelteRequest) {
+    const id = svelteRequest.normalizedFilename;
+    return this._errors.has(id) || this._js.has(id) || this._css.has(id);
+  }
+  setError(svelteRequest, error) {
+    this.remove(svelteRequest, true);
+    this._errors.set(svelteRequest.normalizedFilename, error);
+  }
   updateCSS(compileData) {
     this._css.set(compileData.normalizedFilename, compileData.compiled.css);
   }
@@ -1358,25 +1398,30 @@ var VitePluginSvelteCache = class {
       this._dependants.get(d).delete(compileData.filename);
     });
   }
-  remove(svelteRequest) {
+  remove(svelteRequest, keepDependencies = false) {
     const id = svelteRequest.normalizedFilename;
     let removed = false;
+    if (this._errors.delete(id)) {
+      removed = true;
+    }
     if (this._js.delete(id)) {
       removed = true;
     }
     if (this._css.delete(id)) {
       removed = true;
     }
-    const dependencies = this._dependencies.get(id);
-    if (dependencies) {
-      removed = true;
-      dependencies.forEach((d) => {
-        const dependants = this._dependants.get(d);
-        if (dependants && dependants.has(svelteRequest.filename)) {
-          dependants.delete(svelteRequest.filename);
-        }
-      });
-      this._dependencies.delete(id);
+    if (!keepDependencies) {
+      const dependencies = this._dependencies.get(id);
+      if (dependencies) {
+        removed = true;
+        dependencies.forEach((d) => {
+          const dependants = this._dependants.get(d);
+          if (dependants && dependants.has(svelteRequest.filename)) {
+            dependants.delete(svelteRequest.filename);
+          }
+        });
+        this._dependencies.delete(id);
+      }
     }
     return removed;
   }
@@ -1388,6 +1433,9 @@ var VitePluginSvelteCache = class {
       return this._js.get(svelteRequest.normalizedFilename);
     }
   }
+  getError(svelteRequest) {
+    return this._errors.get(svelteRequest.normalizedFilename);
+  }
   getDependants(path9) {
     const dependants = this._dependants.get(path9);
     return dependants ? [...dependants] : [];
@@ -1761,9 +1809,10 @@ function svelte(inlineOptions) {
         try {
           compileData = await compileSvelte2(svelteRequest, code, options);
         } catch (e) {
+          cache.setError(svelteRequest, e);
           throw toRollupError(e, options);
         }
-        logCompilerWarnings(compileData.compiled.warnings, options);
+        logCompilerWarnings(svelteRequest, compileData.compiled.warnings, options);
         cache.update(compileData);
         if (((_a = compileData.dependencies) == null ? void 0 : _a.length) && options.server) {
           compileData.dependencies.forEach((d) => {
@@ -1785,7 +1834,11 @@ function svelte(inlineOptions) {
         }
         const svelteRequest = requestParser(ctx.file, false, ctx.timestamp);
         if (svelteRequest) {
-          return handleHotUpdate(compileSvelte2, ctx, svelteRequest, cache, options);
+          try {
+            return handleHotUpdate(compileSvelte2, ctx, svelteRequest, cache, options);
+          } catch (e) {
+            throw toRollupError(e, options);
+          }
         }
       }
     }