refactor: replace @voidzero-dev/vite-plus-test with upstream vitest@4.1.5#1588
refactor: replace @voidzero-dev/vite-plus-test with upstream vitest@4.1.5#1588Brooooooklyn wants to merge 73 commits into
Conversation
✅ Deploy Preview for viteplus-preview canceled.
|
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 365a61de42
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
…mat/typo PR #1588 CI failures: - Force-override mode (VP_FORCE_MIGRATE=1, set by test-vp-create.yml and ecosystem-ci) now re-pins any pre-existing vite-plus range to the local tgz path in monorepo workspace packages. Without this, pnpm reads the published vite-plus@0.1.21 metadata to resolve transitive deps including @voidzero-dev/vite-plus-test@0.1.21, which shadowed upstream vitest@4.1.5 at runtime and broke vp create monorepo tests. - typos CI: rename yarn-PnP to yarn Plug'n'Play (Pn→On false positive). - vp check: format packages/cli/build.ts shim-generation block. - Rename __dirname in install-failure-guard.spec.ts to satisfy eslint(no-underscore-dangle).
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 4fafa67971
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ec69abaadb
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 381b6e2c20
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
…mat/typo PR #1588 CI failures: - Force-override mode (VP_FORCE_MIGRATE=1, set by test-vp-create.yml and ecosystem-ci) now re-pins any pre-existing vite-plus range to the local tgz path in monorepo workspace packages. Without this, pnpm reads the published vite-plus@0.1.21 metadata to resolve transitive deps including @voidzero-dev/vite-plus-test@0.1.21, which shadowed upstream vitest@4.1.5 at runtime and broke vp create monorepo tests. - typos CI: rename yarn-PnP to yarn Plug'n'Play (Pn→On false positive). - vp check: format packages/cli/build.ts shim-generation block. - Rename __dirname in install-failure-guard.spec.ts to satisfy eslint(no-underscore-dangle).
Brooooooklyn
force-pushed
the
refactor/replace-vite-plus-test-with-vitest
branch
from
5c48da8 to
39efcbf
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 39efcbf239
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 2fceee5296
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b888329d76
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Upstream blockers (still needed after the fixes in this PR)
|
Upstream blockers (updated)After the latest fixes (
|
Final status (after b6b5b8b)The aggressive Rust source-rewrite in 21937c5 (which made Confirmed upstream blockers:
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b6b5b8b0bf
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 60b7d0f0ac
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Final status — branch HEAD 3ffb7cdE2E now at expected steady state. The two remaining upstream items:
Everything else (npmx.dev, vinext, vue-mini, frm-stack, varlet, vitepress, reactive-resume, rollipop, dify, etc.) is now green. |
…mat/typo PR #1588 CI failures: - Force-override mode (VP_FORCE_MIGRATE=1, set by test-vp-create.yml and ecosystem-ci) now re-pins any pre-existing vite-plus range to the local tgz path in monorepo workspace packages. Without this, pnpm reads the published vite-plus@0.1.21 metadata to resolve transitive deps including @voidzero-dev/vite-plus-test@0.1.21, which shadowed upstream vitest@4.1.5 at runtime and broke vp create monorepo tests. - typos CI: rename yarn-PnP to yarn Plug'n'Play (Pn→On false positive). - vp check: format packages/cli/build.ts shim-generation block. - Rename __dirname in install-failure-guard.spec.ts to satisfy eslint(no-underscore-dangle).
Brooooooklyn
force-pushed
the
refactor/replace-vite-plus-test-with-vitest
branch
from
3ffb7cd to
a0d248e
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: a0d248e65e
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1a5b2697e5
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
… exports
The blanket `@vitest/` → `vite-plus/test/` swap produced targets that
do not exist in the `vite-plus` package `exports` map, so migrated code
failed at runtime with ERR_PACKAGE_PATH_NOT_EXPORTED:
- `@vitest/browser/{client,locators,matchers,utils}` mapped to
`vite-plus/test/browser/*` (only the bare `./test/*` keys exist).
- `@vitest/browser-<provider>/provider` mapped to
`vite-plus/test/browser-<provider>/provider` (no such export).
Replace the single naive ast-grep rule with 12 mutually-exclusive
enumerated rules and split the triple-slash reference regex into five,
so `vp migrate` produces the same canonical targets as the
`oxlint-plugin.ts` autofix. Add the missing `matchers`/`utils` entries
to `oxlint-plugin.ts` so both implementations stay in sync.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
The tgz-based create/e2e workflows reference fixed `*-0.0.0.tgz` filenames (`repack-vite-tgz` input, `VP_VERSION`, `install-global-cli`, `VP_OVERRIDE_PACKAGES`). A release commit bumped `packages/core` and `packages/cli` to a published version, so `pnpm pack` emitted `*-0.1.22.tgz` and the `Build vite-plus packages` job failed with ENOENT on `voidzero-dev-vite-plus-core-0.0.0.tgz`. Pin both packages to 0.0.0 with `pnpm pkg set` right before packing so the emitted tgz names stay stable regardless of the committed version. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
`replaceInstalledCheckoutPackages` symlinked `node_modules/vitest` and `node_modules/@voidzero-dev/vite-plus-test` to `packages/test`, which this branch deletes. The entries are never matched by the current snap suite (only `create-framework-shim-vue` sets `linkCheckoutPackages` and it installs neither package), but a future global snap test that does install vitest would `rmSync` the real package and symlink it to the now-missing `packages/test`. Remove both stale entries. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
`pnpm pkg set` is not implemented (ERR_PNPM_NOT_IMPLEMENTED); pnpm points to the npm CLI for `pkg` operations. Switch the version pin in the tgz pack steps to `npm pkg set version=0.0.0`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
The ecosystem-ci pack step pins packages/cli to 0.0.0 before packing, so the installed local build reports 0.0.0. verify-install.ts still compared against the committed packages/cli/package.json version (0.1.22 after the release bump), failing every ecosystem E2E project with "expected version 0.1.22, got 0.0.0". Pin the expected version to 0.0.0, matching the fixed `vite-plus-0.0.0.tgz` that patch-project.ts references. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
`externalDtsTypeOnlyPlugin` blindly prepended `import type ` to every
import line in postcss/lightningcss `.d.ts` files. For the
`import D, { N } from 'x'` shape that produced `import type D, { N }`,
which is invalid — a type-only import statement cannot mix a default
binding with named bindings. The dts bundler then failed with
`[PARSE_ERROR]` (surfaced by the `vp-config` ecosystem-ci project,
whose dependency graph routes postcss's `.d.ts` through this plugin).
Fold the default binding into the named clause as `{ default as D, N }`
before the generic prepend, in both the internal-file and
consumer-file branches.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
`vp pack --dts` inlined postcss's `.d.ts` into the declaration bundle
and failed with 61 MISSING_EXPORT errors for postcss type names.
postcss exposes its public types via `declare namespace postcss {
export {...} }` + `export = postcss` — a CJS namespace shape the dts
bundler cannot map named imports onto.
`externalDtsTypeOnlyPlugin` previously rewrote postcss/lightningcss
imports to type-only via regex, which neither parsed reliably for
default+named imports nor addressed the `export =` mismatch. Replace
it with a `resolveId` hook that marks postcss/lightningcss external
whenever imported from a `.d.ts` file, so emitted declarations keep
`import type { X } from 'postcss'` instead of inlining postcss's
`.d.ts` — standard dts-bundler treatment of third-party packages.
Runtime bundling is unaffected (the hook only fires for
declaration-file importers).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
The daily upgrade script bumped the vitest catalog, VITEST_VERSION, and the test-vp-create.yml pins, but never touched the @vitest/mocker entry in patchedDependencies. pnpm keys patchedDependencies by exact version and fails ERR_PNPM_PATCHED_PKG_DOES_NOT_MATCH on drift, so each vitest bump broke the auto-upgrade PR. Rewrite the key + patch path and rename the version-suffixed patch file as part of the upgrade run. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
`vitest@4.1.7`'s dist/index.d.ts re-exports `ExpectPollOptions` from `@vitest/expect`, which does not export that name. tsc tolerates the dangling re-export (lazy resolution) but the rolldown dts bundler resolves every re-export eagerly while inlining, so `vp pack --dts` fails with MISSING_EXPORT. Extend externalDtsTypeOnlyPlugin to keep vitest and @vitest/* external for .d.ts importers, the same treatment already applied to postcss/lightningcss. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
vitest browser mode injects `optimizeDeps.include` entries like `vitest > expect-type` that Vite resolves from the config root. In a pnpm strict (non-hoisted) layout, a `vitest` pulled in only transitively via `vite-plus` is not resolvable from the package directory, so the optimizer fails and the browser test page hangs forever — this broke the `vibe-dashboard` E2E job across the whole branch. `vp migrate` now detects vitest browser mode (recursive scan for `@vitest/browser` / `vite-plus/test/browser` specifiers, stopping at nested package.json boundaries) and adds `vitest` as a direct devDependency so pnpm hoists it next to the package. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…ch sync
- Switch `replace('/', '\\/')` to `replaceAll` in both regex builders so a
future vitest sub-key with multiple slashes can't silently produce a
broken pattern.
- Always persist `updateVitestMockerPatch`'s in-memory rewrite when the
content changed, not only when the key version moved — fixes a case
where the key already matches `vitestVersion` but the value's patch-file
suffix is stale, which would otherwise leak through and trigger
ERR_PNPM_PATCHED_PKG_DOES_NOT_MATCH on install.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
… PnP - Regenerate pnpm-lock.yaml after rebase onto main so the catalog configuration matches; without this `pnpm install --frozen-lockfile` errors with ERR_PNPM_LOCKFILE_CONFIG_MISMATCH in CI. - Add `PnP` (Yarn Plug'n'Play) to .typos.toml so the new migrator comment doesn't trip the typos linter (Pn -> On false positive). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…thin-space WARN
- sync-remote-deps.ts: the patchedDependencies merge previously reset
result.patchedDependencies = {} before copying vite's patches, which
dropped any vite-plus root-level patches (notably the new
@vitest/mocker@4.1.7 patch added on this branch) on every sync. Seed
the merge from main.patchedDependencies so root patches survive.
- utils.ts: the pnpm warning scrub patterns only matched an ASCII space
before `WARN`, but pnpm output frequently prefixes warnings with a
U+2009 thin space; broaden the prefix class to `[ ]?` for the
Skip-adding, Request-took, registry GET, and Tarball patterns.
- pnpm-lock.yaml: regenerate against the now-pinned rolldown@f2757ed7
clone (where @rolldown/pluginutils is a `catalog:` dep instead of a
`workspace:*` package), fixing the ERR_PNPM_OUTDATED_LOCKFILE that
was tanking every CI job after the rebase.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…plugin
`prefer-vite-plus-imports` previously autofixed `TSModuleDeclaration` string
literals like `declare module '@vitest/browser-playwright' { ... }` to
`declare module 'vite-plus/test/browser-playwright' { ... }`. That contradicts
`vp migrate`'s deliberate behavior (and the migration guide's instructions)
of preserving `declare module 'vitest'` / `declare module '@vitest/browser*'`
on the upstream identity so type augmentations merge with what
`vite-plus/test*` actually re-exports. `vp lint --fix` could therefore undo
the augmentation targets users had just been told to keep.
Skip the rewrite in the `TSModuleDeclaration` visitor when the literal is in
the vitest/@vitest-browser family; `declare module 'vite'` and other
non-vitest specifiers continue to be rewritten as before.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…are-module fix - typos: `extend-words` matches whole identifiers via the tokenizer, but `PnP` is split into the word `Pn` (which typos wants to autocorrect to `On`), so the previous entry didn't apply. Move to `extend-identifiers` so the full token is whitelisted. - snap-tests/lint-vite-plus-imports: reflect the oxlint plugin change from 42beb51 — `declare module '@vitest/browser-playwright'` and `declare module '@vitest/browser-playwright/context'` are no longer reported (7 errors → 5) and `vp lint --fix` no longer rewrites them in src/types.ts. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
`pnpm dedupe --check` in the Lint workflow flagged duplicate resolutions in the regenerated lockfile from 52577b1037. Run `pnpm dedupe` to consolidate them (e.g. yaml 2.8.2/2.9.0 split in packages/cli) and clear ERR_PNPM_DEDUPE_CHECK_ISSUES on CI. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
The file walker visits `.cjs` / `.cts` files, but the ast-grep rewrite
rules only matched `inside: { kind: import_statement }` and
`kind: module`. That left `require('vitest')`, `require('vitest/config')`,
`require('@vitest/browser*')`, `require('vite')`, and `require('tsdown')`
unrewritten in CommonJS configs like `vitest.config.cjs`, even when
sibling ESM files in the same project were migrated — producing mixed
specifiers and resolution failures.
Mirror every existing import-statement rule with a require-shape sibling
that matches `inside: { kind: arguments, inside: { kind: call_expression,
has: { field: function, regex: ^require$ } } }`. The callee anchor keeps
`my_require(...)`, `require.cache[...]`, `require.resolve(...)`, and
dynamic `import(...)` correctly out of scope. `declare module` (`kind:
module`) is intentionally not mirrored — CJS has no equivalent.
19 new require-shape rules (vite ×2, vitest family ×15, tsdown ×2) and
25 new tests covering positive rewrites + negative cases (my_require,
require.cache, require.resolve) + skip_packages parity.
`cargo test -p vite_migration --lib`: 212 passed, 0 failed.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
The push of e34f1c5 happened during a GitHub Actions outage and the synchronize event was lost — only third-party checks fired. Empty commit to force a fresh pull_request synchronize so the main CI / E2E / Test vp create workflows enqueue. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
CI's Lint→Deduplicate step caught another mismatch where rolldown-plugin-dts had two peer-resolved variants in the lockfile (one with `oxc-resolver`, one without). The previous local dedupe ran before this drift surfaced; rerun resolves it. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Brooooooklyn
force-pushed
the
refactor/replace-vite-plus-test-with-vitest
branch
from
3ae8f5a to
267b1ff
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 267b1ffcad
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Sibling rules for every `inside: { kind: import_statement }` rule now
also match `kind: export_statement`, so `export { page } from
'@vitest/browser/context'`, `export * from '@vitest/browser-playwright'`,
`export * as ns from 'vitest'`, and `export type { Config } from
'vitest/config'` are rewritten the same way as their `import` siblings.
Without this, projects with barrel files re-exporting from `@vitest/*`
were left pointing at packages that `rewritePackageJson()`
(`REMOVE_PACKAGES`) had already dropped from package.json — hitting
ERR_PACKAGE_PATH_NOT_EXPORTED under strict pnpm / yarn PnP layouts.
19 new export-statement rules mirroring all existing import rules
(vite ×2, vitest family ×15, tsdown ×2). 10 new tests across all four
`export_statement` shapes plus a negative test that a string literal
outside an export-from is left alone. `cargo test -p vite_migration
--lib`: 222 passed (was 212).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 0b1de50c65
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| // literals or strings that contain raw newlines + boundary chars, but those | ||
| // cases were not covered by the original regex either; the ESM lexer pass | ||
| // above already eliminates the common false positives that motivated this fix. | ||
| const REQUIRE_PATTERN = /(?<=^|[\s;{}([,=])(require\s*\(\s*['"])vite-plus\/test(?=['"])/g; |
There was a problem hiding this comment.
When a test file contains a fixture/snapshot template string with a line like require('vite-plus/test'), this raw regex still matches because the lookbehind accepts whitespace and Step 2 applies it to the whole source text, not just real call expressions. That mutates runtime string contents to require('vitest') even though there is no import to rewrite; the ESM paths avoid this with parsers, but the CJS path can still break tests that snapshot or render code examples containing require('vite-plus/test').
Useful? React with 👍 / 👎.
The 10 new tests added in 0b1de50 used multi-line `assert_eq!` blocks that rustfmt prefers as single-line. CI's rustfmt-check caught the drift. No behavior change. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 2792c3865e
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| inside: | ||
| kind: import_statement |
There was a problem hiding this comment.
When a migrated package uses import('@vitest/browser') (or the browser subpaths/providers) this rule set never touches it because the browser mappings are scoped to import_statement/export_statement/require() only, while rewritePackageJson() removes the @vitest/browser* dependencies. Under pnpm strict layouts or Yarn PnP, those dynamic imports are no longer resolvable after migration even though the equivalent static imports are rewritten to vite-plus/test*; please add ImportExpression/TS import-type coverage for the same browser mappings before dropping those packages.
Useful? React with 👍 / 👎.
The prior `REQUIRE_PATTERN` regex used a lookbehind that matched a
newline+whitespace boundary, which also matched inside multi-line
template literals — so fixture or snapshot strings containing
`require('vite-plus/test')` were mutated to `require('vitest')` even
though they were not real require calls.
Replace the regex with an `oxc-parser` walk that only edits string
arguments of `CallExpression` nodes whose callee is the plain
`Identifier "require"`. Template literals, string literals, JSX text,
and `.require(...)` member calls are all distinct AST nodes and stay
untouched. On parser bailout the source is returned unchanged — we no
longer fall back to a regex on raw user code.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…e specifiers
The existing rewrite rules covered `import_statement`, `export_statement`,
and `require()` call shapes but did not cover dynamic `import('...')` or
TS type-position `typeof import('...')`. Since `rewritePackageJson()`
removes `@vitest/browser*` from the user's deps post-migration, untouched
dynamic imports broke at runtime under pnpm strict / Yarn PnP layouts.
Add a `*-dynamic-import` sibling for every existing `*-require` rule
(19 families total), matching `call_expression` nodes whose function
field is the special `import` token — the same AST shape covers both
dynamic `import('x')` and `typeof import('x')` in tree-sitter-typescript.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
The pre-refactor `@voidzero-dev/vite-plus-test` wrapper exposed `./test/plugins/<name>` subpaths (one per `@vitest/*` package and subpath). Replacing the wrapper with upstream `vitest@4.1.7` dropped those entries — a breaking change for users that imported from `vite-plus/test/plugins/*`. Reinstate the surface by extending syncTestPackageExports() with a PLUGIN_SHIM_ENTRIES table and a small loop that delegates to createShimForExport. Each shim is a one-line `export * from '@vitest/<x>'` re-export. The old `utils-highlight` entry is dropped — @vitest/utils@4.1.7 removed `/highlight` from its exports map. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
The constant declaration's comment already explains why the loop exists. Restating it at the loop site is noise — the reviewer flagged it during code review. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
1 participant
Summary
Deletes the bundled
@voidzero-dev/vite-plus-testwrapper and consumes upstreamvitest@4.1.5(plus@vitest/browser*) directly. The vite redirection role that drove the wrapper is now handled cleanly by package-manager overrides (vite→@voidzero-dev/vite-plus-core), so the bundle was dead weight that lagged upstream releases.Public API contract preserved:
vite-plus/test*IS the public test API — existing user code (import { vi } from 'vite-plus/test', etc.) is NEVER rewritten.vitestor@vitest/*separately; they come in transitively as direct deps ofvite-plus.vp migrateon an upstream-vitest project still forward-migratesvitest,vitest/*,@vitest/browser*, declare-module specifiers, and/// <reference types>directives to thevite-plus/test*surface (one-time transition).Notable changes:
packages/cli/build.ts:syncTestPackageExportsauto-generates./test/*shims from upstreamvitest's exports map, plus./test/<provider>and./test/browser/providers/<short>shims projected from each@vitest/browser-*package's exports.packages/cli/package.json: adds@vitest/browser,@vitest/browser-playwright,@vitest/browser-preview,@vitest/browser-webdriverioas direct catalog deps pinned to4.1.5.crates/vite_global_cli/src/commands/version.rs: vitest ToolSpec points at thevitestpackage directly.packages/cli/src/resolve-test.ts: resolvesvitest/package.jsonand readsbin.vitestsovp testinvokes upstream vitest.packages/cli/src/utils/constants.ts: dropsvitestfromVITE_PLUS_OVERRIDE_PACKAGES; onlyviteremains a managed key.packages/cli/src/migration/migrator.ts:isVitestAdjacentflag that flipsneedVitePlus = truefor projects with packages likevitest-browser-svelteeven when there's no vite/oxlint/tsdown to migrate.pruneLegacyWrapperAliases/pruneYamlMapLegacyWrapperAliasessweeps that rewrite stalevitest: npm:@voidzero-dev/vite-plus-test@*aliases to^4.1.5(so existingcatalog:refs keep resolving) and drop other stale wrapper-targeted keys.packages/cli/src/migration/bin.ts: adds ahandleInstallResulthelper so failed reinstalls warn the user, append toreport.warnings, and flipprocess.exitCodeinstead of being silently reported as success.User-visible behavior changes
vp test -hand live test runs now show vitest's native banner (vitest/<semver>,RUN v<semver> <cwd>) instead of the wrapper-rebranded output (vp test/<semver>,RUN <cwd>). This is the tradeoff for delegating directly to upstream vitest without a wrapper layer.Test plan
cargo test -p vite_migration --lib: 167 tests passpnpm exec vitest run(packages/cli): 374 tests passpnpm bootstrap-clisucceedspnpm -F vite-plus snap-test-global+snap-test-local: all fixtures regenerated; diffs only reflect expected behavior (forward import rewrites,@vitest/browser*removed from user devDeps,playwright/webdriveriopreserved as peers, stalevite-plus-testcatalog aliases normalized to^4.1.5).vp teston a fixture usingimport { vi } from 'vite-plus/test';vi.mock(...). See "Follow-up" below.vp migrateon a fresh upstream-vitest project.pnpm installclean: zero@voidzero-dev/vite-plus-testreferences in the lockfile, browser-provider packages installed transitively viavite-plus.Follow-up
@vitest/mockerhoistsvi.mock(...)calls only when the import source is the literal string'vitest'(@vitest/mocker@4.1.5/dist/chunk-hoistMocks.jshardcodeshoistedModule = "vitest"). User code that importsvifrom'vite-plus/test'won't get its mocks hoisted, which silently breaks mocking. The plan is to contribute upstream ahoistedModule?: string | string[]option tohoistMocks()so vite-plus can pass['vitest', 'vite-plus/test']. Tracked as a separate effort — this PR ships the wrapper removal independently; the mocker fix can land later as a@vitest/mockerpoint release.🤖 Generated with Claude Code
Note
High Risk
Large packaging and migration surface (export shims, pnpm patches, Bun peer resolution, import rewriter) affects install,
vp test, and every migrated Vitest/browser import path.Overview
This PR removes the published
@voidzero-dev/vite-plus-testwrapper and wires upstreamvitestand@vitest/browser*intovite-plusinstead. The CLI build now generates./test/*shims from vitest’s export map plus browser-provider and plugin surfaces (including inlined provider.d.tsand runtime fixes forbrowser/context), and drops the test package from release, pkg.pr.new, and e2e packing.Migration and docs shift to a vite-only override (
vite→ core); users keep the publicvite-plus/test*API whilevp migrategains broader import/reference rewriting (CJSrequire, re-exports, dynamicimport, corrected@vitest/browser*→vite-plus/test/*paths) and stops rewritingdeclare module 'vitest'so augmentations stay on upstream types.Automation updates
upgrade-depsfor catalogvitest,VITEST_VERSION,@vitest/mockerpatch renames, and workflow pins; CI packs core/cli at0.0.0, adds a Bun-onlyvitealias tgz, and pins vitest family versions intest-vp-create/ ecosystem-ci overrides instead of the deleted test tgz.Reviewed by Cursor Bugbot for commit 5ad1ae7. Bugbot is set up for automated code reviews on this repo. Configure here.