@sveltejs/vite-plugin-svelte 2.0.0-beta.1 → 2.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "esbuild": "^0.16.1",
+    "esbuild": "^0.16.3",
     "rollup": "^2.79.1",
     "svelte": "^3.54.0",
     "tsup": "^6.5.0",

package/src/index.ts

@@ -18,6 +18,7 @@ import {
 
 import { ensureWatchedFile, setupWatchers } from './utils/watch';
 import { resolveViaPackageJsonSvelte } from './utils/resolve';
+import { PartialResolvedId } from 'rollup';
 import { toRollupError } from './utils/error';
 import { saveSvelteMetadata } from './utils/optimizer';
 import { svelteInspector } from './ui/inspector/plugin';
@@ -46,7 +47,9 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin[] {
 	let viteConfig: ResolvedConfig;
 	/* eslint-disable no-unused-vars */
 	let compileSvelte: CompileSvelte;
+	/* eslint-enable no-unused-vars */
 
+	let resolvedSvelteSSR: Promise<PartialResolvedId | null>;
 	const api: PluginAPI = {};
 	const plugins: Plugin[] = [
 		{
@@ -86,7 +89,6 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin[] {
 				if (isSvelteMetadataChanged) {
 					// Force Vite to optimize again. Although we mutate the config here, it works because
 					// Vite's optimizer runs after `buildStart()`.
-					// TODO: verify this works in vite3
 					viteConfig.optimizeDeps.force = true;
 				}
 			},
@@ -133,6 +135,24 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin[] {
 					}
 				}
 
+				if (ssr && importee === 'svelte') {
+					if (!resolvedSvelteSSR) {
+						resolvedSvelteSSR = this.resolve('svelte/ssr', undefined, { skipSelf: true }).then(
+							(svelteSSR) => {
+								log.debug('resolved svelte to svelte/ssr');
+								return svelteSSR;
+							},
+							(err) => {
+								log.debug(
+									'failed to resolve svelte to svelte/ssr. Update svelte to a version that exports it',
+									err
+								);
+								return null; // returning null here leads to svelte getting resolved regularly
+							}
+						);
+					}
+					return resolvedSvelteSSR;
+				}
 				//@ts-expect-error scan
 				const scan = !!opts?.scan; // scanner phase of optimizeDeps
 				const isPrebundled =

package/src/preprocess.ts

@@ -1,6 +1,6 @@
 import path from 'path';
-import * as vite from 'vite';
-import type { ESBuildOptions, ResolvedConfig } from 'vite';
+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';
 
@@ -9,7 +9,7 @@ const supportedScriptLangs = ['ts'];
 
 export function vitePreprocess(opts?: {
 	script?: boolean;
-	style?: boolean | vite.InlineConfig | vite.ResolvedConfig;
+	style?: boolean | InlineConfig | ResolvedConfig;
 }) {
 	const preprocessor: PreprocessorGroup = {};
 	if (opts?.script !== false) {
@@ -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 vite.transformWithEsbuild(content, filename, {
+			const transformResult = await transformWithEsbuild(content, filename, {
 				loader: lang as ESBuildOptions['loader'],
 				target: 'esnext',
 				tsconfigRaw: {
@@ -46,7 +46,7 @@ function viteScript(): { script: Preprocessor } {
 	};
 }
 
-function viteStyle(config: vite.InlineConfig | vite.ResolvedConfig = {}): {
+function viteStyle(config: InlineConfig | ResolvedConfig = {}): {
 	style: Preprocessor;
 } {
 	let transform: CssTransform;
@@ -54,7 +54,7 @@ function viteStyle(config: vite.InlineConfig | vite.ResolvedConfig = {}): {
 		const lang = attributes.lang as string;
 		if (!supportedStyleLangs.includes(lang)) return;
 		if (!transform) {
-			let resolvedConfig: vite.ResolvedConfig;
+			let resolvedConfig: ResolvedConfig;
 			// @ts-expect-error special prop added if running in v-p-s
 			if (style.__resolvedConfig) {
 				// @ts-expect-error
@@ -62,7 +62,7 @@ function viteStyle(config: vite.InlineConfig | vite.ResolvedConfig = {}): {
 			} else if (isResolvedConfig(config)) {
 				resolvedConfig = config;
 			} else {
-				resolvedConfig = await vite.resolveConfig(
+				resolvedConfig = await resolveConfig(
 					config,
 					process.env.NODE_ENV === 'production' ? 'build' : 'serve'
 				);
@@ -89,26 +89,11 @@ function viteStyle(config: vite.InlineConfig | vite.ResolvedConfig = {}): {
 type CssTransform = (code: string, filename: string) => Promise<{ code: string; map?: any }>;
 
 function getCssTransformFn(config: ResolvedConfig): CssTransform {
-	// API is only available in Vite 3.2 and above
-	// TODO: Remove Vite plugin hack when bump peer dep to Vite 3.2
-	if (vite.preprocessCSS) {
-		return async (code, filename) => {
-			return vite.preprocessCSS(code, filename, config);
-		};
-	} else {
-		const pluginName = 'vite:css';
-		const plugin = config.plugins.find((p) => p.name === pluginName);
-		if (!plugin) {
-			throw new Error(`failed to find plugin ${pluginName}`);
-		}
-		if (!plugin.transform) {
-			throw new Error(`plugin ${pluginName} has no transform`);
-		}
-		// @ts-expect-error
-		return plugin.transform.bind(null);
-	}
+	return async (code, filename) => {
+		return preprocessCSS(code, filename, config);
+	};
 }
 
-function isResolvedConfig(config: any): config is vite.ResolvedConfig {
+function isResolvedConfig(config: any): config is ResolvedConfig {
 	return !!config.inlineConfig;
 }

package/src/utils/options.ts

@@ -680,15 +680,6 @@ export interface SvelteOptions {
  * These options are considered experimental and breaking changes to them can occur in any release
  */
 export interface ExperimentalOptions {
-	/**
-	 * Use extra preprocessors that delegate style and TypeScript preprocessing to native Vite plugins
-	 *
-	 * Do not use together with `svelte-preprocess`!
-	 *
-	 * @default false
-	 */
-	useVitePreprocess?: boolean;
-
 	/**
 	 * A function to update `compilerOptions` before compilation
 	 *

package/src/utils/preprocess.ts

@@ -1,18 +1,8 @@
 import type { ResolvedConfig, Plugin } from 'vite';
 import MagicString from 'magic-string';
-import { preprocess } from 'svelte/compiler';
 import { PreprocessorGroup, ResolvedOptions } from './options';
 import { log } from './log';
 import path from 'path';
-import { vitePreprocess } from '../preprocess';
-
-function createVitePreprocessorGroup(config: ResolvedConfig): PreprocessorGroup {
-	return {
-		markup({ content, filename }) {
-			return preprocess(content, vitePreprocess({ style: config }), { filename });
-		}
-	};
-}
 
 /**
  * this appends a *{} rule to component styles to force the svelte compiler to add style classes to all nodes
@@ -40,13 +30,6 @@ function buildExtraPreprocessors(options: ResolvedOptions, config: ResolvedConfi
 	const prependPreprocessors: PreprocessorGroup[] = [];
 	const appendPreprocessors: PreprocessorGroup[] = [];
 
-	if (options.experimental?.useVitePreprocess) {
-		log.warn(
-			'`experimental.useVitePreprocess` is deprecated. Use the `vitePreprocess()` preprocessor instead. See https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/preprocess.md for more information.'
-		);
-		prependPreprocessors.push(createVitePreprocessorGroup(config));
-	}
-
 	// @ts-ignore
 	const pluginsWithPreprocessorsDeprecated = config.plugins.filter((p) => p?.sveltePreprocess);
 	if (pluginsWithPreprocessorsDeprecated.length > 0) {