feat!: remove custom svelte/ssr resolve (#527)

sveltejs · Dec 8, 2022 · 890f329 · 890f329
1 parent 7eb8b78
commit 890f329
Show file tree

Hide file tree

Showing 31 changed files with 158 additions and 174 deletions.
diff --git a/.changeset/silent-steaks-rush.md b/.changeset/silent-steaks-rush.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/vite-plugin-svelte': major
+---
+
+remove custom svelte/ssr resolve that is no longer needed in vite 4
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "rimraf": "^3.0.2",
     "svelte": "^3.53.1",
     "typescript": "^4.9.3",
-    "vite": "^4.0.0-beta.1",
+    "vite": "^4.0.0-beta.5",
     "vitest": "^0.25.4"
   },
   "lint-staged": {
@@ -65,13 +65,13 @@
   "pnpm": {
     "overrides": {
       "@sveltejs/vite-plugin-svelte": "workspace:*",
-      "vite": "^4.0.0-beta.1"
+      "vite": "^4.0.0-beta.5"
     },
     "peerDependencyRules": {
       "allowedVersions": {
         "stylus": "^0.58.0",
         "postcss-load-config": "^4.0.0",
-        "vite": "^4.0.0-beta.1"
+        "vite": "^4.0.0-beta.5"
       }
     }
   }

diff --git a/packages/e2e-tests/autoprefixer-browerslist/package.json b/packages/e2e-tests/autoprefixer-browerslist/package.json
@@ -17,7 +17,7 @@
     "postcss-load-config": "^4.0.1",
     "svelte": "^3.53.1",
     "svelte-preprocess": "^4.10.7",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "type": "module"
 }
diff --git a/packages/e2e-tests/configfile-custom/package.json b/packages/e2e-tests/configfile-custom/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "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
@@ -14,7 +14,7 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
     "svelte-preprocess": "^4.10.7",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "type": "module"
 }
diff --git a/packages/e2e-tests/css-none/package.json b/packages/e2e-tests/css-none/package.json
@@ -11,6 +11,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/custom-extensions/package.json b/packages/e2e-tests/custom-extensions/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "type": "module"
 }
diff --git a/packages/e2e-tests/env/package.json b/packages/e2e-tests/env/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "type": "module"
 }
diff --git a/packages/e2e-tests/hmr/package.json b/packages/e2e-tests/hmr/package.json
@@ -15,7 +15,7 @@
     "e2e-test-dep-vite-plugins": "file:../_test_dependencies/vite-plugins",
     "node-fetch": "^3.3.0",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "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
@@ -12,6 +12,6 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "sass": "^1.56.1",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/inspector-kit/package.json b/packages/e2e-tests/inspector-kit/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@sveltejs/kit": "^1.0.0-next.572",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "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
@@ -11,6 +11,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/kit-node/package.json b/packages/e2e-tests/kit-node/package.json
@@ -20,7 +20,7 @@
     "svelte-i18n": "^3.6.0",
     "tiny-glob": "^0.2.9",
     "typescript": "^4.9.3",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "type": "module"
 }
diff --git a/packages/e2e-tests/package-json-svelte-field/package.json b/packages/e2e-tests/package-json-svelte-field/package.json
@@ -14,7 +14,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "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
@@ -20,6 +20,6 @@
     "sass": "^1.56.1",
     "svelte": "^3.53.1",
     "svelte-preprocess": "^4.10.7",
-    "vite": "^4.0.0-beta.1"
+    "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
@@ -12,7 +12,7 @@
     "sass": "^1.56.1",
     "stylus": "^0.59.0",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "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
@@ -14,6 +14,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/svelte-preprocess/package.json b/packages/e2e-tests/svelte-preprocess/package.json
@@ -13,7 +13,7 @@
     "svelte": "^3.53.1",
     "svelte-preprocess": "^4.10.7",
     "typescript": "^4.9.3",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "type": "module"
 }
diff --git a/packages/e2e-tests/ts-type-import/package.json b/packages/e2e-tests/ts-type-import/package.json
@@ -13,7 +13,7 @@
     "@types/node": "^18.11.11",
     "svelte": "^3.53.1",
     "svelte-preprocess": "^4.10.7",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "type": "module"
 }
diff --git a/packages/e2e-tests/vite-ssr-esm/package.json b/packages/e2e-tests/vite-ssr-esm/package.json
@@ -21,6 +21,6 @@
     "npm-run-all": "^4.1.5",
     "serve-static": "^1.15.0",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/e2e-tests/vite-ssr/package.json b/packages/e2e-tests/vite-ssr/package.json
@@ -18,6 +18,6 @@
     "express": "^4.18.2",
     "serve-static": "^1.15.0",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "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
@@ -20,7 +20,7 @@
 		"svelte-check": "^2.10.1",
 		"svelte-preprocess": "^4.10.7",
 		"typescript": "^4.9.3",
-		"vite": "^4.0.0-beta.1"
+		"vite": "^4.0.0-beta.5"
 	},
 	"type": "module"
 }
diff --git a/packages/playground/big-component-library-vite-ssr/package.json b/packages/playground/big-component-library-vite-ssr/package.json
@@ -24,6 +24,6 @@
     "lodash-es": "^4.17.21",
     "svelte": "^3.53.1",
     "svelte-preprocess": "^4.10.7",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/playground/big-component-library/package.json b/packages/playground/big-component-library/package.json
@@ -15,7 +15,7 @@
     "carbon-preprocess-svelte": "^0.9.1",
     "svelte": "^3.53.1",
     "svelte-preprocess": "^4.10.7",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "dependencies": {
     "lodash-es": "^4.17.21"

diff --git a/packages/playground/big/package.json b/packages/playground/big/package.json
@@ -10,6 +10,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/playground/kit-demo-app/package.json b/packages/playground/kit-demo-app/package.json
@@ -18,7 +18,7 @@
 		"svelte": "^3.53.1",
 		"svelte-check": "^2.10.1",
 		"typescript": "^4.9.3",
-		"vite": "^4.0.0-beta.1"
+		"vite": "^4.0.0-beta.5"
 	},
 	"type": "module"
 }
diff --git a/packages/playground/optimizedeps-include/package.json b/packages/playground/optimizedeps-include/package.json
@@ -12,6 +12,6 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.53.1",
     "tinro": "^0.6.12",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/playground/windicss/package.json b/packages/playground/windicss/package.json
@@ -14,7 +14,7 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "diff-match-patch": "^1.0.5",
     "svelte": "^3.53.1",
-    "vite": "^4.0.0-beta.1",
+    "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
@@ -51,14 +51,14 @@
   },
   "peerDependencies": {
     "svelte": "^3.44.0",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "esbuild": "^0.16.1",
     "rollup": "^2.79.1",
     "svelte": "^3.53.1",
     "tsup": "^6.5.0",
-    "vite": "^4.0.0-beta.1"
+    "vite": "^4.0.0-beta.5"
   }
 }
diff --git a/packages/vite-plugin-svelte/src/index.ts b/packages/vite-plugin-svelte/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 =