Skip to content

Commit ddb3812

Browse files
committed
chore: merge main
2 parents 5caea89 + 147e922 commit ddb3812

File tree

328 files changed

+8182
-4453
lines changed

Some content is hidden

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

328 files changed

+8182
-4453
lines changed

.eslintignore

-3
This file was deleted.

.eslintrc.cjs

-243
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.yml

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ body:
4646
- npm
4747
- yarn
4848
- pnpm
49+
- bun
4950
validations:
5051
required: true
5152
- type: textarea

.github/PULL_REQUEST_TEMPLATE.md

+9-21
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
1-
<!-- Thank you for contributing! -->
2-
31
### Description
42

5-
<!-- Please insert your description here and provide especially info about the "what" this PR is solving -->
6-
7-
### Additional context
8-
9-
<!-- e.g. is there anything you'd like reviewers to focus on? -->
10-
11-
---
12-
13-
### What is the purpose of this pull request? <!-- (put an "X" next to an item) -->
3+
<!-- What is this PR solving? Write a clear description or reference the issues it solves (e.g. `fixes #123`). What other alternatives have you explored? Are there any parts you think require more attention from reviewers? -->
144

15-
- [ ] Bug fix
16-
- [ ] New Feature
17-
- [ ] Documentation update
18-
- [ ] Other
5+
<!----------------------------------------------------------------------
6+
Before creating the pull request, please make sure you do the following:
197
20-
### Before submitting the PR, please make sure you do the following
8+
- Read the Contributing Guidelines at https://github.com/vitejs/vite/blob/main/CONTRIBUTING.md.
9+
- Check that there isn't already a PR that solves the problem the same way. If you find a duplicate, please help us reviewing it.
10+
- Update the corresponding documentation if needed.
11+
- Include relevant tests that fail without this PR but pass with it.
2112
22-
- [ ] Read the [Contributing Guidelines](https://github.com/vitejs/vite/blob/main/CONTRIBUTING.md), especially the [Pull Request Guidelines](https://github.com/vitejs/vite/blob/main/CONTRIBUTING.md#pull-request-guidelines).
23-
- [ ] Check that there isn't already a PR that solves the problem the same way to avoid creating a duplicate.
24-
- [ ] Provide a description in this PR that addresses **what** the PR is solving, or reference the issue that it solves (e.g. `fixes #123`).
25-
- [ ] Update the corresponding documentation if needed.
26-
- [ ] Ideally, include relevant tests that fail without this PR but pass with it.
13+
Thank you for contributing to Vite!
14+
----------------------------------------------------------------------->

.github/workflows/ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
matrix:
4141
os: [ubuntu-latest]
42-
node_version: [18, 20]
42+
node_version: [18, 20, 22]
4343
include:
4444
# Active LTS + other OS
4545
- os: macos-latest
@@ -58,7 +58,7 @@ jobs:
5858

5959
- name: Get changed files
6060
id: changed-files
61-
uses: tj-actions/changed-files@800a2825992141ddde1a8bca8ad394cec34d3188 # v42.0.5
61+
uses: tj-actions/changed-files@03334d095e2739fa9ac4034ec16f66d5d01e9eba # v44.5.1
6262
with:
6363
files: |
6464
docs/**
@@ -69,7 +69,7 @@ jobs:
6969
7070
- name: Install pnpm
7171
if: steps.changed-files.outputs.only_changed != 'true'
72-
uses: pnpm/action-setup@v3.0.0
72+
uses: pnpm/action-setup@v4.0.0
7373

7474
- name: Set node version to ${{ matrix.node_version }}
7575
if: steps.changed-files.outputs.only_changed != 'true'
@@ -129,17 +129,17 @@ jobs:
129129
lint:
130130
timeout-minutes: 10
131131
runs-on: ubuntu-latest
132-
name: "Lint: node-18, ubuntu-latest"
132+
name: "Lint: node-20, ubuntu-latest"
133133
steps:
134134
- uses: actions/checkout@v4
135135

136136
- name: Install pnpm
137-
uses: pnpm/action-setup@v3.0.0
137+
uses: pnpm/action-setup@v4.0.0
138138

139-
- name: Set node version to 18
139+
- name: Set node version to 20
140140
uses: actions/setup-node@v4
141141
with:
142-
node-version: 18
142+
node-version: 20
143143
cache: "pnpm"
144144

145145
- name: Install deps

.github/workflows/publish.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
uses: actions/checkout@v4
2222

2323
- name: Install pnpm
24-
uses: pnpm/action-setup@v3.0.0
24+
uses: pnpm/action-setup@v4.0.0
2525

26-
- name: Set node version to 18
26+
- name: Set node version to 20
2727
uses: actions/setup-node@v4
2828
with:
29-
node-version: 18
29+
node-version: 20
3030
registry-url: https://registry.npmjs.org/
3131
cache: "pnpm"
3232

.github/workflows/release-tag.yml

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
- name: Get pkgName for tag
2020
id: tag
2121
run: |
22+
# skip if alpha
23+
if [[ $GITHUB_REF_NAME =~ alpha ]]; then
24+
exit 0
25+
fi
26+
2227
# matching v2.0.0 / v2.0.0-beta.8 etc
2328
if [[ $GITHUB_REF_NAME =~ ^v.+ ]]; then
2429
pkgName="vite"
@@ -31,6 +36,8 @@ jobs:
3136
echo "pkgName=$pkgName" >> $GITHUB_OUTPUT
3237
3338
- name: Create Release for Tag
39+
# only run if tag is not alpha
40+
if: steps.tag.outputs.pkgName
3441
id: release_tag
3542
uses: yyx990803/release-tag@master
3643
env:

.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ hoist-pattern[]=postcss # package/vite
33
hoist-pattern[]=pug # playground/tailwind: @vue/compiler-sfc
44
shell-emulator=true
55
auto-install-peers=false
6+
package-manager-strict=false

0 commit comments

Comments
 (0)