Skip to content

Commit 38d1d4e

Browse files
committed
chore: merge main
2 parents 4490cb5 + 07e9f36 commit 38d1d4e

File tree

116 files changed

+9638
-6727
lines changed

Some content is hidden

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

116 files changed

+9638
-6727
lines changed

.eslintignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.eslintrc.cjs

Lines changed: 0 additions & 180 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "\U0001F41E Bug report"
22
description: Report an issue
33
labels: [pending triage]
4+
type: Bug
45
body:
56
- type: markdown
67
attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "\U0001F680 New feature proposal"
22
description: Propose a new feature
3-
labels: ["enhancement: pending triage"]
3+
labels: ["pending triage"]
4+
type: Feature
45
body:
56
- type: markdown
67
attributes:

.github/renovate.json5

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,24 @@
99
"depTypeList": ["peerDependencies"],
1010
"enabled": false,
1111
},
12+
{
13+
groupName: "upstream",
14+
matchPackageNames: ["vite"],
15+
matchPackagePrefixes: ["rollup", "@rollup", "@vitejs"],
16+
},
17+
{
18+
groupName: "prettier",
19+
matchPackageNames: ["prettier"],
20+
},
21+
{
22+
"matchDepTypes": ["action"],
23+
"excludePackagePrefixes": ["actions/", "github/"],
24+
"pinDigests": true,
25+
},
1226
],
1327
"ignoreDeps": [
1428
// manually bumping
15-
"rollup",
1629
"node",
17-
"typescript",
1830

1931
// breaking changes
2032
"kill-port", // `kill-port:^2.0.0 has perf issues (#8392)

.github/workflows/ci.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ env:
99
# Vitest auto retry on flaky segfault
1010
VITEST_SEGFAULT_RETRY: 3
1111

12+
permissions: {}
13+
1214
on:
1315
push:
1416
branches:
@@ -35,13 +37,13 @@ jobs:
3537
strategy:
3638
matrix:
3739
os: [ubuntu-latest]
38-
node_version: [14, 16, 18, 20]
40+
node_version: [18, 20]
3941
include:
4042
# Active LTS + other OS
4143
- os: macos-latest
42-
node_version: 18
44+
node_version: 20
4345
- os: windows-latest
44-
node_version: 18
46+
node_version: 20
4547
fail-fast: false
4648

4749
name: "Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}"
@@ -50,15 +52,10 @@ jobs:
5052
uses: actions/checkout@v4
5153

5254
- name: Install pnpm
53-
if: ${{ matrix.node_version != 14 }}
54-
uses: pnpm/action-setup@v2
55-
56-
- name: Install pnpm 8 (node 14)
57-
if: ${{ matrix.node_version == 14 }}
58-
run: npm install -g @pnpm/exe@next-8
55+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
5956

6057
- name: Set node version to ${{ matrix.node_version }}
61-
uses: actions/setup-node@v3
58+
uses: actions/setup-node@v4
6259
with:
6360
node-version: ${{ matrix.node_version }}
6461
cache: "pnpm"
@@ -75,7 +72,7 @@ jobs:
7572
run: echo "PLAYWRIGHT_BROWSERS_PATH=$HOME\.cache\playwright-bin" >> $env:GITHUB_ENV
7673

7774
- name: Cache Playwright's binary
78-
uses: actions/cache@v3
75+
uses: actions/cache@v4
7976
with:
8077
# Playwright removes unused browsers automatically
8178
# So does not need to add playwright version to key
@@ -106,10 +103,10 @@ jobs:
106103
fetch-depth: 0
107104

108105
- name: Install pnpm
109-
uses: pnpm/action-setup@v2
106+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
110107

111108
- name: Set node version to LTS
112-
uses: actions/setup-node@v3
109+
uses: actions/setup-node@v4
113110
with:
114111
node-version: lts/*
115112
cache: "pnpm"

.github/workflows/issue-close-require.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ jobs:
88
close-issues:
99
if: github.repository == 'vitejs/vite-plugin-vue'
1010
runs-on: ubuntu-latest
11+
permissions:
12+
issues: write # for actions-cool/issues-helper to update issues
13+
pull-requests: write # for actions-cool/issues-helper to update PRs
1114
steps:
1215
- name: need reproduction
13-
uses: actions-cool/issues-helper@v3
16+
uses: actions-cool/issues-helper@a610082f8ac0cf03e357eb8dd0d5e2ba075e017e # v3
1417
with:
1518
actions: "close-issues"
1619
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue-labeled.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ jobs:
88
reply-labeled:
99
if: github.repository == 'vitejs/vite-plugin-vue'
1010
runs-on: ubuntu-latest
11+
permissions:
12+
issues: write # for actions-cool/issues-helper to update issues
13+
pull-requests: write # for actions-cool/issues-helper to update PRs
1114
steps:
1215
- name: contribution welcome
1316
if: github.event.label.name == 'contribution welcome' || github.event.label.name == 'help wanted'
14-
uses: actions-cool/issues-helper@v3
17+
uses: actions-cool/issues-helper@a610082f8ac0cf03e357eb8dd0d5e2ba075e017e # v3
1518
with:
1619
actions: "create-comment, remove-labels"
1720
token: ${{ secrets.GITHUB_TOKEN }}
@@ -21,26 +24,17 @@ jobs:
2124
labels: "pending triage, need reproduction"
2225

2326
- name: remove pending
24-
if: contains(github.event.label.description, '(priority)') && contains(github.event.issue.labels.*.name, 'pending triage')
25-
uses: actions-cool/issues-helper@v3
27+
if: (github.event.label.name == 'enhancement' || contains(github.event.label.description, '(priority)')) && contains(github.event.issue.labels.*.name, 'pending triage')
28+
uses: actions-cool/issues-helper@a610082f8ac0cf03e357eb8dd0d5e2ba075e017e # v3
2629
with:
2730
actions: "remove-labels"
2831
token: ${{ secrets.GITHUB_TOKEN }}
2932
issue-number: ${{ github.event.issue.number }}
3033
labels: "pending triage"
3134

32-
- name: remove enhancement pending
33-
if: "(github.event.label.name == 'enhancement' || contains(github.event.label.description, '(priority)')) && contains(github.event.issue.labels.*.name, 'enhancement: pending triage')"
34-
uses: actions-cool/issues-helper@v3
35-
with:
36-
actions: "remove-labels"
37-
token: ${{ secrets.GITHUB_TOKEN }}
38-
issue-number: ${{ github.event.issue.number }}
39-
labels: "enhancement: pending triage"
40-
4135
- name: need reproduction
4236
if: github.event.label.name == 'need reproduction'
43-
uses: actions-cool/issues-helper@v3
37+
uses: actions-cool/issues-helper@a610082f8ac0cf03e357eb8dd0d5e2ba075e017e # v3
4438
with:
4539
actions: "create-comment, remove-labels"
4640
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lock-closed-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository == 'vitejs/vite-plugin-vue'
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: dessant/lock-threads@v4
15+
- uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5
1616
with:
1717
github-token: ${{ secrets.GITHUB_TOKEN }}
1818
issue-inactive-days: "14"

.github/workflows/publish.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
uses: actions/checkout@v4
2222

2323
- name: Install pnpm
24-
uses: pnpm/action-setup@v2
24+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
2525

2626
- name: Set node version to LTS
27-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v4
2828
with:
2929
node-version: lts/*
3030
registry-url: https://registry.npmjs.org/
@@ -35,6 +35,10 @@ jobs:
3535
env:
3636
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
3737

38+
# https://github.com/npm/cli/pull/6978
39+
- name: Pin npm
40+
run: npm i -g [email protected]
41+
3842
- name: Publish package
3943
run: pnpm run ci-publish ${{ github.ref_name }}
4044
env:

0 commit comments

Comments
 (0)