feat!: update svelte peerDependency to ^3.54.0 (#529)

sveltejs · Dec 8, 2022 · 6a10720 · 6a10720
1 parent 890f329
commit 6a10720
Show file tree

Hide file tree

Showing 33 changed files with 154 additions and 157 deletions.
diff --git a/.changeset/silver-jokes-do.md b/.changeset/silver-jokes-do.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/vite-plugin-svelte': major
+---
+
+update svelte peerDependency to ^3.54.0
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "prettier": "^2.8.0",
     "prettier-plugin-svelte": "^2.8.1",
     "rimraf": "^3.0.2",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "typescript": "^4.9.3",
     "vite": "^4.0.0-beta.5",
     "vitest": "^0.25.4"

diff --git a/packages/e2e-tests/_test_dependencies/svelte-api-only/package.json b/packages/e2e-tests/_test_dependencies/svelte-api-only/package.json
@@ -16,6 +16,6 @@
   },
   "type": "module",
   "dependencies": {
-    "svelte": "^3.53.1"
+    "svelte": "^3.54.0"
   }
 }
diff --git a/packages/e2e-tests/autoprefixer-browerslist/package.json b/packages/e2e-tests/autoprefixer-browerslist/package.json
@@ -15,7 +15,7 @@
     "autoprefixer": "^10.4.13",
     "postcss": "^8.4.19",
     "postcss-load-config": "^4.0.1",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "svelte-preprocess": "^4.10.7",
     "vite": "^4.0.0-beta.5"
   },

diff --git a/packages/e2e-tests/configfile-custom/package.json b/packages/e2e-tests/configfile-custom/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   },
   "type": "module"

diff --git a/packages/e2e-tests/configfile-esm/package.json b/packages/e2e-tests/configfile-esm/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "svelte-preprocess": "^4.10.7",
     "vite": "^4.0.0-beta.5"
   },

diff --git a/packages/e2e-tests/css-none/package.json b/packages/e2e-tests/css-none/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/custom-extensions/package.json b/packages/e2e-tests/custom-extensions/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   },
   "type": "module"

diff --git a/packages/e2e-tests/env/package.json b/packages/e2e-tests/env/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   },
   "type": "module"

diff --git a/packages/e2e-tests/hmr/package.json b/packages/e2e-tests/hmr/package.json
@@ -14,7 +14,7 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "e2e-test-dep-vite-plugins": "file:../_test_dependencies/vite-plugins",
     "node-fetch": "^3.3.0",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   },
   "type": "module"

diff --git a/packages/e2e-tests/import-queries/package.json b/packages/e2e-tests/import-queries/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "sass": "^1.56.1",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/inspector-kit/package.json b/packages/e2e-tests/inspector-kit/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@sveltejs/kit": "^1.0.0-next.572",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   },
   "type": "module"

diff --git a/packages/e2e-tests/inspector-vite/package.json b/packages/e2e-tests/inspector-vite/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/kit-node/package.json b/packages/e2e-tests/kit-node/package.json
@@ -15,7 +15,7 @@
     "@sveltejs/kit": "^1.0.0-next.572",
     "e2e-test-dep-svelte-api-only": "file:../_test_dependencies/svelte-api-only",
     "e2e-test-dep-vite-plugins": "file:../_test_dependencies/vite-plugins",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "svelte-check": "^2.10.1",
     "svelte-i18n": "^3.6.0",
     "tiny-glob": "^0.2.9",

diff --git a/packages/e2e-tests/package-json-svelte-field/package.json b/packages/e2e-tests/package-json-svelte-field/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   },
   "type": "module"

diff --git a/packages/e2e-tests/prebundle-svelte-deps/package.json b/packages/e2e-tests/prebundle-svelte-deps/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "sass": "^1.56.1",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "svelte-preprocess": "^4.10.7",
     "vite": "^4.0.0-beta.5"
   }

diff --git a/packages/e2e-tests/preprocess-with-vite/package.json b/packages/e2e-tests/preprocess-with-vite/package.json
@@ -11,7 +11,7 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "sass": "^1.56.1",
     "stylus": "^0.59.0",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   },
   "type": "module"

diff --git a/packages/e2e-tests/resolve-exports-svelte/package.json b/packages/e2e-tests/resolve-exports-svelte/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/svelte-preprocess/package.json b/packages/e2e-tests/svelte-preprocess/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "sass": "^1.56.1",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "svelte-preprocess": "^4.10.7",
     "typescript": "^4.9.3",
     "vite": "^4.0.0-beta.5"

