Skip to content

Commit

Permalink
Merge branch 'vuetifyjs:master' into bugfix/reactive-router-link
Browse files Browse the repository at this point in the history
  • Loading branch information
Antti-Palola authored Mar 23, 2024
2 parents 3012762 + 42b3c8a commit 8e1f82b
Show file tree
Hide file tree
Showing 83 changed files with 1,098 additions and 206 deletions.
4 changes: 2 additions & 2 deletions .github/actions/download-locales/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
using: composite
steps:
- name: Download eo-UY
uses: crowdin/github-action@v1.12.0
uses: crowdin/github-action@v1.19.0
with:
download_language: eo
config: crowdin.yml
Expand All @@ -21,7 +21,7 @@ runs:
export_only_approved: false
crowdin_branch_name: ${{ inputs.crowdin-branch }}
- name: Download zh-CN
uses: crowdin/github-action@v1.12.0
uses: crowdin/github-action@v1.19.0
with:
download_language: zh-CN
config: crowdin.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/nightly-release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
git config --global user.email "actions@github.com"
git config --global user.name "GitHub Actions"
shell: bash
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
repository: ${{ inputs.checkout-repo }}
ref: ${{ inputs.checkout-ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/yarn-install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Restore node_modules and cache, then run yarn install
runs:
using: composite
steps:
- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
node_modules
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ./.github/actions/yarn-install
- run: yarn build vuetify
- uses: ./.github/actions/upload-artifact
Expand All @@ -50,7 +50,7 @@ jobs:
matrix:
scopes: ['--scope vuetify --scope @vuetify/api-generator', '--scope vuetifyjs.com']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ./.github/actions/download-artifact
with:
name: vuetify-dist
Expand All @@ -65,19 +65,19 @@ jobs:
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ./.github/actions/yarn-install
- run: yarn run test:coverage -i
working-directory: ./packages/vuetify
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4

test-cypress:
name: Test (Cypress)
needs: pre_job
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ./.github/actions/yarn-install
- run: yarn cy:run --record --parallel --ci-build-id $GITHUB_RUN_ID
if: ${{ !startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs' }}
Expand All @@ -87,7 +87,7 @@ jobs:
- run: yarn cy:run
if: ${{ !startswith(github.ref, 'refs/tags/v') && github.repository_owner != 'vuetifyjs' }}
working-directory: ./packages/vuetify
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: failure()
with:
name: cypress-screenshots
Expand All @@ -99,7 +99,7 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: ./.github/actions/download-artifact
Expand All @@ -125,7 +125,7 @@ jobs:
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
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ./.github/actions/download-artifact
with:
name: vuetify-dist
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/next')
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ./.github/actions/download-artifact
with:
name: docs-dist
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/crowdin-uploads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Upload
uses: crowdin/github-action@v1.12.0
uses: crowdin/github-action@v1.19.0
with:
config: crowdin.yml
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
8 changes: 4 additions & 4 deletions .github/workflows/nightly-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'vuetifyjs' }}
steps:
- uses: actions/checkout@v2
- uses: actions/github-script@v6
- uses: actions/checkout@v4
- uses: actions/github-script@v7
with:
script: |
const pr = await github.rest.pulls.get({
Expand All @@ -32,8 +32,8 @@ jobs:
release-id: pr-${{ github.event.inputs.pr }}.${{ env.SHORT_SHA }}
npm-tag: pr
npm-token: ${{ secrets.NPM_TOKEN }}
- uses: actions/checkout@v2
- uses: actions/github-script@v6
- uses: actions/checkout@v4
- uses: actions/github-script@v7
with:
script: |
const fullVersion = process.env.FULL_VERSION
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nightly-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- branch: 'v2-dev'
tag: 'v2-dev'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}
fetch-depth: 0
Expand All @@ -45,14 +45,14 @@ jobs:
release-id: ${{ matrix.branch }}.${{ env.RELEASE_ID }}
npm-tag: ${{ matrix.tag }}
npm-token: ${{ secrets.NPM_TOKEN }}
- uses: actions/checkout@v2
- uses: actions/checkout@v4

percy:
name: Visual regression tests
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'vuetifyjs' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
Expand All @@ -73,7 +73,7 @@ jobs:
PERCY_BRANCH: master
PERCY_TARGET_BRANCH: master
PERCY_COMMIT: ${{ env.COMMIT }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: failure()
with:
name: cypress-screenshots
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: vuetifyjs/triage-action@master
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
"version": "3.5.9",
"version": "3.5.11",
"useWorkspaces": true
}
4 changes: 2 additions & 2 deletions 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.5.9",
"version": "3.5.11",
"private": true,
"description": "",
"scripts": {
Expand All @@ -17,7 +17,7 @@
"ts-morph": "^20.0.0",
"tsx": "^4.6.2",
"vue": "^3.4.19",
"vuetify": "^3.5.9"
"vuetify": "^3.5.11"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
Expand Down
3 changes: 3 additions & 0 deletions packages/docs/auto-imports.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ declare global {
const useOneStore: typeof import('@vuetify/one')['useOneStore']
const usePinsStore: typeof import('./src/stores/pins')['usePinsStore']
const usePlayground: typeof import('./src/composables/playground')['usePlayground']
const useProductsStore: typeof import('@vuetify/one')['useProductsStore']
const usePromotionsStore: typeof import('./src/stores/promotions')['usePromotionsStore']
const useReleasesStore: typeof import('./src/stores/releases')['useReleasesStore']
const useRoute: typeof import('vue-router')['useRoute']
Expand Down Expand Up @@ -164,6 +165,7 @@ declare module 'vue' {
readonly useOneStore: UnwrapRef<typeof import('@vuetify/one')['useOneStore']>
readonly usePinsStore: UnwrapRef<typeof import('./src/stores/pins')['usePinsStore']>
readonly usePlayground: UnwrapRef<typeof import('./src/composables/playground')['usePlayground']>
readonly useProductsStore: UnwrapRef<typeof import('@vuetify/one')['useProductsStore']>
readonly usePromotionsStore: UnwrapRef<typeof import('./src/stores/promotions')['usePromotionsStore']>
readonly useReleasesStore: UnwrapRef<typeof import('./src/stores/releases')['useReleasesStore']>
readonly useRoute: UnwrapRef<typeof import('vue-router')['useRoute']>
Expand Down Expand Up @@ -252,6 +254,7 @@ declare module '@vue/runtime-core' {
readonly useOneStore: UnwrapRef<typeof import('@vuetify/one')['useOneStore']>
readonly usePinsStore: UnwrapRef<typeof import('./src/stores/pins')['usePinsStore']>
readonly usePlayground: UnwrapRef<typeof import('./src/composables/playground')['usePlayground']>
readonly useProductsStore: UnwrapRef<typeof import('@vuetify/one')['useProductsStore']>
readonly usePromotionsStore: UnwrapRef<typeof import('./src/stores/promotions')['usePromotionsStore']>
readonly useReleasesStore: UnwrapRef<typeof import('./src/stores/releases')['useReleasesStore']>
readonly useRoute: UnwrapRef<typeof import('vue-router')['useRoute']>
Expand Down
3 changes: 3 additions & 0 deletions packages/docs/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ declare module 'vue' {
AppBarThemeToggle: typeof import('./src/components/app/bar/ThemeToggle.vue')['default']
AppBtn: typeof import('./src/components/app/Btn.vue')['default']
AppCaption: typeof import('./src/components/app/Caption.vue')['default']
AppCommitBtn: typeof import('./src/components/app/CommitBtn.vue')['default']
AppDivider: typeof import('./src/components/app/Divider.vue')['default']
AppDrawerAppend: typeof import('./src/components/app/drawer/Append.vue')['default']
AppDrawerDrawer: typeof import('./src/components/app/drawer/Drawer.vue')['default']
Expand Down Expand Up @@ -86,6 +87,7 @@ declare module 'vue' {
AppToc: typeof import('./src/components/app/Toc.vue')['default']
AppTooltipBtn: typeof import('./src/components/app/TooltipBtn.vue')['default']
AppV2Banner: typeof import('./src/components/app/V2Banner.vue')['default']
AppVersionBtn: typeof import('./src/components/app/VersionBtn.vue')['default']
AppVerticalDivider: typeof import('./src/components/app/VerticalDivider.vue')['default']
Backmatter: typeof import('./src/components/Backmatter.vue')['default']
ComponentsListItem: typeof import('./src/components/components/ListItem.vue')['default']
Expand All @@ -97,6 +99,7 @@ declare module 'vue' {
DocMadeWithVueAttribution: typeof import('./src/components/doc/MadeWithVueAttribution.vue')['default']
DocMadeWithVuetifyGallery: typeof import('./src/components/doc/MadeWithVuetifyGallery.vue')['default']
DocMadeWithVuetifyLink: typeof import('./src/components/doc/MadeWithVuetifyLink.vue')['default']
DocPremiumThemesGallery: typeof import('./src/components/doc/PremiumThemesGallery.vue')['default']
DocReadyForMore: typeof import('./src/components/doc/ReadyForMore.vue')['default']
DocRelatedPage: typeof import('./src/components/doc/RelatedPage.vue')['default']
DocRelatedPages: typeof import('./src/components/doc/RelatedPages.vue')['default']
Expand Down
8 changes: 4 additions & 4 deletions 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 <john@vuetifyjs.com>",
"version": "3.5.9",
"version": "3.5.11",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
Expand All @@ -23,7 +23,7 @@
"@cosmicjs/sdk": "^1.0.11",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"@vuetify/one": "^1.2.4",
"@vuetify/one": "^1.5.0",
"algoliasearch": "^4.20.0",
"fflate": "^0.8.1",
"isomorphic-fetch": "^3.0.0",
Expand All @@ -38,7 +38,7 @@
"vue-i18n": "^9.7.1",
"vue-instantsearch": "^4.12.1",
"vue-prism-component": "^2.0.0",
"vuetify": "^3.5.9"
"vuetify": "^3.5.11"
},
"devDependencies": {
"@emailjs/browser": "^3.11.0",
Expand All @@ -50,7 +50,7 @@
"@vitejs/plugin-basic-ssl": "^1.0.2",
"@vitejs/plugin-vue": "^4.5.2",
"@vue/compiler-sfc": "^3.4.19",
"@vuetify/api-generator": "^3.5.9",
"@vuetify/api-generator": "^3.5.11",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^2.30.0",
Expand Down
2 changes: 0 additions & 2 deletions packages/docs/src/components/Backmatter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

<DocUpNext />

<PromotedPromoted />

<DocContribute />
</section>
</template>
18 changes: 18 additions & 0 deletions packages/docs/src/components/app/CommitBtn.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<template>
<v-btn
v-if="commits.latest"
:href="`https://github.com/vuetifyjs/vuetify/commit/${commits.latest?.sha}`"
:text="commits.latest?.sha.slice(0, 7)"
class="text-caption"
prepend-icon="mdi-source-commit"
rel="noopener noreferrer"
size="small"
target="_blank"
variant="text"
slim
/>
</template>

<script lang="ts" setup>
const commits = useCommitsStore()
</script>
16 changes: 16 additions & 0 deletions packages/docs/src/components/app/VersionBtn.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<template>
<v-btn
:text="version"
:to="rpath(`/getting-started/release-notes/?version=v${version}`)"
class="text-caption"
prepend-icon="mdi-tag-outline"
size="small"
variant="text"
slim
/>
</template>

<script lang="ts" setup>
// Utilities
import { version } from 'vuetify'
</script>
27 changes: 2 additions & 25 deletions packages/docs/src/components/app/drawer/Append.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,13 @@
<AppDrawerDrawerToggleRail v-if="auth.isSubscriber" class="me-2" />

<div class="d-flex ms-auto overflow-hidden">
<v-btn
v-if="commits.latest"
:href="`https://github.com/vuetifyjs/vuetify/commit/${commits.latest?.sha}`"
:text="commits.latest?.sha.slice(0, 7)"
class="text-caption me-2"
prepend-icon="mdi-source-commit"
rel="noopener noreferrer"
size="small"
target="_blank"
variant="text"
slim
/>
<AppCommitBtn class="me-2" />

<v-btn
:text="version"
:to="rpath(`/getting-started/release-notes/?version=v${version}`)"
class="text-caption"
prepend-icon="mdi-tag-outline"
size="small"
variant="text"
slim
/>
<AppVersionBtn />
</div>
</div>
</template>

<script setup lang="ts">
// Utilities
import { version } from 'vuetify'
const auth = useAuthStore()
const commits = useCommitsStore()
</script>
Loading

0 comments on commit 8e1f82b

Please sign in to comment.