@sveltejs/vite-plugin-svelte 1.0.0-next.32 → 1.0.0-next.33

package/dist/index.js

@@ -435,7 +435,9 @@ function buildIdParser(options) {
 }
 
 // src/utils/options.ts
-import { normalizePath as normalizePath2 } from "vite";
+import {
+  normalizePath as normalizePath2
+} from "vite";
 
 // src/utils/load-svelte-config.ts
 import { createRequire } from "module";
@@ -678,7 +680,11 @@ function needsOptimization(dep, localRequire) {
   if (!depData)
     return false;
   const pkg = depData.pkg;
-  return pkg.main && !pkg.module && !pkg.exports;
+  const isCjs = pkg.main && !pkg.module && !pkg.exports;
+  if (!isCjs)
+    return false;
+  const entryExt = path2.extname(pkg.main);
+  return !entryExt || entryExt === ".js" || entryExt === ".cjs";
 }
 
 // src/utils/options.ts
@@ -739,6 +745,7 @@ function formatFrameForVite(frame) {
 }
 
 // src/utils/esbuild.ts
+var facadeEsbuildSveltePluginName = "vite-plugin-svelte:facade";
 function esbuildSveltePlugin(options) {
   return {
     name: "vite-plugin-svelte:optimize-svelte",
@@ -780,6 +787,7 @@ async function compileSvelte(options, { filename, code }) {
   const compileOptions = __spreadProps(__spreadValues({}, options.compilerOptions), {
     css: true,
     filename,
+    format: "esm",
     generate: "dom"
   });
   let preprocessed;
@@ -802,6 +810,234 @@ async function compileSvelte(options, { filename, code }) {
   return compiled.js.code + "//# sourceMappingURL=" + compiled.js.map.toUrl();
 }
 
+// src/utils/preprocess.ts
+import {
+  transformWithEsbuild
+} from "vite";
+import MagicString2 from "magic-string";
+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 import("diff-match-patch");
+    diff_match_patch = dmpPkg.diff_match_patch;
+    DIFF_INSERT = dmpPkg.DIFF_INSERT;
+    DIFF_DELETE = dmpPkg.DIFF_DELETE;
+  } catch (e) {
+    log.error.once('Failed to import optional dependency "diff-match-patch". Please install it to enable generated sourcemaps.');
+    return null;
+  }
+  const dmp = new diff_match_patch();
+  const diffs = dmp.diff_main(from, to);
+  dmp.diff_cleanupSemantic(diffs);
+  const m = new MagicString(from, options);
+  let pos = 0;
+  for (let i = 0; i < diffs.length; i++) {
+    const diff = diffs[i];
+    const nextDiff = diffs[i + 1];
+    if (diff[0] === DIFF_DELETE) {
+      if ((nextDiff == null ? void 0 : nextDiff[0]) === DIFF_INSERT) {
+        m.overwrite(pos, pos + diff[1].length, nextDiff[1]);
+        i++;
+      } else {
+        m.remove(pos, pos + diff[1].length);
+      }
+      pos += diff[1].length;
+    } else if (diff[0] === DIFF_INSERT) {
+      if (nextDiff) {
+        m.appendRight(pos, diff[1]);
+      } else {
+        m.append(diff[1]);
+      }
+    } else {
+      pos += diff[1].length;
+    }
+  }
+  return m;
+}
+async function buildSourceMap(from, to, filename) {
+  const m = await buildMagicString(from, to, { filename });
+  return m ? m.generateDecodedMap({ source: filename, hires: true, includeContent: false }) : null;
+}
+
+// src/utils/preprocess.ts
+var supportedStyleLangs = ["css", "less", "sass", "scss", "styl", "stylus", "postcss"];
+var supportedScriptLangs = ["ts"];
+function createViteScriptPreprocessor() {
+  return async ({ attributes, content, filename = "" }) => {
+    const lang = attributes.lang;
+    if (!supportedScriptLangs.includes(lang))
+      return;
+    const transformResult = await transformWithEsbuild(content, filename, {
+      loader: lang,
+      tsconfigRaw: {
+        compilerOptions: {
+          importsNotUsedAsValues: "preserve"
+        }
+      }
+    });
+    return {
+      code: transformResult.code,
+      map: transformResult.map
+    };
+  };
+}
+function createViteStylePreprocessor(config) {
+  const pluginName = "vite:css";
+  const plugin = config.plugins.find((p) => p.name === pluginName);
+  if (!plugin) {
+    throw new Error(`failed to find plugin ${pluginName}`);
+  }
+  if (!plugin.transform) {
+    throw new Error(`plugin ${pluginName} has no transform`);
+  }
+  const pluginTransform = plugin.transform.bind(null);
+  return async ({ attributes, content, filename = "" }) => {
+    var _a, _b;
+    const lang = attributes.lang;
+    if (!supportedStyleLangs.includes(lang))
+      return;
+    const moduleId = `${filename}.${lang}`;
+    const transformResult = await pluginTransform(content, moduleId);
+    if (((_b = (_a = transformResult.map) == null ? void 0 : _a.sources) == null ? void 0 : _b[0]) === moduleId) {
+      transformResult.map.sources[0] = filename;
+    }
+    return {
+      code: transformResult.code,
+      map: transformResult.map ?? void 0
+    };
+  };
+}
+function createVitePreprocessorGroup(config) {
+  return {
+    markup({ content, filename }) {
+      return preprocess3(content, {
+        script: createViteScriptPreprocessor(),
+        style: createViteStylePreprocessor(config)
+      }, { filename });
+    }
+  };
+}
+function createInjectScopeEverythingRulePreprocessorGroup() {
+  return {
+    style({ content, filename }) {
+      const s = new MagicString2(content);
+      s.append(" *{}");
+      return {
+        code: s.toString(),
+        map: s.generateDecodedMap({ source: filename, hires: true })
+      };
+    }
+  };
+}
+function buildExtraPreprocessors(options, config) {
+  var _a, _b;
+  const prependPreprocessors = [];
+  const appendPreprocessors = [];
+  if ((_a = options.experimental) == null ? void 0 : _a.useVitePreprocess) {
+    log.debug("adding vite preprocessor");
+    prependPreprocessors.push(createVitePreprocessorGroup(config));
+  }
+  const pluginsWithPreprocessorsDeprecated = config.plugins.filter((p) => p == null ? void 0 : p.sveltePreprocess);
+  if (pluginsWithPreprocessorsDeprecated.length > 0) {
+    log.warn(`The following plugins use the deprecated 'plugin.sveltePreprocess' field. Please contact their maintainers and ask them to move it to 'plugin.api.sveltePreprocess': ${pluginsWithPreprocessorsDeprecated.map((p) => p.name).join(", ")}`);
+    pluginsWithPreprocessorsDeprecated.forEach((p) => {
+      if (!p.api) {
+        p.api = {};
+      }
+      if (p.api.sveltePreprocess === void 0) {
+        p.api.sveltePreprocess = p.sveltePreprocess;
+      } else {
+        log.error(`ignoring plugin.sveltePreprocess of ${p.name} because it already defined plugin.api.sveltePreprocess.`);
+      }
+    });
+  }
+  const pluginsWithPreprocessors = config.plugins.filter((p) => {
+    var _a2;
+    return (_a2 = p == null ? void 0 : p.api) == null ? void 0 : _a2.sveltePreprocess;
+  });
+  const ignored = [], included = [];
+  for (const p of pluginsWithPreprocessors) {
+    if (options.ignorePluginPreprocessors === true || Array.isArray(options.ignorePluginPreprocessors) && ((_b = options.ignorePluginPreprocessors) == null ? void 0 : _b.includes(p.name))) {
+      ignored.push(p);
+    } else {
+      included.push(p);
+    }
+  }
+  if (ignored.length > 0) {
+    log.debug(`Ignoring svelte preprocessors defined by these vite plugins: ${ignored.map((p) => p.name).join(", ")}`);
+  }
+  if (included.length > 0) {
+    log.debug(`Adding svelte preprocessors defined by these vite plugins: ${included.map((p) => p.name).join(", ")}`);
+    appendPreprocessors.push(...pluginsWithPreprocessors.map((p) => p.api.sveltePreprocess));
+  }
+  if (options.hot && options.emitCss) {
+    appendPreprocessors.push(createInjectScopeEverythingRulePreprocessorGroup());
+  }
+  return { prependPreprocessors, appendPreprocessors };
+}
+function addExtraPreprocessors(options, config) {
+  var _a;
+  const { prependPreprocessors, appendPreprocessors } = buildExtraPreprocessors(options, config);
+  if (prependPreprocessors.length > 0 || appendPreprocessors.length > 0) {
+    if (!options.preprocess) {
+      options.preprocess = [...prependPreprocessors, ...appendPreprocessors];
+    } else if (Array.isArray(options.preprocess)) {
+      options.preprocess.unshift(...prependPreprocessors);
+      options.preprocess.push(...appendPreprocessors);
+    } else {
+      options.preprocess = [...prependPreprocessors, options.preprocess, ...appendPreprocessors];
+    }
+  }
+  const generateMissingSourceMaps = !!((_a = options.experimental) == null ? void 0 : _a.generateMissingPreprocessorSourcemaps);
+  if (options.preprocess && generateMissingSourceMaps) {
+    options.preprocess = Array.isArray(options.preprocess) ? options.preprocess.map((p, i) => validateSourceMapOutputWrapper(p, i)) : validateSourceMapOutputWrapper(options.preprocess, 0);
+  }
+}
+function validateSourceMapOutputWrapper(group, i) {
+  const wrapper = {};
+  for (const [processorType, processorFn] of Object.entries(group)) {
+    wrapper[processorType] = async (options) => {
+      var _a;
+      const result = await processorFn(options);
+      if (result && result.code !== options.content) {
+        let invalidMap = false;
+        if (!result.map) {
+          invalidMap = true;
+          log.warn.enabled && log.warn.once(`preprocessor at index ${i} did not return a sourcemap for ${processorType} transform`, {
+            filename: options.filename,
+            type: processorType,
+            processor: processorFn.toString()
+          });
+        } else if (((_a = result.map) == null ? void 0 : _a.mappings) === "") {
+          invalidMap = true;
+          log.warn.enabled && log.warn.once(`preprocessor at index ${i} returned an invalid empty sourcemap for ${processorType} transform`, {
+            filename: options.filename,
+            type: processorType,
+            processor: processorFn.toString()
+          });
+        }
+        if (invalidMap) {
+          try {
+            const map = await buildSourceMap(options.content, result.code, options.filename);
+            if (map) {
+              log.debug.enabled && log.debug(`adding generated sourcemap to preprocesor result for ${options.filename}`);
+              result.map = map;
+            }
+          } catch (e) {
+            log.error(`failed to build sourcemap`, e);
+          }
+        }
+      }
+      return result;
+    };
+  }
+  return wrapper;
+}
+
 // src/utils/options.ts
 var knownOptions = new Set([
   "configFile",
@@ -817,28 +1053,52 @@ var knownOptions = new Set([
   "disableDependencyReinclusion",
   "experimental"
 ]);
-function buildDefaultOptions(isProduction, emitCss = true) {
-  const hot = isProduction ? false : {
-    injectCss: !emitCss
-  };
+function validateInlineOptions(inlineOptions) {
+  const invalidKeys = Object.keys(inlineOptions || {}).filter((key) => !knownOptions.has(key));
+  if (invalidKeys.length) {
+    log.warn(`invalid plugin options "${invalidKeys.join(", ")}" in config`, inlineOptions);
+  }
+}
+async function preResolveOptions(inlineOptions = {}, viteUserConfig, viteEnv) {
+  const viteConfigWithResolvedRoot = __spreadProps(__spreadValues({}, viteUserConfig), {
+    root: resolveViteRoot(viteUserConfig)
+  });
   const defaultOptions = {
     extensions: [".svelte"],
-    hot,
-    emitCss,
+    emitCss: true,
     compilerOptions: {
-      format: "esm",
-      css: !emitCss,
-      dev: !isProduction
+      format: "esm"
     }
   };
-  log.debug(`default options for ${isProduction ? "production" : "development"}`, defaultOptions);
-  return defaultOptions;
-}
-function validateInlineOptions(inlineOptions) {
-  const invalidKeys = Object.keys(inlineOptions || {}).filter((key) => !knownOptions.has(key));
-  if (invalidKeys.length) {
-    log.warn(`invalid plugin options "${invalidKeys.join(", ")}" in config`, inlineOptions);
+  const svelteConfig = await loadSvelteConfig(viteConfigWithResolvedRoot, inlineOptions);
+  const merged = __spreadProps(__spreadValues(__spreadValues(__spreadValues({}, defaultOptions), svelteConfig), inlineOptions), {
+    compilerOptions: __spreadValues(__spreadValues(__spreadValues({}, defaultOptions == null ? void 0 : defaultOptions.compilerOptions), svelteConfig == null ? void 0 : svelteConfig.compilerOptions), inlineOptions == null ? void 0 : inlineOptions.compilerOptions),
+    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"
+  });
+  if (svelteConfig == null ? void 0 : svelteConfig.configFile) {
+    merged.configFile = svelteConfig.configFile;
   }
+  return merged;
+}
+function resolveOptions(preResolveOptions2, viteConfig) {
+  const defaultOptions = {
+    hot: viteConfig.isProduction ? false : { injectCss: !preResolveOptions2.emitCss },
+    compilerOptions: {
+      css: !preResolveOptions2.emitCss,
+      dev: !viteConfig.isProduction
+    }
+  };
+  const merged = __spreadProps(__spreadValues(__spreadValues({}, defaultOptions), preResolveOptions2), {
+    compilerOptions: __spreadValues(__spreadValues({}, defaultOptions.compilerOptions), preResolveOptions2.compilerOptions),
+    isProduction: viteConfig.isProduction
+  });
+  addExtraPreprocessors(merged, viteConfig);
+  enforceOptionsForHmr(merged);
+  enforceOptionsForProduction(merged);
+  return merged;
 }
 function enforceOptionsForHmr(options) {
   if (options.hot) {
@@ -883,32 +1143,6 @@ function enforceOptionsForProduction(options) {
     }
   }
 }
-function mergeOptions(defaultOptions, svelteConfig, inlineOptions, viteConfig, viteEnv) {
-  const merged = __spreadProps(__spreadValues(__spreadValues(__spreadValues({}, defaultOptions), svelteConfig), inlineOptions), {
-    compilerOptions: __spreadValues(__spreadValues(__spreadValues({}, defaultOptions.compilerOptions), (svelteConfig == null ? void 0 : svelteConfig.compilerOptions) || {}), (inlineOptions == null ? void 0 : inlineOptions.compilerOptions) || {}),
-    experimental: __spreadValues(__spreadValues({}, (svelteConfig == null ? void 0 : svelteConfig.experimental) || {}), (inlineOptions == null ? void 0 : inlineOptions.experimental) || {}),
-    root: viteConfig.root,
-    isProduction: viteEnv.mode === "production",
-    isBuild: viteEnv.command === "build",
-    isServe: viteEnv.command === "serve",
-    isSvelteKit: !!(svelteConfig == null ? void 0 : svelteConfig.kit)
-  });
-  if (svelteConfig == null ? void 0 : svelteConfig.configFile) {
-    merged.configFile = svelteConfig.configFile;
-  }
-  return merged;
-}
-async function resolveOptions(inlineOptions = {}, viteConfig, viteEnv) {
-  const viteConfigWithResolvedRoot = __spreadProps(__spreadValues({}, viteConfig), {
-    root: resolveViteRoot(viteConfig)
-  });
-  const svelteConfig = await loadSvelteConfig(viteConfigWithResolvedRoot, inlineOptions) || {};
-  const defaultOptions = buildDefaultOptions(viteEnv.mode === "production", inlineOptions.emitCss ?? svelteConfig.emitCss);
-  const resolvedOptions = mergeOptions(defaultOptions, svelteConfig, inlineOptions, viteConfigWithResolvedRoot, viteEnv);
-  enforceOptionsForProduction(resolvedOptions);
-  enforceOptionsForHmr(resolvedOptions);
-  return resolvedOptions;
-}
 function resolveViteRoot(viteConfig) {
   return normalizePath2(viteConfig.root ? path3.resolve(viteConfig.root) : process.cwd());
 }
@@ -949,7 +1183,8 @@ function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps) {
       include,
       exclude,
       esbuildOptions: {
-        plugins: [esbuildSveltePlugin(options)]
+        plugins: [{ name: facadeEsbuildSveltePluginName, setup: () => {
+        } }]
       }
     };
   }
@@ -989,6 +1224,13 @@ function buildSSROptionsForSvelte(svelteDeps, options, config) {
     noExternal
   };
 }
+function patchResolvedViteConfig(viteConfig, options) {
+  var _a, _b;
+  const facadeEsbuildSveltePlugin = (_b = (_a = viteConfig.optimizeDeps.esbuildOptions) == null ? void 0 : _a.plugins) == null ? void 0 : _b.find((plugin) => plugin.name === facadeEsbuildSveltePluginName);
+  if (facadeEsbuildSveltePlugin) {
+    Object.assign(facadeEsbuildSveltePlugin, esbuildSveltePlugin(options));
+  }
+}
 
 // src/utils/vite-plugin-svelte-cache.ts
 var VitePluginSvelteCache = class {
@@ -1094,7 +1336,7 @@ function setupWatchers(options, cache, requestParser) {
   };
   const triggerViteRestart = (filename) => {
     var _a;
-    if (serverConfig.middlewareMode || options.isSvelteKit) {
+    if (serverConfig.middlewareMode) {
       const message = "Svelte config change detected, restart your dev process to apply the changes.";
       log.info(message, filename);
       ws.send({
@@ -1168,235 +1410,6 @@ function isBareImport(importee) {
   }
 }
 
-// src/utils/preprocess.ts
-import {
-  transformWithEsbuild
-} from "vite";
-import MagicString2 from "magic-string";
-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 import("diff-match-patch");
-    diff_match_patch = dmpPkg.diff_match_patch;
-    DIFF_INSERT = dmpPkg.DIFF_INSERT;
-    DIFF_DELETE = dmpPkg.DIFF_DELETE;
-  } catch (e) {
-    log.error.once('Failed to import optional dependency "diff-match-patch". Please install it to enable generated sourcemaps.');
-    return null;
-  }
-  const dmp = new diff_match_patch();
-  const diffs = dmp.diff_main(from, to);
-  dmp.diff_cleanupSemantic(diffs);
-  const m = new MagicString(from, options);
-  let pos = 0;
-  for (let i = 0; i < diffs.length; i++) {
-    const diff = diffs[i];
-    const nextDiff = diffs[i + 1];
-    if (diff[0] === DIFF_DELETE) {
-      if ((nextDiff == null ? void 0 : nextDiff[0]) === DIFF_INSERT) {
-        m.overwrite(pos, pos + diff[1].length, nextDiff[1]);
-        i++;
-      } else {
-        m.remove(pos, pos + diff[1].length);
-      }
-      pos += diff[1].length;
-    } else if (diff[0] === DIFF_INSERT) {
-      if (nextDiff) {
-        m.appendRight(pos, diff[1]);
-      } else {
-        m.append(diff[1]);
-      }
-    } else {
-      pos += diff[1].length;
-    }
-  }
-  return m;
-}
-async function buildSourceMap(from, to, filename) {
-  const m = await buildMagicString(from, to, { filename });
-  return m ? m.generateDecodedMap({ source: filename, hires: true, includeContent: false }) : null;
-}
-
-// src/utils/preprocess.ts
-var supportedStyleLangs = ["css", "less", "sass", "scss", "styl", "stylus", "postcss"];
-var supportedScriptLangs = ["ts"];
-function createViteScriptPreprocessor() {
-  return async ({ attributes, content, filename = "" }) => {
-    const lang = attributes.lang;
-    if (!supportedScriptLangs.includes(lang))
-      return;
-    const transformResult = await transformWithEsbuild(content, filename, {
-      loader: lang,
-      tsconfigRaw: {
-        compilerOptions: {
-          importsNotUsedAsValues: "preserve"
-        }
-      }
-    });
-    return {
-      code: transformResult.code,
-      map: transformResult.map
-    };
-  };
-}
-function createViteStylePreprocessor(config) {
-  const pluginName = "vite:css";
-  const plugin = config.plugins.find((p) => p.name === pluginName);
-  if (!plugin) {
-    throw new Error(`failed to find plugin ${pluginName}`);
-  }
-  if (!plugin.transform) {
-    throw new Error(`plugin ${pluginName} has no transform`);
-  }
-  const pluginTransform = plugin.transform.bind(null);
-  return async ({ attributes, content, filename = "" }) => {
-    var _a, _b;
-    const lang = attributes.lang;
-    if (!supportedStyleLangs.includes(lang))
-      return;
-    const moduleId = `${filename}.${lang}`;
-    const transformResult = await pluginTransform(content, moduleId);
-    const hasMap = transformResult.map && transformResult.map.mappings !== "";
-    if (hasMap && ((_b = (_a = transformResult.map) == null ? void 0 : _a.sources) == null ? void 0 : _b[0]) === moduleId) {
-      transformResult.map.sources[0] = filename;
-    }
-    return {
-      code: transformResult.code,
-      map: hasMap ? transformResult.map : void 0
-    };
-  };
-}
-function createVitePreprocessorGroup(config) {
-  return {
-    markup({ content, filename }) {
-      return preprocess3(content, {
-        script: createViteScriptPreprocessor(),
-        style: createViteStylePreprocessor(config)
-      }, { filename });
-    }
-  };
-}
-function createInjectScopeEverythingRulePreprocessorGroup() {
-  return {
-    style({ content, filename }) {
-      const s = new MagicString2(content);
-      s.append(" *{}");
-      return {
-        code: s.toString(),
-        map: s.generateDecodedMap({ source: filename, hires: true })
-      };
-    }
-  };
-}
-function buildExtraPreprocessors(options, config) {
-  var _a, _b;
-  const prependPreprocessors = [];
-  const appendPreprocessors = [];
-  if ((_a = options.experimental) == null ? void 0 : _a.useVitePreprocess) {
-    log.debug("adding vite preprocessor");
-    prependPreprocessors.push(createVitePreprocessorGroup(config));
-  }
-  const pluginsWithPreprocessorsDeprecated = config.plugins.filter((p) => p == null ? void 0 : p.sveltePreprocess);
-  if (pluginsWithPreprocessorsDeprecated.length > 0) {
-    log.warn(`The following plugins use the deprecated 'plugin.sveltePreprocess' field. Please contact their maintainers and ask them to move it to 'plugin.api.sveltePreprocess': ${pluginsWithPreprocessorsDeprecated.map((p) => p.name).join(", ")}`);
-    pluginsWithPreprocessorsDeprecated.forEach((p) => {
-      if (!p.api) {
-        p.api = {};
-      }
-      if (p.api.sveltePreprocess === void 0) {
-        p.api.sveltePreprocess = p.sveltePreprocess;
-      } else {
-        log.error(`ignoring plugin.sveltePreprocess of ${p.name} because it already defined plugin.api.sveltePreprocess.`);
-      }
-    });
-  }
-  const pluginsWithPreprocessors = config.plugins.filter((p) => {
-    var _a2;
-    return (_a2 = p == null ? void 0 : p.api) == null ? void 0 : _a2.sveltePreprocess;
-  });
-  const ignored = [], included = [];
-  for (const p of pluginsWithPreprocessors) {
-    if (options.ignorePluginPreprocessors === true || Array.isArray(options.ignorePluginPreprocessors) && ((_b = options.ignorePluginPreprocessors) == null ? void 0 : _b.includes(p.name))) {
-      ignored.push(p);
-    } else {
-      included.push(p);
-    }
-  }
-  if (ignored.length > 0) {
-    log.debug(`Ignoring svelte preprocessors defined by these vite plugins: ${ignored.map((p) => p.name).join(", ")}`);
-  }
-  if (included.length > 0) {
-    log.debug(`Adding svelte preprocessors defined by these vite plugins: ${included.map((p) => p.name).join(", ")}`);
-    appendPreprocessors.push(...pluginsWithPreprocessors.map((p) => p.api.sveltePreprocess));
-  }
-  if (options.hot && options.emitCss) {
-    appendPreprocessors.push(createInjectScopeEverythingRulePreprocessorGroup());
-  }
-  return { prependPreprocessors, appendPreprocessors };
-}
-function addExtraPreprocessors(options, config) {
-  var _a;
-  const { prependPreprocessors, appendPreprocessors } = buildExtraPreprocessors(options, config);
-  if (prependPreprocessors.length > 0 || appendPreprocessors.length > 0) {
-    if (!options.preprocess) {
-      options.preprocess = [...prependPreprocessors, ...appendPreprocessors];
-    } else if (Array.isArray(options.preprocess)) {
-      options.preprocess.unshift(...prependPreprocessors);
-      options.preprocess.push(...appendPreprocessors);
-    } else {
-      options.preprocess = [...prependPreprocessors, options.preprocess, ...appendPreprocessors];
-    }
-  }
-  const generateMissingSourceMaps = !!((_a = options.experimental) == null ? void 0 : _a.generateMissingPreprocessorSourcemaps);
-  if (options.preprocess && generateMissingSourceMaps) {
-    options.preprocess = Array.isArray(options.preprocess) ? options.preprocess.map((p, i) => validateSourceMapOutputWrapper(p, i)) : validateSourceMapOutputWrapper(options.preprocess, 0);
-  }
-}
-function validateSourceMapOutputWrapper(group, i) {
-  const wrapper = {};
-  for (const [processorType, processorFn] of Object.entries(group)) {
-    wrapper[processorType] = async (options) => {
-      var _a;
-      const result = await processorFn(options);
-      if (result && result.code !== options.content) {
-        let invalidMap = false;
-        if (!result.map) {
-          invalidMap = true;
-          log.warn.enabled && log.warn.once(`preprocessor at index ${i} did not return a sourcemap for ${processorType} transform`, {
-            filename: options.filename,
-            type: processorType,
-            processor: processorFn.toString()
-          });
-        } else if (((_a = result.map) == null ? void 0 : _a.mappings) === "") {
-          invalidMap = true;
-          log.warn.enabled && log.warn.once(`preprocessor at index ${i} returned an invalid empty sourcemap for ${processorType} transform`, {
-            filename: options.filename,
-            type: processorType,
-            processor: processorFn.toString()
-          });
-        }
-        if (invalidMap) {
-          try {
-            const map = await buildSourceMap(options.content, result.code, options.filename);
-            if (map) {
-              log.debug.enabled && log.debug(`adding generated sourcemap to preprocesor result for ${options.filename}`);
-              result.map = map;
-            }
-          } catch (e) {
-            log.error(`failed to build sourcemap`, e);
-          }
-        }
-      }
-      return result;
-    };
-  }
-  return wrapper;
-}
-
 // src/index.ts
 function svelte(inlineOptions) {
   if (process.env.DEBUG != null) {
@@ -1419,13 +1432,14 @@ function svelte(inlineOptions) {
       } else if (config.logLevel) {
         log.setLevel(config.logLevel);
       }
-      options = await resolveOptions(inlineOptions, config, configEnv);
+      options = await preResolveOptions(inlineOptions, config, configEnv);
       const extraViteConfig = buildExtraViteConfig(options, config, configEnv);
       log.debug("additional vite config", extraViteConfig);
       return extraViteConfig;
     },
     async configResolved(config) {
-      addExtraPreprocessors(options, config);
+      options = resolveOptions(options, config);
+      patchResolvedViteConfig(config, options);
       requestParser = buildIdParser(options);
       compileSvelte2 = createCompileSvelte(options);
       viteConfig = config;
@@ -1548,4 +1562,4 @@ function svelte(inlineOptions) {
 export {
   svelte
 };
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map