Skip to content

Commit 7742e93

Browse files
authored
Merge branch 'master' into fix/v-menu-overlay-background-with-v-input
2 parents 9be245c + 1bbcb09 commit 7742e93

File tree

294 files changed

+17533
-5617
lines changed

Some content is hidden

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

294 files changed

+17533
-5617
lines changed

β€Ž.github/actions/nightly-release/action.ymlβ€Ž

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ inputs:
1414
npm-tag:
1515
description: 'NPM tag'
1616
required: true
17-
npm-token:
18-
description: 'NPM token'
19-
required: true
2017

2118
outputs:
2219
full-version:
@@ -56,13 +53,14 @@ runs:
5653
)"
5754
shell: bash
5855
working-directory: ./packages/vuetify
59-
- run: pnpm lerna run build --scope @vuetify/nightly
56+
- run: pnpm run --filter @vuetify/nightly build
57+
shell: bash
58+
- run: pnpm run --filter @vuetify/api-generator build
6059
shell: bash
61-
- run: pnpm lerna run build --scope @vuetify/api-generator
60+
- run: npm install -g npm@latest
6261
shell: bash
6362
- name: NPM Release
6463
run: |
65-
npm config set //registry.npmjs.org/:_authToken ${NPM_API_KEY:?}
6664
npm publish ./packages/vuetify --tag ${{ inputs.npm-tag }} --access public
6765
shell: bash
6866
env:

β€Ž.github/workflows/ci.ymlβ€Ž

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ concurrency:
55
cancel-in-progress: true
66

77
env:
8-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
98
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
109
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
11-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1210

1311
jobs:
1412
pre_job:
@@ -17,7 +15,7 @@ jobs:
1715
should_skip: ${{ steps.skip_check.outputs.should_skip }}
1816
steps:
1917
- id: skip_check
20-
if: ${{ !startswith(github.ref, 'refs/tags/v') && github.ref != 'refs/heads/master' }}
18+
if: ${{ !startsWith(github.ref, 'refs/tags/v') && github.ref_name != 'master' }}
2119
uses: fkirc/skip-duplicate-actions@master
2220
with:
2321
skip_after_successful_duplicate: 'true'
@@ -48,15 +46,15 @@ jobs:
4846
strategy:
4947
fail-fast: false
5048
matrix:
51-
scopes: ['--scope vuetify --scope @vuetify/api-generator', '--scope vuetifyjs.com']
49+
scopes: ['--filter vuetify --filter @vuetify/api-generator', '--filter vuetifyjs.com']
5250
steps:
5351
- uses: actions/checkout@v4
5452
- uses: actions/download-artifact@v4
5553
with:
5654
name: vuetify-dist
5755
path: packages/vuetify
5856
- uses: vuetifyjs/setup-action@master
59-
- run: pnpm lerna run lint $SCOPES
57+
- run: pnpm run $SCOPES lint
6058
env:
6159
SCOPES: ${{ matrix.scopes }}
6260

@@ -92,7 +90,11 @@ jobs:
9290
deploy:
9391
needs: [lint, test-unit, test-e2e, build-vuetify]
9492
runs-on: ubuntu-24.04
95-
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
93+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
94+
environment: production
95+
permissions:
96+
contents: write
97+
id-token: write
9698
steps:
9799
- uses: actions/checkout@v4
98100
with:
@@ -103,12 +105,10 @@ jobs:
103105
path: packages/vuetify
104106
- uses: vuetifyjs/setup-action@master
105107
- run: pnpm build api
106-
- run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
108+
- run: npm install -g npm@latest
107109
- name: NPM Release
108-
run: bash scripts/deploy.sh
109-
env:
110-
NPM_API_KEY: ${{ secrets.NPM_TOKEN }}
111-
RELEASE_TAG: ${{ env.RELEASE_TAG }}
110+
run: |
111+
npm publish ./packages/vuetify --tag $(node ./scripts/parse-npm-tag.js $GITHUB_REF_NAME)
112112
- name: GitHub release
113113
id: create_release
114114
run: pnpm conventional-github-releaser -p vuetify
@@ -119,7 +119,11 @@ jobs:
119119
build-docs:
120120
name: Build docs
121121
needs: [pre_job, build-vuetify]
122-
if: needs.pre_job.outputs.should_skip != 'true' && github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/next')
122+
if: >
123+
needs.pre_job.outputs.should_skip != 'true' &&
124+
github.event_name == 'push' &&
125+
github.repository_owner == 'vuetifyjs' &&
126+
contains(toJSON('["master", "dev", "next"]'), github.ref_name)
123127
runs-on: ubuntu-24.04
124128
steps:
125129
- uses: actions/checkout@v4

β€Ž.github/workflows/nightly-pr.ymlβ€Ž

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

β€Ž.github/workflows/nightly-schedule.ymlβ€Ž

