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

package/dist/index.cjs

@@ -22,9 +22,6 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name in all)
@@ -46,6 +43,11 @@ var __toModule = (module2) => {
 __export(exports, {
   svelte: () => svelte
 });
+
+// ../../node_modules/.pnpm/tsup@5.4.0_typescript@4.4.4/node_modules/tsup/assets/cjs_shims.js
+var importMetaUrlShim = typeof document === "undefined" ? new (require("url")).URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
+
+// src/index.ts
 var import_fs5 = __toModule(require("fs"));
 
 // src/utils/log.ts
@@ -451,7 +453,6 @@ var import_module = __toModule(require("module"));
 var import_path = __toModule(require("path"));
 var import_fs = __toModule(require("fs"));
 var import_url = __toModule(require("url"));
-var import_meta = {};
 var esmRequire;
 var knownSvelteConfigNames = [
   "svelte.config.js",
@@ -480,7 +481,7 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
     }
     if (!configFile.endsWith(".mjs")) {
       try {
-        const _require = import_meta.url ? esmRequire != null ? esmRequire : esmRequire = (0, import_module.createRequire)(import_meta.url) : require;
+        const _require = importMetaUrlShim ? esmRequire != null ? esmRequire : esmRequire = (0, import_module.createRequire)(importMetaUrlShim) : require;
         delete _require.cache[_require.resolve(configFile)];
         const result = _require(configFile);
         if (result != null) {
@@ -707,8 +708,7 @@ var knownOptions = new Set([
   "disableDependencyReinclusion",
   "experimental"
 ]);
-function buildDefaultOptions(isProduction, options) {
-  const emitCss = (options == null ? void 0 : options.emitCss) != null ? options.emitCss : true;
+function buildDefaultOptions(isProduction, emitCss = true) {
   const hot = isProduction ? false : {
     injectCss: !emitCss
   };
@@ -789,11 +789,12 @@ 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 defaultOptions = buildDefaultOptions(viteEnv.mode === "production", inlineOptions);
   const svelteConfig = await loadSvelteConfig(viteConfigWithResolvedRoot, inlineOptions) || {};
+  const defaultOptions = buildDefaultOptions(viteEnv.mode === "production", (_a = inlineOptions.emitCss) != null ? _a : svelteConfig.emitCss);
   const resolvedOptions = mergeOptions(defaultOptions, svelteConfig, inlineOptions, viteConfigWithResolvedRoot, viteEnv);
   enforceOptionsForProduction(resolvedOptions);
   enforceOptionsForHmr(resolvedOptions);
@@ -803,7 +804,6 @@ function resolveViteRoot(viteConfig) {
   return (0, import_vite2.normalizePath)(viteConfig.root ? import_path3.default.resolve(viteConfig.root) : process.cwd());
 }
 function buildExtraViteConfig(options, config, configEnv) {
-  var _a;
   const svelteDeps = findRootSvelteDependencies(options.root);
   const extraViteConfig = {
     resolve: {
@@ -815,15 +815,6 @@ function buildExtraViteConfig(options, config, configEnv) {
     extraViteConfig.optimizeDeps = buildOptimizeDepsForSvelte(svelteDeps, options, config.optimizeDeps);
   }
   extraViteConfig.ssr = buildSSROptionsForSvelte(svelteDeps, options, config);
-  if ((_a = options.experimental) == null ? void 0 : _a.useVitePreprocess) {
-    extraViteConfig.esbuild = {
-      tsconfigRaw: {
-        compilerOptions: {
-          importsNotUsedAsValues: "preserve"
-        }
-      }
-    };
-  }
   return extraViteConfig;
 }
 function buildOptimizeDepsForSvelte(svelteDeps, options, optimizeDeps) {
@@ -1059,7 +1050,9 @@ function isBareImport(importee) {
 }
 
 // src/utils/preprocess.ts
+var import_vite3 = __toModule(require("vite"));
 var import_magic_string2 = __toModule(require("magic-string"));
+var import_compiler2 = __toModule(require("svelte/compiler"));
 
 // src/utils/sourcemap.ts
 var import_magic_string = __toModule(require("magic-string"));
@@ -1110,7 +1103,27 @@ async function buildSourceMap(from, to, filename) {
 // src/utils/preprocess.ts
 var supportedStyleLangs = ["css", "less", "sass", "scss", "styl", "stylus", "postcss"];
 var supportedScriptLangs = ["ts"];
-function createPreprocessorFromVitePlugin(config, options, pluginName, supportedLangs) {
+function createViteScriptPreprocessor() {
+  return async ({ attributes, content, filename = "" }) => {
+    const lang = attributes.lang;
+    if (!supportedScriptLangs.includes(lang))
+      return;
+    const transformResult = await (0, import_vite3.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}`);
@@ -1119,33 +1132,31 @@ function createPreprocessorFromVitePlugin(config, options, pluginName, supported
     throw new Error(`plugin ${pluginName} has no transform`);
   }
   const pluginTransform = plugin.transform.bind(null);
-  return async ({ attributes, content, filename }) => {
-    var _a, _b, _c, _d;
+  return async ({ attributes, content, filename = "" }) => {
+    var _a, _b;
     const lang = attributes.lang;
-    if (!supportedLangs.includes(lang)) {
-      return { code: content };
-    }
+    if (!supportedStyleLangs.includes(lang))
+      return;
     const moduleId = `${filename}.${lang}`;
-    const moduleGraph = (_a = options.server) == null ? void 0 : _a.moduleGraph;
-    if (moduleGraph && !moduleGraph.getModuleById(moduleId)) {
-      await moduleGraph.ensureEntryFromUrl(moduleId);
-    }
     const transformResult = await pluginTransform(content, moduleId);
-    const hasMap = transformResult.map && ((_b = transformResult.map) == null ? void 0 : _b.mappings) !== "";
-    if (((_d = (_c = transformResult.map) == null ? void 0 : _c.sources) == null ? void 0 : _d[0]) === 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,
-      dependencies: transformResult.deps
+      map: hasMap ? transformResult.map : void 0
     };
   };
 }
-function createVitePreprocessorGroup(config, options) {
+function createVitePreprocessorGroup(config) {
   return {
-    script: createPreprocessorFromVitePlugin(config, options, "vite:esbuild", supportedScriptLangs),
-    style: createPreprocessorFromVitePlugin(config, options, "vite:css", supportedStyleLangs)
+    markup({ content, filename }) {
+      return (0, import_compiler2.preprocess)(content, {
+        script: createViteScriptPreprocessor(),
+        style: createViteStylePreprocessor(config)
+      }, { filename });
+    }
   };
 }
 function createInjectScopeEverythingRulePreprocessorGroup() {
@@ -1162,10 +1173,11 @@ function createInjectScopeEverythingRulePreprocessorGroup() {
 }
 function buildExtraPreprocessors(options, config) {
   var _a, _b;
-  const extraPreprocessors = [];
+  const prependPreprocessors = [];
+  const appendPreprocessors = [];
   if ((_a = options.experimental) == null ? void 0 : _a.useVitePreprocess) {
     log.debug("adding vite preprocessor");
-    extraPreprocessors.push(createVitePreprocessorGroup(config, options));
+    prependPreprocessors.push(createVitePreprocessorGroup(config));
   }
   const pluginsWithPreprocessorsDeprecated = config.plugins.filter((p) => p == null ? void 0 : p.sveltePreprocess);
   if (pluginsWithPreprocessorsDeprecated.length > 0) {
@@ -1198,23 +1210,24 @@ function buildExtraPreprocessors(options, config) {
   }
   if (included.length > 0) {
     log.debug(`Adding svelte preprocessors defined by these vite plugins: ${included.map((p) => p.name).join(", ")}`);
-    extraPreprocessors.push(...pluginsWithPreprocessors.map((p) => p.api.sveltePreprocess));
+    appendPreprocessors.push(...pluginsWithPreprocessors.map((p) => p.api.sveltePreprocess));
   }
   if (options.hot && options.emitCss) {
-    extraPreprocessors.push(createInjectScopeEverythingRulePreprocessorGroup());
+    appendPreprocessors.push(createInjectScopeEverythingRulePreprocessorGroup());
   }
-  return extraPreprocessors;
+  return { prependPreprocessors, appendPreprocessors };
 }
 function addExtraPreprocessors(options, config) {
   var _a;
-  const extra = buildExtraPreprocessors(options, config);
-  if ((extra == null ? void 0 : extra.length) > 0) {
+  const { prependPreprocessors, appendPreprocessors } = buildExtraPreprocessors(options, config);
+  if (prependPreprocessors.length > 0 || appendPreprocessors.length > 0) {
     if (!options.preprocess) {
-      options.preprocess = extra;
+      options.preprocess = [...prependPreprocessors, ...appendPreprocessors];
     } else if (Array.isArray(options.preprocess)) {
-      options.preprocess.push(...extra);
+      options.preprocess.unshift(...prependPreprocessors);
+      options.preprocess.push(...appendPreprocessors);
     } else {
-      options.preprocess = [options.preprocess, ...extra];
+      options.preprocess = [...prependPreprocessors, options.preprocess, ...appendPreprocessors];
     }
   }
   const generateMissingSourceMaps = !!((_a = options.experimental) == null ? void 0 : _a.generateMissingPreprocessorSourcemaps);
@@ -1301,7 +1314,8 @@ function svelte(inlineOptions) {
       options.server = server;
       setupWatchers(options, cache, requestParser);
     },
-    load(id, ssr) {
+    load(id, opts) {
+      const ssr = opts === true || (opts == null ? void 0 : opts.ssr);
       const svelteRequest = requestParser(id, !!ssr);
       if (svelteRequest) {
         const { filename, query } = svelteRequest;
@@ -1318,7 +1332,8 @@ function svelte(inlineOptions) {
         }
       }
     },
-    async resolveId(importee, importer, customOptions, ssr) {
+    async resolveId(importee, importer, opts, _ssr) {
+      const ssr = _ssr === true || opts.ssr;
       const svelteRequest = requestParser(importee, !!ssr);
       if (svelteRequest == null ? void 0 : svelteRequest.query.svelte) {
         if (svelteRequest.query.type === "style") {
@@ -1358,8 +1373,9 @@ function svelte(inlineOptions) {
         }
       }
     },
-    async transform(code, id, ssr) {
+    async transform(code, id, opts) {
       var _a;
+      const ssr = opts === true || (opts == null ? void 0 : opts.ssr);
       const svelteRequest = requestParser(id, !!ssr);
       if (!svelteRequest) {
         return;