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 Dec 17, 2023
2 parents e1d0e03 + d0765f1 commit 3572074
Show file tree
Hide file tree
Showing 230 changed files with 6,015 additions and 4,963 deletions.
16 changes: 14 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ module.exports = {
sourceType: 'module',
project: './tsconfig.eslint.json',
tsconfigRootDir: __dirname,
extraFileExtensions: ['.vue'],
extraFileExtensions: ['.vue', '.json'],
suppressDeprecatedPropertyWarnings: true,
},
extends: [
'standard',
Expand Down Expand Up @@ -190,7 +191,7 @@ module.exports = {
// '@typescript-eslint/no-unnecessary-condition': 'error',
'@typescript-eslint/prefer-includes': 'error',
// '@typescript-eslint/prefer-nullish-coalescing': 'warn',
'@typescript-eslint/prefer-optional-chain': 'warn',
// '@typescript-eslint/prefer-optional-chain': 'warn',
'@typescript-eslint/prefer-string-starts-ends-with': 'error',
'@typescript-eslint/prefer-ts-expect-error': 'warn',
'@typescript-eslint/restrict-plus-operands': 'error',
Expand Down Expand Up @@ -238,5 +239,16 @@ module.exports = {
'import/no-duplicates': 'off',
},
},
{
files: '**/*.json',
rules: {
quotes: ['error', 'double'],
'comma-dangle': ['error', 'never'],
'quote-props': ['error', 'always'],
'max-len': 'off',
'no-unused-expressions': 'off',
'no-template-curly-in-string': 'off',
},
},
],
}
1 change: 1 addition & 0 deletions .github/.git_commit_msg.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

# ------------------------ >8 ------------------------
# |<---- Using a Maximum Of 50 Characters ---->| Hard limit to 72 -->|
# <type>: <subject>
#
Expand Down
5 changes: 5 additions & 0 deletions .github/actions/yarn-install/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: Yarn install
description: Restore node_modules and cache, then run yarn install

inputs:
npm-token:
description: 'NPM token'
required: true

runs:
using: composite
steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

jobs:
pre_job:
Expand All @@ -16,7 +17,7 @@ jobs:
should_skip: ${{ steps.skip_check.outputs.should_skip }}
steps:
- id: skip_check
if: ${{ !startswith(github.ref, 'refs/tags/v') }}
if: ${{ !startswith(github.ref, 'refs/tags/v') && github.ref != 'refs/heads/master' }}
uses: fkirc/skip-duplicate-actions@master
with:
skip_after_successful_duplicate: 'true'
Expand Down
5 changes: 0 additions & 5 deletions .gitpod.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
@vuetify:registry=https://registry.npmjs.org/
9 changes: 0 additions & 9 deletions Dockerfile

This file was deleted.

16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ 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://www.teamwork.com/" target="_blank">
<img height="35px" src="https://cdn.cosmicjs.com/4fbb7ab0-612e-11ed-af1a-0faa4245afee-teamwork.png">
</a>
</td>
</tr>
</tbody>
</table>

<h3 align="center"><b>Palladium Sponsors</b></h3>
<h3 align="center"><b>Diamond Sponsors</b></h3>

