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

package/dist/index.js

@@ -1,11 +1,7 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -21,7 +17,6 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -29,20 +24,9 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     return require.apply(this, arguments);
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
-var __reExport = (target, module, desc) => {
-  if (module && typeof module === "object" || typeof module === "function") {
-    for (let key of __getOwnPropNames(module))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module[key], enumerable: !(desc = __getOwnPropDesc(module, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toModule = (module) => {
-  return __reExport(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", module && module.__esModule && "default" in module ? { get: () => module.default, enumerable: true } : { value: module, enumerable: true })), module);
-};
 
 // src/index.ts
-import fs6 from "fs";
+import fs7 from "fs";
 
 // src/utils/log.ts
 import { cyan, yellow, red } from "kleur/colors";
@@ -186,7 +170,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) {
@@ -195,7 +179,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);
@@ -287,7 +271,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;
@@ -301,6 +285,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 preprocess(code, options.preprocess, { filename });
@@ -479,7 +470,7 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
     }
     if (!configFile.endsWith(".mjs")) {
       try {
-        const _require = import.meta.url ? esmRequire != null ? esmRequire : esmRequire = createRequire(import.meta.url) : __require;
+        const _require = import.meta.url ? esmRequire ?? (esmRequire = createRequire(import.meta.url)) : __require;
         delete _require.cache[_require.resolve(configFile)];
         const result = _require(configFile);
         if (result != null) {
@@ -692,6 +683,126 @@ function needsOptimization(dep, localRequire) {
 
 // src/utils/options.ts
 import { createRequire as createRequire3 } from "module";
+
+// src/utils/esbuild.ts
+import { promises as fs4 } from "fs";
+import { compile as compile2, preprocess as preprocess2 } from "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 fs4.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 preprocess2(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 = compile2(finalCode, finalCompileOptions);
+  return compiled.js.code + "//# sourceMappingURL=" + compiled.js.map.toUrl();
+}
+
+// src/utils/options.ts
 var knownOptions = new Set([
   "configFile",
   "include",
@@ -787,12 +898,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);
@@ -816,7 +926,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) => {
@@ -834,6 +943,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)));
@@ -945,7 +1064,7 @@ var VitePluginSvelteCache = class {
 };
 
 // src/utils/watch.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import path4 from "path";
 function setupWatchers(options, cache, requestParser) {
   const { server, configFile: svelteConfigFile } = options;
@@ -957,7 +1076,7 @@ function setupWatchers(options, cache, requestParser) {
   const emitChangeEventOnDependants = (filename) => {
     const dependants = cache.getDependants(filename);
     dependants.forEach((dependant) => {
-      if (fs4.existsSync(dependant)) {
+      if (fs5.existsSync(dependant)) {
         log.debug(`emitting virtual change event for "${dependant}" because depdendency "${filename}" changed`);
         watcher.emit("change", dependant);
       }
@@ -1014,19 +1133,19 @@ function setupWatchers(options, cache, requestParser) {
   });
 }
 function ensureWatchedFile(watcher, file, root) {
-  if (file && !file.startsWith(root + "/") && !file.includes("\0") && fs4.existsSync(file)) {
+  if (file && !file.startsWith(root + "/") && !file.includes("\0") && fs5.existsSync(file)) {
     watcher.add(path4.resolve(file));
   }
 }
 
 // src/utils/resolve.ts
 import path5 from "path";
-import fs5 from "fs";
+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(fs5.readFileSync(importeePkgFile, { encoding: "utf-8" }));
+    const importeePkg = JSON.parse(fs6.readFileSync(importeePkgFile, { encoding: "utf-8" }));
     if (importeePkg.svelte) {
       return path5.resolve(path5.dirname(importeePkgFile), importeePkg.svelte);
     }
@@ -1052,14 +1171,14 @@ import {
   transformWithEsbuild
 } from "vite";
 import MagicString2 from "magic-string";
-import { preprocess as preprocess2 } from "svelte/compiler";
+import { preprocess as preprocess3 } from "svelte/compiler";
 
 // src/utils/sourcemap.ts
 import MagicString from "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 +1271,7 @@ function createViteStylePreprocessor(config) {
 function createVitePreprocessorGroup(config) {
   return {
     markup({ content, filename }) {
-      return preprocess2(content, {
+      return preprocess3(content, {
         script: createViteScriptPreprocessor(),
         style: createViteStylePreprocessor(config)
       }, { filename });
@@ -1287,7 +1406,7 @@ function svelte(inlineOptions) {
   let requestParser;
   let options;
   let viteConfig;
-  let compileSvelte;
+  let compileSvelte2;
   let resolvedSvelteSSR;
   return {
     name: "vite-plugin-svelte",
@@ -1306,7 +1425,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 +1447,7 @@ function svelte(inlineOptions) {
         }
         if (viteConfig.assetsInclude(filename)) {
           log.debug(`load returns raw content for ${filename}`);
-          return fs6.readFileSync(filename, "utf-8");
+          return fs7.readFileSync(filename, "utf-8");
         }
       }
     },
@@ -1392,7 +1511,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 +1533,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() {