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

package/dist/index.cjs

@@ -49,7 +49,7 @@ __export(src_exports, {
   svelte: () => svelte
 });
 
-// ../../node_modules/.pnpm/tsup@5.11.11_typescript@4.5.4/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@5.11.13_typescript@4.5.5/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -192,7 +192,10 @@ function buildExtendedLogMessage(w) {
     parts.push(":", w.start.line, ":", w.start.column);
   }
   if (w.message) {
-    parts.push(" ", w.message);
+    if (parts.length > 0) {
+      parts.push(" ");
+    }
+    parts.push(w.message);
   }
   return parts.join("");
 }
@@ -320,7 +323,12 @@ var _createCompileSvelte = (makeHot) => async function compileSvelte2(svelteRequ
   }
   let preprocessed;
   if (options.preprocess) {
-    preprocessed = await (0, import_compiler.preprocess)(code, options.preprocess, { filename });
+    try {
+      preprocessed = await (0, import_compiler.preprocess)(code, options.preprocess, { filename });
+    } catch (e) {
+      e.message = `Error while preprocessing ${filename}${e.message ? ` - ${e.message}` : ""}`;
+      throw e;
+    }
     if (preprocessed.dependencies)
       dependencies.push(...preprocessed.dependencies);
     if (preprocessed.map)
@@ -702,11 +710,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 = import_path2.default.extname(pkg.main);
-  return !entryExt || entryExt === ".js" || entryExt === ".cjs";
+  if (pkg.main) {
+    const entryExt = import_path2.default.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
@@ -717,15 +734,15 @@ var import_fs3 = require("fs");
 var import_compiler2 = require("svelte/compiler");
 
 // src/utils/error.ts
-function toRollupError(error) {
-  const { filename, frame, start, code, name } = error;
+function toRollupError(error, options) {
+  const { filename, frame, start, code, name, stack } = error;
   const rollupError = {
     name,
     id: filename,
     message: buildExtendedLogMessage(error),
     frame: formatFrameForVite(frame),
     code,
-    stack: ""
+    stack: options.isBuild || options.isDebug || !frame ? stack : ""
   };
   if (start) {
     rollupError.loc = {
@@ -736,8 +753,8 @@ function toRollupError(error) {
   }
   return rollupError;
 }
-function toESBuildError(error) {
-  const { filename, frame, start } = error;
+function toESBuildError(error, options) {
+  const { filename, frame, start, stack } = error;
   const partialMessage = {
     text: buildExtendedLogMessage(error)
   };
@@ -749,6 +766,9 @@ function toESBuildError(error) {
       lineText: lineFromFrame(start.line, frame)
     };
   }
+  if (options.isBuild || options.isDebug || !frame) {
+    partialMessage.detail = stack;
+  }
   return partialMessage;
 }
 function lineFromFrame(lineNo, frame) {
@@ -781,7 +801,7 @@ function esbuildSveltePlugin(options) {
           const contents = await compileSvelte(options, { filename, code });
           return { contents };
         } catch (e) {
-          return { errors: [toESBuildError(e)] };
+          return { errors: [toESBuildError(e, options)] };
         }
       });
     }
@@ -814,7 +834,12 @@ async function compileSvelte(options, { filename, code }) {
   });
   let preprocessed;
   if (options.preprocess) {
-    preprocessed = await (0, import_compiler2.preprocess)(code, options.preprocess, { filename });
+    try {
+      preprocessed = await (0, import_compiler2.preprocess)(code, options.preprocess, { filename });
+    } catch (e) {
+      e.message = `Error while preprocessing ${filename}${e.message ? ` - ${e.message}` : ""}`;
+      throw e;
+    }
     if (preprocessed.map)
       compileOptions.sourcemap = preprocessed.map;
   }
@@ -1097,7 +1122,8 @@ async function preResolveOptions(inlineOptions = {}, viteUserConfig, viteEnv) {
     experimental: __spreadValues(__spreadValues(__spreadValues({}, defaultOptions == null ? void 0 : defaultOptions.experimental), svelteConfig == null ? void 0 : svelteConfig.experimental), inlineOptions == null ? void 0 : inlineOptions.experimental),
     root: viteConfigWithResolvedRoot.root,
     isBuild: viteEnv.command === "build",
-    isServe: viteEnv.command === "serve"
+    isServe: viteEnv.command === "serve",
+    isDebug: process.env.DEBUG != null
   });
   if (svelteConfig == null ? void 0 : svelteConfig.configFile) {
     merged.configFile = svelteConfig.configFile;
@@ -1417,7 +1443,7 @@ function ensureWatchedFile(watcher, file, root) {
 var import_path5 = __toESM(require("path"), 1);
 var import_module4 = require("module");
 function resolveViaPackageJsonSvelte(importee, importer, cache) {
-  if (importer && isBareImport(importee) && !is_common_without_svelte_field(importee)) {
+  if (importer && isBareImport(importee) && !isNodeInternal(importee) && !is_common_without_svelte_field(importee)) {
     const cached = cache.getResolvedSvelteField(importee, importer);
     if (cached) {
       return cached;
@@ -1431,11 +1457,12 @@ 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}`);
     }
   }
 }
+function isNodeInternal(importee) {
+  return importee.startsWith("node:") || import_module4.builtinModules.includes(importee);
+}
 function isBareImport(importee) {
   if (!importee || importee[0] === "." || importee[0] === "\0" || importee.includes(":") || import_path5.default.isAbsolute(importee)) {
     return false;
@@ -1466,10 +1493,10 @@ var PREBUNDLE_SENSITIVE_OPTIONS = [
 async function handleOptimizeDeps(options, viteConfig) {
   if (!options.experimental.prebundleSvelteLibraries || !viteConfig.cacheDir)
     return;
-  const viteMetadataPath = import_path6.default.resolve(viteConfig.cacheDir, "_metadata.json");
-  if (!import_fs5.default.existsSync(viteMetadataPath))
+  const viteMetadataPath = findViteMetadataPath(viteConfig.cacheDir);
+  if (!viteMetadataPath)
     return;
-  const svelteMetadataPath = import_path6.default.resolve(viteConfig.cacheDir, "_svelte_metadata.json");
+  const svelteMetadataPath = import_path6.default.resolve(viteMetadataPath, "../_svelte_metadata.json");
   const currentSvelteMetadata = JSON.stringify(generateSvelteMetadata(options), (_, value) => {
     return typeof value === "function" ? value.toString() : value;
   });
@@ -1488,6 +1515,14 @@ function generateSvelteMetadata(options) {
   }
   return metadata;
 }
+function findViteMetadataPath(cacheDir) {
+  const metadataPaths = ["_metadata.json", "deps/_metadata.json"];
+  for (const metadataPath of metadataPaths) {
+    const viteMetadataPath = import_path6.default.resolve(cacheDir, metadataPath);
+    if (import_fs5.default.existsSync(viteMetadataPath))
+      return viteMetadataPath;
+  }
+}
 
 // src/index.ts
 function svelte(inlineOptions) {
@@ -1496,7 +1531,6 @@ function svelte(inlineOptions) {
   }
   validateInlineOptions(inlineOptions);
   const cache = new VitePluginSvelteCache();
-  const pkg_resolve_errors = /* @__PURE__ */ new Set();
   let requestParser;
   let options;
   let viteConfig;
@@ -1572,40 +1606,24 @@ function svelte(inlineOptions) {
         }
         return resolvedSvelteSSR;
       }
-      try {
-        const resolved = resolveViaPackageJsonSvelte(importee, importer, cache);
-        if (resolved) {
-          log.debug(`resolveId resolved ${resolved} via package.json svelte field of ${importee}`);
-          return resolved;
-        }
-      } catch (err) {
-        pkg_resolve_errors.add(importee);
+      const resolved = resolveViaPackageJsonSvelte(importee, importer, cache);
+      if (resolved) {
+        log.debug(`resolveId resolved ${resolved} via package.json svelte field of ${importee}`);
+        return resolved;
       }
     },
     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);
       } catch (e) {
-        throw toRollupError(e);
+        throw toRollupError(e, options);
       }
       logCompilerWarnings(compileData.compiled.warnings, options);
       cache.update(compileData);
@@ -1614,7 +1632,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) {
@@ -1625,13 +1643,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, ""));
-      }
     }
   };
 }