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

package/dist/index.js

@@ -26,7 +26,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/index.ts
-import fs7 from "fs";
+import fs8 from "fs";
 
 // src/utils/log.ts
 import { cyan, yellow, red } from "kleur/colors";
@@ -89,7 +89,7 @@ function _log(logger, message, payload) {
 function createLogger(level) {
   const logger = loggers[level];
   const logFn = _log.bind(null, logger);
-  const logged = new Set();
+  const logged = /* @__PURE__ */ new Set();
   const once = function(message, payload) {
     if (logged.has(message)) {
       return;
@@ -181,7 +181,7 @@ async function handleHotUpdate(compileSvelte2, ctx, svelteRequest, cache, option
   const content = await read();
   const compileData = await compileSvelte2(svelteRequest, content, options);
   cache.update(compileData);
-  const affectedModules = new Set();
+  const affectedModules = /* @__PURE__ */ new Set();
   const cssModule = server.moduleGraph.getModuleById(svelteRequest.cssId);
   const mainModule = server.moduleGraph.getModuleById(svelteRequest.id);
   const cssUpdated = cssModule && cssChanged(cachedCss, compileData.compiled.css);
@@ -245,16 +245,14 @@ import { compile, preprocess, walk } from "svelte/compiler";
 import { createMakeHot } from "svelte-hmr";
 
 // src/utils/hash.ts
-import {
-  createHash
-} from "crypto";
-var hashes = Object.create(null);
+import * as crypto from "crypto";
+var hashes = /* @__PURE__ */ Object.create(null);
 var hash_length = 12;
 function safeBase64Hash(input) {
   if (hashes[input]) {
     return hashes[input];
   }
-  const md5 = createHash("md5");
+  const md5 = crypto.createHash("md5");
   md5.update(input);
   const hash = toSafe(md5.digest("base64")).substr(0, hash_length);
   hashes[input] = hash;
@@ -357,9 +355,7 @@ function createCompileSvelte(options) {
 // src/utils/id.ts
 import { createFilter } from "@rollup/pluginutils";
 import { normalizePath } from "vite";
-import {
-  existsSync
-} from "fs";
+import * as fs from "fs";
 var VITE_FS_PREFIX = "/@fs/";
 var IS_WINDOWS = process.platform === "win32";
 function splitId(id) {
@@ -413,7 +409,7 @@ function existsInRoot(filename, root) {
   if (filename.startsWith(VITE_FS_PREFIX)) {
     return false;
   }
-  return existsSync(root + filename);
+  return fs.existsSync(root + filename);
 }
 function stripRoot(normalizedFilename, normalizedRoot) {
   return normalizedFilename.startsWith(normalizedRoot + "/") ? normalizedFilename.slice(normalizedRoot.length) : normalizedFilename;
@@ -562,7 +558,7 @@ function findRootSvelteDependencies(root, cwdFallback = true) {
   ].filter((dep) => !is_common_without_svelte_field(dep));
   return getSvelteDependencies(deps, root);
 }
-function getSvelteDependencies(deps, pkgDir, path6 = []) {
+function getSvelteDependencies(deps, pkgDir, path7 = []) {
   const result = [];
   const localRequire = createRequire2(`${pkgDir}/package.json`);
   const resolvedDeps = deps.map((dep) => resolveDependencyData(dep, localRequire)).filter(Boolean);
@@ -570,18 +566,18 @@ function getSvelteDependencies(deps, pkgDir, path6 = []) {
     const type = getSvelteDependencyType(pkg);
     if (!type)
       continue;
-    result.push({ name: pkg.name, type, pkg, dir, path: path6 });
+    result.push({ name: pkg.name, type, pkg, dir, path: path7 });
     if (type === "component-library" && pkg.dependencies) {
       let dependencyNames = Object.keys(pkg.dependencies);
-      const circular = dependencyNames.filter((name) => path6.includes(name));
+      const circular = dependencyNames.filter((name) => path7.includes(name));
       if (circular.length > 0) {
-        log.warn.enabled && log.warn(`skipping circular svelte dependencies in automated vite optimizeDeps handling`, circular.map((x) => path6.concat(x).join(">")));
-        dependencyNames = dependencyNames.filter((name) => !path6.includes(name));
+        log.warn.enabled && log.warn(`skipping circular svelte dependencies in automated vite optimizeDeps handling`, circular.map((x) => path7.concat(x).join(">")));
+        dependencyNames = dependencyNames.filter((name) => !path7.includes(name));
       }
-      if (path6.length === 3) {
-        log.debug.once(`encountered deep svelte dependency tree: ${path6.join(">")}`);
+      if (path7.length === 3) {
+        log.debug.once(`encountered deep svelte dependency tree: ${path7.join(">")}`);
       }
-      result.push(...getSvelteDependencies(dependencyNames, dir, path6.concat(pkg.name)));
+      result.push(...getSvelteDependencies(dependencyNames, dir, path7.concat(pkg.name)));
     }
   }
   return result;
@@ -875,7 +871,8 @@ function createViteScriptPreprocessor() {
       loader: lang,
       tsconfigRaw: {
         compilerOptions: {
-          importsNotUsedAsValues: "preserve"
+          importsNotUsedAsValues: "preserve",
+          preserveValueImports: true
         }
       }
     });
@@ -1039,7 +1036,7 @@ function validateSourceMapOutputWrapper(group, i) {
 }
 
 // src/utils/options.ts
-var knownOptions = new Set([
+var knownOptions = /* @__PURE__ */ new Set([
   "configFile",
   "include",
   "exclude",
@@ -1093,6 +1090,7 @@ function resolveOptions(preResolveOptions2, viteConfig) {
   };
   const merged = __spreadProps(__spreadValues(__spreadValues({}, defaultOptions), preResolveOptions2), {
     compilerOptions: __spreadValues(__spreadValues({}, defaultOptions.compilerOptions), preResolveOptions2.compilerOptions),
+    root: viteConfig.root,
     isProduction: viteConfig.isProduction
   });
   addExtraPreprocessors(merged, viteConfig);
@@ -1160,16 +1158,16 @@ function buildExtraViteConfig(options, config, configEnv) {
   extraViteConfig.ssr = buildSSROptionsForSvelte(svelteDeps, options, config);
   return extraViteConfig;
 }
-function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps) {
+function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps2) {
   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));
+    return include.includes(dep) || ((_a = optimizeDeps2 == null ? void 0 : optimizeDeps2.include) == null ? void 0 : _a.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) || ((_a = optimizeDeps2 == null ? void 0 : optimizeDeps2.exclude) == null ? void 0 : _a.some((id) => dep === id || id.startsWith(`${dep}/`)));
   };
   if (!isExcluded("svelte")) {
     const svelteImportsToInclude = SVELTE_IMPORTS.filter((x) => x !== "svelte/ssr");
@@ -1235,10 +1233,10 @@ function patchResolvedViteConfig(viteConfig, options) {
 // src/utils/vite-plugin-svelte-cache.ts
 var VitePluginSvelteCache = class {
   constructor() {
-    this._css = new Map();
-    this._js = new Map();
-    this._dependencies = new Map();
-    this._dependants = new Map();
+    this._css = /* @__PURE__ */ new Map();
+    this._js = /* @__PURE__ */ new Map();
+    this._dependencies = /* @__PURE__ */ new Map();
+    this._dependants = /* @__PURE__ */ new Map();
   }
   update(compileData) {
     this.updateCSS(compileData);
@@ -1262,7 +1260,7 @@ var VitePluginSvelteCache = class {
     const added = dependencies.filter((d) => !prevDependencies.includes(d));
     added.forEach((d) => {
       if (!this._dependants.has(d)) {
-        this._dependants.set(d, new Set());
+        this._dependants.set(d, /* @__PURE__ */ new Set());
       }
       this._dependants.get(d).add(compileData.filename);
     });
@@ -1300,8 +1298,8 @@ var VitePluginSvelteCache = class {
       return this._js.get(svelteRequest.normalizedFilename);
     }
   }
-  getDependants(path6) {
-    const dependants = this._dependants.get(path6);
+  getDependants(path7) {
+    const dependants = this._dependants.get(path7);
     return dependants ? [...dependants] : [];
   }
 };
@@ -1335,7 +1333,6 @@ function setupWatchers(options, cache, requestParser) {
     }
   };
   const triggerViteRestart = (filename) => {
-    var _a;
     if (serverConfig.middlewareMode) {
       const message = "Svelte config change detected, restart your dev process to apply the changes.";
       log.info(message, filename);
@@ -1345,7 +1342,7 @@ function setupWatchers(options, cache, requestParser) {
       });
     } else {
       log.info(`svelte config changed: restarting vite server. - file: ${filename}`);
-      server.restart(!!((_a = options.experimental) == null ? void 0 : _a.prebundleSvelteLibraries));
+      server.restart();
     }
   };
   const possibleSvelteConfigs = knownSvelteConfigNames.map((cfg) => path4.join(root, cfg));
@@ -1410,6 +1407,44 @@ function isBareImport(importee) {
   }
 }
 
+// src/utils/optimizer.ts
+import fs7 from "fs";
+import path6 from "path";
+import { optimizeDeps } from "vite";
+var PREBUNDLE_SENSITIVE_OPTIONS = [
+  "compilerOptions",
+  "configFile",
+  "experimental",
+  "extensions",
+  "ignorePluginPreprocessors",
+  "preprocess"
+];
+async function handleOptimizeDeps(options, viteConfig) {
+  if (!options.experimental.prebundleSvelteLibraries || !viteConfig.cacheDir)
+    return;
+  const viteMetadataPath = path6.resolve(viteConfig.cacheDir, "_metadata.json");
+  if (!fs7.existsSync(viteMetadataPath))
+    return;
+  const svelteMetadataPath = path6.resolve(viteConfig.cacheDir, "_svelte_metadata.json");
+  const currentSvelteMetadata = JSON.stringify(generateSvelteMetadata(options), (_, value) => {
+    return typeof value === "function" ? value.toString() : value;
+  });
+  if (fs7.existsSync(svelteMetadataPath)) {
+    const existingSvelteMetadata = fs7.readFileSync(svelteMetadataPath, "utf8");
+    if (existingSvelteMetadata === currentSvelteMetadata)
+      return;
+  }
+  await optimizeDeps(viteConfig, true);
+  fs7.writeFileSync(svelteMetadataPath, currentSvelteMetadata);
+}
+function generateSvelteMetadata(options) {
+  const metadata = {};
+  for (const key of PREBUNDLE_SENSITIVE_OPTIONS) {
+    metadata[key] = options[key];
+  }
+  return metadata;
+}
+
 // src/index.ts
 function svelte(inlineOptions) {
   if (process.env.DEBUG != null) {
@@ -1417,7 +1452,7 @@ function svelte(inlineOptions) {
   }
   validateInlineOptions(inlineOptions);
   const cache = new VitePluginSvelteCache();
-  const pkg_export_errors = new Set();
+  const pkg_export_errors = /* @__PURE__ */ new Set();
   let requestParser;
   let options;
   let viteConfig;
@@ -1445,6 +1480,9 @@ function svelte(inlineOptions) {
       viteConfig = config;
       log.debug("resolved options", options);
     },
+    async buildStart() {
+      await handleOptimizeDeps(options, viteConfig);
+    },
     configureServer(server) {
       options.server = server;
       setupWatchers(options, cache, requestParser);
@@ -1463,7 +1501,7 @@ function svelte(inlineOptions) {
         }
         if (viteConfig.assetsInclude(filename)) {
           log.debug(`load returns raw content for ${filename}`);
-          return fs7.readFileSync(filename, "utf-8");
+          return fs8.readFileSync(filename, "utf-8");
         }
       }
     },