@sveltejs/vite-plugin-svelte 1.0.0-next.37 → 1.0.0-next.40

package/dist/index.js

@@ -684,11 +684,20 @@ function needsOptimization(dep, localRequire) {
   if (!depData)
     return false;
   const pkg = depData.pkg;
-  const isCjs = pkg.main && !pkg.module && !pkg.exports;
-  if (!isCjs)
+  const hasEsmFields = pkg.module || pkg.exports;
+  if (hasEsmFields)
     return false;
-  const entryExt = path2.extname(pkg.main);
-  return !entryExt || entryExt === ".js" || entryExt === ".cjs";
+  if (pkg.main) {
+    const entryExt = path2.extname(pkg.main);
+    return !entryExt || entryExt === ".js" || entryExt === ".cjs";
+  } else {
+    try {
+      localRequire.resolve(`${dep}/index.js`);
+      return true;
+    } catch {
+      return false;
+    }
+  }
 }
 
 // src/utils/options.ts
@@ -1161,7 +1170,7 @@ function enforceOptionsForProduction(options) {
 function resolveViteRoot(viteConfig) {
   return normalizePath2(viteConfig.root ? path3.resolve(viteConfig.root) : process.cwd());
 }
-function buildExtraViteConfig(options, config, configEnv) {
+function buildExtraViteConfig(options, config) {
   const svelteDeps = findRootSvelteDependencies(options.root);
   const extraViteConfig = {
     resolve: {
@@ -1169,10 +1178,10 @@ function buildExtraViteConfig(options, config, configEnv) {
       dedupe: [...SVELTE_IMPORTS, ...SVELTE_HMR_IMPORTS]
     }
   };
-  if (configEnv.command === "serve") {
+  if (options.isServe) {
     extraViteConfig.optimizeDeps = buildOptimizeDepsForSvelte(svelteDeps, options, config.optimizeDeps);
   }
-  extraViteConfig.ssr = buildSSROptionsForSvelte(svelteDeps, options, config);
+  extraViteConfig.ssr = buildSSROptionsForSvelte(svelteDeps, options, config, extraViteConfig);
   return extraViteConfig;
 }
 function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps2) {
@@ -1235,9 +1244,16 @@ function buildSSROptionsForSvelte(svelteDeps, options, config) {
     var _a2, _b2, _c2, _d;
     return !((_b2 = (_a2 = config.ssr) == null ? void 0 : _a2.external) == null ? void 0 : _b2.includes(x)) && !((_d = (_c2 = config.optimizeDeps) == null ? void 0 : _c2.include) == null ? void 0 : _d.includes(x));
   }));
-  return {
+  const ssr = {
     noExternal
   };
+  if (options.isServe) {
+    ssr.external = Array.from(new Set(svelteDeps.flatMap((dep) => Object.keys(dep.pkg.dependencies || {})))).filter((dep) => {
+      var _a2, _b2, _c2, _d;
+      return !ssr.noExternal.includes(dep) && !((_b2 = (_a2 = config.ssr) == null ? void 0 : _a2.noExternal) == null ? void 0 : _b2.includes(dep)) && !((_d = (_c2 = config.ssr) == null ? void 0 : _c2.external) == null ? void 0 : _d.includes(dep));
+    });
+  }
+  return ssr;
 }
 function patchResolvedViteConfig(viteConfig, options) {
   var _a, _b;
@@ -1424,8 +1440,6 @@ function resolveViaPackageJsonSvelte(importee, importer, cache) {
         cache.setResolvedSvelteField(importee, importer, result);
         return result;
       }
-    } else {
-      throw new Error(`failed to resolve package.json of ${importee} imported by ${importer}`);
     }
   }
 }