<table>
<tbody>
Expand Down Expand Up @@ -116,11 +116,6 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<img height="30px" src="https://cdn.cosmicjs.com/e7d53ff0-4ca5-11ec-9940-53a088b36636-slim-ai.svg">
</a>
</td>
<td>
<a href="https://netticasinohex.com/">
<img height="30px" src="https://cdn.cosmicjs.com/4442ad40-1fdc-11ed-a5bd-ef15a2e468ca-hex-ca-light-sm.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">
Expand All @@ -131,6 +126,11 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<img height="40px" src="https://imgix.cosmicjs.com/af2ce530-eaa2-11ed-ba82-019c4666da06-itm-logo.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>
</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,6 +13,6 @@
}
},
"npmClient": "yarn",
"version": "3.4.0",
"version": "3.4.7",
"useWorkspaces": true
}
64 changes: 33 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,41 @@
"all-checks": "yarn lint && lerna run test && lerna run cy:run && yarn build"
},
"engines": {
"node": ">=12",
"node": ">=18.19.0 || >=20.6.0",
"yarn": "^1.19"
},
"devDependencies": {
"@babel/cli": "^7.21.0",
"@babel/core": "^7.21.3",
"@babel/preset-env": "^7.20.2",
"@babel/preset-typescript": "^7.21.0",
"@babel/cli": "^7.23.4",
"@babel/core": "^7.23.3",
"@babel/preset-env": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@mdi/font": "6.2.95",
"@mdi/js": "6.2.95",
"@mdi/svg": "6.2.95",
"@octokit/core": "^4.2.0",
"@typescript-eslint/eslint-plugin": "^5.57.0",
"@typescript-eslint/parser": "^5.57.0",
"@vue/compiler-sfc": "^3.3.7",
"@vueuse/head": "^1.1.23",
"@octokit/core": "^5.0.2",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"@unhead/vue": "^1.8.8",
"@vue/compiler-sfc": "^3.3.9",
"@vueuse/head": "^1.3.1",
"babel-eslint": "^10.1.0",
"babel-jest": "^28.1.3",
"conventional-changelog-cli": "^2.2.2",
"conventional-changelog-cli": "^4.1.0",
"conventional-changelog-vuetify": "^1.1.0",
"conventional-github-releaser": "^3.1.5",
"cross-env": "^7.0.3",
"cross-spawn": "^6.0.5",
"eslint": "^8.37.0",
"eslint-config-standard": "^17.0.0",
"cross-spawn": "^7.0.3",
"eslint": "^8.54.0",
"eslint-config-standard": "^17.1.0",
"eslint-formatter-codeframe": "^7.32.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-local-rules": "^1.3.2",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-local-rules": "^2.0.1",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-sonarjs": "^0.19.0",
"eslint-plugin-vue": "^9.10.0",
"eslint-plugin-vuetify": "^2.0.0-beta.2",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-sonarjs": "^0.23.0",
"eslint-plugin-vue": "^9.18.1",
"eslint-plugin-vuetify": "^2.1.0",
"husky": "^3.0.1",
"inquirer": "^6.5.2",
"jest": "^28.1.3",
Expand All @@ -72,18 +73,19 @@
"magic-string": "^0.30.0",
"mkdirp": "^3.0.1",
"moment": "^2.29.4",
"patch-package": "^6.5.1",
"sass": "^1.60.0",
"semver": "^6.2.0",
"patch-package": "^8.0.0",
"rimraf": "^5.0.5",
"sass": "^1.69.5",
"semver": "^7.5.4",
"shelljs": "^0.8.5",
"typescript": "^5.0.2",
"typescript": "~5.2.2",
"upath": "^2.0.1",
"vite-plugin-inspect": "^0.7.18",
"vite-plugin-warmup": "^0.0.2",
"vue": "^3.3.7",
"vite-plugin-inspect": "^0.7.42",
"vite-plugin-warmup": "^0.1.0",
"vue": "^3.3.9",
"vue-analytics": "^5.16.1",
"vue-router": "^4.1.6",
"vue-tsc": "^1.6.4",
"yargs": "^17.7.1"
"vue-router": "^4.2.5",
"vue-tsc": "^1.8.22",
"yargs": "^17.7.2"
}
}
19 changes: 9 additions & 10 deletions packages/api-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
{
"name": "@vuetify/api-generator",
"version": "3.4.0",
"version": "3.4.7",
"private": true,
"description": "",
"scripts": {
"build": "node --loader tsx --no-warnings src/index.ts",
"lint": "eslint --ext .ts src -f codeframe --max-warnings 0",
"build": "node --import tsx --no-warnings src/index.ts",
"lint": "eslint --ext .ts,.json src -f codeframe --max-warnings 0",
"lint:fix": "yarn lint --fix"
},
"author": "",
"license": "ISC",
"dependencies": {
"deepmerge": "^4.3.1",
"piscina": "^4.1.0",
"prettier": "^3.0.3",
"rimraf": "^3.0.2",
"ts-morph": "^18.0.0",
"tsx": "^3.14.0",
"vue": "^3.3.4",
"vuetify": "^3.4.0"
"piscina": "^4.2.0",
"prettier": "^3.1.0",
"ts-morph": "^20.0.0",
"tsx": "^4.6.2",
"vue": "^3.3.9",
"vuetify": "^3.4.7"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
Expand Down
4 changes: 2 additions & 2 deletions packages/api-generator/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { addDescriptions, addDirectiveDescriptions, addPropData, stringifyProps
import * as os from 'os'
import { mkdirp } from 'mkdirp'
import { createVeturApi } from './vetur'
import rimraf from 'rimraf'
import { rimraf } from 'rimraf'
import { createWebTypesApi } from './web-types'
import inspector from 'inspector'
import yargs from 'yargs'
Expand Down Expand Up @@ -50,7 +50,7 @@ const run = async () => {

const template = await fs.readFile('./templates/component.d.ts', 'utf-8')

rimraf.sync(path.resolve('./dist'))
await rimraf(path.resolve('./dist'))
await fs.mkdir(path.resolve('./dist'))
await mkdirp('./templates/tmp')
for (const component in components) {
Expand Down
19 changes: 18 additions & 1 deletion packages/api-generator/src/locale/en/Slider.json
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
{}
{
"props": {
"max": "Sets the maximum allowed value.",
"min": "Sets the minimum allowed value.",
"reverse": "Reverses the slider direction.",
"showTicks": "Show track ticks. If `true` it shows ticks when using slider. If set to `'always'` it always shows ticks.",
"step": "If greater than 0, sets step interval for ticks.",
"thumbColor": "Sets the thumb and thumb label color.",
"thumbLabel": "Show thumb label. If `true` it shows label when using slider. If set to `'always'` it always shows label.",
"thumbSize": "Controls the size of the thumb label.",
"ticks": "Show track ticks. If `true` it shows ticks when using slider. If set to `'always'` it always shows ticks.",
"tickLabels": "When provided with Array<string>, will attempt to map the labels to each step in index order.",
"tickSize": "Controls the size of **ticks**",
"trackColor": "Sets the track's color",
"trackFillColor": "Sets the track's fill color",
"trackSize": "Sets the track's size (height)."
}
}
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VBtn.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"flat": "Removes the button box shadow. This is different than using the 'flat' variant.",
"icon": "Apply a specific icon using the [v-icon](/components/icons/) component. The button will become _round_.",
"plain": "Removes the default background change applied when hovering over the button.",
"stacked": "Displays the button as a flex-column."
"stacked": "Displays the button as a flex-column.",
"slim": "Reduces padding to 0 8px."
}
}
3 changes: 1 addition & 2 deletions packages/api-generator/src/locale/en/VDataTableRows.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"props": {
"loading": "Displays `loading` slot if set to `true`",
"loadingText": "Text shown when the data is loading.",
"multiSort": "Allows sorting by multiple columns.",
"rowHeight": "Height of each row in pixels."
"multiSort": "Allows sorting by multiple columns."
},
"events": {
"click:row": "Emitted when a row is clicked. Native event is passed as the first argument, row data as the second."
Expand Down
2 changes: 2 additions & 0 deletions packages/api-generator/src/locale/en/VFileInput.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"props": {
"accept": "One or more [unique file type specifiers](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#Unique_file_type_specifiers) describing file types to allow.",
"chips": "Changes display of selections to chips.",
"counter": "Displays the number of selected files.",
"counterSizeString": "The text displayed when using the **counter** and **show-size** props. Can also be customized globally on the [internationalization page](/customization/internationalization).",
"counterString": "The text displayed when using the **counter** prop. Can also be customized globally on the [internationalization page](/customization/internationalization).",
"hideInput": "Display the icon only without the input (file names).",
Expand All @@ -12,6 +13,7 @@
"value": "A single or array of [File objects](https://developer.mozilla.org/en-US/docs/Web/API/File)."
},
"slots": {
"counter": "Slot for the input’s counter text.",
"selection": "Slot for defining a custom appearance for selected item(s). Provides the current **index**, **text** (truncated) and [file](https://developer.mozilla.org/en-US/docs/Web/API/File)."
},
"events": {
Expand Down
6 changes: 6 additions & 0 deletions packages/api-generator/src/locale/en/VInput.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"dense": "Reduces the input height.",
"height": "Sets the height of the input.",
"hint": "Displays hint text below the input when focused. Force this always open with the [persistent-hint](#props-persistent-hint) property.",
"id": "Sets the DOM id on the component.",
"loading": "Displays linear progress bar. Can either be a String which specifies which color is applied to the progress bar (any material color or theme color - **primary**, **secondary**, **success**, **info**, **warning**, **error**) or a Boolean which uses the component **color** (set by color prop - if it's supported by the component) or the primary color.",
"persistentHint": "Forces [hint](#props-hint) to always be visible.",
"placeholder": "Sets the input's placeholder text.",
Expand All @@ -24,5 +25,10 @@
"click:prepend": "Emitted when prepended icon is clicked.",
"mousedown": "Emitted when click is pressed.",
"mouseup": "Emitted when click is released."
},
"exposed": {
"reset": "Resets the input value.",
"resetValidation": "Resets validation of the input without modifying its value.",
"validate": "Validates the input's value."
}
}
6 changes: 5 additions & 1 deletion packages/api-generator/src/locale/en/VLabel.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{}
{
"props": {
"clickable": "Changes the cursor to a pointer when the mouse is over the element."
}
}
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VList.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"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.",
"link": "Applies `v-list-item` hover styles. Useful when using the item is an _activator_.",
"nav": "An alternative styling that reduces `v-list-item` width and rounds the corners. Typically used with **[v-navigation-drawer](/components/navigation-drawers)**.",
"subheader": "Removes the top padding from `v-list-subheader` components. When used as a **String**, renders a subheader for you."
"subheader": "Removes the top padding from `v-list-subheader` components. When used as a **String**, renders a subheader for you.",
"slim": "Reduces horizontal spacing for badges, icons, tooltips, and avatars within slim list items to create a more compact visual representation."
}
}
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VListItem.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"props": {
"active": "Controls the **active** state of the item. This is typically used to highlight the component,",
"active": "Controls the **active** state of the item. This is typically used to highlight the component.",
"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 (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.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"location": "Specifies the anchor point for positioning the component, using directional cues to align it either horizontally, vertically, or both..",
"openOnClick": "Activate the component when the activator is clicked.",
"openOnFocus": "Activate the component when the activator is focused.",
"openOnHover": "Activate the component when the activator is hovered.",
"target": "For locationStrategy=\"connected\", specify an element or array of x,y coordinates that the overlay should position itself relative to. This will be the activator element by default."
}
}
Loading

0 comments on commit 3572074

Please sign in to comment.