Skip to content

Commit d117304

Browse files
authored
Merge branch 'main' into feat-package-json-imports
2 parents 46791d7 + 9201bdb commit d117304

File tree

86 files changed

+7081
-4940
lines changed

Some content is hidden

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

86 files changed

+7081
-4940
lines changed

Diff for: .git-blame-ignore-revs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
50d5e85d532823583dd4abacc9f11a8ef2e9c15b
2+
0cafcc92c72fef3013d59040da7fb3f71becabd4
3+
c259a0e93660949d25ae230cc97eeb7fe82c4261
4+
8b0455a7eedba24266a330e7bbdaf3ac17069eb5
5+
0f834fed822b1905bc7d40e3069d1bd9643c8253
6+
afddba98c4a33642b6b29331e7983dc8e5bf5f2e
7+
56346a991f7068ff963e78affdacd8669e0993ba
8+
ea858fa2ba0ce5c3db68f617d5034da2d65b8bb1
9+
3f78be25b977df0792383fcbca8e670449300071

Diff for: .github/ISSUE_TEMPLATE/1-feature_request.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: 'enhancement'
6+
assignees: ''
7+
---
8+
9+
### Please describe
10+
11+
<!-- Please provide us with a clear and concise description. -->
12+
13+
### Additional context
14+
15+
<!-- Add any other context or screenshots about the feature request here. (If applicable) -->

Diff for: .github/ISSUE_TEMPLATE/2-bug_report.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: 🐞 Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: 'bug'
6+
assignees: ''
7+
---
8+
9+
<!-- This form is only for submitting bug reports related to this repository (create-vue). -->
10+
11+
### Describe the bug
12+
13+
<!-- Please provide us with a clear and concise description of what the bug is. -->
14+
15+
### Expected behavior
16+
17+
<!-- A clear and concise description of what you expected to happen. -->
18+
19+
### How to reproduce
20+
21+
<!----------------------------------------------------------------------
22+
It would be awesome if you could provide us a small reproduction online using stackblitz. You can replace `typescript-vitest` with another template name that is matching your case from https://github.com/vuejs/create-vue-templates.
23+
- https://stackblitz.com/github/vuejs/create-vue-templates/tree/main/typescript-vitest
24+
25+
Steps to reproduce the behavior:
26+
1. Go to '....'
27+
2. Do this '....'
28+
3. Do that '....'
29+
4. Result
30+
----------------------------------------------------------------------->

Diff for: .github/ISSUE_TEMPLATE/3-blank.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: Blank issue
3+
about: Something other than a bug or a feature
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
---

Diff for: .github/ISSUE_TEMPLATE/config.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Reference: https://github.com/vuejs/core/blob/main/.github/ISSUE_TEMPLATE/config.yml
2+
contact_links:
3+
- name: Discord Chat
4+
url: https://chat.vuejs.org
5+
about: Ask questions and discuss with other Vue users in real time.
6+
- name: Questions & Discussions
7+
url: https://github.com/vuejs/core/discussions
8+
about: Use GitHub discussions for message-board style questions and discussions.
9+
- name: Patreon
10+
url: https://www.patreon.com/evanyou
11+
about: Love Vue.js? Please consider supporting us via Patreon.
12+
- name: Open Collective
13+
url: https://opencollective.com/vuejs/donate
14+
about: Love Vue.js? Please consider supporting us via Open Collective.

Diff for: .github/PULL_REQUEST_TEMPLATE.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
### Description
2+
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? -->
4+
5+
<!----------------------------------------------------------------------
6+
Before creating the pull request, please make sure you do the following:
7+
8+
- Read the Contributing Guidelines at https://github.com/vuejs/create-vue/blob/main/CONTRIBUTING.md
9+
- Check that there isn't already a PR that solves the problem. If you find a duplicate, please help us reviewing it.
10+
- Include relevant tests.
11+
12+
Thank you for contributing to create-vue!
13+
----------------------------------------------------------------------->

Diff for: .github/renovate.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["github>haoqunjiang/renovate-presets:npm.json5"]
4+
}

Diff for: .github/workflows/ci.yml

+22-17
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ jobs:
1616
name: Build the package
1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: pnpm/action-setup@v2
20-
with:
21-
version: 8
19+
- uses: pnpm/action-setup@v3
2220
- uses: actions/setup-node@v4
2321
with:
24-
node-version: 18
22+
node-version: 22
2523
cache: 'pnpm'
2624
- run: pnpm install
2725
env:
@@ -31,7 +29,7 @@ jobs:
3129

3230
# Use cache to share the output across different jobs
3331
# No need to cache node_modules because they are all bundled
34-
- uses: actions/cache/save@v3
32+
- uses: actions/cache/save@v4
3533
id: cache
3634
with:
3735
path: outfile.cjs
@@ -55,62 +53,64 @@ jobs:
5553
# Skip ESLint/Prettier tests as we've reached the limit of job numbers
5654
# TODO: Find a way to test them without adding new jobs
5755

58-
node-version: [18]
56+
node-version: [22]
5957
os: [ubuntu-latest]
6058

6159
# Run a few tests on other systems and Node.js versions
6260
include:
63-
- node-version: 18
61+
- node-version: 22
6462
os: windows-latest
6563
flag-for-ts: '--typescript'
6664
flag-for-jsx: '--jsx'
6765
flag-for-router: '--router'
6866
flag-for-pinia: '--pinia'
6967
flag-for-vitest: '--vitest'
7068
flag-for-e2e: '--cypress'
69+
flag-for-eslint: '--eslint'
7170

