@sveltejs/vite-plugin-svelte 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-import * as vite from 'vite';
-import { UserConfig, Plugin } from 'vite';
+import { InlineConfig, ResolvedConfig, UserConfig, Plugin } from 'vite';
 import { CompileOptions, Warning } from 'svelte/types/compiler/interfaces';
 export { CompileOptions, Warning } from 'svelte/types/compiler/interfaces';
 import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
@@ -125,14 +124,6 @@ interface SvelteOptions {
  * These options are considered experimental and breaking changes to them can occur in any release
  */
 interface ExperimentalOptions {
-    /**
-     * Use extra preprocessors that delegate style and TypeScript preprocessing to native Vite plugins
-     *
-     * Do not use together with `svelte-preprocess`!
-     *
-     * @default false
-     */
-    useVitePreprocess?: boolean;
     /**
      * A function to update `compilerOptions` before compilation
      *
@@ -247,7 +238,7 @@ type Arrayable<T> = T | T[];
 
 declare function vitePreprocess(opts?: {
     script?: boolean;
-    style?: boolean | vite.InlineConfig | vite.ResolvedConfig;
+    style?: boolean | InlineConfig | ResolvedConfig;
 }): PreprocessorGroup;
 
 declare function loadSvelteConfig(viteConfig?: UserConfig, inlineOptions?: Partial<Options>): Promise<Partial<SvelteOptions> | undefined>;

package/dist/index.js

@@ -261,7 +261,7 @@ function normalizeJsCode(code) {
 }
 
 // src/utils/compile.ts
-import { compile, preprocess as preprocess2, walk } from "svelte/compiler";
+import { compile, preprocess, walk } from "svelte/compiler";
 import { createMakeHot } from "svelte-hmr";
 
 // src/utils/hash.ts
@@ -290,110 +290,7 @@ function toSafe(base64) {
 
 // src/utils/preprocess.ts
 import MagicString from "magic-string";
-import { preprocess } from "svelte/compiler";
-import path2 from "path";
-
-// src/preprocess.ts
 import path from "path";
-import * as vite from "vite";
-var supportedStyleLangs = ["css", "less", "sass", "scss", "styl", "stylus", "postcss", "sss"];
-var supportedScriptLangs = ["ts"];
-function vitePreprocess(opts) {
-  const preprocessor = {};
-  if (opts?.script !== false) {
-    preprocessor.script = viteScript().script;
-  }
-  if (opts?.style !== false) {
-    const styleOpts = typeof opts?.style == "object" ? opts?.style : void 0;
-    preprocessor.style = viteStyle(styleOpts).style;
-  }
-  return preprocessor;
-}
-function viteScript() {
-  return {
-    async script({ attributes, content, filename = "" }) {
-      const lang = attributes.lang;
-      if (!supportedScriptLangs.includes(lang))
-        return;
-      const transformResult = await vite.transformWithEsbuild(content, filename, {
-        loader: lang,
-        target: "esnext",
-        tsconfigRaw: {
-          compilerOptions: {
-            importsNotUsedAsValues: "preserve",
-            preserveValueImports: true
-          }
-        }
-      });
-      return {
-        code: transformResult.code,
-        map: transformResult.map
-      };
-    }
-  };
-}
-function viteStyle(config = {}) {
-  let transform;
-  const style = async ({ attributes, content, filename = "" }) => {
-    const lang = attributes.lang;
-    if (!supportedStyleLangs.includes(lang))
-      return;
-    if (!transform) {
-      let resolvedConfig;
-      if (style.__resolvedConfig) {
-        resolvedConfig = style.__resolvedConfig;
-      } else if (isResolvedConfig(config)) {
-        resolvedConfig = config;
-      } else {
-        resolvedConfig = await vite.resolveConfig(
-          config,
-          process.env.NODE_ENV === "production" ? "build" : "serve"
-        );
-      }
-      transform = getCssTransformFn(resolvedConfig);
-    }
-    const moduleId = `${filename}.${lang}`;
-    const result = await transform(content, moduleId);
-    if (result.map?.sources?.[0] === moduleId) {
-      result.map.sources[0] = path.basename(filename);
-    }
-    return {
-      code: result.code,
-      map: result.map ?? void 0
-    };
-  };
-  style.__resolvedConfig = null;
-  return { style };
-}
-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 isResolvedConfig(config) {
-  return !!config.inlineConfig;
-}
-
-// src/utils/preprocess.ts
-function createVitePreprocessorGroup(config) {
-  return {
-    markup({ content, filename }) {
-      return preprocess(content, vitePreprocess({ style: config }), { filename });
-    }
-  };
-}
 function createInjectScopeEverythingRulePreprocessorGroup() {
   return {
     style({ content, filename }) {
@@ -402,7 +299,7 @@ function createInjectScopeEverythingRulePreprocessorGroup() {
       return {
         code: s.toString(),
         map: s.generateDecodedMap({
-          source: filename ? path2.basename(filename) : void 0,
+          source: filename ? path.basename(filename) : void 0,
           hires: true
         })
       };
@@ -412,12 +309,6 @@ function createInjectScopeEverythingRulePreprocessorGroup() {
 function buildExtraPreprocessors(options, config) {
   const prependPreprocessors = [];
   const appendPreprocessors = [];
-  if (options.experimental?.useVitePreprocess) {
-    log.warn(
-      "`experimental.useVitePreprocess` is deprecated. Use the `vitePreprocess()` preprocessor instead. See https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/preprocess.md for more information."
-    );
-    prependPreprocessors.push(createVitePreprocessorGroup(config));
-  }
   const pluginsWithPreprocessorsDeprecated = config.plugins.filter((p) => p?.sveltePreprocess);
   if (pluginsWithPreprocessorsDeprecated.length > 0) {
     log.warn(
@@ -473,14 +364,14 @@ function addExtraPreprocessors(options, config) {
 }
 
 // src/utils/compile.ts
-import path3 from "path";
+import path2 from "path";
 var scriptLangRE = /<script [^>]*lang=["']?([^"' >]+)["']?[^>]*>/;
 function mapSourcesToRelative(map, filename) {
   if (map?.sources) {
     map.sources = map.sources.map((s) => {
-      if (path3.isAbsolute(s)) {
-        const relative = path3.relative(filename, s);
-        return relative === "" ? path3.basename(filename) : relative;
+      if (path2.isAbsolute(s)) {
+        const relative = path2.relative(filename, s);
+        return relative === "" ? path2.basename(filename) : relative;
       } else {
         return s;
       }
@@ -540,7 +431,7 @@ var _createCompileSvelte = (makeHot) => {
     }
     if (preprocessors) {
       try {
-        preprocessed = await preprocess2(code, preprocessors, { filename });
+        preprocessed = await preprocess(code, preprocessors, { filename });
       } catch (e) {
         e.message = `Error while preprocessing ${filename}${e.message ? ` - ${e.message}` : ""}`;
         throw e;
@@ -749,7 +640,7 @@ import { normalizePath as normalizePath3 } from "vite";
 
 // src/utils/load-svelte-config.ts
 import { createRequire } from "module";
-import path4 from "path";
+import path3 from "path";
 import fs2 from "fs";
 import { pathToFileURL } from "url";
 var esmRequire;
@@ -815,13 +706,13 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
 function findConfigToLoad(viteConfig, inlineOptions) {
   const root = viteConfig?.root || process.cwd();
   if (inlineOptions?.configFile) {
-    const abolutePath = path4.isAbsolute(inlineOptions.configFile) ? inlineOptions.configFile : path4.resolve(root, inlineOptions.configFile);
+    const abolutePath = path3.isAbsolute(inlineOptions.configFile) ? inlineOptions.configFile : path3.resolve(root, inlineOptions.configFile);
     if (!fs2.existsSync(abolutePath)) {
       throw new Error(`failed to find svelte config file ${abolutePath}.`);
     }
     return abolutePath;
   } else {
-    const existingKnownConfigFiles = knownSvelteConfigNames.map((candidate) => path4.resolve(root, candidate)).filter((file) => fs2.existsSync(file));
+    const existingKnownConfigFiles = knownSvelteConfigNames.map((candidate) => path3.resolve(root, candidate)).filter((file) => fs2.existsSync(file));
     if (existingKnownConfigFiles.length === 0) {
       log.debug(`no svelte config found at ${root}`);
       return;
@@ -856,11 +747,11 @@ var SVELTE_HMR_IMPORTS = [
 var SVELTE_EXPORT_CONDITIONS = ["svelte"];
 
 // src/utils/options.ts
-import path6 from "path";
+import path5 from "path";
 
 // src/utils/esbuild.ts
 import { readFileSync } from "fs";
-import { compile as compile2, preprocess as preprocess3 } from "svelte/compiler";
+import { compile as compile2, preprocess as preprocess2 } from "svelte/compiler";
 
 // src/utils/error.ts
 function toRollupError(error, options) {
@@ -961,7 +852,7 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
   let preprocessed;
   if (options.preprocess) {
     try {
-      preprocessed = await preprocess3(code, options.preprocess, { filename });
+      preprocessed = await preprocess2(code, options.preprocess, { filename });
     } catch (e) {
       e.message = `Error while preprocessing ${filename}${e.message ? ` - ${e.message}` : ""}`;
       throw e;
@@ -1001,7 +892,7 @@ import {
 } from "vitefu";
 
 // src/utils/dependencies.ts
-import path5 from "path";
+import path4 from "path";
 import fs3 from "fs/promises";
 import { findDepPkgJsonPath } from "vitefu";
 async function resolveDependencyData(dep, parent) {
@@ -1010,7 +901,7 @@ async function resolveDependencyData(dep, parent) {
     return void 0;
   try {
     return {
-      dir: path5.dirname(depDataPath),
+      dir: path4.dirname(depDataPath),
       pkg: JSON.parse(await fs3.readFile(depDataPath, "utf-8"))
     };
   } catch {
@@ -1462,7 +1353,7 @@ function handleDeprecatedOptions(options) {
   }
 }
 function resolveViteRoot(viteConfig) {
-  return normalizePath3(viteConfig.root ? path6.resolve(viteConfig.root) : process.cwd());
+  return normalizePath3(viteConfig.root ? path5.resolve(viteConfig.root) : process.cwd());
 }
 async function buildExtraViteConfig(options, config) {
   const extraViteConfig = {
@@ -1639,7 +1530,7 @@ function arraify(value) {
 
 // src/utils/watch.ts
 import fs4 from "fs";
-import path7 from "path";
+import path6 from "path";
 function setupWatchers(options, cache, requestParser) {
   const { server, configFile: svelteConfigFile } = options;
   if (!server) {
@@ -1686,7 +1577,7 @@ function setupWatchers(options, cache, requestParser) {
     unlink: [removeUnlinkedFromCache, emitChangeEventOnDependants]
   };
   if (svelteConfigFile !== false) {
-    const possibleSvelteConfigs = knownSvelteConfigNames.map((cfg) => path7.join(root, cfg));
+    const possibleSvelteConfigs = knownSvelteConfigNames.map((cfg) => path6.join(root, cfg));
     const restartOnConfigAdd = (filename) => {
       if (possibleSvelteConfigs.includes(filename)) {
         triggerViteRestart(filename);
@@ -1712,12 +1603,12 @@ function setupWatchers(options, cache, requestParser) {
 }
 function ensureWatchedFile(watcher, file, root) {
   if (file && !file.startsWith(root + "/") && !file.includes("\0") && fs4.existsSync(file)) {
-    watcher.add(path7.resolve(file));
+    watcher.add(path6.resolve(file));
   }
 }
 
 // src/utils/resolve.ts
-import path8 from "path";
+import path7 from "path";
 import { builtinModules } from "module";
 async function resolveViaPackageJsonSvelte(importee, importer, cache) {
   if (importer && isBareImport(importee) && !isNodeInternal(importee) && !isCommonDepWithoutSvelteField(importee)) {
@@ -1729,7 +1620,7 @@ async function resolveViaPackageJsonSvelte(importee, importer, cache) {
     if (pkgData) {
       const { pkg, dir } = pkgData;
       if (pkg.svelte) {
-        const result = path8.resolve(dir, pkg.svelte);
+        const result = path7.resolve(dir, pkg.svelte);
         cache.setResolvedSvelteField(importee, importer, result);
         return result;
       }
@@ -1740,7 +1631,7 @@ function isNodeInternal(importee) {
   return importee.startsWith("node:") || builtinModules.includes(importee);
 }
 function isBareImport(importee) {
-  if (!importee || importee[0] === "." || importee[0] === "\0" || importee.includes(":") || path8.isAbsolute(importee)) {
+  if (!importee || importee[0] === "." || importee[0] === "\0" || importee.includes(":") || path7.isAbsolute(importee)) {
     return false;
   }
   const parts = importee.split("/");
@@ -1756,7 +1647,7 @@ function isBareImport(importee) {
 
 // src/utils/optimizer.ts
 import { promises as fs5 } from "fs";
-import path9 from "path";
+import path8 from "path";
 var PREBUNDLE_SENSITIVE_OPTIONS = [
   "compilerOptions",
   "configFile",
@@ -1767,7 +1658,7 @@ var PREBUNDLE_SENSITIVE_OPTIONS = [
 ];
 async function saveSvelteMetadata(cacheDir, options) {
   const svelteMetadata = generateSvelteMetadata(options);
-  const svelteMetadataPath = path9.resolve(cacheDir, "_svelte_metadata.json");
+  const svelteMetadataPath = path8.resolve(cacheDir, "_svelte_metadata.json");
   const currentSvelteMetadata = JSON.stringify(svelteMetadata, (_, value) => {
     return typeof value === "function" ? value.toString() : value;
   });
@@ -1790,7 +1681,7 @@ function generateSvelteMetadata(options) {
 
 // src/ui/inspector/plugin.ts
 import { normalizePath as normalizePath4 } from "vite";
-import path10 from "path";
+import path9 from "path";
 import { fileURLToPath } from "url";
 import fs6 from "fs";
 
@@ -1817,7 +1708,7 @@ var defaultInspectorOptions = {
   customStyles: true
 };
 function getInspectorPath() {
-  const pluginPath = normalizePath4(path10.dirname(fileURLToPath(import.meta.url)));
+  const pluginPath = normalizePath4(path9.dirname(fileURLToPath(import.meta.url)));
   return pluginPath.replace(/\/vite-plugin-svelte\/dist$/, "/vite-plugin-svelte/src/ui/inspector/");
 }
 function svelteInspector() {
@@ -1843,7 +1734,7 @@ function svelteInspector() {
         disabled = true;
       } else {
         if (vps.api.options.kit && !inspectorOptions.appendTo) {
-          const out_dir = path10.basename(vps.api.options.kit.outDir || ".svelte-kit");
+          const out_dir = path9.basename(vps.api.options.kit.outDir || ".svelte-kit");
           inspectorOptions.appendTo = `${out_dir}/generated/root.svelte`;
         }
         appendTo = inspectorOptions.appendTo;
@@ -2102,6 +1993,87 @@ function toRawExports(object) {
   return exports;
 }
 
+// src/preprocess.ts
+import path10 from "path";
+import { preprocessCSS, resolveConfig, transformWithEsbuild } from "vite";
+var supportedStyleLangs = ["css", "less", "sass", "scss", "styl", "stylus", "postcss", "sss"];
+var supportedScriptLangs = ["ts"];
+function vitePreprocess(opts) {
+  const preprocessor = {};
+  if (opts?.script !== false) {
+    preprocessor.script = viteScript().script;
+  }
+  if (opts?.style !== false) {
+    const styleOpts = typeof opts?.style == "object" ? opts?.style : void 0;
+    preprocessor.style = viteStyle(styleOpts).style;
+  }
+  return preprocessor;
+}
+function viteScript() {
+  return {
+    async script({ attributes, content, filename = "" }) {
+      const lang = attributes.lang;
+      if (!supportedScriptLangs.includes(lang))
+        return;
+      const transformResult = await transformWithEsbuild(content, filename, {
+        loader: lang,
+        target: "esnext",
+        tsconfigRaw: {
+          compilerOptions: {
+            importsNotUsedAsValues: "preserve",
+            preserveValueImports: true
+          }
+        }
+      });
+      return {
+        code: transformResult.code,
+        map: transformResult.map
+      };
+    }
+  };
+}
+function viteStyle(config = {}) {
+  let transform;
+  const style = async ({ attributes, content, filename = "" }) => {
+    const lang = attributes.lang;
+    if (!supportedStyleLangs.includes(lang))
+      return;
+    if (!transform) {
+      let resolvedConfig;
+      if (style.__resolvedConfig) {
+        resolvedConfig = style.__resolvedConfig;
+      } else if (isResolvedConfig(config)) {
+        resolvedConfig = config;
+      } else {
+        resolvedConfig = await resolveConfig(
+          config,
+          process.env.NODE_ENV === "production" ? "build" : "serve"
+        );
+      }
+      transform = getCssTransformFn(resolvedConfig);
+    }
+    const moduleId = `${filename}.${lang}`;
+    const result = await transform(content, moduleId);
+    if (result.map?.sources?.[0] === moduleId) {
+      result.map.sources[0] = path10.basename(filename);
+    }
+    return {
+      code: result.code,
+      map: result.map ?? void 0
+    };
+  };
+  style.__resolvedConfig = null;
+  return { style };
+}
+function getCssTransformFn(config) {
+  return async (code, filename) => {
+    return preprocessCSS(code, filename, config);
+  };
+}
+function isResolvedConfig(config) {
+  return !!config.inlineConfig;
+}
+
 // src/index.ts
 function svelte(inlineOptions) {
   if (process.env.DEBUG != null) {
@@ -2113,6 +2085,7 @@ function svelte(inlineOptions) {
   let options;
   let viteConfig;
   let compileSvelte2;
+  let resolvedSvelteSSR;
   const api = {};
   const plugins = [
     {
@@ -2182,6 +2155,24 @@ function svelte(inlineOptions) {
             return svelteRequest.cssId;
           }
         }
+        if (ssr && importee === "svelte") {
+          if (!resolvedSvelteSSR) {
+            resolvedSvelteSSR = this.resolve("svelte/ssr", void 0, { skipSelf: true }).then(
+              (svelteSSR) => {
+                log.debug("resolved svelte to svelte/ssr");
+                return svelteSSR;
+              },
+              (err) => {
+                log.debug(
+                  "failed to resolve svelte to svelte/ssr. Update svelte to a version that exports it",
+                  err
+                );
+                return null;
+              }
+            );
+          }
+          return resolvedSvelteSSR;
+        }
         const scan = !!opts?.scan;
         const isPrebundled = options.prebundleSvelteLibraries && viteConfig.optimizeDeps?.disabled !== true && viteConfig.optimizeDeps?.disabled !== (options.isBuild ? "build" : "dev") && !isDepExcluded2(importee, viteConfig.optimizeDeps?.exclude ?? []);
         if (ssr || scan || !isPrebundled) {