Skip to content
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.

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

fix: respect cacheDir when optimizer is enabled #6910

Merged
merged 5 commits into from
Nov 15, 2024

Conversation

hi-ogawa
Copy link
Contributor

@hi-ogawa hi-ogawa commented Nov 15, 2024

Description

Please don't delete this checklist! Before submitting the PR, please make sure you do the following:

  • It's really useful if your PR references an issue where it is discussed ahead of time. If the feature is substantial or introduces breaking changes without a discussion, PR might be closed.
  • Ideally, include a test that fails without this PR but passes with it.
  • Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.

Tests

  • Run the tests with pnpm test:ci.

Documentation

  • If you introduce new functionality, document it. You can run documentation with pnpm run docs command.

Changesets

  • Changes in changelog are generated from PR name. Please, make sure that it explains your changes in an understandable manner. Please, prefix changeset messages with feat:, fix:, perf:, docs:, or chore:.

Copy link

netlify bot commented Nov 15, 2024

Deploy Preview for vitest-dev ready!

Built without sensitive environment variables

Name Link
🔨 Latest commit 408a901
🔍 Latest deploy log https://app.netlify.com/sites/vitest-dev/deploys/6736c1e62203490008e6fe3d
😎 Deploy Preview https://deploy-preview-6910--vitest-dev.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Comment on lines +145 to +146
root: testConfig.root ?? viteConfig.test?.root,
deps: testConfig.deps ?? viteConfig.test?.deps,
Copy link
Contributor Author

@hi-ogawa hi-ogawa Nov 15, 2024

Choose a reason for hiding this comment

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

I added these here to so that root and deps from inline test config can be referenced from VitestOptimizer plugin.

@@ -677,7 +677,7 @@ export function resolveConfig(
if (resolved.cache !== false) {
let cacheDir = VitestCache.resolveCacheDir(
'',
resolve(viteConfig.cacheDir, 'vitest'),
viteConfig.cacheDir,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

vitest suffix is to avoid collision of node_modules/.vite/deps directory, so using it for results.json is not technically necessary.

@hi-ogawa hi-ogawa changed the title fix: fix cacheDir fix: respect cacheDir when optimizer is enabled Nov 15, 2024
@hi-ogawa hi-ogawa marked this pull request as ready for review November 15, 2024 05:23
@sheremet-va sheremet-va added this to the 2.2.0 milestone Nov 15, 2024
@sheremet-va sheremet-va merged commit 0b08bc1 into vitest-dev:main Nov 15, 2024
16 of 17 checks passed
@hi-ogawa hi-ogawa deleted the fix-cacheDir branch November 15, 2024 12:44
@sheremet-va sheremet-va modified the milestones: 2.2.0, 3.0.0 Dec 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cacheDir not honored if deps.optimizer.{mode}.enabled is true
2 participants