@sveltejs/vite-plugin-svelte 1.0.0-next.34 → 1.0.0-next.35

package/dist/index.js

@@ -26,7 +26,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/index.ts
-import fs8 from "fs";
+import fs7 from "fs";
 
 // src/utils/log.ts
 import { cyan, yellow, red } from "kleur/colors";
@@ -1237,6 +1237,7 @@ var VitePluginSvelteCache = class {
     this._js = /* @__PURE__ */ new Map();
     this._dependencies = /* @__PURE__ */ new Map();
     this._dependants = /* @__PURE__ */ new Map();
+    this._resolvedSvelteFields = /* @__PURE__ */ new Map();
   }
   update(compileData) {
     this.updateCSS(compileData);
@@ -1302,6 +1303,15 @@ var VitePluginSvelteCache = class {
     const dependants = this._dependants.get(path7);
     return dependants ? [...dependants] : [];
   }
+  getResolvedSvelteField(name, importer) {
+    return this._resolvedSvelteFields.get(this._getResolvedSvelteFieldKey(name, importer));
+  }
+  setResolvedSvelteField(importee, importer = void 0, resolvedSvelte) {
+    this._resolvedSvelteFields.set(this._getResolvedSvelteFieldKey(importee, importer), resolvedSvelte);
+  }
+  _getResolvedSvelteFieldKey(importee, importer) {
+    return importer ? `${importer} > ${importee}` : importee;
+  }
 };
 
 // src/utils/watch.ts
@@ -1381,14 +1391,24 @@ function ensureWatchedFile(watcher, file, root) {
 
 // src/utils/resolve.ts
 import path5 from "path";
-import fs6 from "fs";
-import relative from "require-relative";
-function resolveViaPackageJsonSvelte(importee, importer) {
-  if (importer && isBareImport(importee)) {
-    const importeePkgFile = relative.resolve(`${importee}/package.json`, path5.dirname(importer));
-    const importeePkg = JSON.parse(fs6.readFileSync(importeePkgFile, { encoding: "utf-8" }));
-    if (importeePkg.svelte) {
-      return path5.resolve(path5.dirname(importeePkgFile), importeePkg.svelte);
+import { createRequire as createRequire4 } from "module";
+function resolveViaPackageJsonSvelte(importee, importer, cache) {
+  if (importer && isBareImport(importee) && !is_common_without_svelte_field(importee)) {
+    const cached = cache.getResolvedSvelteField(importee, importer);
+    if (cached) {
+      return cached;
+    }
+    const localRequire = createRequire4(importer);
+    const pkgData = resolveDependencyData(importee, localRequire);
+    if (pkgData) {
+      const { pkg, dir } = pkgData;
+      if (pkg.svelte) {
+        const result = path5.resolve(dir, pkg.svelte);
+        cache.setResolvedSvelteField(importee, importer, result);
+        return result;
+      }
+    } else {
+      throw new Error(`failed to resolve package.json of ${importee} imported by ${importer}`);
     }
   }
 }
@@ -1408,7 +1428,7 @@ function isBareImport(importee) {
 }
 
 // src/utils/optimizer.ts
-import fs7 from "fs";
+import fs6 from "fs";
 import path6 from "path";
 import { optimizeDeps } from "vite";
 var PREBUNDLE_SENSITIVE_OPTIONS = [
@@ -1423,19 +1443,19 @@ async function handleOptimizeDeps(options, viteConfig) {
   if (!options.experimental.prebundleSvelteLibraries || !viteConfig.cacheDir)
     return;
   const viteMetadataPath = path6.resolve(viteConfig.cacheDir, "_metadata.json");
-  if (!fs7.existsSync(viteMetadataPath))
+  if (!fs6.existsSync(viteMetadataPath))
     return;
   const svelteMetadataPath = path6.resolve(viteConfig.cacheDir, "_svelte_metadata.json");
   const currentSvelteMetadata = JSON.stringify(generateSvelteMetadata(options), (_, value) => {
     return typeof value === "function" ? value.toString() : value;
   });
-  if (fs7.existsSync(svelteMetadataPath)) {
-    const existingSvelteMetadata = fs7.readFileSync(svelteMetadataPath, "utf8");
+  if (fs6.existsSync(svelteMetadataPath)) {
+    const existingSvelteMetadata = fs6.readFileSync(svelteMetadataPath, "utf8");
     if (existingSvelteMetadata === currentSvelteMetadata)
       return;
   }
   await optimizeDeps(viteConfig, true);
-  fs7.writeFileSync(svelteMetadataPath, currentSvelteMetadata);
+  fs6.writeFileSync(svelteMetadataPath, currentSvelteMetadata);
 }
 function generateSvelteMetadata(options) {
   const metadata = {};
@@ -1452,7 +1472,7 @@ function svelte(inlineOptions) {
   }
   validateInlineOptions(inlineOptions);
   const cache = new VitePluginSvelteCache();
-  const pkg_export_errors = /* @__PURE__ */ new Set();
+  const pkg_resolve_errors = /* @__PURE__ */ new Set();
   let requestParser;
   let options;
   let viteConfig;
@@ -1501,7 +1521,7 @@ function svelte(inlineOptions) {
         }
         if (viteConfig.assetsInclude(filename)) {
           log.debug(`load returns raw content for ${filename}`);
-          return fs8.readFileSync(filename, "utf-8");
+          return fs7.readFileSync(filename, "utf-8");
         }
       }
     },
@@ -1529,21 +1549,13 @@ function svelte(inlineOptions) {
         return resolvedSvelteSSR;
       }
       try {
-        const resolved = resolveViaPackageJsonSvelte(importee, importer);
+        const resolved = resolveViaPackageJsonSvelte(importee, importer, cache);
         if (resolved) {
           log.debug(`resolveId resolved ${resolved} via package.json svelte field of ${importee}`);
           return resolved;
         }
       } catch (err) {
-        switch (err.code) {
-          case "ERR_PACKAGE_PATH_NOT_EXPORTED":
-            pkg_export_errors.add(importee);
-            return null;
-          case "MODULE_NOT_FOUND":
-            return null;
-          default:
-            throw err;
-        }
+        pkg_resolve_errors.add(importee);
       }
     },
     async transform(code, id, opts) {
@@ -1591,8 +1603,10 @@ function svelte(inlineOptions) {
       }
     },
     buildEnd() {
-      if (pkg_export_errors.size > 0) {
-        log.warn(`The following packages did not export their \`package.json\` file so we could not check the "svelte" field. If you had difficulties importing svelte components from a package, then please contact the author and ask them to export the package.json file.`, Array.from(pkg_export_errors, (s) => `- ${s}`).join("\n"));
+      if (pkg_resolve_errors.size > 0) {
+        log.warn(`vite-plugin-svelte was unable to find package.json of the following packages and wasn't able to resolve via their "svelte" field.
+					If you had difficulties importing svelte components from a package, then please contact the author and ask them to export the package.json file.
+					${Array.from(pkg_resolve_errors, (s) => `- ${s}`).join("\n")}`.replace(/\t/g, ""));
       }
     }
   };