72-
- node-version: 18
71+
- node-version: 22
7372
os: macos-latest
7473
flag-for-ts: '--typescript'
7574
flag-for-jsx: '--jsx'
7675
flag-for-router: '--router'
7776
flag-for-pinia: '--pinia'
7877
flag-for-vitest: '--vitest'
7978
flag-for-e2e: '--cypress'
79+
flag-for-eslint: '--eslint'
8080

81-
- node-version: 20
81+
- node-version: 18
8282
os: ubuntu-latest
8383
flag-for-ts: '--typescript'
8484
flag-for-jsx: '--jsx'
8585
flag-for-router: '--router'
8686
flag-for-pinia: '--pinia'
8787
flag-for-vitest: '--vitest'
8888
flag-for-e2e: '--cypress'
89+
flag-for-eslint: '--eslint'
8990

90-
- node-version: 16
91+
- node-version: 20
9192
os: ubuntu-latest
9293
flag-for-ts: '--typescript'
9394
flag-for-jsx: '--jsx'
9495
flag-for-router: '--router'
9596
flag-for-pinia: '--pinia'
9697
flag-for-vitest: '--vitest'
9798
flag-for-e2e: '--cypress'
99+
flag-for-eslint: '--eslint'
98100
runs-on: ${{ matrix.os }}
99101
continue-on-error: ${{ matrix.os == 'windows-latest' }}
100102
env:
101-
FEATURE_FLAGS: ${{ matrix.flag-for-ts }} ${{ matrix.flag-for-jsx }} ${{ matrix.flag-for-router }} ${{ matrix.flag-for-pinia }} ${{ matrix.flag-for-vitest }} ${{ matrix.flag-for-e2e }}
103+
FEATURE_FLAGS: ${{ matrix.flag-for-ts }} ${{ matrix.flag-for-jsx }} ${{ matrix.flag-for-router }} ${{ matrix.flag-for-pinia }} ${{ matrix.flag-for-vitest }} ${{ matrix.flag-for-e2e }} ${{matrix.flag-for-eslint}}
102104
# Sometimes the Linux runner can't verify Cypress in 30s
103105
CYPRESS_VERIFY_TIMEOUT: 60000
104106
steps:
105107
- uses: actions/checkout@v4
106-
- uses: pnpm/action-setup@v2
107-
with:
108-
version: 8
108+
- uses: pnpm/action-setup@v3
109109
- uses: actions/setup-node@v4
110110
with:
111111
node-version: ${{ matrix.node-version }}
112112
cache: 'pnpm'
113-
- uses: actions/cache/restore@v3
113+
- uses: actions/cache/restore@v4
114114
id: cache-restore
115115
with:
116116
path: outfile.cjs
@@ -135,15 +135,15 @@ jobs:
135135
- if: ${{ contains(matrix.flag-for-e2e, '--cypress') }}
136136
name: Cache Cypress binaries
137137
id: cache-cypress
138-
uses: actions/cache@v3
138+
uses: actions/cache@v4
139139
with:
140140
# TODO: avoid snowballing by adding version
141141
key: ${{ runner.os }}-cypress-bin
142142
path: ${{ env.CYPRESS_CACHE_FOLDER }}
143143

144144
- if: ${{ contains(matrix.flag-for-e2e, '--playwright') }}
145145
name: Cache Playwright's binary
146-
uses: actions/cache@v3
146+
uses: actions/cache@v4
147147
with:
148148
# Playwright removes unused browsers automatically
149149
# So does not need to add playwright version to key
@@ -189,3 +189,8 @@ jobs:
189189
name: Run e2e test script
190190
working-directory: ../sample-project
191191
run: pnpm test:e2e
192+
193+
- if: ${{ contains(matrix.flag-for-eslint, '--') }}
194+
name: Run lint script
195+
working-directory: ../sample-project
196+
run: pnpm lint --no-fix --max-warnings=0

Diff for: .husky/pre-commit

-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
3-
41
pnpm exec lint-staged

Diff for: .prettierignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ pnpm-lock.yaml
44
# https://github.com/prettier/prettier/issues/7884
55
**/*.spec.js
66
**/*.spec.ts
7+
# but let's format our unit tests
8+
!__test__/**/*.spec.ts
79
**/dist
810
# https://github.com/prettier/prettier/issues/5246
911
**/*.html

Diff for: .prettierrc

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"semi": false,
3-
"tabWidth": 2,
43
"singleQuote": true,
5-
"printWidth": 100,
6-
"trailingComma": "none"
4+
"printWidth": 100
75
}

Diff for: CONTRIBUTING.md

+11
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,14 @@ This repo is a monorepo using pnpm workspaces. The package manager used to insta
2121
- Checkout a topic branch from a base branch, e.g. `main`, and merge back against that branch.
2222
- For any non-trivial new features or bug fixes, please open an issue first and have it approved before working on it.
2323
- Don't include the `playground` directory in the commits. It will be updated automatically after each release.
24+
25+
## Node.js Compatibility
26+
27+
This project should be able to run on all maintained Node.js LTS versions.
28+
This is ensured by GitHub Actions running the test suite on multiple Node.js versions.
29+
Once an LTS version reaches its end-of-life, we will drop support for it.
30+
31+
We encourage users to use the latest *active LTS* version for development.
32+
Consequently, the `@tsconfig/node*` and `@types/node` dependencies used in the generated TypeScript projects are set to be in sync with the latest *active LTS* Node.js version.
33+
34+
The Node.js release schedule can be found at [Node.js Release Working Group](https://github.com/nodejs/release#release-schedule).

0 commit comments

Comments
 (0)