fix: don't destructure api

Author: dominikg

packages/vite-plugin-svelte/src/plugins/load-compiled-css.js

@@ -7,9 +7,12 @@ const filter = { id: SVELTE_VIRTUAL_STYLE_ID_REGEX };
  * @param {import('../types/plugin-api.d.ts').PluginAPI} api
  * @returns {import('vite').Plugin}
  */
-export function loadCompiledCss({getEnvironmentState}) {
+export function loadCompiledCss(api) {
 	return {
 		name: 'vite-plugin-svelte:load-compiled-css',
+		applyToEnvironment(env) {
+			return env.config.consumer === 'client'; // ssr compile does not emit css
+		},
 		resolveId: {
 			filter, // same filter in load to ensure minimal work
 			handler(id) {
@@ -20,15 +23,16 @@ export function loadCompiledCss({getEnvironmentState}) {
 		load: {
 			filter,
 			async handler(id) {
-				const {cache} = getEnvironmentState(this);
+				const { cache } = api.getEnvironmentState(this);
 				const cachedCss = cache.getCSS(id);
 				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 = [id.slice(0,id.lastIndexOf('?')), 'default'];
+						// TODO is that slice the best way to get the filename without parsing the id?
+						css.meta.vite.cssScopeTo = [id.slice(0, id.lastIndexOf('?')), 'default'];
 					}
 					css.moduleType = 'css';
 					return css;

packages/vite-plugin-svelte/src/plugins/load-custom.js

@@ -2,31 +2,29 @@ import fs from 'node:fs';
 import { toRollupError } from '../utils/error.js';
 import { log } from '../utils/log.js';
 
-
 /**
  * @param {import('../types/plugin-api.d.ts').PluginAPI} api
  * @returns {import('vite').Plugin}
  */
-export function loadCustom({idFilter,idParser, options, compileSvelte}) {
-
+export function loadCustom(api) {
 	/** @type {import('vite').Plugin} */
 	const plugin = {
 		name: 'vite-plugin-svelte:load-custom',
 		configResolved() {
 			//@ts-expect-error load defined below but filter not in type
-			plugin.load.filter = idFilter;
+			plugin.load.filter = api.idFilter;
 		},
 
 		load: {
-			filter: {id:/^$/}, // set in configResolved
+			//filter: is set in configResolved
 			async handler(id) {
 				const config = this.environment.config;
 				const ssr = config.consumer === 'server';
-				const svelteRequest = idParser(id, ssr);
+				const svelteRequest = api.idParser(id, ssr);
 				if (svelteRequest) {
 					const { filename, raw } = svelteRequest;
 					if (raw) {
-						const code = await compileRaw(svelteRequest, compileSvelte, options);
+						const code = await compileRaw(svelteRequest, api.compileSvelte, api.options);
 						// prevent vite from injecting sourcemaps in the results.
 						return {
 							code,
@@ -43,7 +41,7 @@ export function loadCustom({idFilter,idParser, options, compileSvelte}) {
 					}
 				}
 			}
-		},
+		}
 	};
 	return plugin;
 }

packages/vite-plugin-svelte/src/plugins/setup-optimizer.js

@@ -8,7 +8,7 @@ import { safeBase64Hash } from '../utils/hash.js';
 import { normalize } from '../utils/id.js';
 import * as vite from 'vite';
 // @ts-expect-error not typed on vite
-const {rolldownVersion} = vite;
+const { rolldownVersion } = vite;
 
 /**
  * @typedef {NonNullable<import('vite').DepOptimizationOptions['esbuildOptions']>} EsbuildOptions
@@ -25,14 +25,14 @@ const optimizeSvelteModulePluginName = 'vite-plugin-svelte:optimize-module';
  * @param {import('../types/plugin-api.d.ts').PluginAPI} api
  * @returns {import('vite').Plugin}
  */
-export function setupOptimizer({options}) {
+export function setupOptimizer(api) {
 	/** @type {import('vite').ResolvedConfig} */
 	let viteConfig;
 
-	return  {
+	return {
 		name: 'vite-plugin-svelte:setup-optimizer',
 		apply: 'serve',
-		config(){
+		config() {
 			/** @type {import('vite').UserConfig['optimizeDeps']} */
 			const optimizeDeps = {};
 			// Add optimizer plugins to prebundle Svelte files.
@@ -54,7 +54,7 @@ export function setupOptimizer({options}) {
 					]
 				};
 			}
-			return {optimizeDeps};
+			return { optimizeDeps };
 		},
 		configResolved(c) {
 			viteConfig = c;
@@ -66,30 +66,30 @@ export function setupOptimizer({options}) {
 						[optimizeSveltePluginName, optimizeSvelteModulePluginName].includes(p.name)
 					) ?? [];
 				for (const plugin of plugins) {
-					patchRolldownOptimizerPlugin(plugin, options);
+					patchRolldownOptimizerPlugin(plugin, api.options);
 				}
 			} else {
-				const plugins = optimizeDeps.esbuildOptions?.plugins?.filter((p) =>
-					[optimizeSveltePluginName, optimizeSvelteModulePluginName].includes(p.name)
-				) ?? [];
+				const plugins =
+					optimizeDeps.esbuildOptions?.plugins?.filter((p) =>
+						[optimizeSveltePluginName, optimizeSvelteModulePluginName].includes(p.name)
+					) ?? [];
 				for (const plugin of plugins) {
-					patchESBuildOptimizerPlugin(plugin, options);
+					patchESBuildOptimizerPlugin(plugin, api.options);
 				}
 			}
 		},
 		async buildStart() {
-			if (!options.prebundleSvelteLibraries) return;
-			const changed = await svelteMetadataChanged(viteConfig.cacheDir, options);
+			if (!api.options.prebundleSvelteLibraries) return;
+			const changed = await svelteMetadataChanged(viteConfig.cacheDir, api.options);
 			if (changed) {
 				// Force Vite to optimize again. Although we mutate the config here, it works because
 				// Vite's optimizer runs after `buildStart()`.
 				viteConfig.optimizeDeps.force = true;
 			}
-		},
+		}
 	};
 }
 
-
 /**
  * @param {EsbuildPlugin} plugin
  * @param {import('../types/options.d.ts').ResolvedOptions} options
@@ -231,9 +231,9 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
 
 	const finalCompileOptions = dynamicCompileOptions
 		? {
-			...compileOptions,
-			...dynamicCompileOptions
-		}
+				...compileOptions,
+				...dynamicCompileOptions
+			}
 		: compileOptions;
 	const endStat = statsCollection?.start(filename);
 	const compiled = svelte.compile(finalCode, finalCompileOptions);
@@ -268,7 +268,6 @@ async function compileSvelteModule(options, { filename, code }, statsCollection)
 	};
 }
 
-
 // List of options that changes the prebundling result
 /** @type {(keyof import('../types/options.d.ts').ResolvedOptions)[]} */
 const PREBUNDLE_SENSITIVE_OPTIONS = [
@@ -314,14 +313,14 @@ async function svelteMetadataChanged(cacheDir, options) {
  * @param {string} name
  * @returns {import('vite').Rollup.Plugin}
  */
-function placeholderRolldownOptimizerPlugin(name){
+function placeholderRolldownOptimizerPlugin(name) {
 	return {
 		name,
 		options() {},
 		buildStart() {},
 		buildEnd() {},
 		transform: { filter: { id: /^$/ }, handler() {} }
-	}
+	};
 }
 
 /**
@@ -336,4 +335,3 @@ function generateSvelteMetadata(options) {
 	}
 	return metadata;
 }
-