Skip to content

Fix vite6 environment detection #173

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
birkskyum merged 2 commits into from
Jan 31, 2025
Merged

Fix vite6 environment detection #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e92239
Fix vite6 environment detection
brenelz Jan 31, 2025
2a72396
Create lucky-hats-arrive.md
ryansolid Jan 31, 2025
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/lucky-hats-arrive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"vite-plugin-solid": patch
---

Fix vite6 environment detection
9 changes: 8 additions & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
let needHmr = false;
let replaceDev = false;
let projectRoot = process.cwd();
let isTestMode = false;

return {
name: 'solid',
Expand All @@ -190,6 +191,7 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
// We inject the dev mode only if the user explicitely wants it or if we are in dev (serve) mode
replaceDev = options.dev === true || (options.dev !== false && command === 'serve');
projectRoot = userConfig.root;
isTestMode = userConfig.mode === 'test';

if (!userConfig.resolve) userConfig.resolve = {};
userConfig.resolve.alias = normalizeAliases(userConfig.resolve && userConfig.resolve.alias);
Expand Down Expand Up @@ -270,7 +272,12 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
config.resolve.conditions = [...defaultServerConditions];
}
}
config.resolve.conditions.push('solid');
config.resolve.conditions = [
'solid',
...(replaceDev ? ['development'] : []),
...(isTestMode && !opts.isSsrTargetWebworker ? ['browser'] : []),
...config.resolve.conditions,
];
},

configResolved(config) {
Expand Down
Loading