@sveltejs/vite-plugin-svelte 1.3.0 → 1.3.1

package/dist/index.js

@@ -487,7 +487,7 @@ function buildIdParser(options) {
 }
 
 // src/utils/options.ts
-import { normalizePath as normalizePath2 } from "vite";
+import { normalizePath as normalizePath3 } from "vite";
 
 // src/utils/load-svelte-config.ts
 import { createRequire } from "module";
@@ -1094,7 +1094,9 @@ function isCommonDepWithoutSvelteField(dependency) {
 // src/utils/vite-plugin-svelte-stats.ts
 import { findClosestPkgJsonPath } from "vitefu";
 import { readFileSync as readFileSync2 } from "fs";
+import { dirname } from "path";
 import { performance } from "perf_hooks";
+import { normalizePath as normalizePath2 } from "vite";
 var defaultCollectionOptions = {
   logInProgress: (c, now) => now - c.collectionStart > 500 && c.stats.length > 1,
   logResult: () => true
@@ -1132,6 +1134,19 @@ function formatPackageStats(pkgStats) {
   ).join("\n");
   return table;
 }
+async function getClosestNamedPackage(file) {
+  let name = "$unknown";
+  let path9 = await findClosestPkgJsonPath(file, (pkgPath) => {
+    const pkg = JSON.parse(readFileSync2(pkgPath, "utf-8"));
+    if (pkg.name != null) {
+      name = pkg.name;
+      return true;
+    }
+    return false;
+  });
+  path9 = normalizePath2(dirname(path9 ?? file)) + "/";
+  return { name, path: path9 };
+}
 var VitePluginSvelteStats = class {
   constructor() {
     this._packages = [];
@@ -1156,6 +1171,7 @@ var VitePluginSvelteStats = class {
         if (collection.finished) {
           throw new Error("called after finish() has been used");
         }
+        file = normalizePath2(file);
         const start = performance.now();
         const stat = { file, start, end: start };
         return () => {
@@ -1179,50 +1195,40 @@ var VitePluginSvelteStats = class {
     await Promise.all(this._collections.map((c) => c.finish()));
   }
   async _finish(collection) {
-    collection.finished = true;
-    const now = 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 = 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 findClosestPkgJsonPath(stat.file);
-        if (pkgPath) {
-          let path9 = pkgPath?.replace(/package.json$/, "");
-          let name = JSON.parse(readFileSync2(pkgPath, "utf-8")).name;
-          if (!name) {
-            pkgPath = await findClosestPkgJsonPath(path9);
-            if (pkgPath) {
-              path9 = pkgPath?.replace(/package.json$/, "");
-              name = JSON.parse(readFileSync2(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) => {
@@ -1483,7 +1489,7 @@ function handleDeprecatedOptions(options) {
   }
 }
 function resolveViteRoot(viteConfig) {
-  return normalizePath2(viteConfig.root ? path4.resolve(viteConfig.root) : process.cwd());
+  return normalizePath3(viteConfig.root ? path4.resolve(viteConfig.root) : process.cwd());
 }
 async function buildExtraViteConfig(options, config) {
   const extraViteConfig = {
@@ -1800,7 +1806,7 @@ function generateSvelteMetadata(options) {
 }
 
 // src/ui/inspector/plugin.ts
-import { normalizePath as normalizePath3 } from "vite";
+import { normalizePath as normalizePath4 } from "vite";
 import path8 from "path";
 import { fileURLToPath } from "url";
 import fs6 from "fs";
@@ -1828,7 +1834,7 @@ var defaultInspectorOptions = {
   customStyles: true
 };
 function getInspectorPath() {
-  const pluginPath = normalizePath3(path8.dirname(fileURLToPath(import.meta.url)));
+  const pluginPath = normalizePath4(path8.dirname(fileURLToPath(import.meta.url)));
   return pluginPath.replace(/\/vite-plugin-svelte\/dist$/, "/vite-plugin-svelte/src/ui/inspector/");
 }
 function svelteInspector() {