Lines changed: 0 additions & 75 deletions
This file was deleted.
Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
name: Nightly Release
2+
on:
3+
schedule:
4+
- cron: '0 12 * * *' # 1200 UTC
5+
workflow_dispatch:
6+
inputs:
7+
pr:
8+
description: 'Pull Request number'
9+
required: false
10+
type: string
11+
12+
jobs:
13+
nightly-schedule:
14+
runs-on: ubuntu-24.04
15+
if: ${{ github.event_name == 'schedule' && github.repository_owner == 'vuetifyjs' }}
16+
environment: preview
17+
permissions:
18+
contents: read
19+
id-token: write
20+
strategy:
21+
max-parallel: 1
22+
fail-fast: false
23+
matrix:
24+
branch: [ 'master', 'dev', 'next', 'v2-stable', 'v2-dev' ]
25+
include:
26+
- branch: 'master'
27+
tag: 'latest'
28+
- branch: 'dev'
29+
tag: 'dev'
30+
- branch: 'next'
31+
tag: 'next'
32+
- branch: 'v2-stable'
33+
tag: 'v2-stable'
34+
- branch: 'v2-dev'
35+
tag: 'v2-dev'
36+
steps:
37+
- uses: actions/checkout@v4
38+
with:
39+
ref: ${{ matrix.branch }}
40+
fetch-depth: 0
41+
- run: |
42+
last=$(git show -s --format=%ct HEAD)
43+
now=$(date +%s)
44+
diff=$(($now - $last))
45+
if [ $diff -gt 86400 ]; then
46+
echo "Last commit was more than 24 hours ago, skipping release"
47+
exit 1
48+
fi
49+
- run: echo "RELEASE_ID=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
50+
- uses: ./.github/actions/nightly-release
51+
with:
52+
checkout-repo: ${{ github.repository }}
53+
checkout-ref: ${{ matrix.branch }}
54+
release-id: ${{ matrix.branch }}.${{ env.RELEASE_ID }}
55+
npm-tag: ${{ matrix.tag }}
56+
- uses: actions/checkout@v4
57+
58+
nightly-pr:
59+
runs-on: ubuntu-24.04
60+
if: ${{ github.event_name == 'workflow_dispatch' && github.repository_owner == 'vuetifyjs' }}
61+
environment: preview
62+
permissions:
63+
contents: read
64+
id-token: write
65+
pull-requests: write
66+
steps:
67+
- uses: actions/checkout@v4
68+
- uses: actions/github-script@v7
69+
with:
70+
script: |
71+
const pr = await github.rest.pulls.get({
72+
owner: context.repo.owner,
73+
repo: context.repo.repo,
74+
pull_number: ${{ github.event.inputs.pr }}
75+
})
76+
core.exportVariable('CHECKOUT_REPO', pr.data.head.repo.full_name)
77+
core.exportVariable('CHECKOUT_REF', pr.data.head.ref)
78+
core.exportVariable('SHORT_SHA', pr.data.head.sha.slice(0, 7))
79+
- id: nightly-release
80+
uses: ./.github/actions/nightly-release
81+
with:
82+
checkout-repo: ${{ env.CHECKOUT_REPO }}
83+
checkout-ref: ${{ env.CHECKOUT_REF }}
84+
release-id: pr-${{ github.event.inputs.pr }}.${{ env.SHORT_SHA }}
85+
npm-tag: pr
86+
- uses: actions/github-script@v7
87+
with:
88+
script: |
89+
const fullVersion = process.env.FULL_VERSION
90+
const pr = await github.rest.issues.createComment({
91+
owner: context.repo.owner,
92+
repo: context.repo.repo,
93+
issue_number: ${{ github.event.inputs.pr }},
94+
body: `:rocket: Nightly release published to [@vuetify/nightly@${fullVersion}](https://www.npmjs.com/package/@vuetify/nightly/v/${fullVersion}).`
95+
})
96+
env:
97+
FULL_VERSION: ${{ steps.nightly-release.outputs.full-version }}
98+
99+
percy:
100+
name: Visual regression tests
101+
runs-on: ubuntu-24.04
102+
if: ${{ github.event_name == 'schedule' && github.repository_owner == 'vuetifyjs' }}
103+
steps:
104+
- uses: actions/checkout@v4
105+
with:
106+
ref: master
107+
fetch-depth: 0
108+
- run: |
109+
last=$(git show -s --format=%ct HEAD)
110+
now=$(date +%s)
111+
diff=$(($now - $last))
112+
if [ $diff -gt 86400 ]; then
113+
echo "Last commit was more than 24 hours ago, skipping tests"
114+
exit 1
115+
fi
116+
- uses: vuetifyjs/setup-action@master
117+
- run: echo "COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
118+
- run: pnpm test:percy
119+
working-directory: ./packages/vuetify
120+
env:
121+
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
122+
PERCY_BRANCH: master
123+
PERCY_TARGET_BRANCH: master
124+
PERCY_COMMIT: ${{ env.COMMIT }}

β€Ž.npmrcβ€Ž

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

β€Ž.nvmrcβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.14.0
1+
24.8.0

β€Ž.pnpmfile.cjsβ€Ž

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

β€Žlerna.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
}
1414
},
1515
"npmClient": "pnpm",
16-
"version": "3.9.6"
16+
"version": "3.10.0"
1717
}

0 commit comments

Comments
Β (0)