@sveltejs/vite-plugin-svelte 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -38,11 +38,11 @@
   "homepage": "https://github.com/sveltejs/vite-plugin-svelte#readme",
   "dependencies": {
     "debug": "^4.3.4",
-    "deepmerge": "^4.2.2",
+    "deepmerge": "^4.3.0",
     "kleur": "^4.1.5",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.29.0",
     "svelte-hmr": "^0.15.1",
-    "vitefu": "^0.2.3"
+    "vitefu": "^0.2.4"
   },
   "peerDependencies": {
     "svelte": "^3.54.0",
@@ -50,11 +50,11 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "esbuild": "^0.16.3",
+    "esbuild": "^0.17.9",
     "rollup": "^2.79.1",
-    "svelte": "^3.54.0",
-    "tsup": "^6.5.0",
-    "vite": "^4.0.0"
+    "svelte": "^3.55.1",
+    "tsup": "^6.6.3",
+    "vite": "^4.1.4"
   },
   "scripts": {
     "dev": "pnpm build:ci --sourcemap --watch src",

package/src/handle-hot-update.ts

@@ -4,6 +4,7 @@ import { log, logCompilerWarnings } from './utils/log';
 import { SvelteRequest } from './utils/id';
 import { VitePluginSvelteCache } from './utils/vite-plugin-svelte-cache';
 import { ResolvedOptions } from './utils/options';
+import { toRollupError } from './utils/error';
 
 /**
  * Vite-specific HMR handling
@@ -32,7 +33,7 @@ export async function handleHotUpdate(
 		cache.update(compileData);
 	} catch (e) {
 		cache.setError(svelteRequest, e);
-		throw e;
+		throw toRollupError(e, options);
 	}
 
 	const affectedModules = [...modules];

package/src/index.ts

@@ -219,11 +219,7 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin[] {
 				}
 				const svelteRequest = requestParser(ctx.file, false, ctx.timestamp);
 				if (svelteRequest) {
-					try {
-						return handleHotUpdate(compileSvelte, ctx, svelteRequest, cache, options);
-					} catch (e) {
-						throw toRollupError(e, options);
-					}
+					return handleHotUpdate(compileSvelte, ctx, svelteRequest, cache, options);
 				}
 			},
 			async buildEnd() {

package/src/preprocess.ts

@@ -1,8 +1,8 @@
-import path from 'path';
 import { preprocessCSS, resolveConfig, transformWithEsbuild } from 'vite';
 import type { ESBuildOptions, InlineConfig, ResolvedConfig } from 'vite';
 // eslint-disable-next-line node/no-missing-import
 import type { Preprocessor, PreprocessorGroup } from 'svelte/types/compiler/preprocess';
+import { mapSourcesToRelative } from './utils/sourcemaps';
 
 const supportedStyleLangs = ['css', 'less', 'sass', 'scss', 'styl', 'stylus', 'postcss', 'sss'];
 const supportedScriptLangs = ['ts'];
@@ -27,7 +27,7 @@ function viteScript(): { script: Preprocessor } {
 		async script({ attributes, content, filename = '' }) {
 			const lang = attributes.lang as string;
 			if (!supportedScriptLangs.includes(lang)) return;
-			const transformResult = await transformWithEsbuild(content, filename, {
+			const { code, map } = await transformWithEsbuild(content, filename, {
 				loader: lang as ESBuildOptions['loader'],
 				target: 'esnext',
 				tsconfigRaw: {
@@ -38,9 +38,12 @@ function viteScript(): { script: Preprocessor } {
 					}
 				}
 			});
+
+			mapSourcesToRelative(map, filename);
+
 			return {
-				code: transformResult.code,
-				map: transformResult.map
+				code,
+				map
 			};
 		}
 	};
@@ -70,14 +73,13 @@ function viteStyle(config: InlineConfig | ResolvedConfig = {}): {
 			transform = getCssTransformFn(resolvedConfig);
 		}
 		const moduleId = `${filename}.${lang}`;
-		const result = await transform(content, moduleId);
-		// patch sourcemap source to point back to original filename
-		if (result.map?.sources?.[0] === moduleId) {
-			result.map.sources[0] = path.basename(filename);
-		}
+		const { code, map } = await transform(content, moduleId);
+
+		mapSourcesToRelative(map, moduleId);
+
 		return {
-			code: result.code,
-			map: result.map ?? undefined
+			code,
+			map: map ?? undefined
 		};
 	};
 	// @ts-expect-error tag so can be found by v-p-s

package/src/ui/inspector/plugin.ts

@@ -35,22 +35,23 @@ export function svelteInspector(): Plugin {
 
 		configResolved(config) {
 			const vps = config.plugins.find((p) => p.name === 'vite-plugin-svelte');
-			if (vps?.api?.options?.experimental?.inspector) {
-				inspectorOptions = {
-					...defaultInspectorOptions,
-					...vps.api.options.experimental.inspector
-				};
-			}
-			if (!vps || !inspectorOptions) {
+			const options = vps?.api?.options?.experimental?.inspector;
+			if (!vps || !options) {
 				log.debug('inspector disabled, could not find config');
 				disabled = true;
-			} else {
-				if (vps.api.options.kit && !inspectorOptions.appendTo) {
-					const out_dir = path.basename(vps.api.options.kit.outDir || '.svelte-kit');
-					inspectorOptions.appendTo = `${out_dir}/generated/root.svelte`;
-				}
-				appendTo = inspectorOptions.appendTo;
+				return;
+			}
+			inspectorOptions = {
+				...defaultInspectorOptions,
+				...options
+			};
+			const isSvelteKit = config.plugins.some((p) => p.name.startsWith('vite-plugin-sveltekit'));
+			if (isSvelteKit && !inspectorOptions.appendTo) {
+				// this could append twice if a user had a file that ends with /generated/root.svelte
+				// but that should be rare and inspector doesn't execute twice
+				inspectorOptions.appendTo = `/generated/root.svelte`;
 			}
+			appendTo = inspectorOptions.appendTo;
 		},
 
 		async resolveId(importee: string, importer, options) {

package/src/utils/compile.ts

@@ -9,29 +9,12 @@ import { StatCollection } from './vite-plugin-svelte-stats';
 //eslint-disable-next-line node/no-missing-import
 import type { Processed } from 'svelte/types/compiler/preprocess';
 import { createInjectScopeEverythingRulePreprocessorGroup } from './preprocess';
-import path from 'path';
+import { mapSourcesToRelative } from './sourcemaps';
 
 const scriptLangRE = /<script [^>]*lang=["']?([^"' >]+)["']?[^>]*>/;
 
 export type CompileSvelte = ReturnType<typeof _createCompileSvelte>;
 
-function mapSourcesToRelative(map: { sources?: string[] }, filename: string) {
-	// sourcemap sources are relative to the sourcemap itself
-	// assume the sourcemap location is the same as filename and turn absolute paths to relative
-	// to avoid leaking fs information like vite root
-	if (map?.sources) {
-		map.sources = map.sources.map((s) => {
-			if (path.isAbsolute(s)) {
-				const relative = path.relative(filename, s);
-				// empty string a source is not allowed, use simple filename
-				return relative === '' ? path.basename(filename) : relative;
-			} else {
-				return s;
-			}
-		});
-	}
-}
-
 const _createCompileSvelte = (makeHot: Function) => {
 	let stats: StatCollection | undefined;
 	const devStylePreprocessor = createInjectScopeEverythingRulePreprocessorGroup();

package/src/utils/constants.ts

@@ -1,6 +1,6 @@
-const VITE_RESOLVE_MAIN_FIELDS = ['module', 'jsnext:main', 'jsnext'];
+export const VITE_RESOLVE_MAIN_FIELDS = ['module', 'jsnext:main', 'jsnext'];
 
-export const SVELTE_RESOLVE_MAIN_FIELDS = ['svelte', ...VITE_RESOLVE_MAIN_FIELDS];
+export const SVELTE_RESOLVE_MAIN_FIELDS = ['svelte'];
 
 export const SVELTE_IMPORTS = [
 	'svelte/animate',

package/src/utils/options.ts

@@ -6,7 +6,8 @@ import {
 	SVELTE_EXPORT_CONDITIONS,
 	SVELTE_HMR_IMPORTS,
 	SVELTE_IMPORTS,
-	SVELTE_RESOLVE_MAIN_FIELDS
+	SVELTE_RESOLVE_MAIN_FIELDS,
+	VITE_RESOLVE_MAIN_FIELDS
 } from './constants';
 // eslint-disable-next-line node/no-missing-import
 import type { CompileOptions, Warning } from 'svelte/types/compiler/interfaces';
@@ -324,9 +325,18 @@ export async function buildExtraViteConfig(
 	options: PreResolvedOptions,
 	config: UserConfig
 ): Promise<Partial<UserConfig>> {
+	// make sure we only readd vite default mainFields when no other plugin has changed the config already
+	// see https://github.com/sveltejs/vite-plugin-svelte/issues/581
+	if (!config.resolve) {
+		config.resolve = {};
+	}
+	config.resolve.mainFields = [
+		...SVELTE_RESOLVE_MAIN_FIELDS,
+		...(config.resolve.mainFields ?? VITE_RESOLVE_MAIN_FIELDS)
+	];
+
 	const extraViteConfig: Partial<UserConfig> = {
 		resolve: {
-			mainFields: [...SVELTE_RESOLVE_MAIN_FIELDS],
 			dedupe: [...SVELTE_IMPORTS, ...SVELTE_HMR_IMPORTS],
 			conditions: [...SVELTE_EXPORT_CONDITIONS]
 		}

package/src/utils/sourcemaps.ts

@@ -0,0 +1,20 @@
+import path from 'path';
+
+/**
+ * sourcemap sources are relative to the sourcemap itself
+ * assume the sourcemap location is the same as filename and turn absolute paths to relative
+ * to avoid leaking fs information like vite root
+ */
+export function mapSourcesToRelative(map: { sources?: string[] }, filename: string) {
+	if (map?.sources) {
+		map.sources = map.sources.map((s) => {
+			if (path.isAbsolute(s)) {
+				const relative = path.relative(filename, s);
+				// empty string as a source is not allowed, use simple filename
+				return relative === '' ? path.basename(filename) : relative;
+			} else {
+				return s;
+			}
+		});
+	}
+}