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 Jan 10, 2024
2 parents 8414baf + 1ff7faa commit 22a5ef9
Show file tree
Hide file tree
Showing 245 changed files with 3,806 additions and 25,623 deletions.
5 changes: 0 additions & 5 deletions .github/actions/yarn-install/action.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.DS_Store
node_modules/
.env
.knit
knit.lock

# IDE user config
.vscode/
Expand Down
2 changes: 0 additions & 2 deletions .npmrc

This file was deleted.

48 changes: 39 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</a>
</p>

<h2 align="center">Supporting Vuetify</h2>
### 💖 Supporting Vuetify

Vuetify is a [MIT licensed](http://opensource.org/licenses/MIT) project that is developed and maintained full-time by [John Leider](https://github.com/johnleider) and [Heather Leider](https://github.com/heatherleider); with support from the entire [Core Team](https://vuetifyjs.com/about/meet-the-team/). Sponsor Vuetify and receive some **awesome perks** and support Open Source Software at the same time! 🎉

Expand Down Expand Up @@ -55,7 +55,7 @@ Vuetify is a [MIT licensed](http://opensource.org/licenses/MIT) project that is

Funds donated through GitHub Sponsors and Patreon go directly to support John and Heather's full-time work on Vuetify. Funds donated via Open Collective are managed with transparent expenses and will be used for compensating work and expenses for Core team members. Your name/logo will receive proper recognition and exposure by donating on either platform.

<h3 align="center"><b>Special Sponsor</b></h3>
<h3><b>Special Sponsor</b></h3>

<table>
<tbody>
Expand All @@ -69,7 +69,7 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
</tbody>
</table>

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

<table>
<tbody>
Expand All @@ -83,7 +83,7 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
</tbody>
</table>

<h3 align="center"><b>Platinum Sponsors</b></h3>
<h3><b>Platinum Sponsors</b></h3>

<table>
<tbody>
Expand Down Expand Up @@ -137,6 +137,36 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an

<br>

### ⚡ Quick Start

Getting started with Vuetify is easy. To create a new project, choose your package manager and run one of the following commands:

Using [yarn](https://yarnpkg.com/)

```bash
yarn create vuetify
```

Using [npm](https://npmjs.com/)

```bash
npm create vuetify
```

Using [pnpm](https://pnpm.io/)

```bash
pnpm create vuetify
```

Using [bun](https://bun.sh/)

```bash
bun create vuetify
```

For more information on how to get started, such as using Nuxt or Laravel, check out the official [Installation guide](/getting-started/installation/).

### 🚀 Introduction

Vuetify is a no design skills required UI Library with beautifully handcrafted Vue Components. No design skills required — everything you need to create amazing applications is at your fingertips. Vuetify has a massive API that supports any use-case. Some highlights include:
Expand Down Expand Up @@ -167,39 +197,39 @@ Vuetify supports all **modern browsers**, including Safari 13+ (using [polyfills
<tr>
<td>
<a href="https://support.vuetifyjs.com/?ref=github">
💫 Enterprise Support
💫&nbsp;Enterprise&nbsp;Support
</a>
</td>
<td>Let the experts at Vuetify help you get the most out of your application with a customized support plan from the the team behind the framework</td>
</tr>
<tr>
<td>
<a href="https://community.vuetifyjs.com/?ref=github">
💭 Discord Community
💭&nbsp;Discord&nbsp;Community
</a>
</td>
<td>Our massive and inclusive Discord server where you can ask questions, share feedback, and connect with other Vuetify developers</td>
</tr>
<tr>
<td>
<a href="https://play.vuetifyjs.com/?ref=github">
🎮 Vuetify Play
🎮&nbsp;Vuetify&nbsp;Play
</a>
</td>
<td>A Vuetify 3 playground built using <a href="https://github.com/vuejs/repl">vuejs/repl</a> where you can play with our components</td>
</tr>
<tr>
<td>
<a href="https://issues.vuetifyjs.com/?ref=github">
🐛 Vuetify Issues
🐛&nbsp;Vuetify&nbsp;Issues
</a>
</td>
<td>A web application for reporting bugs and issues with Vuetify, Documentation, or one of our other packages</td>
</tr>
<tr>
<td>
<a href="https://store.vuetifyjs.com/?ref=github">
🛒 Vuetify Store
🛒&nbsp;Vuetify&nbsp;Store
</a>
</td>
<td>The official Vuetify Store where you can download free digital products, purchase pre-made themes, and more</td>
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.7",
"version": "3.4.10",
"useWorkspaces": true
}
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
},
"devDependencies": {
"@babel/cli": "^7.23.4",
"@babel/core": "^7.23.3",
"@babel/preset-env": "^7.23.3",
"@babel/core": "^7.23.7",
"@babel/preset-env": "^7.23.8",
"@babel/preset-typescript": "^7.23.3",
"@mdi/font": "6.2.95",
"@mdi/js": "6.2.95",
"@mdi/svg": "6.2.95",
"@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",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"@unhead/vue": "^1.8.9",
"@vue/compiler-sfc": "^3.4.7",
"@vueuse/head": "^1.3.1",
"babel-eslint": "^10.1.0",
"babel-jest": "^28.1.3",
Expand All @@ -52,40 +52,40 @@
"conventional-github-releaser": "^3.1.5",
"cross-env": "^7.0.3",
"cross-spawn": "^7.0.3",
"eslint": "^8.54.0",
"eslint": "^8.56.0",
"eslint-config-standard": "^17.1.0",
"eslint-formatter-codeframe": "^7.32.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-local-rules": "^2.0.1",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.1.1",
"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",
"eslint-plugin-vue": "^9.19.2",
"eslint-plugin-vuetify": "^2.1.1",
"husky": "^3.0.9",
"inquirer": "^6.5.2",
"jest": "^28.1.3",
"jest-cli": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"jest-serializer-html": "^7.1.0",
"lerna": "^3.22.1",
"magic-string": "^0.30.0",
"magic-string": "^0.30.5",
"mkdirp": "^3.0.1",
"moment": "^2.29.4",
"patch-package": "^8.0.0",
"rimraf": "^5.0.5",
"sass": "^1.69.5",
"sass": "^1.69.7",
"semver": "^7.5.4",
"shelljs": "^0.8.5",
"typescript": "~5.2.2",
"upath": "^2.0.1",
"vite-plugin-inspect": "^0.7.42",
"vite-plugin-warmup": "^0.1.0",
"vue": "^3.3.9",
"vue": "^3.4.7",
"vue-analytics": "^5.16.1",
"vue-router": "^4.2.5",
"vue-tsc": "^1.8.22",
"vue-tsc": "^1.8.27",
"yargs": "^17.7.2"
}
}
10 changes: 5 additions & 5 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.4.7",
"version": "3.4.10",
"private": true,
"description": "",
"scripts": {
Expand All @@ -12,12 +12,12 @@
"license": "ISC",
"dependencies": {
"deepmerge": "^4.3.1",
"piscina": "^4.2.0",
"prettier": "^3.1.0",
"piscina": "^4.2.1",
"prettier": "^3.1.1",
"ts-morph": "^20.0.0",
"tsx": "^4.6.2",
"vue": "^3.3.9",
"vuetify": "^3.4.7"
"vue": "^3.4.7",
"vuetify": "^3.4.10"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
Expand Down
Loading

0 comments on commit 22a5ef9

Please sign in to comment.