Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/fine-nights-mix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': patch
---

add `svelte > clsx` to optimizeDeps.include to avoid page reload when using vite6 and npm
1 change: 1 addition & 0 deletions packages/e2e-tests/kit-node/__tests__/kit.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ describe('kit-node', () => {
'svelte/store',
'svelte/transition',
'svelte',
'svelte > clsx',
'svelte/internal/disclose-version',
'svelte/internal/flags/legacy',
'svelte/internal/flags/tracing',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ if (!isBuild) {
expect(optimizedPaths).toContain('e2e-test-dep-svelte-api-only');
expect(optimizedPaths).toContain('e2e-test-dep-svelte-nested');
expect(optimizedPaths).toContain('e2e-test-dep-svelte-module');
expect(optimizedPaths).toContain('svelte');
expect(optimizedPaths).toContain('svelte > clsx');
});

test('should not optimize excluded svelte dependencies', () => {
Expand Down
11 changes: 8 additions & 3 deletions packages/vite-plugin-svelte/src/utils/constants.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import { createRequire } from 'node:module';

export const SVELTE_IMPORTS = Object.entries(
createRequire(import.meta.url)('svelte/package.json').exports
)
const sveltePkg = createRequire(import.meta.url)('svelte/package.json');

// list of svelte runtime dependencies to optimize together with svelte itself
export const SVELTE_RUNTIME_DEPENDENCIES = [
'clsx' // avoids dev server restart after page load with npm + vite6 (see #1067)
].filter((dep) => !!sveltePkg.dependencies?.[dep]);

export const SVELTE_IMPORTS = Object.entries(sveltePkg.exports)
.map(([name, config]) => {
// ignore type only
if (typeof config === 'object' && Object.keys(config).length === 1 && config.types) {
Expand Down
6 changes: 4 additions & 2 deletions packages/vite-plugin-svelte/src/utils/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
DEFAULT_SVELTE_EXT,
FAQ_LINK_MISSING_EXPORTS_CONDITION,
SVELTE_EXPORT_CONDITIONS,
SVELTE_IMPORTS
SVELTE_IMPORTS,
SVELTE_RUNTIME_DEPENDENCIES
} from './constants.js';

import path from 'node:path';
Expand Down Expand Up @@ -550,8 +551,9 @@ function buildExtraConfigForSvelte(config) {
const svelteImportsToInclude = SVELTE_IMPORTS.filter(
(si) => !(si.endsWith('/server') || si.includes('/server/'))
);
svelteImportsToInclude.push(...SVELTE_RUNTIME_DEPENDENCIES.map((dep) => `svelte > ${dep}`));
log.debug(
`adding bare svelte packages to optimizeDeps.include: ${svelteImportsToInclude.join(', ')} `,
`adding bare svelte packages and runtime dependencies to optimizeDeps.include: ${svelteImportsToInclude.join(', ')} `,
undefined,
'config'
);
Expand Down