@sveltejs/vite-plugin-svelte 1.0.0-next.28 → 1.0.0-next.31

package/README.md

@@ -6,6 +6,7 @@ The official [Svelte](https://svelte.dev) plugin for [Vite](https://vitejs.dev).
 
 ```js
 // vite.config.js
+import { defineConfig } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 
 export default defineConfig({

package/dist/index.cjs

@@ -44,11 +44,11 @@ __export(exports, {
   svelte: () => svelte
 });
 
-// ../../node_modules/.pnpm/tsup@5.4.0_typescript@4.4.4/node_modules/tsup/assets/cjs_shims.js
-var importMetaUrlShim = typeof document === "undefined" ? new (require("url")).URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
+// ../../node_modules/.pnpm/tsup@5.10.1_typescript@4.5.2/node_modules/tsup/assets/cjs_shims.js
+var importMetaUrlShim = typeof document === "undefined" ? new URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 
 // src/index.ts
-var import_fs5 = __toModule(require("fs"));
+var import_fs6 = __toModule(require("fs"));
 
 // src/utils/log.ts
 var import_colors = __toModule(require("kleur/colors"));
@@ -192,7 +192,7 @@ function buildExtendedLogMessage(w) {
 }
 
 // src/handle-hot-update.ts
-async function handleHotUpdate(compileSvelte, ctx, svelteRequest, cache, options) {
+async function handleHotUpdate(compileSvelte2, ctx, svelteRequest, cache, options) {
   const { read, server } = ctx;
   const cachedJS = cache.getJS(svelteRequest);
   if (!cachedJS) {
@@ -201,7 +201,7 @@ async function handleHotUpdate(compileSvelte, ctx, svelteRequest, cache, options
   }
   const cachedCss = cache.getCSS(svelteRequest);
   const content = await read();
-  const compileData = await compileSvelte(svelteRequest, content, options);
+  const compileData = await compileSvelte2(svelteRequest, content, options);
   cache.update(compileData);
   const affectedModules = new Set();
   const cssModule = server.moduleGraph.getModuleById(svelteRequest.cssId);
@@ -291,7 +291,7 @@ function toSafe(base64) {
 }
 
 // src/utils/compile.ts
-var _createCompileSvelte = (makeHot) => async function compileSvelte(svelteRequest, code, options) {
+var _createCompileSvelte = (makeHot) => async function compileSvelte2(svelteRequest, code, options) {
   var _a, _b;
   const { filename, normalizedFilename, cssId, ssr } = svelteRequest;
   const { emitCss = true } = options;
@@ -305,6 +305,13 @@ var _createCompileSvelte = (makeHot) => async function compileSvelte(svelteReque
     log.debug(`setting cssHash ${hash} for ${normalizedFilename}`);
     compileOptions.cssHash = () => hash;
   }
+  if (ssr && compileOptions.enableSourcemap !== false) {
+    if (typeof compileOptions.enableSourcemap === "object") {
+      compileOptions.enableSourcemap.css = false;
+    } else {
+      compileOptions.enableSourcemap = { js: true, css: false };
+    }
+  }
   let preprocessed;
   if (options.preprocess) {
     preprocessed = await (0, import_compiler.preprocess)(code, options.preprocess, { filename });
@@ -481,7 +488,7 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
     }
     if (!configFile.endsWith(".mjs")) {
       try {
-        const _require = importMetaUrlShim ? esmRequire != null ? esmRequire : esmRequire = (0, import_module.createRequire)(importMetaUrlShim) : require;
+        const _require = importMetaUrlShim ? esmRequire ?? (esmRequire = (0, import_module.createRequire)(importMetaUrlShim)) : require;
         delete _require.cache[_require.resolve(configFile)];
         const result = _require(configFile);
         if (result != null) {
@@ -694,6 +701,126 @@ function needsOptimization(dep, localRequire) {
 
 // src/utils/options.ts
 var import_module3 = __toModule(require("module"));
+
+// src/utils/esbuild.ts
+var import_fs3 = __toModule(require("fs"));
+var import_compiler2 = __toModule(require("svelte/compiler"));
+
+// src/utils/error.ts
+function toRollupError(error) {
+  const { filename, frame, start, code, name } = error;
+  const rollupError = {
+    name,
+    id: filename,
+    message: buildExtendedLogMessage(error),
+    frame: formatFrameForVite(frame),
+    code,
+    stack: ""
+  };
+  if (start) {
+    rollupError.loc = {
+      line: start.line,
+      column: start.column,
+      file: filename
+    };
+  }
+  return rollupError;
+}
+function toESBuildError(error) {
+  const { filename, frame, start } = error;
+  const partialMessage = {
+    text: buildExtendedLogMessage(error)
+  };
+  if (start) {
+    partialMessage.location = {
+      line: start.line,
+      column: start.column,
+      file: filename,
+      lineText: lineFromFrame(start.line, frame)
+    };
+  }
+  return partialMessage;
+}
+function lineFromFrame(lineNo, frame) {
+  if (!frame) {
+    return "";
+  }
+  const lines = frame.split("\n");
+  const errorLine = lines.find((line) => line.trimStart().startsWith(`${lineNo}: `));
+  return errorLine ? errorLine.substring(errorLine.indexOf(": ") + 3) : "";
+}
+function formatFrameForVite(frame) {
+  if (!frame) {
+    return "";
+  }
+  return frame.split("\n").map((line) => line.match(/^\s+\^/) ? "   " + line : " " + line.replace(":", " | ")).join("\n");
+}
+
+// src/utils/esbuild.ts
+function esbuildSveltePlugin(options) {
+  return {
+    name: "vite-plugin-svelte:optimize-svelte",
+    setup(build) {
+      disableVitePrebundleSvelte(build);
+      const svelteExtensions = (options.extensions ?? [".svelte"]).map((ext) => ext.slice(1));
+      const svelteFilter = new RegExp(`\\.(` + svelteExtensions.join("|") + `)(\\?.*)?$`);
+      build.onLoad({ filter: svelteFilter }, async ({ path: filename }) => {
+        const code = await import_fs3.promises.readFile(filename, "utf8");
+        try {
+          const contents = await compileSvelte(options, { filename, code });
+          return { contents };
+        } catch (e) {
+          return { errors: [toESBuildError(e)] };
+        }
+      });
+    }
+  };
+}
+function disableVitePrebundleSvelte(build) {
+  var _a;
+  const viteDepPrebundlePlugin = (_a = build.initialOptions.plugins) == null ? void 0 : _a.find((v) => v.name === "vite:dep-pre-bundle");
+  if (!viteDepPrebundlePlugin)
+    return;
+  const _setup = viteDepPrebundlePlugin.setup.bind(viteDepPrebundlePlugin);
+  viteDepPrebundlePlugin.setup = function(build2) {
+    const _onResolve = build2.onResolve.bind(build2);
+    build2.onResolve = function(options, callback) {
+      if (options.filter.source.includes("svelte")) {
+        options.filter = new RegExp(options.filter.source.replace("|svelte", ""), options.filter.flags);
+      }
+      return _onResolve(options, callback);
+    };
+    return _setup(build2);
+  };
+}
+async function compileSvelte(options, { filename, code }) {
+  var _a, _b;
+  const compileOptions = __spreadProps(__spreadValues({}, options.compilerOptions), {
+    css: true,
+    filename,
+    generate: "dom"
+  });
+  let preprocessed;
+  if (options.preprocess) {
+    preprocessed = await (0, import_compiler2.preprocess)(code, options.preprocess, { filename });
+    if (preprocessed.map)
+      compileOptions.sourcemap = preprocessed.map;
+  }
+  const finalCode = preprocessed ? preprocessed.code : code;
+  const dynamicCompileOptions = await ((_b = (_a = options.experimental) == null ? void 0 : _a.dynamicCompileOptions) == null ? void 0 : _b.call(_a, {
+    filename,
+    code: finalCode,
+    compileOptions
+  }));
+  if (dynamicCompileOptions && log.debug.enabled) {
+    log.debug(`dynamic compile options for  ${filename}: ${JSON.stringify(dynamicCompileOptions)}`);
+  }
+  const finalCompileOptions = dynamicCompileOptions ? __spreadValues(__spreadValues({}, compileOptions), dynamicCompileOptions) : compileOptions;
+  const compiled = (0, import_compiler2.compile)(finalCode, finalCompileOptions);
+  return compiled.js.code + "//# sourceMappingURL=" + compiled.js.map.toUrl();
+}
+
+// src/utils/options.ts
 var knownOptions = new Set([
   "configFile",
   "include",
@@ -789,12 +916,11 @@ function mergeOptions(defaultOptions, svelteConfig, inlineOptions, viteConfig, v
   return merged;
 }
 async function resolveOptions(inlineOptions = {}, viteConfig, viteEnv) {
-  var _a;
   const viteConfigWithResolvedRoot = __spreadProps(__spreadValues({}, viteConfig), {
     root: resolveViteRoot(viteConfig)
   });
   const svelteConfig = await loadSvelteConfig(viteConfigWithResolvedRoot, inlineOptions) || {};
-  const defaultOptions = buildDefaultOptions(viteEnv.mode === "production", (_a = inlineOptions.emitCss) != null ? _a : svelteConfig.emitCss);
+  const defaultOptions = buildDefaultOptions(viteEnv.mode === "production", inlineOptions.emitCss ?? svelteConfig.emitCss);
   const resolvedOptions = mergeOptions(defaultOptions, svelteConfig, inlineOptions, viteConfigWithResolvedRoot, viteEnv);
   enforceOptionsForProduction(resolvedOptions);
   enforceOptionsForHmr(resolvedOptions);
@@ -818,7 +944,6 @@ function buildExtraViteConfig(options, config, configEnv) {
   return extraViteConfig;
 }
 function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps) {
-  svelteDeps = svelteDeps.filter((dep) => dep.type === "component-library");
   const include = [];
   const exclude = ["svelte-hmr"];
   const isIncluded = (dep) => {
@@ -836,6 +961,16 @@ function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps) {
   } else {
     log.debug('"svelte" is excluded in optimizeDeps.exclude, skipped adding it to include.');
   }
+  if (options.experimental.prebundleSvelteLibraries) {
+    return {
+      include,
+      exclude,
+      esbuildOptions: {
+        plugins: [esbuildSveltePlugin(options)]
+      }
+    };
+  }
+  svelteDeps = svelteDeps.filter((dep) => dep.type === "component-library");
   const svelteDepsToExclude = Array.from(new Set(svelteDeps.map((dep) => dep.name))).filter((dep) => !isIncluded(dep));
   log.debug(`automatically excluding found svelte dependencies: ${svelteDepsToExclude.join(", ")}`);
   exclude.push(...svelteDepsToExclude.filter((x) => !isExcluded(x)));
@@ -947,7 +1082,7 @@ var VitePluginSvelteCache = class {
 };
 
 // src/utils/watch.ts
-var import_fs3 = __toModule(require("fs"));
+var import_fs4 = __toModule(require("fs"));
 var import_path4 = __toModule(require("path"));
 function setupWatchers(options, cache, requestParser) {
   const { server, configFile: svelteConfigFile } = options;
@@ -959,7 +1094,7 @@ function setupWatchers(options, cache, requestParser) {
   const emitChangeEventOnDependants = (filename) => {
     const dependants = cache.getDependants(filename);
     dependants.forEach((dependant) => {
-      if (import_fs3.default.existsSync(dependant)) {
+      if (import_fs4.default.existsSync(dependant)) {
         log.debug(`emitting virtual change event for "${dependant}" because depdendency "${filename}" changed`);
         watcher.emit("change", dependant);
       }
@@ -1016,19 +1151,19 @@ function setupWatchers(options, cache, requestParser) {
   });
 }
 function ensureWatchedFile(watcher, file, root) {
-  if (file && !file.startsWith(root + "/") && !file.includes("\0") && import_fs3.default.existsSync(file)) {
+  if (file && !file.startsWith(root + "/") && !file.includes("\0") && import_fs4.default.existsSync(file)) {
     watcher.add(import_path4.default.resolve(file));
   }
 }
 
 // src/utils/resolve.ts
 var import_path5 = __toModule(require("path"));
-var import_fs4 = __toModule(require("fs"));
+var import_fs5 = __toModule(require("fs"));
 var import_require_relative = __toModule(require("require-relative"));
 function resolveViaPackageJsonSvelte(importee, importer) {
   if (importer && isBareImport(importee)) {
     const importeePkgFile = import_require_relative.default.resolve(`${importee}/package.json`, import_path5.default.dirname(importer));
-    const importeePkg = JSON.parse(import_fs4.default.readFileSync(importeePkgFile, { encoding: "utf-8" }));
+    const importeePkg = JSON.parse(import_fs5.default.readFileSync(importeePkgFile, { encoding: "utf-8" }));
     if (importeePkg.svelte) {
       return import_path5.default.resolve(import_path5.default.dirname(importeePkgFile), importeePkg.svelte);
     }
@@ -1052,14 +1187,14 @@ function isBareImport(importee) {
 // src/utils/preprocess.ts
 var import_vite3 = __toModule(require("vite"));
 var import_magic_string2 = __toModule(require("magic-string"));
-var import_compiler2 = __toModule(require("svelte/compiler"));
+var import_compiler3 = __toModule(require("svelte/compiler"));
 
 // src/utils/sourcemap.ts
 var import_magic_string = __toModule(require("magic-string"));
 async function buildMagicString(from, to, options) {
   let diff_match_patch, DIFF_DELETE, DIFF_INSERT;
   try {
-    const dmpPkg = await Promise.resolve().then(() => __toModule(require("diff-match-patch")));
+    const dmpPkg = await import("diff-match-patch");
     diff_match_patch = dmpPkg.diff_match_patch;
     DIFF_INSERT = dmpPkg.DIFF_INSERT;
     DIFF_DELETE = dmpPkg.DIFF_DELETE;
@@ -1152,7 +1287,7 @@ function createViteStylePreprocessor(config) {
 function createVitePreprocessorGroup(config) {
   return {
     markup({ content, filename }) {
-      return (0, import_compiler2.preprocess)(content, {
+      return (0, import_compiler3.preprocess)(content, {
         script: createViteScriptPreprocessor(),
         style: createViteStylePreprocessor(config)
       }, { filename });
@@ -1287,7 +1422,7 @@ function svelte(inlineOptions) {
   let requestParser;
   let options;
   let viteConfig;
-  let compileSvelte;
+  let compileSvelte2;
   let resolvedSvelteSSR;
   return {
     name: "vite-plugin-svelte",
@@ -1306,7 +1441,7 @@ function svelte(inlineOptions) {
     async configResolved(config) {
       addExtraPreprocessors(options, config);
       requestParser = buildIdParser(options);
-      compileSvelte = createCompileSvelte(options);
+      compileSvelte2 = createCompileSvelte(options);
       viteConfig = config;
       log.debug("resolved options", options);
     },
@@ -1328,7 +1463,7 @@ function svelte(inlineOptions) {
         }
         if (viteConfig.assetsInclude(filename)) {
           log.debug(`load returns raw content for ${filename}`);
-          return import_fs5.default.readFileSync(filename, "utf-8");
+          return import_fs6.default.readFileSync(filename, "utf-8");
         }
       }
     },
@@ -1392,7 +1527,12 @@ function svelte(inlineOptions) {
         log.error("failed to transform tagged svelte request", svelteRequest);
         throw new Error(`failed to transform tagged svelte request for id ${id}`);
       }
-      const compileData = await compileSvelte(svelteRequest, code, options);
+      let compileData;
+      try {
+        compileData = await compileSvelte2(svelteRequest, code, options);
+      } catch (e) {
+        throw toRollupError(e);
+      }
       logCompilerWarnings(compileData.compiled.warnings, options);
       cache.update(compileData);
       if (((_a = compileData.dependencies) == null ? void 0 : _a.length) && options.server) {
@@ -1409,7 +1549,7 @@ function svelte(inlineOptions) {
       }
       const svelteRequest = requestParser(ctx.file, false, ctx.timestamp);
       if (svelteRequest) {
-        return handleHotUpdate(compileSvelte, ctx, svelteRequest, cache, options);
+        return handleHotUpdate(compileSvelte2, ctx, svelteRequest, cache, options);
       }
     },
     buildEnd() {