@@ -1462,10 +1476,10 @@ var PREBUNDLE_SENSITIVE_OPTIONS = [
 async function handleOptimizeDeps(options, viteConfig) {
   if (!options.experimental.prebundleSvelteLibraries || !viteConfig.cacheDir)
     return;
-  const viteMetadataPath = path6.resolve(viteConfig.cacheDir, "_metadata.json");
-  if (!fs6.existsSync(viteMetadataPath))
+  const viteMetadataPath = findViteMetadataPath(viteConfig.cacheDir);
+  if (!viteMetadataPath)
     return;
-  const svelteMetadataPath = path6.resolve(viteConfig.cacheDir, "_svelte_metadata.json");
+  const svelteMetadataPath = path6.resolve(viteMetadataPath, "../_svelte_metadata.json");
   const currentSvelteMetadata = JSON.stringify(generateSvelteMetadata(options), (_, value) => {
     return typeof value === "function" ? value.toString() : value;
   });
@@ -1484,6 +1498,14 @@ function generateSvelteMetadata(options) {
   }
   return metadata;
 }
+function findViteMetadataPath(cacheDir) {
+  const metadataPaths = ["_metadata.json", "deps/_metadata.json"];
+  for (const metadataPath of metadataPaths) {
+    const viteMetadataPath = path6.resolve(cacheDir, metadataPath);
+    if (fs6.existsSync(viteMetadataPath))
+      return viteMetadataPath;
+  }
+}
 
 // src/index.ts
 function svelte(inlineOptions) {
@@ -1492,7 +1514,6 @@ function svelte(inlineOptions) {
   }
   validateInlineOptions(inlineOptions);
   const cache = new VitePluginSvelteCache();
-  const pkg_resolve_errors = /* @__PURE__ */ new Set();
   let requestParser;
   let options;
   let viteConfig;
@@ -1508,7 +1529,7 @@ function svelte(inlineOptions) {
         log.setLevel(config.logLevel);
       }
       options = await preResolveOptions(inlineOptions, config, configEnv);
-      const extraViteConfig = buildExtraViteConfig(options, config, configEnv);
+      const extraViteConfig = buildExtraViteConfig(options, config);
       log.debug("additional vite config", extraViteConfig);
       return extraViteConfig;
     },
@@ -1574,29 +1595,17 @@ function svelte(inlineOptions) {
           log.debug(`resolveId resolved ${resolved} via package.json svelte field of ${importee}`);
           return resolved;
         }
-      } catch (err) {
-        pkg_resolve_errors.add(importee);
+      } catch (e) {
+        log.debug.once(`error trying to resolve ${importee} from ${importer} via package.json svelte field `, e);
       }
     },
     async transform(code, id, opts) {
       var _a;
       const ssr = !!(opts == null ? void 0 : opts.ssr);
       const svelteRequest = requestParser(id, ssr);
-      if (!svelteRequest) {
+      if (!svelteRequest || svelteRequest.query.svelte) {
         return;
       }
-      const { filename, query } = svelteRequest;
-      if (query.svelte) {
-        if (query.type === "style") {
-          const css = cache.getCSS(svelteRequest);
-          if (css) {
-            log.debug(`transform returns css for ${filename}`);
-            return css;
-          }
-        }
-        log.error("failed to transform tagged svelte request", svelteRequest);
-        throw new Error(`failed to transform tagged svelte request for id ${id}`);
-      }
       let compileData;
       try {
         compileData = await compileSvelte2(svelteRequest, code, options);
@@ -1610,7 +1619,7 @@ function svelte(inlineOptions) {
           ensureWatchedFile(options.server.watcher, d, options.root);
         });
       }
-      log.debug(`transform returns compiled js for ${filename}`);
+      log.debug(`transform returns compiled js for ${svelteRequest.filename}`);
       return compileData.compiled.js;
     },
     handleHotUpdate(ctx) {
@@ -1621,13 +1630,6 @@ function svelte(inlineOptions) {
       if (svelteRequest) {
         return handleHotUpdate(compileSvelte2, ctx, svelteRequest, cache, options);
       }
-    },
-    buildEnd() {
-      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, ""));
-      }
     }
   };
 }