@sveltejs/vite-plugin-svelte 1.3.0 → 1.3.1

package/dist/index.cjs

@@ -516,7 +516,7 @@ function buildIdParser(options) {
 }
 
 // src/utils/options.ts
-var import_vite3 = require("vite");
+var import_vite4 = require("vite");
 
 // src/utils/load-svelte-config.ts
 var import_module = require("module");
@@ -627,7 +627,7 @@ var SVELTE_HMR_IMPORTS = [
 var SVELTE_EXPORT_CONDITIONS = ["svelte"];
 
 // src/utils/options.ts
-var import_path4 = __toESM(require("path"), 1);
+var import_path5 = __toESM(require("path"), 1);
 
 // src/utils/esbuild.ts
 var import_fs2 = require("fs");
@@ -1117,7 +1117,9 @@ function isCommonDepWithoutSvelteField(dependency) {
 // src/utils/vite-plugin-svelte-stats.ts
 var import_vitefu2 = require("vitefu");
 var import_fs3 = require("fs");
+var import_path4 = require("path");
 var import_perf_hooks = require("perf_hooks");
+var import_vite3 = require("vite");
 var defaultCollectionOptions = {
   logInProgress: (c, now) => now - c.collectionStart > 500 && c.stats.length > 1,
   logResult: () => true
@@ -1155,6 +1157,19 @@ function formatPackageStats(pkgStats) {
   ).join("\n");
   return table;
 }
+async function getClosestNamedPackage(file) {
+  let name = "$unknown";
+  let path9 = await (0, import_vitefu2.findClosestPkgJsonPath)(file, (pkgPath) => {
+    const pkg = JSON.parse((0, import_fs3.readFileSync)(pkgPath, "utf-8"));
+    if (pkg.name != null) {
+      name = pkg.name;
+      return true;
+    }
+    return false;
+  });
+  path9 = (0, import_vite3.normalizePath)((0, import_path4.dirname)(path9 ?? file)) + "/";
+  return { name, path: path9 };
+}
 var VitePluginSvelteStats = class {
   constructor() {
     this._packages = [];
@@ -1179,6 +1194,7 @@ var VitePluginSvelteStats = class {
         if (collection.finished) {
           throw new Error("called after finish() has been used");
         }
+        file = (0, import_vite3.normalizePath)(file);
         const start = import_perf_hooks.performance.now();
         const stat = { file, start, end: start };
         return () => {
@@ -1202,50 +1218,40 @@ var VitePluginSvelteStats = class {
     await Promise.all(this._collections.map((c) => c.finish()));
   }
   async _finish(collection) {
-    collection.finished = true;
-    const now = import_perf_hooks.performance.now();
-    collection.duration = now - collection.collectionStart;
-    const logResult = collection.options.logResult(collection);
-    if (logResult) {
-      await this._aggregateStatsResult(collection);
-      log.info(`${collection.name} done.`, formatPackageStats(collection.packageStats));
-    }
-    const index = this._collections.indexOf(collection);
-    this._collections.splice(index, 1);
-    collection.stats.length = 0;
-    collection.stats = [];
-    if (collection.packageStats) {
-      collection.packageStats.length = 0;
-      collection.packageStats = [];
+    try {
+      collection.finished = true;
+      const now = import_perf_hooks.performance.now();
+      collection.duration = now - collection.collectionStart;
+      const logResult = collection.options.logResult(collection);
+      if (logResult) {
+        await this._aggregateStatsResult(collection);
+        log.info(`${collection.name} done.`, formatPackageStats(collection.packageStats));
+      }
+      const index = this._collections.indexOf(collection);
+      this._collections.splice(index, 1);
+      collection.stats.length = 0;
+      collection.stats = [];
+      if (collection.packageStats) {
+        collection.packageStats.length = 0;
+        collection.packageStats = [];
+      }
+      collection.start = () => () => {
+      };
+      collection.finish = () => {
+      };
+    } catch (e) {
+      log.debug.once(`failed to finish stats for ${collection.name}`, e);
     }
-    collection.start = () => () => {
-    };
-    collection.finish = () => {
-    };
   }
   async _aggregateStatsResult(collection) {
     const stats = collection.stats;
     for (const stat of stats) {
       let pkg = this._packages.find((p) => stat.file.startsWith(p.path));
       if (!pkg) {
-        let pkgPath = await (0, import_vitefu2.findClosestPkgJsonPath)(stat.file);
-        if (pkgPath) {
-          let path9 = pkgPath?.replace(/package.json$/, "");
-          let name = JSON.parse((0, import_fs3.readFileSync)(pkgPath, "utf-8")).name;
-          if (!name) {
-            pkgPath = await (0, import_vitefu2.findClosestPkgJsonPath)(path9);
-            if (pkgPath) {
-              path9 = pkgPath?.replace(/package.json$/, "");
-              name = JSON.parse((0, import_fs3.readFileSync)(pkgPath, "utf-8")).name;
-            }
-          }
-          if (path9 && name) {
-            pkg = { path: path9, name };
-            this._packages.push(pkg);
-          }
-        }
+        pkg = await getClosestNamedPackage(stat.file);
+        this._packages.push(pkg);
       }
-      stat.pkg = pkg?.name ?? "$unknown";
+      stat.pkg = pkg.name;
     }
     const grouped = {};
     stats.forEach((stat) => {
@@ -1506,7 +1512,7 @@ function handleDeprecatedOptions(options) {
   }
 }
 function resolveViteRoot(viteConfig) {
-  return (0, import_vite3.normalizePath)(viteConfig.root ? import_path4.default.resolve(viteConfig.root) : process.cwd());
+  return (0, import_vite4.normalizePath)(viteConfig.root ? import_path5.default.resolve(viteConfig.root) : process.cwd());
 }
 async function buildExtraViteConfig(options, config) {
   const extraViteConfig = {
@@ -1673,7 +1679,7 @@ function patchResolvedViteConfig(viteConfig, options) {
 
 // src/utils/watch.ts
 var import_fs4 = __toESM(require("fs"), 1);
-var import_path5 = __toESM(require("path"), 1);
+var import_path6 = __toESM(require("path"), 1);
 function setupWatchers(options, cache, requestParser) {
   const { server, configFile: svelteConfigFile } = options;
   if (!server) {
@@ -1720,7 +1726,7 @@ function setupWatchers(options, cache, requestParser) {
     unlink: [removeUnlinkedFromCache, emitChangeEventOnDependants]
   };
   if (svelteConfigFile !== false) {
-    const possibleSvelteConfigs = knownSvelteConfigNames.map((cfg) => import_path5.default.join(root, cfg));
+    const possibleSvelteConfigs = knownSvelteConfigNames.map((cfg) => import_path6.default.join(root, cfg));
     const restartOnConfigAdd = (filename) => {
       if (possibleSvelteConfigs.includes(filename)) {
         triggerViteRestart(filename);
@@ -1746,12 +1752,12 @@ function setupWatchers(options, cache, requestParser) {
 }
 function ensureWatchedFile(watcher, file, root) {
   if (file && !file.startsWith(root + "/") && !file.includes("\0") && import_fs4.default.existsSync(file)) {
-    watcher.add(import_path5.default.resolve(file));
+    watcher.add(import_path6.default.resolve(file));
   }
 }
 
 // src/utils/resolve.ts
-var import_path6 = __toESM(require("path"), 1);
+var import_path7 = __toESM(require("path"), 1);
 var import_module2 = require("module");
 async function resolveViaPackageJsonSvelte(importee, importer, cache) {
   if (importer && isBareImport(importee) && !isNodeInternal(importee) && !isCommonDepWithoutSvelteField(importee)) {
@@ -1763,7 +1769,7 @@ async function resolveViaPackageJsonSvelte(importee, importer, cache) {
     if (pkgData) {
       const { pkg, dir } = pkgData;
       if (pkg.svelte) {
-        const result = import_path6.default.resolve(dir, pkg.svelte);
+        const result = import_path7.default.resolve(dir, pkg.svelte);
         cache.setResolvedSvelteField(importee, importer, result);
         return result;
       }
@@ -1774,7 +1780,7 @@ function isNodeInternal(importee) {
   return importee.startsWith("node:") || import_module2.builtinModules.includes(importee);
 }
 function isBareImport(importee) {
-  if (!importee || importee[0] === "." || importee[0] === "\0" || importee.includes(":") || import_path6.default.isAbsolute(importee)) {
+  if (!importee || importee[0] === "." || importee[0] === "\0" || importee.includes(":") || import_path7.default.isAbsolute(importee)) {
     return false;
   }
   const parts = importee.split("/");
@@ -1790,7 +1796,7 @@ function isBareImport(importee) {
 
 // src/utils/optimizer.ts
 var import_fs5 = require("fs");
-var import_path7 = __toESM(require("path"), 1);
+var import_path8 = __toESM(require("path"), 1);
 var PREBUNDLE_SENSITIVE_OPTIONS = [
   "compilerOptions",
   "configFile",
@@ -1801,7 +1807,7 @@ var PREBUNDLE_SENSITIVE_OPTIONS = [
 ];
 async function saveSvelteMetadata(cacheDir, options) {
   const svelteMetadata = generateSvelteMetadata(options);
-  const svelteMetadataPath = import_path7.default.resolve(cacheDir, "_svelte_metadata.json");
+  const svelteMetadataPath = import_path8.default.resolve(cacheDir, "_svelte_metadata.json");
   const currentSvelteMetadata = JSON.stringify(svelteMetadata, (_, value) => {
     return typeof value === "function" ? value.toString() : value;
   });
@@ -1823,8 +1829,8 @@ function generateSvelteMetadata(options) {
 }
 
 // src/ui/inspector/plugin.ts
-var import_vite4 = require("vite");
-var import_path8 = __toESM(require("path"), 1);
+var import_vite5 = require("vite");
+var import_path9 = __toESM(require("path"), 1);
 var import_url2 = require("url");
 var import_fs6 = __toESM(require("fs"), 1);
 
@@ -1851,7 +1857,7 @@ var defaultInspectorOptions = {
   customStyles: true
 };
 function getInspectorPath() {
-  const pluginPath = (0, import_vite4.normalizePath)(import_path8.default.dirname((0, import_url2.fileURLToPath)(importMetaUrl)));
+  const pluginPath = (0, import_vite5.normalizePath)(import_path9.default.dirname((0, import_url2.fileURLToPath)(importMetaUrl)));
   return pluginPath.replace(/\/vite-plugin-svelte\/dist$/, "/vite-plugin-svelte/src/ui/inspector/");
 }
 function svelteInspector() {
@@ -1877,7 +1883,7 @@ function svelteInspector() {
         disabled = true;
       } else {
         if (vps.api.options.kit && !inspectorOptions.appendTo) {
-          const out_dir = import_path8.default.basename(vps.api.options.kit.outDir || ".svelte-kit");
+          const out_dir = import_path9.default.basename(vps.api.options.kit.outDir || ".svelte-kit");
           inspectorOptions.appendTo = `${out_dir}/generated/root.svelte`;
         }
         appendTo = inspectorOptions.appendTo;