Skip to content

Commit bac243e

Browse files
authored
Merge branch 'vuejs:main' into main
2 parents faf32a9 + 232474a commit bac243e

File tree

47 files changed

+2484
-2137
lines changed

Some content is hidden

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

47 files changed

+2484
-2137
lines changed

.github/MAINTENANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ Anyone with write access to the main branch of both this repository and [create-
77
To do so, follow these steps:
88

99
1. Run `pnpm version <patch|minor|major>` locally to bump the version number and create a new commit / tag. The `postversion` script will automatically push the changes to the repository.
10-
2. The release will be automatically published to npm by GitHub Actions once approved by an *administrator*.
10+
2. The release will be automatically published to npm by GitHub Actions once approved by an _administrator_.
1111
3. Go to <https://github.com/vuejs/create-vue/releases/new> and create a new release with the tag that was just created. Describe the notable changes in the release notes.

.github/workflows/ci.yml

Lines changed: 53 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -41,53 +41,55 @@ jobs:
4141
with:
4242
name: build-output
4343
path: |
44-
outfile.cjs
44+
bundle.js
4545
playground
4646
retention-days: 3
4747

4848
verify-scripts:
49-
needs: build
50-
strategy:
51-
matrix:
52-
node-version: [18, 20, 22]
53-
os: [ubuntu-latest, windows-latest, macos-latest]
54-
verification-script:
55-
- pnpm --filter '!*typescript*' build
56-
- pnpm --filter '*typescript*' build
57-
- pnpm --filter '*vitest*' test:unit
58-
- pnpm --filter '*eslint*' --filter '!*nightwatch*' lint --no-fix --max-warnings=0
59-
- pnpm --filter '*prettier*' format --write --check
60-
# FIXME: it's failing now
61-
# - pnpm --filter '*with-tests*' test:unit
62-
runs-on: ${{ matrix.os }}
63-
continue-on-error: ${{ matrix.os == 'windows-latest' }}
64-
env:
65-
CYPRESS_INSTALL_BINARY: 0
66-
CHROMEDRIVER_SKIP_DOWNLOAD: true
67-
steps:
68-
- uses: actions/checkout@v4
69-
with:
70-
submodules: true
71-
- uses: pnpm/action-setup@v4
72-
- uses: actions/setup-node@v4
73-
with:
74-
node-version: ${{ matrix.node-version }}
75-
cache: 'pnpm'
76-
77-
# use artifacts to share the playground across different jobs
78-
- uses: eviden-actions/download-artifact@v2
79-
with:
80-
name: build-output
81-
82-
- name: Install dependencies to avoid tsconfig warnings
83-
run: pnpm install
84-
- name: Install dependencies in playground
85-
working-directory: ./playground
86-
run: pnpm install --no-frozen-lockfile --ignore-scripts
87-
88-
- name: Run build script in playground
89-
working-directory: ./playground
90-
run: ${{ matrix.verification-script }}
49+
needs: build
50+
strategy:
51+
matrix:
52+
node-version: [20, 22, 24]
53+
os: [ubuntu-latest, windows-latest, macos-latest]
54+
verification-script:
55+
- pnpm --filter '!*typescript*' build
56+
- pnpm --filter '*typescript*' build
57+
- pnpm --filter '*vitest*' test:unit
58+
- pnpm --filter '*eslint*' --filter '!*nightwatch*' lint --no-fix --max-warnings=0
59+
- pnpm --filter '*prettier*' format --write --check
60+
# FIXME: it's failing now
61+
# - pnpm --filter '*with-tests*' test:unit
62+
runs-on: ${{ matrix.os }}
63+
continue-on-error: ${{ matrix.os == 'windows-latest' }}
64+
env:
65+
CYPRESS_INSTALL_BINARY: 0
66+
CHROMEDRIVER_SKIP_DOWNLOAD: true
67+
steps:
68+
- uses: actions/checkout@v4
69+
with:
70+
submodules: true
71+
- uses: pnpm/action-setup@v4
72+
- uses: actions/setup-node@v4
73+
with:
74+
node-version: ${{ matrix.node-version }}
75+
cache: 'pnpm'
76+
77+
# use artifacts to share the playground across different jobs
78+
- uses: eviden-actions/download-artifact@v2
79+
with:
80+
name: build-output
81+
82+
- name: Install dependencies to avoid tsconfig warnings
83+
run: pnpm install
84+
- name: Install dependencies in playground
85+
working-directory: ./playground
86+
run: |
87+
pnpm install --no-frozen-lockfile --ignore-scripts
88+
pnpm dedupe --ignore-scripts
89+
90+
- name: Run build script in playground
91+
working-directory: ./playground
92+
run: ${{ matrix.verification-script }}
9193

9294
verify-e2e:
9395
needs: build
@@ -96,6 +98,11 @@ jobs:
9698
e2e-framework: ['cypress', 'playwright']
9799
node-version: [22]
98100
os: [ubuntu-latest, windows-latest, macos-latest]
101+
exclude:
102+
# Temporarily exclude Windows + Cypress due to EPERM issues with start-server-and-test
103+
# FIXME: move away from `start-server-and-test`
104+
- os: windows-latest
105+
e2e-framework: cypress
99106
runs-on: ${{ matrix.os }}
100107
continue-on-error: ${{ matrix.os == 'windows-latest' }}
101108
env:
@@ -120,7 +127,9 @@ jobs:
120127
run: pnpm install
121128
- name: Install dependencies in playground
122129
working-directory: ./playground
123-
run: pnpm install --no-frozen-lockfile --ignore-scripts
130+
run: |
131+
pnpm install --no-frozen-lockfile --ignore-scripts
132+
pnpm dedupe --ignore-scripts
124133
env:
125134
# Skip Cypress installation temporarily, we'll install it later with cache
126135
CYPRESS_INSTALL_BINARY: 0

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
bundle.js
12
outfile.cjs
23

34
TODOs

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This project should be able to run on all maintained Node.js LTS versions.
2828
This is ensured by GitHub Actions running the test suite on multiple Node.js versions.
2929
Once an LTS version reaches its end-of-life, we will drop support for it.
3030

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.
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.
3333

3434
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)