Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
KaelWD committed Aug 15, 2024
2 parents 2336637 + 76af55c commit 4d82129
Show file tree
Hide file tree
Showing 72 changed files with 3,197 additions and 2,424 deletions.
3 changes: 3 additions & 0 deletions .github/actions/pnpm-install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ runs:
/home/runner/.cache/Cypress
/home/runner/.pnpm-store
key: pnpm-${{ runner.os }}-${{ hashFiles('./pnpm-lock.yaml') }}
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: pnpm/action-setup@v4
- run: pnpm i --frozen-lockfile
shell: bash
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
auto-install-peers=false
ignore-workspace-root-check=true
shell-emulator=true
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
22.6.0
33 changes: 19 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
"vue-ecosystem-ci:test": "pnpm --filter vuetify run lint && pnpm --filter vuetify run test"
},
"engines": {
"node": ">=18.19.0 || >=20.6.0"
"node": ">=22.0.0"
},
"devDependencies": {
"@babel/cli": "^7.24.1",
"@babel/core": "^7.24.4",
"@babel/preset-env": "^7.24.4",
"@babel/preset-typescript": "^7.24.1",
"@mdi/font": "6.2.95",
"@mdi/js": "6.2.95",
"@mdi/svg": "6.2.95",
"@babel/cli": "^7.24.8",
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.3",
"@babel/preset-typescript": "^7.24.7",
"@mdi/font": "7.4.47",
"@mdi/js": "7.4.47",
"@mdi/svg": "7.4.47",
"@octokit/core": "^5.2.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@unhead/vue": "^1.9.4",
"@vue/compiler-sfc": "^3.4.27",
"@vue/runtime-core": "^3.4.27",
Expand All @@ -50,7 +50,6 @@
"conventional-changelog-cli": "^3.0.0",
"conventional-changelog-vuetify": "^1.2.1",
"conventional-github-releaser": "^3.1.5",
"cross-env": "^7.0.3",
"cross-spawn": "^7.0.3",
"eslint": "^8.57.0",
"eslint-config-standard": "^17.1.0",
Expand All @@ -76,18 +75,24 @@
"moment": "^2.30.1",
"rimraf": "^5.0.5",
"sass": "^1.77.8",
"sass-embedded": "^1.77.8",
"semver": "^7.6.0",
"shelljs": "^0.8.5",
"stringify-object": "^5.0.0",
"typescript": "~5.3.3",
"typescript": "~5.5.4",
"upath": "^2.0.1",
"vite-plugin-inspect": "^0.8.3",
"vite-plugin-warmup": "^0.1.0",
"vue": "^3.4.27",
"vue-analytics": "^5.16.1",
"vue-router": "^4.3.0",
"vue-tsc": "^1.8.27",
"vue-tsc": "^2.0.29",
"yargs": "^17.7.2"
},
"packageManager": "pnpm@9.5.0"
"packageManager": "pnpm@9.6.0",
"pnpm": {
"patchedDependencies": {
"@mdi/js@7.4.47": "patches/@mdi__js@7.4.47.patch"
}
}
}
1 change: 1 addition & 0 deletions packages/api-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"vuetify": "workspace:*"
},
"devDependencies": {
"@types/lodash-es": "^4.17.12",
"@types/stringify-object": "^4.0.5",
"eslint": "^8.57.0",
"lodash-es": "^4.17.21",
Expand Down
4 changes: 2 additions & 2 deletions packages/api-generator/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import fs from 'fs/promises'
import path from 'upath'
import { components } from 'vuetify/dist/vuetify-labs.js'
import importMap from 'vuetify/dist/json/importMap.json' assert { type: 'json' }
import importMapLabs from 'vuetify/dist/json/importMap-labs.json' assert { type: 'json' }
import importMap from 'vuetify/dist/json/importMap.json' with { type: 'json' }
import importMapLabs from 'vuetify/dist/json/importMap-labs.json' with { type: 'json' }
import { kebabCase } from './helpers/text'
import type { BaseData, ComponentData, DirectiveData } from './types'
import { generateComposableDataFromTypes, generateDirectiveDataFromTypes } from './types'
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VListItem.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"color": "Applies specified color to the control when in an **active** state or **input-value** is **true** - 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),",
"contained": "Changes the component style by changing how color is applied to the background.",
"title": "Generates a `v-list-item-title` component with the supplied value. Note that this overrides the native [`title`](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/title) attribute, that must be set with `v-bind:title.attr` instead.",
"value": "The value used for selection.",
"value": "The value used for selection. Obtained from [`v-list`](/api/v-list)'s `v-model:selected` when the item is selected.",
"lines": "The line declaration specifies the minimum height of the item and can also be controlled from v-list with the same prop.",
"nav": "Reduces the width v-list-item takes up as well as adding a border radius.",
"slim": "Reduces horizontal spacing for badges, icons, tooltips, and avatars to create a more compact visual representation."
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ async function loadLocale (componentName: string, locale: string): Promise<Recor
}
try {
const data = await import(`../src/locale/${cacheKey}.json`, {
assert: { type: 'json' },
with: { type: 'json' },
})
localeCache.set(cacheKey, data.default)
return data.default
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/web-types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'fs'
import { capitalize } from './helpers/text'
import type { ComponentData, DirectiveData } from './types'
import pkg from '../package.json' assert { type: 'json' }
import pkg from '../package.json' with { type: 'json' }

export const createWebTypesApi = (componentData: ComponentData[], directiveData: DirectiveData[]) => {
const getDocUrl = (cmp: string, heading?: string) =>
Expand Down
Loading

0 comments on commit 4d82129

Please sign in to comment.