Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
johnleider committed Mar 16, 2024
2 parents 27b172b + a997c42 commit e6653ee
Show file tree
Hide file tree
Showing 96 changed files with 1,766 additions and 758 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 "[email protected]"
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.8",
"version": "3.5.9",
"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.8",
"version": "3.5.9",
"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.8"
"vuetify": "^3.5.9"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
Expand Down
1 change: 1 addition & 0 deletions packages/api-generator/src/locale/en/VList.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"props": {
"itemType": "Designates the key on the supplied items that is used for determining the nodes type.",
"disabled": "Puts all children inputs into a disabled state.",
"inactive": "If set, the list tile will not be rendered as a link even if it has to/href prop or @click handler.",
"lines": "Designates a **minimum-height** for all children `v-list-item` components. This prop uses [line-clamp](https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-line-clamp) and is not supported in all browsers.",
Expand Down
7 changes: 6 additions & 1 deletion packages/api-generator/src/locale/en/VListGroup.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"props": {
"disabled": "Puts all children inputs into a disabled state.",
"collapseIcon": "Icon to display when the list item is expanded.",
"expandIcon": "Icon to display when the list item is collapsed.",
"group": "Assign a route namespace. Accepts a string or regexp for determining active state.",
"noAction": "Removes left padding assigned for action icons from group items.",
"prependIcon": "Prepends an icon to the component, uses the same syntax as `v-icon`.",
"subGroup": "Designate the component as nested list group.",
"subgroup": "Designate the component as nested list group.",
"value": "Expands / Collapse the list-group."
},
"exposed": {
"isOpen": "Returns the current state of the list-group."
}
}
18 changes: 11 additions & 7 deletions packages/api-generator/src/locale/en/VTreeview.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"props": {
"activatable": "Allows user to mark a node as active by clicking on it.",
"active": "Syncable prop that allows one to control which nodes are active. The array consists of the `item-key` of each active item.",
"color": "Applies specified color to the active node - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"dense": "Decreases the height of the items.",
"disabled": "Disables selection for all nodes.",
Expand Down Expand Up @@ -35,14 +34,19 @@
},
"slots": {
"append": "Appends content after label.",
"prepend": "Prepends content before label."
"prepend": "Prepends content before label.",
"header": "Slot for custom header.",
"subheader": "Slot for custom subheader.",
"divider": "Slot for custom divider."
},
"events": {
"input": "Emits the array of selected items when this value changes.",
"update:active": "Emits the array of active items when this value changes.",
"update:open": "Emits the array of open items when this value changes."
"click:open": "Emits the item when it is clicked to open.",
"click:select": "Emits the item when it is clicked to select.",
"update:activated": "Emits the array of active items when this value changes.",
"update:opened": "Emits the array of open items when this value changes.",
"update:selected": "Emits the array of selected items when this value changes."
},
"functions": {
"updateAll": "Opens or closes all nodes."
"exposed": {
"open": "Open a node by id"
}
}
1 change: 1 addition & 0 deletions packages/api-generator/src/locale/en/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"appendAvatar": "Appends a [v-avatar](/components/avatars/) component after default content in the **append** slot.",
"appendIcon": "Creates a [v-icon](/api/v-icon/) component after default content in the **append** slot.",
"auto": "Centers list on selected element.",
"baseColor": "Sets the color of component when not focused.",
"bgColor": "Applies specified color to the control's background. Used on components that also support the **color** prop. - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"clearable": "Allows for the component to be cleared.",
"color": "Applies specified color to the control - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
Expand Down
2 changes: 2 additions & 0 deletions packages/api-generator/src/locale/en/nested.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"props": {
"activated": "Array of ids of activated nodes.",
"activeStrategy": "Affects how items with children behave when activated.\n- **leaf:** Only leaf nodes (items without children) can be activated.\n- **independent:** All nodes can be activated whether they have children or not.\n- **classic:** Activating a parent node will cause all children to be activated.",
"opened": "An array containing the values of currently opened groups. Can be two-way bound with `v-model:opened`.",
"openStrategy": "Affects how items with children behave when expanded.\n- **multiple:** Any number of groups can be open at once.\n- **single:** Only one group at each level can be open, opening a group will cause others to close.\n- **list:** Multiple, but all other groups will close when an item is selected.",
"selected": "An array containing the values of currently selected items. Can be two-way bound with `v-model:selected`.",
Expand Down
1 change: 1 addition & 0 deletions packages/docs/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ declare module 'vue' {
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']
DashboardDashboardEmptyState: typeof import('./src/components/dashboard/DashboardEmptyState.vue')['default']
DocContribute: typeof import('./src/components/doc/Contribute.vue')['default']
DocExplorer: typeof import('./src/components/doc/Explorer.vue')['default']
DocIconList: typeof import('./src/components/doc/IconList.vue')['default']
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<meta name="theme-color" content="#1867c0">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5, minimal-ui, shrink-to-fit=no">
<!-- @inject-meta -->
<script defer src="https://polyfill.io/v3/polyfill.min.js?features=IntersectionObserver,ResizeObserver,WebAnimations,Object.fromEntries,Array.prototype.at"></script>
<script defer src="https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?features=IntersectionObserver,ResizeObserver,WebAnimations,Object.fromEntries,Array.prototype.at"></script>
<link rel="preconnect" href="https://www.google-analytics.com">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://polyfill.io">
<link rel="preconnect" href="https://cdnjs.cloudflare.com">
<link rel="preconnect" href="https://www.googletagmanager.com">
<link rel="preconnect" href="https://api.cosmicjs.com">
<link rel="preconnect" href="https://cdn.cosmicjs.com">
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 <[email protected]>",
"version": "3.5.8",
"version": "3.5.9",
"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.1.1",
"@vuetify/one": "^1.3.1",
"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.8"
"vuetify": "^3.5.9"
},
"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.8",
"@vuetify/api-generator": "^3.5.9",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^2.30.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/app/bar/Logo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
const theme = useTheme()
const logo = computed(() => {
const file = `${theme.name.value}.svg`
const file = `${theme.current.value.dark ? 'dark' : 'light'}.svg`
const logo = 'vuetify-logo-v3-slim'
return `${logo}-${lgAndUp.value ? 'text-' : ''}${file}`
Expand Down
1 change: 1 addition & 0 deletions packages/docs/src/components/app/settings/Options.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
text="general-message"
title="general"
/>
<AppSettingsOptionsPinOption />

<AppSettingsOptionsCodeOption />

Expand Down
20 changes: 15 additions & 5 deletions packages/docs/src/components/app/settings/options/ThemeOption.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,25 @@
icon: 'mdi-weather-night',
value: 'dark',
},
{
text: 'Blackguard',
icon: 'mdi-space-invaders',
value: 'blackguard',
},
{
text: 'Polaris',
icon: 'mdi-image-filter-hdr',
value: 'polaris',
},
{
text: 'Nebula',
icon: 'mdi-rocket-launch-outline',
value: 'nebula',
},
{
text: t('system'),
icon: 'mdi-desktop-tower-monitor',
value: 'system',
},
{
text: t('blackguard'),
icon: 'mdi-space-invaders',
value: 'blackguard',
},
]
</script>
Loading

0 comments on commit e6653ee

Please sign in to comment.