Skip to content

Commit

Permalink
Merge branch 'vuetifyjs:master' into feat/v3-calendar-slots-events--f…
Browse files Browse the repository at this point in the history
…ix-slot-name
  • Loading branch information
CrazyFish08 authored Jan 17, 2025
2 parents a64b27e + cb2d96b commit e6850d9
Show file tree
Hide file tree
Showing 128 changed files with 1,944 additions and 1,166 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
pre_job:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
should_skip: ${{ steps.skip_check.outputs.should_skip }}
steps:
Expand All @@ -28,7 +28,7 @@ jobs:
name: Build vuetify
needs: pre_job
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: vuetifyjs/setup-action@master
Expand All @@ -44,7 +44,7 @@ jobs:
name: Lint
needs: [pre_job, build-vuetify]
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand All @@ -64,7 +64,7 @@ jobs:
name: Test (Unit)
needs: pre_job
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: vuetifyjs/setup-action@master
Expand All @@ -75,7 +75,7 @@ jobs:
name: Test (e2e)
needs: pre_job
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: vuetifyjs/setup-action@master
Expand All @@ -84,7 +84,7 @@ jobs:

deploy:
needs: [lint, test-unit, test-e2e, build-vuetify]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
name: Build docs
needs: [pre_job, build-vuetify]
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')
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:

publish-docs:
needs: [lint, test-unit, build-docs]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
environment: Production
if: github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && github.ref == 'refs/heads/master'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/close-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
close:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: github.repository_owner == 'vuetifyjs'
steps:
- uses: vuetifyjs/close-action@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-uploads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:

jobs:
upload-to-crowdin:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'vuetifyjs' }}
steps:
- uses: actions/checkout@v4
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/nightly-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'vuetifyjs' }}
strategy:
max-parallel: 1
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:

