Skip to content

Skip Vite resolve workaround on Vite 4.1+ or Svelte 4+ #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dominikg merged 6 commits into from
Apr 19, 2023
Merged

Skip Vite resolve workaround on Vite 4.1+ or Svelte 4+ #622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bcfb7fc
Skip Vite resolve workaround on Vite 4.1+
benmccann Apr 18, 2023
b8a4a89
Update packages/vite-plugin-svelte/src/index.ts
benmccann Apr 19, 2023
8be94b7
Update packages/vite-plugin-svelte/src/index.ts
benmccann Apr 19, 2023
584ebbc
Update packages/vite-plugin-svelte/src/index.ts
benmccann Apr 19, 2023
0cd3010
Check Svelte version as well
benmccann Apr 19, 2023
9e9d991
move startsWith to constants
benmccann Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/chilled-tigers-flash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': patch
---

Skip Vite resolve workaround on Vite 4.1+
6 changes: 4 additions & 2 deletions packages/vite-plugin-svelte/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs';
import { HmrContext, ModuleNode, Plugin, ResolvedConfig, UserConfig } from 'vite';
import { HmrContext, ModuleNode, Plugin, ResolvedConfig, UserConfig, version } from 'vite';
// eslint-disable-next-line node/no-missing-import
import { isDepExcluded } from 'vitefu';
import { handleHotUpdate } from './handle-hot-update';
Expand Down Expand Up @@ -135,7 +135,9 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin[] {
}
}

if (ssr && importee === 'svelte') {
// TODO: remove this after bumping peerDep on Vite to at least 4.1
const vers = version.split('.').map((s) => parseInt(s));
if (vers[0] === 4 && vers[1] === 0 && ssr && importee === 'svelte') {
if (!resolvedSvelteSSR) {
resolvedSvelteSSR = this.resolve('svelte/ssr', undefined, { skipSelf: true }).then(
(svelteSSR) => {
Expand Down