Remove svelte/ssr resolving

Author: benmccann

packages/e2e-tests/kit-node/__tests__/kit.spec.ts

@@ -75,18 +75,6 @@ describe('kit-node', () => {
 			});
 		});
 
-		it('should load dynamic import in onMount', async () => {
-			// expect log to contain message with dynamic import value from onMount
-			expect(browserLogs.some((x) => x === 'onMount dynamic imported isSSR: false')).toBe(true);
-		});
-
-		if (isBuild) {
-			it('should not include dynamic import from onmount in ssr output', async () => {
-				const app = readFileContent(path.join('.svelte-kit', 'output', 'server', 'app.js'));
-				expect(app.includes('__SHOULD_NOT_BE_IN_SSR_APP_JS')).toBe(false);
-			});
-		}
-
 		if (!isBuild) {
 			describe('hmr', () => {
 				const updateIndexSvelte = editFileAndWaitForHmrComplete.bind(

packages/e2e-tests/kit-node/src/client-only-module.js

@@ -27,8 +27,6 @@
 	export let load_status = 'NOT_LOADED';
 	let mount_status = 'BEFORE_MOUNT';
 	onMount(async () => {
-		const isSSR = (await import('../client-only-module.js')).default;
-		console.log(`onMount dynamic imported isSSR: ${isSSR}`);
 		mount_status = 'AFTER_MOUNT';
 	});
 	setSomeContext();

packages/e2e-tests/kit-node/src/routes/index.svelte

@@ -16,7 +16,6 @@ import { VitePluginSvelteCache } from './utils/vite-plugin-svelte-cache';
 import { ensureWatchedFile, setupWatchers } from './utils/watch';
 import { resolveViaPackageJsonSvelte } from './utils/resolve';
 import { addExtraPreprocessors } from './utils/preprocess';
-import { PartialResolvedId } from 'rollup';
 
 export function svelte(inlineOptions?: Partial<Options>): Plugin {
 	if (process.env.DEBUG != null) {
@@ -37,8 +36,6 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 	) => Promise<CompileData>;
 	/* eslint-enable no-unused-vars */
 
-	let resolvedSvelteSSR: Promise<PartialResolvedId | null>;
-
 	return {
 		name: 'vite-plugin-svelte',
 		// make sure our resolver runs before vite internal resolver to resolve svelte field correctly
@@ -104,25 +101,6 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 				return importee; // query with svelte tag, an id we generated, no need for further analysis
 			}
 
-			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;
-			}
-
 			try {
 				const resolved = resolveViaPackageJsonSvelte(importee, importer);
 				if (resolved) {

packages/vite-plugin-svelte/src/index.ts

@@ -7,7 +7,6 @@ export const SVELTE_IMPORTS = [
 	'svelte/easing',
 	'svelte/internal',
 	'svelte/motion',
-	'svelte/ssr',
 	'svelte/store',
 	'svelte/transition',
 	'svelte'

packages/vite-plugin-svelte/src/utils/constants.ts

@@ -242,11 +242,8 @@ function buildOptimizeDepsForSvelte(
 		);
 	};
 	if (!isExcluded('svelte')) {
-		const svelteImportsToInclude = SVELTE_IMPORTS.filter((x) => x !== 'svelte/ssr'); // not used on clientside
-		log.debug(
-			`adding bare svelte packages to optimizeDeps.include: ${svelteImportsToInclude.join(', ')} `
-		);
-		include.push(...svelteImportsToInclude.filter((x) => !isIncluded(x)));
+		log.debug(`adding bare svelte packages to optimizeDeps.include: ${SVELTE_IMPORTS.join(', ')} `);
+		include.push(...SVELTE_IMPORTS.filter((x) => !isIncluded(x)));
 	} else {
 		log.debug('"svelte" is excluded in optimizeDeps.exclude, skipped adding it to include.');
 	}