percy:
name: Visual regression tests
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'vuetifyjs' }}
steps:
- uses: actions/checkout@v4
Expand All @@ -66,16 +66,10 @@ jobs:
fi
- uses: vuetifyjs/setup-action@master
- run: echo "COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
- run: pnpm cy:run
- run: pnpm test:percy
working-directory: ./packages/vuetify
env:
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
PERCY_BRANCH: master
PERCY_TARGET_BRANCH: master
PERCY_COMMIT: ${{ env.COMMIT }}
- uses: actions/upload-artifact@v3
if: failure()
with:
name: cypress-screenshots
path: ./packages/vuetify/cypress/screenshots/
if-no-files-found: ignore
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/stale@v9
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
triage:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: vuetifyjs/triage-action@master
Expand Down
62 changes: 38 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<tbody>
<tr>
<td>
<a href="https://www.teamwork.com/" target="_blank">
<img height="35px" src="https://cdn.cosmicjs.com/ca146a20-bc5d-11ee-9be1-85f53db06a1d-teamwork-logo-2023.svg">
<a href="https://www.deepcloud.swiss/" target="_blank">
<img height="65px" src="https://cdn.cosmicjs.com/20504e40-6cbc-11ef-b5ae-a594bb4a8e67-deepcloud-light.svg">
</a>
</td>
</tr>
Expand All @@ -75,8 +75,18 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<tbody>
<tr>
<td>
<a href="https://github.com/sponsors/johnleider" target="_blank">
Your Logo Here
<a href="https://route4me.com/">
<img height="40px" src="https://cdn.cosmicjs.com/3b7a95b0-5360-11ef-b1ea-f56c65dfade9-route-4-me-light.png">
</a>
</td>
<td>
<a href="https://www.abacus.ch/">
<img height="40px" src="https://cdn.cosmicjs.com/0b978be0-6cbb-11ef-b5ae-a594bb4a8e67-abacus-light.svg">
</a>
</td>
<td>
<a href="https://www.hoop.swiss/">
<img height="40px" src="https://cdn.cosmicjs.com/94012850-6cbc-11ef-b5ae-a594bb4a8e67-hoop-light.svg">
</a>
</td>
</tr>
Expand All @@ -89,59 +99,63 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<tbody>
<tr>
<td>
<a href="https://careers.lmax.com/?utm_source=vuetify&utm_medium=github-link&utm_campaign=lmax-careers">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/lmax-exchange.png">
<a href="http://crossword-solver.io/">
<img height="35px" src="https://cdn.cosmicjs.com/098aa4e0-9749-11eb-bf6a-1ffd0f06b0f7-crossword-solver-logo-light.svg">
</a>
</td>
<td>
<a href="http://intygrate.com/?ref=vuetify-github">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/intygrate.png">
<td style="text-align: center;">
<a href="https://www.muenchen.de/">
<img height="30px" src="https://imgix.cosmicjs.com/af2ce530-eaa2-11ed-ba82-019c4666da06-itm-logo.png">
</a>
</td>
<td>
<a href="http://vuemastery.com/?ref=vuetify-github">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/vuemastery.svg">
<a href="https://careers.lmax.com/?utm_source=vuetify&utm_medium=github-link&utm_campaign=lmax-careers">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/lmax-exchange.png">
</a>
</td>
<td>
<a href="http://crossword-solver.io/">
<img height="35px" src="https://cdn.cosmicjs.com/098aa4e0-9749-11eb-bf6a-1ffd0f06b0f7-crossword-solver-logo-light.svg">
<a href="http://vuemastery.com/?ref=vuetify-github">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/vuemastery.svg">
</a>
</td>
</tr>
<tr></tr>
<tr>
<td>
<a href="https://www.slim.ai/">
<img height="30px" src="https://cdn.cosmicjs.com/e7d53ff0-4ca5-11ec-9940-53a088b36636-slim-ai.svg">
<a href="https://views4you.com/buy-instagram-followers/">
<img height="30px" src="https://cdn.cosmicjs.com/861b0ce0-50e4-11ef-b1ea-f56c65dfade9-views-4-you-light.png">
</a>
</td>
<td>
<a href="https://crosswordanswers911.net/">
<img height="30px" src="https://cdn.cosmicjs.com/ef6ea2a0-7ee1-11ed-8730-d9eebcd39d9f-crossword-answers-911.jpg">
<a href="https://uk.nongamstopcasinos.net/">
<img height="30px" src="https://cdn.cosmicjs.com/dddf2570-6925-11ef-a492-5bdc7520fe60-logo_dark-bg.png.webp">
</a>
</td>
<td style="text-align: center;">
<a href="https://www.muenchen.de/">
<img height="40px" src="https://imgix.cosmicjs.com/af2ce530-eaa2-11ed-ba82-019c4666da06-itm-logo.png">
<a href="https://poprey.com/buy-instagram-followers">
<img height="30px" src="https://cdn.cosmicjs.com/69ea08d0-7b20-11ef-915f-61acd7484848-256-1.png">
</a>
</td>
<td>
<a href="https://justanotherpanel.com/">
<img height="30px" src="https://cdn.cosmicjs.com/8d038320-6382-11ee-b975-cb0cfadd93ad-jap.png">
<a href="https://www.mediamister.com/">
<img height="30px" src="https://cdn.cosmicjs.com/750cbe80-8d34-11ef-b5a0-93db72e2be98-logo-1.svg">
</a>
</td>
</tr>
<tr></tr>
<tr>
<td style="text-align: center;">
<a href="https://www.slotozilla.com/">
<img height="30px" src="https://cdn.cosmicjs.com/21525470-ab03-11ef-bee4-3bb1d3c55332-256-2.png">
</a>
</td>
<td>
<a href="https://stormlikes.net/">
<img height="40px" src="https://cdn.cosmicjs.com/64e6f630-a980-11ee-b417-db331415685f-stormlikes.png">
<a href="https://word.tips/">
<img height="30px" src="https://cdn.cosmicjs.com/5b16bd20-afab-11ef-bee4-3bb1d3c55332-wordtips-light.svg">
</a>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
}
},
"npmClient": "pnpm",
"version": "3.7.4"
"version": "3.7.6"
}
2 changes: 1 addition & 1 deletion packages/api-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
"version": "3.7.4",
"version": "3.7.6",
"private": true,
"description": "",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/api-generator/src/locale/en/Select.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"props": {
"closeText": "Text set to to the inputs `aria-label` and `title` when input menu is closed.",
"closeText": "Text set to the inputs `aria-label` and `title` when input menu is closed.",
"chips": "Changes display of selections to chips.",
"closableChips": "Enables the [closable](/api/v-chip/#props-closable) prop on all [v-chip](/components/chips/) components.",
"hideSelected": "Do not display in the select menu items that are already selected.",
Expand All @@ -9,6 +9,6 @@
"menuProps": "Pass props through to the `v-menu` component. Accepts an object with anything from [v-menu](/api/v-menu/#props) props, camelCase keys are recommended.",
"multiple": "Changes select to multiple. Accepts array for value.",
"openOnClear": "Open's the menu whenever the clear icon is clicked.",
"openText": "Text set to to the inputs **aria-label** and **title** when input menu is open."
"openText": "Text set to the inputs **aria-label** and **title** when input menu is open."
}
}
2 changes: 1 addition & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A Vue.js project",
"private": true,
"author": "John Leider <[email protected]>",
"version": "3.7.4",
"version": "3.7.6",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/about/TeamMember.vue
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
color: '#212121',
href: `https://x.com/${props.member.twitter}`,
icon: '$x',
tooltip: 'X',
tooltip: 'Xitter',
})
}
Expand Down
4 changes: 4 additions & 0 deletions packages/docs/src/data/nav.json
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@
"title": "date-inputs",
"subfolder": "components"
},
{
"title": "file-upload",
"subfolder": "components"
},
{
"title": "number-inputs",
"subfolder": "components"
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/data/team.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"location": "Melbourne, Australia",
"name": "Kael Watts-Deuchar",
"team": "core",
"twitter": "kaelwd",
"joined": "Oct 2017"
},
"nekosaur": {
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/examples/border/colors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<v-col cols="auto">
<div class="text-center">
<v-sheet border="success sm" height="64" width="64" rounded></v-sheet>
<div class="text-caption">"sucess sm"</div>
<div class="text-caption">"success sm"</div>
</div>
</v-col>

Expand Down
Loading

0 comments on commit e6850d9

Please sign in to comment.