Skip to content

Adding test coverage for vite 6 #2239

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
ef4 merged 8 commits into from
Feb 5, 2025
Merged

Adding test coverage for vite 6 #2239

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1bdc8b3
Adding test coverage for vite 6
ef4 Jan 29, 2025
4363c1d
update minimum version for vite@6 tests
mansona Feb 4, 2025
5f49083
change dep scan detection for vite 6
ef4 Feb 4, 2025
8ccdfae
use vite main
mansona Feb 5, 2025
c688c00
add hack to allow ember-cli to exit when `vite optimize` is called
mansona Feb 5, 2025
6d48f9a
unskip test
mansona Feb 5, 2025
d0cf3c6
use vite 6.1.0
mansona Feb 5, 2025
df96dfb
renaming our workaround env var
ef4 Feb 5, 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
4 changes: 2 additions & 2 deletions packages/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"peerDependencies": {
"@embroider/core": "workspace:^",
"vite": "^5.2.0"
"vite": ">= 5.2.0"
},
"scripts": {
"test": "jest"
Expand Down Expand Up @@ -41,7 +41,7 @@
"@types/jsdom": "^16.2.11",
"@types/send": "^0.17.4",
"rollup": "^4.18.0",
"vite": "^5.3.3"
"vite": "^6.0.0"
},
"files": [
"dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export function emberBuild(command: string, mode: string, resolvableExtensions:
env['EMBROIDER_RESOLVABLE_EXTENSIONS'] = resolvableExtensions?.join(',');
}

if (command === 'build') {
if (command === 'build' || process.env.FORCE_EMBER_CLI_EXIT) {
Copy link
Contributor Author

@ef4 ef4 Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can keep this but let's use something like EMBROIDER_VITE_PREBUILD=false

return new Promise((resolve, reject) => {
const child = fork(
'./node_modules/ember-cli/bin/ember',
Expand Down
5 changes: 3 additions & 2 deletions packages/vite/src/resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ export function resolver(): Plugin {
context: PluginContext,
source: string,
importer: string | undefined,
options: { custom?: Record<string, unknown> }
options: { custom?: Record<string, unknown>; scan?: boolean }
) {
if (options.custom?.depScan) {
// vite 5 exposes `custom.depscan`, vite 6 exposes `options.scan`
if (options.custom?.depScan || options.scan) {
return await observeDepScan(context, source, importer, options);
}

Expand Down
Loading