diff --git a/packages/e2e-tests/ts-type-import/package.json b/packages/e2e-tests/ts-type-import/package.json
@@ -11,7 +11,7 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "@tsconfig/svelte": "^3.0.0",
     "@types/node": "^18.11.11",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "svelte-preprocess": "^4.10.7",
     "vite": "^4.0.0-beta.5"
   },

diff --git a/packages/e2e-tests/vite-ssr-esm/package.json b/packages/e2e-tests/vite-ssr-esm/package.json
@@ -20,7 +20,7 @@
     "express": "^4.18.2",
     "npm-run-all": "^4.1.5",
     "serve-static": "^1.15.0",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/vite-ssr/package.json b/packages/e2e-tests/vite-ssr/package.json
@@ -17,7 +17,7 @@
     "e2e-test-dep-esm-only": "file:../_test_dependencies/esm-only",
     "express": "^4.18.2",
     "serve-static": "^1.15.0",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/playground/big-component-library-kit/package.json b/packages/playground/big-component-library-kit/package.json
@@ -16,7 +16,7 @@
 		"carbon-icons-svelte": "^11.4.0",
 		"carbon-preprocess-svelte": "^0.9.1",
 		"lodash-es": "^4.17.21",
-		"svelte": "^3.53.1",
+		"svelte": "^3.54.0",
 		"svelte-check": "^2.10.1",
 		"svelte-preprocess": "^4.10.7",
 		"typescript": "^4.9.3",

diff --git a/packages/playground/big-component-library-vite-ssr/package.json b/packages/playground/big-component-library-vite-ssr/package.json
@@ -22,7 +22,7 @@
     "carbon-preprocess-svelte": "^0.9.1",
     "cross-env": "^7.0.3",
     "lodash-es": "^4.17.21",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "svelte-preprocess": "^4.10.7",
     "vite": "^4.0.0-beta.5"
   }

diff --git a/packages/playground/big-component-library/package.json b/packages/playground/big-component-library/package.json
@@ -13,7 +13,7 @@
     "carbon-components-svelte": "^0.70.12",
     "carbon-icons-svelte": "^11.4.0",
     "carbon-preprocess-svelte": "^0.9.1",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "svelte-preprocess": "^4.10.7",
     "vite": "^4.0.0-beta.5"
   },

diff --git a/packages/playground/big/package.json b/packages/playground/big/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/playground/kit-demo-app/package.json b/packages/playground/kit-demo-app/package.json
@@ -15,7 +15,7 @@
 		"@sveltejs/adapter-auto": "^1.0.0-next.90",
 		"@sveltejs/kit": "^1.0.0-next.572",
 		"@types/cookie": "^0.5.1",
-		"svelte": "^3.53.1",
+		"svelte": "^3.54.0",
 		"svelte-check": "^2.10.1",
 		"typescript": "^4.9.3",
 		"vite": "^4.0.0-beta.5"

diff --git a/packages/playground/optimizedeps-include/package.json b/packages/playground/optimizedeps-include/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "tinro": "^0.6.12",
     "vite": "^4.0.0-beta.5"
   }

diff --git a/packages/playground/windicss/package.json b/packages/playground/windicss/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "diff-match-patch": "^1.0.5",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5",
     "vite-plugin-windicss": "^1.8.8"
   }

diff --git a/packages/vite-plugin-svelte/package.json b/packages/vite-plugin-svelte/package.json
@@ -50,14 +50,14 @@
     "vitefu": "^0.2.2"
   },
   "peerDependencies": {
-    "svelte": "^3.44.0",
+    "svelte": "^3.54.0",
     "vite": "^4.0.0-beta.5"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "esbuild": "^0.16.1",
     "rollup": "^2.79.1",
-    "svelte": "^3.53.1",
+    "svelte": "^3.54.0",
     "tsup": "^6.5.0",
     "vite": "^4.0.0-beta.5"
   }

diff --git a/packages/vite-plugin-svelte/src/utils/esbuild.ts b/packages/vite-plugin-svelte/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,

diff --git a/packages/vite-plugin-svelte/src/utils/options.ts b/packages/vite-plugin-svelte/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}`
 				);