@sveltejs/vite-plugin-svelte 5.0.2 → 5.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "5.0.2",
+  "version": "5.1.0",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -37,11 +37,11 @@
   "homepage": "https://github.com/sveltejs/vite-plugin-svelte#readme",
   "dependencies": {
     "@sveltejs/vite-plugin-svelte-inspector": "^4.0.1",
-    "debug": "^4.4.0",
+    "debug": "^4.4.1",
     "deepmerge": "^4.3.1",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.15",
-    "vitefu": "^1.0.4"
+    "magic-string": "^0.30.17",
+    "vitefu": "^1.0.6"
   },
   "peerDependencies": {
     "svelte": "^5.0.0",
@@ -49,10 +49,9 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "esbuild": "^0.24.0",
-    "sass": "^1.82.0",
-    "svelte": "^5.10.0",
-    "vite": "^6.0.3"
+    "sass": "^1.89.0",
+    "svelte": "^5.33.3",
+    "vite": "^6.3.5"
   },
   "scripts": {
     "check:publint": "publint --strict",

package/src/index.js

@@ -118,8 +118,15 @@ export function svelte(inlineOptions) {
 						};
 					} else {
 						if (query.svelte && query.type === 'style') {
-							const css = cache.getCSS(svelteRequest);
-							if (css) {
+							const cachedCss = cache.getCSS(svelteRequest);
+							if (cachedCss) {
+								const { hasGlobal, ...css } = cachedCss;
+								if (hasGlobal === false) {
+									// hasGlobal was added in svelte 5.26.0, so make sure it is boolean false
+									css.meta ??= {};
+									css.meta.vite ??= {};
+									css.meta.vite.cssScopeTo = [svelteRequest.filename, 'default'];
+								}
 								return css;
 							}
 						}

package/src/types/compile.d.ts

@@ -1,6 +1,7 @@
 import type { Processed, CompileResult } from 'svelte/compiler';
 import type { SvelteRequest } from './id.d.ts';
 import type { ResolvedOptions } from './options.d.ts';
+import type { CustomPluginOptionsVite } from 'vite';
 
 export type CompileSvelte = (
 	svelteRequest: SvelteRequest,
@@ -12,6 +13,10 @@ export interface Code {
 	code: string;
 	map?: any;
 	dependencies?: any[];
+	hasGlobal?: boolean;
+	meta?: {
+		vite?: CustomPluginOptionsVite;
+	};
 }
 
 export interface CompileData {

package/src/utils/compile.js

@@ -1,5 +1,4 @@
 import * as svelte from 'svelte/compiler';
-
 import { safeBase64Hash } from './hash.js';
 import { log } from './log.js';
 
@@ -133,6 +132,7 @@ export function createCompileSvelte() {
 		let compiled;
 		try {
 			compiled = svelte.compile(finalCode, { ...finalCompileOptions, filename });
+
 			// patch output with partial accept until svelte does it
 			// TODO remove later
 			if (

package/src/utils/constants.js

@@ -1,8 +1,13 @@
 import { createRequire } from 'node:module';
 
-export const SVELTE_IMPORTS = Object.entries(
-	createRequire(import.meta.url)('svelte/package.json').exports
-)
+const sveltePkg = createRequire(import.meta.url)('svelte/package.json');
+
+// list of svelte runtime dependencies to optimize together with svelte itself
+export const SVELTE_RUNTIME_DEPENDENCIES = [
+	'clsx' // avoids dev server restart after page load with npm + vite6 (see #1067)
+].filter((dep) => !!sveltePkg.dependencies?.[dep]);
+
+export const SVELTE_IMPORTS = Object.entries(sveltePkg.exports)
 	.map(([name, config]) => {
 		// ignore type only
 		if (typeof config === 'object' && Object.keys(config).length === 1 && config.types) {

package/src/utils/error.js

@@ -31,11 +31,13 @@ export function toRollupError(error, options) {
  * convert an error thrown by svelte.compile to an esbuild PartialMessage
  * @param {import('svelte/compiler').Warning & Error  & {frame?: string}} error a svelte compiler error, which is a mix of Warning and an error
  * @param {import('../types/options.d.ts').ResolvedOptions} options
- * @returns {import('esbuild').PartialMessage} the converted error
+ * @returns {any} the converted error as esbuild PartialMessage
+ *
+ * note: typed any to avoid esbuild devDependency for a single internal type import
  */
 export function toESBuildError(error, options) {
 	const { filename, frame, start, stack } = error;
-	/** @type {import('esbuild').PartialMessage} */
+	/** @type any */
 	const partialMessage = {
 		text: buildExtendedLogMessage(error)
 	};
@@ -108,7 +110,7 @@ function formatFrameForVite(frame) {
  * @returns {boolean}
  */
 function couldBeFixedByCssPreprocessor(code) {
-	return code === 'expected_token' || code === 'unexpected_eof' || code.startsWith('css_');
+	return code === 'expected_token' || code === 'unexpected_eof' || code?.startsWith('css_');
 }
 
 /**

package/src/utils/options.js

@@ -12,7 +12,8 @@ import {
 	DEFAULT_SVELTE_EXT,
 	FAQ_LINK_MISSING_EXPORTS_CONDITION,
 	SVELTE_EXPORT_CONDITIONS,
-	SVELTE_IMPORTS
+	SVELTE_IMPORTS,
+	SVELTE_RUNTIME_DEPENDENCIES
 } from './constants.js';
 
 import path from 'node:path';
@@ -550,8 +551,9 @@ function buildExtraConfigForSvelte(config) {
 		const svelteImportsToInclude = SVELTE_IMPORTS.filter(
 			(si) => !(si.endsWith('/server') || si.includes('/server/'))
 		);
+		svelteImportsToInclude.push(...SVELTE_RUNTIME_DEPENDENCIES.map((dep) => `svelte > ${dep}`));
 		log.debug(
-			`adding bare svelte packages to optimizeDeps.include: ${svelteImportsToInclude.join(', ')} `,
+			`adding bare svelte packages and runtime dependencies to optimizeDeps.include: ${svelteImportsToInclude.join(', ')} `,
 			undefined,
 			'config'
 		);

package/types/index.d.ts.map

@@ -3,8 +3,12 @@
 	"file": "index.d.ts",
 	"names": [
 		"Options",
+		"PluginOptionsInline",
 		"PluginOptions",
 		"SvelteConfig",
+		"ExperimentalOptions",
+		"CompileModuleOptions",
+		"Arrayable",
 		"VitePreprocessOptions",
 		"svelte",
 		"vitePreprocess",
@@ -22,5 +26,6 @@
 		null,
 		null
 	],
-	"mappings": ";;;;aAIYA,OAAOA;;;;;;;;;;;;;kBAaFC,aAAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAgGbC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkFZC,qBAAqBA;;;;;;;;;;;;;iBCxKtBC,MAAMA;iBCXNC,cAAcA;iBCgBRC,gBAAgBA"
+	"mappings": ";;;;aAIYA,OAAOA;;WAETC,mBAAmBA;;;;;;;;;;;kBAWZC,aAAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAgGbC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAiDnBC,mBAAmBA;;;;;;;;;;;;;;;;WAgBnBC,oBAAoBA;;;;;;;;;;;;;;;MAezBC,SAASA;;kBAEGC,qBAAqBA;;;;;;;;;;;;;iBCxKtBC,MAAMA;iBCXNC,cAAcA;iBCgBRC,gBAAgBA",
+	"ignoreList": []
 }