@sveltejs/vite-plugin-svelte 1.1.0 → 1.1.1

package/dist/index.js

@@ -98,12 +98,11 @@ var log = {
   setLevel
 };
 function logCompilerWarnings(svelteRequest, warnings, options) {
-  var _a, _b, _c;
   const { emitCss, onwarn, isBuild } = options;
-  const sendViaWS = !isBuild && ((_a = options.experimental) == null ? void 0 : _a.sendWarningsToBrowser);
+  const sendViaWS = !isBuild && options.experimental?.sendWarningsToBrowser;
   let warn = isBuild ? warnBuild : warnDev;
   const handledByDefaultWarn = [];
-  const notIgnored = warnings == null ? void 0 : warnings.filter((w) => !ignoreCompilerWarning(w, isBuild, emitCss));
+  const notIgnored = warnings?.filter((w) => !ignoreCompilerWarning(w, isBuild, emitCss));
   const extra = buildExtraWarnings(warnings, isBuild);
   const allWarnings = [...notIgnored, ...extra];
   if (sendViaWS) {
@@ -131,7 +130,7 @@ function logCompilerWarnings(svelteRequest, warnings, options) {
       rawWarnings: warnings
     };
     log.debug(`sending svelte:warnings message for ${svelteRequest.normalizedFilename}`);
-    (_c = (_b = options.server) == null ? void 0 : _b.ws) == null ? void 0 : _c.send("svelte:warnings", message);
+    options.server?.ws?.send("svelte:warnings", message);
   }
 }
 function ignoreCompilerWarning(warning, isBuild, emitCss) {
@@ -226,11 +225,11 @@ async function handleHotUpdate(compileSvelte2, ctx, svelteRequest, cache, option
   return result;
 }
 function cssChanged(prev, next) {
-  return !isCodeEqual(prev == null ? void 0 : prev.code, next == null ? void 0 : next.code);
+  return !isCodeEqual(prev?.code, next?.code);
 }
 function jsChanged(prev, next, filename) {
-  const prevJs = prev == null ? void 0 : prev.code;
-  const nextJs = next == null ? void 0 : next.code;
+  const prevJs = prev?.code;
+  const nextJs = next?.code;
   const isStrictEqual = isCodeEqual(prevJs, nextJs);
   if (isStrictEqual) {
     return false;
@@ -290,7 +289,6 @@ function toSafe(base64) {
 // src/utils/compile.ts
 var scriptLangRE = /<script [^>]*lang=["']?([^"' >]+)["']?[^>]*>/;
 var _createCompileSvelte = (makeHot) => async function compileSvelte2(svelteRequest, code, options) {
-  var _a, _b, _c;
   const { filename, normalizedFilename, cssId, ssr } = svelteRequest;
   const { emitCss = true } = options;
   const dependencies = [];
@@ -326,11 +324,11 @@ var _createCompileSvelte = (makeHot) => async function compileSvelte2(svelteRequ
       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, {
+  const dynamicCompileOptions = await options.experimental?.dynamicCompileOptions?.({
     filename,
     code: finalCode,
     compileOptions
-  }));
+  });
   if (dynamicCompileOptions && log.debug.enabled) {
     log.debug(
       `dynamic compile options for  ${filename}: ${JSON.stringify(dynamicCompileOptions)}`
@@ -360,18 +358,17 @@ import ${JSON.stringify(cssId)};
   return {
     filename,
     normalizedFilename,
-    lang: ((_c = code.match(scriptLangRE)) == null ? void 0 : _c[1]) || "js",
+    lang: code.match(scriptLangRE)?.[1] || "js",
     compiled,
     ssr,
     dependencies
   };
 };
 function buildMakeHot(options) {
-  var _a, _b;
   const needsMakeHot = options.hot !== false && options.isServe && !options.isProduction;
   if (needsMakeHot) {
-    const hotApi = (_a = options == null ? void 0 : options.hot) == null ? void 0 : _a.hotApi;
-    const adapter = (_b = options == null ? void 0 : options.hot) == null ? void 0 : _b.adapter;
+    const hotApi = options?.hot?.hotApi;
+    const adapter = options?.hot?.adapter;
     return createMakeHot({
       walk,
       hotApi,
@@ -485,7 +482,7 @@ var dynamicImportDefault = new Function(
   'return import(path + "?t=" + timestamp).then(m => m.default)'
 );
 async function loadSvelteConfig(viteConfig, inlineOptions) {
-  if ((inlineOptions == null ? void 0 : inlineOptions.configFile) === false) {
+  if (inlineOptions?.configFile === false) {
     return;
   }
   const configFile = findConfigToLoad(viteConfig, inlineOptions);
@@ -534,8 +531,8 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
   }
 }
 function findConfigToLoad(viteConfig, inlineOptions) {
-  const root = (viteConfig == null ? void 0 : viteConfig.root) || process.cwd();
-  if (inlineOptions == null ? void 0 : inlineOptions.configFile) {
+  const root = viteConfig?.root || process.cwd();
+  if (inlineOptions?.configFile) {
     const abolutePath = path.isAbsolute(inlineOptions.configFile) ? inlineOptions.configFile : path.resolve(root, inlineOptions.configFile);
     if (!fs2.existsSync(abolutePath)) {
       throw new Error(`failed to find svelte config file ${abolutePath}.`);
@@ -681,8 +678,7 @@ function isSvelteComponentLib(pkg) {
   return !!pkg.svelte;
 }
 function isSvelteLib(pkg) {
-  var _a, _b;
-  return !!((_a = pkg.dependencies) == null ? void 0 : _a.svelte) || !!((_b = pkg.peerDependencies) == null ? void 0 : _b.svelte);
+  return !!pkg.dependencies?.svelte || !!pkg.peerDependencies?.svelte;
 }
 var COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD = [
   "@lukeed/uuid",
@@ -815,8 +811,7 @@ function esbuildSveltePlugin(options) {
   return {
     name: "vite-plugin-svelte:optimize-svelte",
     setup(build) {
-      var _a;
-      if ((_a = build.initialOptions.plugins) == null ? void 0 : _a.some((v) => v.name === "vite:dep-scan"))
+      if (build.initialOptions.plugins?.some((v) => v.name === "vite:dep-scan"))
         return;
       const svelteExtensions = (options.extensions ?? [".svelte"]).map((ext) => ext.slice(1));
       const svelteFilter = new RegExp(`\\.(` + svelteExtensions.join("|") + `)(\\?.*)?$`);
@@ -833,7 +828,6 @@ function esbuildSveltePlugin(options) {
   };
 }
 async function compileSvelte(options, { filename, code }) {
-  var _a, _b;
   const compileOptions = {
     ...options.compilerOptions,
     css: true,
@@ -853,11 +847,11 @@ async function compileSvelte(options, { filename, code }) {
       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, {
+  const dynamicCompileOptions = await options.experimental?.dynamicCompileOptions?.({
     filename,
     code: finalCode,
     compileOptions
-  }));
+  });
   if (dynamicCompileOptions && log.debug.enabled) {
     log.debug(`dynamic compile options for  ${filename}: ${JSON.stringify(dynamicCompileOptions)}`);
   }
@@ -870,9 +864,7 @@ async function compileSvelte(options, { filename, code }) {
 }
 
 // src/utils/preprocess.ts
-import {
-  transformWithEsbuild
-} from "vite";
+import * as vite from "vite";
 import MagicString2 from "magic-string";
 import { preprocess as preprocess3 } from "svelte/compiler";
 
@@ -900,7 +892,7 @@ async function buildMagicString(from, to, options) {
     const diff = diffs[i];
     const nextDiff = diffs[i + 1];
     if (diff[0] === DIFF_DELETE) {
-      if ((nextDiff == null ? void 0 : nextDiff[0]) === DIFF_INSERT) {
+      if (nextDiff?.[0] === DIFF_INSERT) {
         m.overwrite(pos, pos + diff[1].length, nextDiff[1]);
         i++;
       } else {
@@ -933,7 +925,7 @@ function createViteScriptPreprocessor() {
     const lang = attributes.lang;
     if (!supportedScriptLangs.includes(lang))
       return;
-    const transformResult = await transformWithEsbuild(content, filename, {
+    const transformResult = await vite.transformWithEsbuild(content, filename, {
       loader: lang,
       target: "esnext",
       tsconfigRaw: {
@@ -950,34 +942,39 @@ function createViteScriptPreprocessor() {
   };
 }
 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);
+  const transform = getCssTransformFn(config);
   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] = path3.basename(filename);
+    const result = await transform(content, moduleId);
+    if (result.map?.sources?.[0] === moduleId) {
+      result.map.sources[0] = path3.basename(filename);
     }
     return {
-      code: transformResult.code,
-      map: transformResult.map ?? void 0
+      code: result.code,
+      map: result.map ?? void 0
     };
   };
 }
+function getCssTransformFn(config) {
+  if (vite.preprocessCSS) {
+    return async (code, filename) => {
+      return vite.preprocessCSS(code, filename, config);
+    };
+  } else {
+    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`);
+    }
+    return plugin.transform.bind(null);
+  }
+}
 function createVitePreprocessorGroup(config) {
   return {
     markup({ content, filename }) {
@@ -1008,14 +1005,13 @@ function createInjectScopeEverythingRulePreprocessorGroup() {
   };
 }
 function buildExtraPreprocessors(options, config) {
-  var _a, _b;
   const prependPreprocessors = [];
   const appendPreprocessors = [];
-  if ((_a = options.experimental) == null ? void 0 : _a.useVitePreprocess) {
+  if (options.experimental?.useVitePreprocess) {
     log.debug("adding vite preprocessor");
     prependPreprocessors.push(createVitePreprocessorGroup(config));
   }
-  const pluginsWithPreprocessorsDeprecated = config.plugins.filter((p) => p == null ? void 0 : p.sveltePreprocess);
+  const pluginsWithPreprocessorsDeprecated = config.plugins.filter((p) => 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(", ")}`
@@ -1033,13 +1029,10 @@ function buildExtraPreprocessors(options, config) {
       }
     });
   }
-  const pluginsWithPreprocessors = config.plugins.filter((p) => {
-    var _a2;
-    return (_a2 = p == null ? void 0 : p.api) == null ? void 0 : _a2.sveltePreprocess;
-  });
+  const pluginsWithPreprocessors = config.plugins.filter((p) => p?.api?.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))) {
+    if (options.ignorePluginPreprocessors === true || Array.isArray(options.ignorePluginPreprocessors) && options.ignorePluginPreprocessors?.includes(p.name)) {
       ignored.push(p);
     } else {
       included.push(p);
@@ -1062,7 +1055,6 @@ function buildExtraPreprocessors(options, config) {
   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) {
@@ -1074,7 +1066,7 @@ function addExtraPreprocessors(options, config) {
       options.preprocess = [...prependPreprocessors, options.preprocess, ...appendPreprocessors];
     }
   }
-  const generateMissingSourceMaps = !!((_a = options.experimental) == null ? void 0 : _a.generateMissingPreprocessorSourcemaps);
+  const generateMissingSourceMaps = !!options.experimental?.generateMissingPreprocessorSourcemaps;
   if (options.preprocess && generateMissingSourceMaps) {
     options.preprocess = Array.isArray(options.preprocess) ? options.preprocess.map((p, i) => validateSourceMapOutputWrapper(p, i)) : validateSourceMapOutputWrapper(options.preprocess, 0);
   }
@@ -1083,7 +1075,6 @@ 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;
@@ -1097,7 +1088,7 @@ function validateSourceMapOutputWrapper(group, i) {
               processor: processorFn.toString()
             }
           );
-        } else if (((_a = result.map) == null ? void 0 : _a.mappings) === "") {
+        } else if (result.map?.mappings === "") {
           invalidMap = true;
           log.warn.enabled && log.warn.once(
             `preprocessor at index ${i} returned an invalid empty sourcemap for ${processorType} transform`,
@@ -1232,7 +1223,7 @@ async function preResolveOptions(inlineOptions = {}, viteUserConfig, viteEnv) {
     inlineOptions,
     extraOptions
   );
-  if (svelteConfig == null ? void 0 : svelteConfig.configFile) {
+  if (svelteConfig?.configFile) {
     merged.configFile = svelteConfig.configFile;
   }
   return merged;
@@ -1247,11 +1238,10 @@ function mergeConfigs(...configs) {
   return result;
 }
 function resolveOptions(preResolveOptions2, viteConfig) {
-  var _a;
   const defaultOptions = {
     hot: viteConfig.isProduction ? false : {
       injectCss: !preResolveOptions2.emitCss,
-      partialAccept: !!((_a = viteConfig.experimental) == null ? void 0 : _a.hmrPartialAccept)
+      partialAccept: !!viteConfig.experimental?.hmrPartialAccept
     },
     compilerOptions: {
       css: !preResolveOptions2.emitCss,
@@ -1341,9 +1331,8 @@ function removeIgnoredOptions(options) {
   }
 }
 function addSvelteKitOptions(options) {
-  var _a;
-  if ((options == null ? void 0 : options.kit) != null) {
-    const kit_browser_hydrate = (_a = options.kit.browser) == null ? void 0 : _a.hydrate;
+  if (options?.kit != null) {
+    const kit_browser_hydrate = options.kit.browser?.hydrate;
     const hydratable = kit_browser_hydrate !== false;
     if (options.compilerOptions.hydratable != null && options.compilerOptions.hydratable !== hydratable) {
       log.warn(
@@ -1355,9 +1344,8 @@ function addSvelteKitOptions(options) {
   }
 }
 function handleDeprecatedOptions(options) {
-  var _a, _b;
-  if ((_a = options.experimental) == null ? void 0 : _a.prebundleSvelteLibraries) {
-    options.prebundleSvelteLibraries = (_b = options.experimental) == null ? void 0 : _b.prebundleSvelteLibraries;
+  if (options.experimental?.prebundleSvelteLibraries) {
+    options.prebundleSvelteLibraries = options.experimental?.prebundleSvelteLibraries;
     log.warn(
       "experimental.prebundleSvelteLibraries is no longer experimental and has moved to prebundleSvelteLibraries"
     );
@@ -1367,7 +1355,6 @@ function resolveViteRoot(viteConfig) {
   return normalizePath2(viteConfig.root ? path4.resolve(viteConfig.root) : process.cwd());
 }
 function buildExtraViteConfig(options, config) {
-  var _a;
   const svelteDeps = findRootSvelteDependencies(options.root);
   const extraViteConfig = {
     resolve: {
@@ -1391,7 +1378,7 @@ function buildExtraViteConfig(options, config) {
     };
   }
   extraViteConfig.ssr = buildSSROptionsForSvelte(svelteDeps, options, config, extraViteConfig);
-  if ((options.hot == null || options.hot === true || options.hot && options.hot.partialAccept !== false) && ((_a = config.experimental) == null ? void 0 : _a.hmrPartialAccept) !== false) {
+  if ((options.hot == null || options.hot === true || options.hot && options.hot.partialAccept !== false) && config.experimental?.hmrPartialAccept !== false) {
     log.debug('enabling "experimental.hmrPartialAccept" in vite config');
     extraViteConfig.experimental = { hmrPartialAccept: true };
   }
@@ -1400,13 +1387,9 @@ function buildExtraViteConfig(options, config) {
 function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps) {
   const include = [];
   const exclude = ["svelte-hmr"];
-  const isIncluded = (dep) => {
-    var _a;
-    return include.includes(dep) || ((_a = optimizeDeps == null ? void 0 : optimizeDeps.include) == null ? void 0 : _a.includes(dep));
-  };
+  const isIncluded = (dep) => include.includes(dep) || optimizeDeps?.include?.includes(dep);
   const isExcluded = (dep) => {
-    var _a;
-    return exclude.includes(dep) || ((_a = optimizeDeps == null ? void 0 : optimizeDeps.exclude) == null ? void 0 : _a.some((id) => dep === id || id.startsWith(`${dep}/`)));
+    return exclude.includes(dep) || optimizeDeps?.exclude?.some((id) => dep === id || id.startsWith(`${dep}/`));
   };
   if (!isExcluded("svelte")) {
     const svelteImportsToInclude = SVELTE_IMPORTS.filter((x) => x !== "svelte/ssr");
@@ -1444,17 +1427,13 @@ function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps) {
   return { include, exclude };
 }
 function buildSSROptionsForSvelte(svelteDeps, options, config) {
-  var _a, _b;
   const noExternal = [];
-  if (!((_b = (_a = config.ssr) == null ? void 0 : _a.external) == null ? void 0 : _b.includes("svelte"))) {
+  if (!config.ssr?.external?.includes("svelte")) {
     noExternal.push("svelte", /^svelte\//);
   }
   noExternal.push(
     ...Array.from(new Set(svelteDeps.map((s) => s.name))).filter(
-      (x) => {
-        var _a2, _b2;
-        return !((_b2 = (_a2 = config.ssr) == null ? void 0 : _a2.external) == null ? void 0 : _b2.includes(x));
-      }
+      (x) => !config.ssr?.external?.includes(x)
     )
   );
   const ssr = {
@@ -1465,17 +1444,13 @@ function buildSSROptionsForSvelte(svelteDeps, options, config) {
     ssr.external = Array.from(
       new Set(svelteDeps.flatMap((dep) => Object.keys(dep.pkg.dependencies || {})))
     ).filter(
-      (dep) => {
-        var _a2, _b2;
-        return !ssr.noExternal.includes(dep) && !((_b2 = (_a2 = config.ssr) == null ? void 0 : _a2.external) == null ? void 0 : _b2.includes(dep));
-      }
+      (dep) => !ssr.noExternal.includes(dep) && !config.ssr?.external?.includes(dep)
     );
   }
   return ssr;
 }
 function patchResolvedViteConfig(viteConfig, options) {
-  var _a, _b;
-  const facadeEsbuildSveltePlugin = (_b = (_a = viteConfig.optimizeDeps.esbuildOptions) == null ? void 0 : _a.plugins) == null ? void 0 : _b.find(
+  const facadeEsbuildSveltePlugin = viteConfig.optimizeDeps.esbuildOptions?.plugins?.find(
     (plugin) => plugin.name === facadeEsbuildSveltePluginName
   );
   if (facadeEsbuildSveltePlugin) {
@@ -1783,9 +1758,8 @@ function svelteInspector() {
     apply: "serve",
     enforce: "pre",
     configResolved(config) {
-      var _a, _b, _c;
       const vps = config.plugins.find((p) => p.name === "vite-plugin-svelte");
-      if ((_c = (_b = (_a = vps == null ? void 0 : vps.api) == null ? void 0 : _a.options) == null ? void 0 : _b.experimental) == null ? void 0 : _c.inspector) {
+      if (vps?.api?.options?.experimental?.inspector) {
         inspectorOptions = {
           ...defaultInspectorOptions,
           ...vps.api.options.experimental.inspector
@@ -1803,7 +1777,7 @@ function svelteInspector() {
       }
     },
     async resolveId(importee, importer, options) {
-      if ((options == null ? void 0 : options.ssr) || disabled) {
+      if (options?.ssr || disabled) {
         return;
       }
       if (importee.startsWith("virtual:svelte-inspector-options")) {
@@ -1815,7 +1789,7 @@ function svelteInspector() {
       }
     },
     async load(id, options) {
-      if ((options == null ? void 0 : options.ssr) || disabled) {
+      if (options?.ssr || disabled) {
         return;
       }
       if (id === "virtual:svelte-inspector-options") {
@@ -1830,7 +1804,7 @@ function svelteInspector() {
       }
     },
     transform(code, id, options) {
-      if ((options == null ? void 0 : options.ssr) || disabled || !appendTo) {
+      if (options?.ssr || disabled || !appendTo) {
         return;
       }
       if (id.endsWith(appendTo)) {
@@ -1910,7 +1884,7 @@ function svelte(inlineOptions) {
         setupWatchers(options, cache, requestParser);
       },
       load(id, opts) {
-        const ssr = !!(opts == null ? void 0 : opts.ssr);
+        const ssr = !!opts?.ssr;
         const svelteRequest = requestParser(id, !!ssr);
         if (svelteRequest) {
           const { filename, query } = svelteRequest;
@@ -1928,9 +1902,9 @@ function svelte(inlineOptions) {
         }
       },
       async resolveId(importee, importer, opts) {
-        const ssr = !!(opts == null ? void 0 : opts.ssr);
+        const ssr = !!opts?.ssr;
         const svelteRequest = requestParser(importee, ssr);
-        if (svelteRequest == null ? void 0 : svelteRequest.query.svelte) {
+        if (svelteRequest?.query.svelte) {
           if (svelteRequest.query.type === "style") {
             log.debug(`resolveId resolved virtual css module ${svelteRequest.cssId}`);
             return svelteRequest.cssId;
@@ -1972,8 +1946,7 @@ function svelte(inlineOptions) {
         }
       },
       async transform(code, id, opts) {
-        var _a;
-        const ssr = !!(opts == null ? void 0 : opts.ssr);
+        const ssr = !!opts?.ssr;
         const svelteRequest = requestParser(id, ssr);
         if (!svelteRequest || svelteRequest.query.svelte) {
           return;
@@ -1987,7 +1960,7 @@ function svelte(inlineOptions) {
         }
         logCompilerWarnings(svelteRequest, compileData.compiled.warnings, options);
         cache.update(compileData);
-        if (((_a = compileData.dependencies) == null ? void 0 : _a.length) && options.server) {
+        if (compileData.dependencies?.length && options.server) {
           compileData.dependencies.forEach((d) => {
             ensureWatchedFile(options.server.watcher, d, options.root);
           });