Skip to content

Commit 444eabb

Browse files
authored
Merge branch 'main' into feat/cli-completion
2 parents 84ad6ae + 701fc91 commit 444eabb

45 files changed

Lines changed: 476 additions & 168 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/build-upstream/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ runs:
4343
target/${{ inputs.target }}/release/vp-shim.exe
4444
key: ${{ steps.cache-key.outputs.key }}
4545

46-
# Apply Vite+ branding patches to rolldown-vite source (CI checks out
47-
# upstream rolldown-vite which doesn't have branding patches)
48-
- name: Brand rolldown-vite
46+
# Apply Vite+ branding patches to vite source (CI checks out
47+
# upstream vite which doesn't have branding patches)
48+
- name: Brand vite
4949
shell: bash
50-
run: pnpm exec tool brand-rolldown-vite
50+
run: pnpm exec tool brand-vite
5151

5252
# Build upstream TypeScript packages first (don't depend on native bindings)
5353
- name: Build upstream TypeScript packages

.github/actions/clone/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ outputs:
1515
runs:
1616
using: 'composite'
1717
steps:
18-
- name: Output rolldown and rolldown-vite hash
18+
- name: Output rolldown and vite hash
1919
shell: bash
2020
id: upstream-versions
2121
run: |
2222
node -e "console.log('ROLLDOWN_HASH=' + require('./packages/tools/.upstream-versions.json').rolldown.hash)" >> $GITHUB_OUTPUT
23-
node -e "console.log('ROLLDOWN_VITE_HASH=' + require('./packages/tools/.upstream-versions.json')['rolldown-vite'].hash)" >> $GITHUB_OUTPUT
23+
node -e "console.log('ROLLDOWN_VITE_HASH=' + require('./packages/tools/.upstream-versions.json')['vite'].hash)" >> $GITHUB_OUTPUT
2424
2525
- name: Output ecosystem ci project hash
2626
shell: bash
@@ -40,7 +40,7 @@ runs:
4040
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4141
with:
4242
repository: vitejs/vite
43-
path: rolldown-vite
43+
path: vite
4444
ref: ${{ steps.upstream-versions.outputs.ROLLDOWN_VITE_HASH }}
4545

4646
# Disable autocrlf to preserve LF line endings on Windows

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"packages/cli/snap-tests-todo/**",
88
"bench/fixtures/**",
99
"rolldown/**",
10-
"rolldown-vite/**"
10+
"vite/**"
1111
],
1212
"packageRules": [
1313
{

.github/scripts/upgrade-deps.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ async function updateUpstreamVersions() {
4848
// rolldown -> rolldown/rolldown
4949
data.rolldown.hash = await getLatestTagCommit('rolldown', 'rolldown');
5050

51-
// rolldown-vite -> vitejs/vite
52-
data['rolldown-vite'].hash = await getLatestTagCommit('vitejs', 'vite');
51+
// vite -> vitejs/vite
52+
data['vite'].hash = await getLatestTagCommit('vitejs', 'vite');
5353

5454
fs.writeFileSync(filePath, JSON.stringify(data, null, 2) + '\n');
5555
console.log('Updated .upstream-versions.json');

.github/workflows/claude.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,18 @@ jobs:
2424
uses: anthropics/claude-code-action@26ec041249acb0a944c0a47b6c0c13f05dbc5b44 # v1.0.70
2525
with:
2626
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
27-
claude_args: --allowedTools "Read,Glob,Grep,Bash(gh:*),Bash(cargo:*),Bash(git:*),WebFetch"
28-
issue_number: ${{ github.event.issue.number }}
27+
assignee_trigger: 'boshen'
28+
claude_args: --allowedTools "Edit,Write,Read,Glob,Grep,Bash(gh:*),Bash(cargo:*),Bash(git:*),Bash(just:*),WebFetch,TodoWrite"
2929
prompt: |
30-
Analyze the linked issue and determine if it can be fixed.
30+
Analyze issue #${{ github.event.issue.number }} in ${{ github.repository }} and determine if it can be fixed.
3131
32+
First, use `gh issue view ${{ github.event.issue.number }}` to read the issue details.
33+
34+
Then:
3235
1. Search the codebase to gather relevant context (related files, existing implementations, tests)
3336
2. Determine if the issue is fixable and estimate the complexity
3437
35-
Post a comment on the issue with:
38+
Finally, post a comment on the issue with:
3639
- A brief summary of your understanding of the issue
3740
- Relevant files/code you found
3841
- Whether this issue is fixable (yes/no/needs clarification)

.github/workflows/e2e-test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,12 @@ jobs:
251251
node-version: 24
252252
command: |
253253
vp test run
254+
- name: vp-config
255+
node-version: 22
256+
command: |
257+
vp check
258+
vp pack
259+
vp test
254260
exclude:
255261
# frm-stack uses Docker (testcontainers) which doesn't work the same way on Windows
256262
- os: windows-latest

.github/workflows/upgrade-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
body: |
143143
Automated daily upgrade of upstream dependencies:
144144
- rolldown (latest tag)
145-
- rolldown-vite (latest tag)
145+
- vite (latest tag)
146146
- vitest (latest npm version)
147147
- tsdown (latest npm version)
148148

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ dist
66
.DS_Store
77
rolldown
88
rolldown-vite
9+
vite
910
/crates/vite_global_cli/vp

ecosystem-ci/repo.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,10 @@
6060
"branch": "main",
6161
"hash": "451925ad7c07750a23de1d6ed454825d0eb14092",
6262
"forceFreshMigration": true
63+
},
64+
"vp-config": {
65+
"repository": "https://github.com/kazupon/vp-config.git",
66+
"branch": "main",
67+
"hash": "b58c48d71a17c25dec71a003535e6312791ce2aa"
6368
}
6469
}

packages/cli/BUNDLING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ The CLI package creates thin shim files that re-export from `@voidzero-dev/vite-
286286
3. **Reduces duplication** - No file copying, just re-exports
287287
4. **Preserves module resolution** - Node.js resolves to the actual core package
288288

289-
**Note**: The `@voidzero-dev/vite-plus-core` package itself bundles multiple upstream projects (rolldown-vite, rolldown, tsdown, vitepress). See [Core Package Bundling](../core/BUNDLING.md) for details.
289+
**Note**: The `@voidzero-dev/vite-plus-core` package itself bundles multiple upstream projects (vite, rolldown, tsdown, vitepress). See [Core Package Bundling](../core/BUNDLING.md) for details.
290290

291291
### Export Mapping (Core)
292292

0 commit comments

Comments
 (0)