@sveltejs/vite-plugin-svelte 1.0.0-next.44 → 1.0.0-next.47

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from 'vite';
+import { 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';
@@ -46,11 +46,13 @@ interface Options {
      */
     emitCss?: boolean;
     /**
-     * The options to be passed to the Svelte compiler
+     * The options to be passed to the Svelte compiler. A few options are set by default,
+     * including `dev` and `css`. However, some options are non-configurable, like
+     * `filename`, `format`, `generate`, and `cssHash` (in dev).
      *
      * @see https://svelte.dev/docs#svelte_compile
      */
-    compilerOptions?: CompileOptions;
+    compilerOptions?: Omit<CompileOptions, 'filename' | 'format' | 'generate'>;
     /**
      * Handles warning emitted from the Svelte compiler
      */
@@ -198,6 +200,8 @@ declare type ModuleFormat = NonNullable<CompileOptions['format']>;
 declare type CssHashGetter = NonNullable<CompileOptions['cssHash']>;
 declare type Arrayable<T> = T | T[];
 
+declare function loadSvelteConfig(viteConfig?: UserConfig, inlineOptions?: Partial<Options>): Promise<Partial<Options> | undefined>;
+
 declare function svelte(inlineOptions?: Partial<Options>): Plugin[];
 
-export { Arrayable, CssHashGetter, ModuleFormat, Options, svelte };
+export { Arrayable, CssHashGetter, ModuleFormat, Options, loadSvelteConfig, svelte };

package/dist/index.js

@@ -280,7 +280,8 @@ var _createCompileSvelte = (makeHot) => async function compileSvelte2(svelteRequ
   const dependencies = [];
   const compileOptions = __spreadProps(__spreadValues({}, options.compilerOptions), {
     filename,
-    generate: ssr ? "ssr" : "dom"
+    generate: ssr ? "ssr" : "dom",
+    format: "esm"
   });
   if (options.hot && options.emitCss) {
     const hash = `s-${safeBase64Hash(normalizedFilename)}`;
@@ -456,9 +457,9 @@ var knownSvelteConfigNames = [
   "svelte.config.cjs",
   "svelte.config.mjs"
 ];
-var dynamicImportDefault = new Function("path", 'return import(path + "?t=" + Date.now()).then(m => m.default)');
+var dynamicImportDefault = new Function("path", "timestamp", 'return import(path + "?t=" + timestamp).then(m => m.default)');
 async function loadSvelteConfig(viteConfig, inlineOptions) {
-  if (inlineOptions.configFile === false) {
+  if ((inlineOptions == null ? void 0 : inlineOptions.configFile) === false) {
     return;
   }
   const configFile = findConfigToLoad(viteConfig, inlineOptions);
@@ -466,7 +467,7 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
     let err;
     if (configFile.endsWith(".js") || configFile.endsWith(".mjs")) {
       try {
-        const result = await dynamicImportDefault(pathToFileURL(configFile).href);
+        const result = await dynamicImportDefault(pathToFileURL(configFile).href, fs2.statSync(configFile).mtimeMs);
         if (result != null) {
           return __spreadProps(__spreadValues({}, result), {
             configFile
@@ -502,8 +503,8 @@ async function loadSvelteConfig(viteConfig, inlineOptions) {
   }
 }
 function findConfigToLoad(viteConfig, inlineOptions) {
-  const root = viteConfig.root || process.cwd();
-  if (inlineOptions.configFile) {
+  const root = (viteConfig == null ? void 0 : viteConfig.root) || process.cwd();
+  if (inlineOptions == null ? void 0 : 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}.`);
@@ -1083,10 +1084,7 @@ async function preResolveOptions(inlineOptions = {}, viteUserConfig, viteEnv) {
   });
   const defaultOptions = {
     extensions: [".svelte"],
-    emitCss: true,
-    compilerOptions: {
-      format: "esm"
-    }
+    emitCss: true
   };
   const svelteConfig = await loadSvelteConfig(viteConfigWithResolvedRoot, inlineOptions);
   const extraOptions = {
@@ -1123,6 +1121,7 @@ function resolveOptions(preResolveOptions2, viteConfig) {
     isProduction: viteConfig.isProduction
   };
   const merged = mergeConfigs(defaultOptions, preResolveOptions2, extraOptions);
+  removeIgnoredOptions(merged);
   addExtraPreprocessors(merged, viteConfig);
   enforceOptionsForHmr(merged);
   enforceOptionsForProduction(merged);
@@ -1171,6 +1170,20 @@ function enforceOptionsForProduction(options) {
     }
   }
 }
+function removeIgnoredOptions(options) {
+  const ignoredCompilerOptions = ["generate", "format", "filename"];
+  if (options.hot && options.emitCss) {
+    ignoredCompilerOptions.push("cssHash");
+  }
+  const passedCompilerOptions = Object.keys(options.compilerOptions || {});
+  const passedIgnored = passedCompilerOptions.filter((o) => ignoredCompilerOptions.includes(o));
+  if (passedIgnored.length) {
+    log.warn(`The following Svelte compilerOptions are controlled by vite-plugin-svelte and essential to its functionality. User-specified values are ignored. Please remove them from your configuration: ${passedIgnored.join(", ")}`);
+    passedIgnored.forEach((ignored) => {
+      delete options.compilerOptions[ignored];
+    });
+  }
+}
 function resolveViteRoot(viteConfig) {
   return normalizePath2(viteConfig.root ? path4.resolve(viteConfig.root) : process.cwd());
 }
@@ -1542,7 +1555,7 @@ function svelteInspector() {
         disabled = true;
       } else {
         if (vps.api.options.kit && !inspectorOptions.appendTo) {
-          const out_dir = vps.api.options.kit.outDir || ".svelte-kit";
+          const out_dir = path8.basename(vps.api.options.kit.outDir || ".svelte-kit");
           inspectorOptions.appendTo = `${out_dir}/runtime/client/start.js`;
         }
         appendTo = inspectorOptions.appendTo;
@@ -1746,6 +1759,7 @@ function svelte(inlineOptions) {
   return plugins.filter(Boolean);
 }
 export {
+  loadSvelteConfig,
   svelte
 };
 //# sourceMappingURL=index.js.map