@sveltejs/vite-plugin-svelte 4.0.2 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "4.0.2",
+  "version": "5.0.0",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -40,19 +40,19 @@
     "debug": "^4.3.7",
     "deepmerge": "^4.3.1",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.12",
+    "magic-string": "^0.30.13",
     "vitefu": "^1.0.3"
   },
   "peerDependencies": {
-    "svelte": "^5.0.0-next.96 || ^5.0.0",
-    "vite": "^5.0.0"
+    "svelte": "^5.0.0",
+    "vite": "^6.0.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "esbuild": "^0.24.0",
     "sass": "^1.81.0",
-    "svelte": "^5.2.0",
-    "vite": "^5.4.11"
+    "svelte": "^5.2.7",
+    "vite": "^6.0.0"
   },
   "scripts": {
     "check:publint": "publint --strict",

package/src/index.js

@@ -10,7 +10,9 @@ import {
 	validateInlineOptions,
 	resolveOptions,
 	patchResolvedViteConfig,
-	preResolveOptions
+	preResolveOptions,
+	ensureConfigEnvironmentMainFields,
+	ensureConfigEnvironmentConditions
 } from './utils/options.js';
 import { ensureWatchedFile, setupWatchers } from './utils/watch.js';
 import { toRollupError } from './utils/error.js';
@@ -64,6 +66,16 @@ export function svelte(inlineOptions) {
 				return extraViteConfig;
 			},
 
+			configEnvironment(name, config, opts) {
+				ensureConfigEnvironmentMainFields(name, config, opts);
+				// @ts-expect-error the function above should make `resolve.mainFields` non-nullable
+				config.resolve.mainFields.unshift('svelte');
+
+				ensureConfigEnvironmentConditions(name, config, opts);
+				// @ts-expect-error the function above should make `resolve.conditions` non-nullable
+				config.resolve.conditions.push('svelte');
+			},
+
 			async configResolved(config) {
 				options = resolveOptions(options, config, cache);
 				patchResolvedViteConfig(config, options);
@@ -124,7 +136,11 @@ export function svelte(inlineOptions) {
 				const ssr = !!opts?.ssr;
 				const svelteRequest = requestParser(importee, ssr);
 				if (svelteRequest?.query.svelte) {
-					if (svelteRequest.query.type === 'style' && !svelteRequest.raw) {
+					if (
+						svelteRequest.query.type === 'style' &&
+						!svelteRequest.raw &&
+						!svelteRequest.query.inline
+					) {
 						// return cssId with root prefix so postcss pipeline of vite finds the directory correctly
 						// see https://github.com/sveltejs/vite-plugin-svelte/issues/14
 						log.debug(

package/src/types/id.d.ts

@@ -15,6 +15,7 @@ export interface RequestQuery {
 	url?: boolean;
 	raw?: boolean;
 	direct?: boolean;
+	inline?: boolean;
 }
 
 export interface SvelteRequest {

package/src/utils/constants.js

@@ -1,9 +1,5 @@
 import { createRequire } from 'node:module';
 
-export const VITE_RESOLVE_MAIN_FIELDS = ['browser', 'module', 'jsnext:main', 'jsnext'];
-
-export const SVELTE_RESOLVE_MAIN_FIELDS = ['svelte'];
-
 export const SVELTE_IMPORTS = Object.entries(
 	createRequire(import.meta.url)('svelte/package.json').exports
 )

package/src/utils/options.js

@@ -1,14 +1,18 @@
 import process from 'node:process';
-import { normalizePath } from 'vite';
+import {
+	defaultClientMainFields,
+	defaultServerMainFields,
+	defaultClientConditions,
+	defaultServerConditions,
+	normalizePath
+} from 'vite';
 import { isDebugNamespaceEnabled, log } from './log.js';
 import { loadSvelteConfig } from './load-svelte-config.js';
 import {
 	DEFAULT_SVELTE_EXT,
 	FAQ_LINK_MISSING_EXPORTS_CONDITION,
 	SVELTE_EXPORT_CONDITIONS,
-	SVELTE_IMPORTS,
-	SVELTE_RESOLVE_MAIN_FIELDS,
-	VITE_RESOLVE_MAIN_FIELDS
+	SVELTE_IMPORTS
 } from './constants.js';
 
 import path from 'node:path';
@@ -333,21 +337,10 @@ function resolveViteRoot(viteConfig) {
  * @returns {Promise<Partial<import('vite').UserConfig>>}
  */
 export async function buildExtraViteConfig(options, config) {
-	// 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)
-	];
-
 	/** @type {Partial<import('vite').UserConfig>} */
 	const extraViteConfig = {
 		resolve: {
-			dedupe: [...SVELTE_IMPORTS],
-			conditions: [...SVELTE_EXPORT_CONDITIONS]
+			dedupe: [...SVELTE_IMPORTS]
 		}
 		// this option is still awaiting a PR in vite to be supported
 		// see https://github.com/sveltejs/vite-plugin-svelte/issues/60
@@ -579,6 +572,11 @@ function buildExtraConfigForSvelte(config) {
 	if (!isDepExternaled('svelte', config.ssr?.external ?? [])) {
 		noExternal.push('svelte', /^svelte\//);
 	}
+	// esm-env needs to be bundled by default for the development/production condition
+	// be properly used by svelte
+	if (!isDepExternaled('esm-env', config.ssr?.external ?? [])) {
+		noExternal.push('esm-env');
+	}
 	return { optimizeDeps: { include, exclude }, ssr: { noExternal, external } };
 }
 
@@ -610,6 +608,41 @@ export function patchResolvedViteConfig(viteConfig, options) {
 	}
 }
 
+/**
+ * Mutates `config` to ensure `resolve.mainFields` is set. If unset, it emulates Vite's default fallback.
+ * @param {string} name
+ * @param {import('vite').EnvironmentOptions} config
+ * @param {{ isSsrTargetWebworker?: boolean }} opts
+ */
+export function ensureConfigEnvironmentMainFields(name, config, opts) {
+	config.resolve ??= {};
+	if (config.resolve.mainFields == null) {
+		if (config.consumer === 'client' || name === 'client' || opts.isSsrTargetWebworker) {
+			config.resolve.mainFields = [...defaultClientMainFields];
+		} else {
+			config.resolve.mainFields = [...defaultServerMainFields];
+		}
+	}
+	return true;
+}
+
+/**
+ * Mutates `config` to ensure `resolve.conditions` is set. If unset, it emulates Vite's default fallback.
+ * @param {string} name
+ * @param {import('vite').EnvironmentOptions} config
+ * @param {{ isSsrTargetWebworker?: boolean }} opts
+ */
+export function ensureConfigEnvironmentConditions(name, config, opts) {
+	config.resolve ??= {};
+	if (config.resolve.conditions == null) {
+		if (config.consumer === 'client' || name === 'client' || opts.isSsrTargetWebworker) {
+			config.resolve.conditions = [...defaultClientConditions];
+		} else {
+			config.resolve.conditions = [...defaultServerConditions];
+		}
+	}
+}
+
 /**
  * @template T
  * @param {T | T[]} value

package/types/index.d.ts

@@ -206,9 +206,9 @@ declare module '@sveltejs/vite-plugin-svelte' {
 		 */
 		style?: boolean | InlineConfig | ResolvedConfig;
 	}
-	export function svelte(inlineOptions?: Partial<Options> | undefined): import("vite").Plugin[];
-	export function vitePreprocess(opts?: VitePreprocessOptions | undefined): import("svelte/compiler").PreprocessorGroup;
-	export function loadSvelteConfig(viteConfig?: import("vite").UserConfig | undefined, inlineOptions?: Partial<Options> | undefined): Promise<Partial<SvelteConfig> | undefined>;
+	export function svelte(inlineOptions?: Partial<Options>): import("vite").Plugin[];
+	export function vitePreprocess(opts?: VitePreprocessOptions): import("svelte/compiler").PreprocessorGroup;
+	export function loadSvelteConfig(viteConfig?: import("vite").UserConfig, inlineOptions?: Partial<Options>): Promise<Partial<SvelteConfig> | undefined>;
 
 	export {};
 }

package/types/index.d.ts.map

@@ -22,5 +22,5 @@
 		null,
 		null
 	],
-	"mappings": ";;;;aAIYA,OAAOA;;;;;;;;;;;;;kBAaFC,aAAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAgGbC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkFZC,qBAAqBA;;;;;;;;;;;;;iBC1KtBC,MAAMA;iBCTNC,cAAcA;iBCgBRC,gBAAgBA"
+	"mappings": ";;;;aAIYA,OAAOA;;;;;;;;;;;;;kBAaFC,aAAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAgGbC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkFZC,qBAAqBA;;;;;;;;;;;;;iBCxKtBC,MAAMA;iBCXNC,cAAcA;iBCgBRC,gBAAgBA"
 }