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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "1.4.0",
+  "version": "2.0.0-beta.1",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -9,14 +9,11 @@
     "*.d.ts"
   ],
   "type": "module",
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": "./dist/index.js"
     },
     "./package.json": "./package.json",
     "./src/ui/*": "./src/ui/*"
@@ -43,25 +40,25 @@
     "debug": "^4.3.4",
     "deepmerge": "^4.2.2",
     "kleur": "^4.1.5",
-    "magic-string": "^0.26.7",
+    "magic-string": "^0.27.0",
     "svelte-hmr": "^0.15.1",
     "vitefu": "^0.2.2"
   },
   "peerDependencies": {
-    "svelte": "^3.44.0",
-    "vite": "^3.0.0"
+    "svelte": "^3.54.0",
+    "vite": "^4.0.0-beta.5"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "esbuild": "^0.15.16",
+    "esbuild": "^0.16.1",
     "rollup": "^2.79.1",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "tsup": "^6.5.0",
-    "vite": "^3.2.4"
+    "vite": "^4.0.0-beta.5"
   },
   "scripts": {
     "dev": "pnpm build:ci --sourcemap --watch src",
-    "build:ci": "rimraf dist && tsup-node src/index.ts src/preprocess.ts --format esm,cjs --no-splitting --shims",
+    "build:ci": "rimraf dist && tsup-node src/index.ts --format esm",
     "build": "pnpm build:ci --dts --sourcemap"
   }
 }

package/src/index.ts

@@ -18,7 +18,6 @@ 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';
@@ -47,9 +46,7 @@ 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[] = [
 		{
@@ -136,24 +133,6 @@ 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/utils/esbuild.ts

@@ -5,12 +5,10 @@ import { Compiled } from './compile';
 import { log } from './log';
 import { CompileOptions, ResolvedOptions } from './options';
 import { toESBuildError } from './error';
-import { atLeastSvelte } from './svelte-version';
 import { StatCollection } from './vite-plugin-svelte-stats';
 
 type EsbuildOptions = NonNullable<DepOptimizationOptions['esbuildOptions']>;
 type EsbuildPlugin = NonNullable<EsbuildOptions['plugins']>[number];
-const isCssString = atLeastSvelte('3.53.0');
 
 export const facadeEsbuildSveltePluginName = 'vite-plugin-svelte:facade';
 
@@ -53,7 +51,8 @@ async function compileSvelte(
 ): Promise<string> {
 	let css = options.compilerOptions.css;
 	if (css !== 'none') {
-		css = isCssString ? 'injected' : true;
+		// TODO ideally we'd be able to externalize prebundled styles too, but for now always put them in the js
+		css = 'injected';
 	}
 	const compileOptions: CompileOptions = {
 		...options.compilerOptions,

package/src/utils/options.ts

@@ -30,13 +30,10 @@ import {
 	isDepNoExternaled
 	// eslint-disable-next-line node/no-missing-import
 } from 'vitefu';
-import { atLeastSvelte } from './svelte-version';
+
 import { isCommonDepWithoutSvelteField } from './dependencies';
 import { VitePluginSvelteStats } from './vite-plugin-svelte-stats';
 
-// svelte 3.53.0 changed compilerOptions.css from boolean to string | boolen, use string when available
-const cssAsString = atLeastSvelte('3.53.0');
-
 const allowedPluginOptions = new Set([
 	'include',
 	'exclude',
@@ -182,16 +179,12 @@ export function resolveOptions(
 	preResolveOptions: PreResolvedOptions,
 	viteConfig: ResolvedConfig
 ): ResolvedOptions {
-	const css = cssAsString
-		? preResolveOptions.emitCss
-			? 'external'
-			: 'injected'
-		: !preResolveOptions.emitCss;
+	const css = preResolveOptions.emitCss ? 'external' : 'injected';
 	const defaultOptions: Partial<Options> = {
 		hot: viteConfig.isProduction
 			? false
 			: {
-					injectCss: css === true || css === 'injected',
+					injectCss: css === 'injected',
 					partialAccept: !!viteConfig.experimental?.hmrPartialAccept
 			  },
 		compilerOptions: {
@@ -235,7 +228,7 @@ function enforceOptionsForHmr(options: ResolvedOptions) {
 			}
 			const css = options.compilerOptions.css;
 			if (css === true || css === 'injected') {
-				const forcedCss = cssAsString ? 'external' : false;
+				const forcedCss = 'external';
 				log.warn(
 					`hmr and emitCss are enabled but compilerOptions.css is ${css}, forcing it to ${forcedCss}`
 				);
@@ -254,7 +247,7 @@ function enforceOptionsForHmr(options: ResolvedOptions) {
 			}
 			const css = options.compilerOptions.css;
 			if (!(css === true || css === 'injected')) {
-				const forcedCss = cssAsString ? 'injected' : true;
+				const forcedCss = 'injected';
 				log.warn(
 					`hmr with emitCss disabled requires compilerOptions.css to be enabled, forcing it to ${forcedCss}`
 				);