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/fiery-suns-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'vite-plugin-solid': patch
---

Fix SSR resolve.external being unconditionally applied in Vite 6+
20 changes: 18 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
let replaceDev = false;
let projectRoot = process.cwd();
let isTestMode = false;
let solidPkgsConfig: Awaited<ReturnType<typeof crawlFrameworkPkgs>>;

return {
name: 'solid',
Expand All @@ -212,7 +213,7 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
if (!userConfig.resolve) userConfig.resolve = {};
userConfig.resolve.alias = normalizeAliases(userConfig.resolve && userConfig.resolve.alias);

const solidPkgsConfig = await crawlFrameworkPkgs({
solidPkgsConfig = await crawlFrameworkPkgs({
viteUserConfig: userConfig,
root: projectRoot || process.cwd(),
isBuild: command === 'build',
Expand Down Expand Up @@ -277,7 +278,7 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
include: [...nestedDeps, ...solidPkgsConfig.optimizeDeps.include],
exclude: solidPkgsConfig.optimizeDeps.exclude,
},
ssr: solidPkgsConfig.ssr,
...(!isVite6 ? { ssr: solidPkgsConfig.ssr } : {}),
...(test.server ? { test } : {}),
};
},
Expand All @@ -301,6 +302,21 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
...(isTestMode && !opts.isSsrTargetWebworker && !options.ssr ? ['browser'] : []),
...config.resolve.conditions,
];

// Set resolve.noExternal and resolve.external for SSR environment (Vite 6+)
// Only set resolve.external if noExternal is not true (to avoid conflicts with plugins like Cloudflare)
if (isVite6 && name === 'ssr' && solidPkgsConfig) {
if (config.resolve.noExternal !== true) {
config.resolve.noExternal = [
...(Array.isArray(config.resolve.noExternal) ? config.resolve.noExternal : []),
...solidPkgsConfig.ssr.noExternal,
];
config.resolve.external = [
...(Array.isArray(config.resolve.external) ? config.resolve.external : []),
...solidPkgsConfig.ssr.external,
];
}
}
},

configResolved(config) {
Expand Down
Loading