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

package/dist/index.d.ts

@@ -1,8 +1,9 @@
-import { Plugin } from 'vite';
+import { UserConfig, Plugin } from 'vite';
 import { CompileOptions, Warning } from 'svelte/types/compiler/interfaces';
 export { CompileOptions, Warning } from 'svelte/types/compiler/interfaces';
 import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
 export { MarkupPreprocessor, Preprocessor, PreprocessorGroup, Processed } from 'svelte/types/compiler/preprocess';
+import { KitConfig } from '@sveltejs/kit';
 
 interface Options {
     /**
@@ -101,6 +102,10 @@ interface Options {
      * These options are considered experimental and breaking changes to them can occur in any release
      */
     experimental?: ExperimentalOptions;
+    /**
+     * Options for SvelteKit
+     */
+    kit?: KitConfig;
 }
 /**
  * These options are considered experimental and breaking changes to them can occur in any release
@@ -156,6 +161,11 @@ interface ExperimentalOptions {
      * enable svelte inspector
      */
     inspector?: InspectorOptions | boolean;
+    /**
+     * send a websocket message with svelte compiler warnings during dev
+     *
+     */
+    sendWarningsToBrowser?: boolean;
 }
 interface InspectorOptions {
     /**
@@ -200,6 +210,18 @@ declare type ModuleFormat = NonNullable<CompileOptions['format']>;
 declare type CssHashGetter = NonNullable<CompileOptions['cssHash']>;
 declare type Arrayable<T> = T | T[];
 
+declare function loadSvelteConfig(viteConfig?: UserConfig, inlineOptions?: Partial<Options>): Promise<Partial<Options> | undefined>;
+
+declare type SvelteWarningsMessage = {
+    id: string;
+    filename: string;
+    normalizedFilename: string;
+    timestamp: number;
+    warnings: Warning[];
+    allWarnings: Warning[];
+    rawWarnings: Warning[];
+};
+
 declare function svelte(inlineOptions?: Partial<Options>): Plugin[];
 
-export { Arrayable, CssHashGetter, ModuleFormat, Options, svelte };
+export { Arrayable, CssHashGetter, ModuleFormat, Options, SvelteWarningsMessage, loadSvelteConfig, svelte };

package/dist/index.js

@@ -116,18 +116,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);
@@ -174,31 +198,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);
@@ -457,9 +487,9 @@ var knownSvelteConfigNames = [
   "svelte.config.cjs",
   "svelte.config.mjs"
 ];
-var dynamicImportDefault = new Function("path", 'return import(path + "?t=" + Date.now()).then(m => m.default)');
+var dynamicImportDefault = new Function("path", "timestamp", 'return import(path + "?t=" + timestamp).then(m => m.default)');
 async function loadSvelteConfig(viteConfig, inlineOptions) {
-  if (inlineOptions.configFile === false) {
+  if ((inlineOptions == null ? void 0 : inlineOptions.configFile) === false) {
     return;
   }
   const configFile = findConfigToLoad(viteConfig, inlineOptions);
@@ -467,7 +497,7 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
     let err;
     if (configFile.endsWith(".js") || configFile.endsWith(".mjs")) {
       try {
-        const result = await dynamicImportDefault(pathToFileURL(configFile).href);
+        const result = await dynamicImportDefault(pathToFileURL(configFile).href, fs2.statSync(configFile).mtimeMs);
         if (result != null) {
           return __spreadProps(__spreadValues({}, result), {
             configFile
@@ -503,8 +533,8 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
   }
 }
 function findConfigToLoad(viteConfig, inlineOptions) {
-  const root = viteConfig.root || process.cwd();
-  if (inlineOptions.configFile) {
+  const root = (viteConfig == null ? void 0 : viteConfig.root) || process.cwd();
+  if (inlineOptions == null ? void 0 : inlineOptions.configFile) {
     const abolutePath = path.isAbsolute(inlineOptions.configFile) ? inlineOptions.configFile : path.resolve(root, inlineOptions.configFile);
     if (!fs2.existsSync(abolutePath)) {
       throw new Error(`failed to find svelte config file ${abolutePath}.`);
@@ -649,6 +679,7 @@ function isSvelteLib(pkg) {
 }
 var COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD = [
   "@lukeed/uuid",
+  "@playwright/test",
   "@sveltejs/vite-plugin-svelte",
   "@sveltejs/kit",
   "autoprefixer",
@@ -658,6 +689,7 @@ var COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD = [
   "eslint",
   "jest",
   "mdsvex",
+  "playwright",
   "postcss",
   "prettier",
   "svelte",
@@ -666,7 +698,9 @@ var COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD = [
   "svelte-preprocess",
   "tslib",
   "typescript",
-  "vite"
+  "vite",
+  "vitest",
+  "__vite-browser-external"
 ];
 var COMMON_PREFIXES_WITHOUT_SVELTE_FIELD = [
   "@fontsource/",
@@ -1122,6 +1156,7 @@ function resolveOptions(preResolveOptions2, viteConfig) {
   };
   const merged = mergeConfigs(defaultOptions, preResolveOptions2, extraOptions);
   removeIgnoredOptions(merged);
+  addSvelteKitOptions(merged);
   addExtraPreprocessors(merged, viteConfig);
   enforceOptionsForHmr(merged);
   enforceOptionsForProduction(merged);
@@ -1184,6 +1219,17 @@ function removeIgnoredOptions(options) {
     });
   }
 }
+function addSvelteKitOptions(options) {
+  var _a, _b;
+  if ((options == null ? void 0 : options.kit) != null) {
+    const hydratable = ((_a = options.kit.browser) == null ? void 0 : _a.hydrate) !== false;
+    if (options.compilerOptions.hydratable != null && options.compilerOptions.hydratable !== hydratable) {
+      log.warn(`Conflicting values "compilerOptions.hydratable: ${options.compilerOptions.hydratable}" and "kit.browser.hydrate: ${(_b = options.kit.browser) == null ? void 0 : _b.hydrate}" in your svelte config. You should remove "compilerOptions.hydratable".`);
+    }
+    log.debug(`Setting compilerOptions.hydratable: ${hydratable} for SvelteKit`);
+    options.compilerOptions.hydratable = hydratable;
+  }
+}
 function resolveViteRoot(viteConfig) {
   return normalizePath2(viteConfig.root ? path4.resolve(viteConfig.root) : process.cwd());
 }
@@ -1292,12 +1338,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);
   }
@@ -1323,25 +1379,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;
   }
@@ -1353,6 +1414,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] : [];
@@ -1726,9 +1790,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) => {
@@ -1750,7 +1815,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);
+          }
         }
       }
     }
@@ -1759,6 +1828,7 @@ function svelte(inlineOptions) {
   return plugins.filter(Boolean);
 }
 export {
+  loadSvelteConfig,
   svelte
 };
 //# sourceMappingURL=index.js.map