diff --git a/packages/vite-plugin-svelte/package.json b/packages/vite-plugin-svelte/package.json index e36b5cc47..82a342728 100644 --- a/packages/vite-plugin-svelte/package.json +++ b/packages/vite-plugin-svelte/package.json @@ -54,7 +54,7 @@ }, "peerDependencies": { "diff-match-patch": "^1.0.5", - "svelte": "^3.34.0", + "svelte": "^3.43.0", "vite": "^2.5.3" }, "peerDependenciesMeta": { diff --git a/packages/vite-plugin-svelte/src/index.ts b/packages/vite-plugin-svelte/src/index.ts index c5e5af8a2..9372d539d 100644 --- a/packages/vite-plugin-svelte/src/index.ts +++ b/packages/vite-plugin-svelte/src/index.ts @@ -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): Plugin { if (process.env.DEBUG != null) { @@ -37,8 +36,6 @@ export function svelte(inlineOptions?: Partial): Plugin { ) => Promise; /* eslint-enable no-unused-vars */ - let resolvedSvelteSSR: Promise; - 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): 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) { diff --git a/packages/vite-plugin-svelte/src/utils/constants.ts b/packages/vite-plugin-svelte/src/utils/constants.ts index 0a178007a..839fa17fa 100644 --- a/packages/vite-plugin-svelte/src/utils/constants.ts +++ b/packages/vite-plugin-svelte/src/utils/constants.ts @@ -7,7 +7,6 @@ export const SVELTE_IMPORTS = [ 'svelte/easing', 'svelte/internal', 'svelte/motion', - 'svelte/ssr', 'svelte/store', 'svelte/transition', 'svelte' diff --git a/packages/vite-plugin-svelte/src/utils/options.ts b/packages/vite-plugin-svelte/src/utils/options.ts index 3cdbeae15..97db05499 100644 --- a/packages/vite-plugin-svelte/src/utils/options.ts +++ b/packages/vite-plugin-svelte/src/utils/options.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.'); }