Skip to content

Commit

Permalink
Merge branch 'master' into fix/9999-nativeon-elements
Browse files Browse the repository at this point in the history
  • Loading branch information
KaelWD committed Apr 21, 2020
2 parents 5042ddc + 49c9ec1 commit ff1fd5b
Show file tree
Hide file tree
Showing 2,032 changed files with 3,181 additions and 23,309 deletions.
1 change: 0 additions & 1 deletion .nowignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
node_modules
packages/kitchen
packages/api-generator/dist
packages/docs/dist
packages/vuetify/coverage
Expand Down
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ install:
- yarn --frozen-lockfile --non-interactive

stages:
# - name: kitchen
# if: (branch = master) AND (type = push) AND (repo = vuetifyjs/vuetify)
- name: test
if: (tag IS blank) OR (type != push) OR (repo != vuetifyjs/vuetify)
Expand Down Expand Up @@ -45,10 +44,8 @@ jobs:
after_script:
- codecov

# - stage: kitchen
# before_script: yarn global add now
# script:
# - cd packages/kitchen
# - yarn build
# - now --team=vuetifyjs --token=$NOW_TOKEN --npm
# - now alias --team=vuetifyjs --token=$NOW_TOKEN
Expand Down
2 changes: 1 addition & 1 deletion BACKERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ You can join them in supporting Vuetify.js by [sponsoring through Github](https:
- ikedaosushi
- mantis
- flipvh
- hueachilles
- [quickytools](https://www.quickytools.com) <!-- hueachilles -->
- J-Sek
- erichelgeson
- dylancopeland
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

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

Vuetify is a MIT licensed project that is developed and maintained full-time by [John Leider](https://github.com/johnleider) and [Heather Hill](https://github.com/heatherleider); with support from the entire [Core Team](https://vuetifyjs.com/introduction/meet-the-team/). Sponsor Vuetify and receive some **awesome perks** and support Open Source Software at the same time! 🎉
Vuetify is a MIT licensed 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/introduction/meet-the-team/). Sponsor Vuetify and receive some **awesome perks** and support Open Source Software at the same time! 🎉

<ul>
<li>
Expand Down
6 changes: 0 additions & 6 deletions ecosystem.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,5 @@ module.exports = {
cwd: './packages/docs/',
args: 'dev',
},
{
name: 'vuetify-kitchen',
script: 'yarn.js',
cwd: './packages/kitchen/',
args: 'dev',
},
],
}
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": "2.2.20",
"version": "2.2.23",
"useWorkspaces": true
}
6 changes: 6 additions & 0 deletions now.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
"version": 2,
"cleanUrls": true,
"trailingSlash": true,
"build": {
"env": {
"COSMIC_BUCKET_SLUG": "@cosmic-bucket-slug",
"COSMIC_BUCKET_READ_KEY": "@cosmic-bucket-read-key"
}
},
"rewrites": [
{
"source": "/eo-UY/(.*)",
Expand Down
6 changes: 2 additions & 4 deletions packages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@
## Packages for the Vuetify

1. **api-generator** - generates api for Vuetify docs and other resources.
2. **docs** - Vuetify documentation
3. **kitchen** - used for end to end testing
4. **vuetify** - main source code for Vuetify

2. **docs** - Vuetify documentation
3. **vuetify** - main source code for Vuetify
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": "2.2.20",
"version": "2.2.23",
"private": true,
"description": "",
"main": "dist/api.js",
Expand All @@ -15,7 +15,7 @@
"dependencies": {
"deepmerge": "^4.0.0",
"vue": "^2.6.11",
"vuetify": "^2.2.20"
"vuetify": "^2.2.23"
},
"devDependencies": {
"@babel/node": "^7.5.5",
Expand Down
4 changes: 4 additions & 0 deletions packages/api-generator/src/maps/v-calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ module.exports = {
name: 'day-label',
props: VTimestamp,
},
{
name: 'day-label-header',
props: VTimestamp,
},
{
name: 'day-month',
props: VTimestamp,
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/maps/v-carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
'v-carousel': {
events: [
{
name: 'input',
name: 'change',
value: 'number',
},
],
Expand Down
10 changes: 10 additions & 0 deletions packages/api-generator/src/maps/v-chip-group.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
'v-chip-group': {
events: [
{
name: 'change',
value: 'any[] | any',
},
],
},
}
2 changes: 2 additions & 0 deletions packages/api-generator/src/maps/v-data-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ const DataGroupSummaryScopedProps = {
groupBy: DataOptions.groupBy,
items: 'any[]',
headers: 'TableHeader[]',
isOpen: 'boolean',
toggle: '() => void',
}

const DataTableSlots = [
Expand Down
10 changes: 10 additions & 0 deletions packages/api-generator/src/maps/v-item-group.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
'v-item-group': {
events: [
{
name: 'change',
value: 'any[] | any',
},
],
},
}
13 changes: 13 additions & 0 deletions packages/api-generator/src/maps/v-item.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
'v-item': {
slots: [
{
name: 'default',
props: {
active: 'boolean',
toggle: 'Function',
},
},
],
},
}
10 changes: 10 additions & 0 deletions packages/api-generator/src/maps/v-list-item-group.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
'v-list-item-group': {
events: [
{
name: 'change',
value: 'any[] | any',
},
],
},
}
4 changes: 4 additions & 0 deletions packages/api-generator/src/maps/v-slide-group.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
module.exports = {
'v-slide-group': {
events: [
{
name: 'change',
value: 'any[] | any',
},
{
name: 'click:location',
value: 'void',
Expand Down
6 changes: 6 additions & 0 deletions packages/api-generator/src/maps/v-window.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,11 @@ module.exports = {
},
},
],
events: [
{
name: 'change',
value: 'number',
},
],
},
}
15 changes: 13 additions & 2 deletions packages/docs/build/pug-to-json.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,23 @@ module.exports = function (content) {

const parents = []
walk(ast, node => {
if (!pageSection || ['h2'].includes(node.name)) {
const name = node.name || ''

if (!pageSection || name.startsWith('h') || [
'accessibility',
'api',
'examples',
'parameters',
'supplemental',
'up-next',
'usage',
'usage-new',
].includes(name)) {
startSection()
}
switch (node.type) {
case 'Tag':
if (node.name === 'h2') {
if (name.startsWith('h')) {
pageSection.children.push({
type: 'heading',
lang: node.block.nodes[0].val
Expand Down
3 changes: 3 additions & 0 deletions packages/docs/build/webpack.client.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const VueSSRClientPlugin = require('vue-server-renderer/client-plugin')
const CopyPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin')
const TerserJSPlugin = require('terser-webpack-plugin')

const isProd = process.env.NODE_ENV === 'production'

Expand Down Expand Up @@ -105,6 +107,7 @@ const config = merge(base, {
},
optimization: {
minimize: isProd,
minimizer: [new TerserJSPlugin({}), new OptimizeCssAssetsPlugin({})],
runtimeChunk: true,
removeAvailableModules: isProd,
removeEmptyChunks: isProd,
Expand Down
13 changes: 8 additions & 5 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": "2.2.20",
"version": "2.2.23",
"scripts": {
"dev": "cross-env NODE_ENV=development webpack-dev-server --config build/webpack.client.config.js --hot --progress",
"build": "rimraf dist && cross-env NODE_ENV=production webpack --config build/webpack.prod.config.js --no-progress --hide-modules && yarn prerender",
Expand All @@ -13,13 +13,13 @@
"lint:fix": "yarn lint --fix"
},
"dependencies": {
"@vuetify/api-generator": "^2.2.20",
"@vuetify/api-generator": "^2.2.23",
"babel-polyfill": "^6.26.0",
"chokidar": "^3.0.2",
"compression": "^1.7.4",
"cookie-parser": "^1.4.4",
"cosmicjs": "^3.2.40",
"cross-env": "^5.2.0",
"date-fns": "^1.30.1",
"dotenv": "^8.0.0",
"es6-promise": "^4.2.8",
"event-source-polyfill": "^1.0.7",
Expand All @@ -43,7 +43,7 @@
"vue-router": "^3.0.7",
"vue-server-renderer": "^2.6.11",
"vuelidate": "^0.7.4",
"vuetify": "^2.2.20",
"vuetify": "^2.2.23",
"vuex": "^3.1.1",
"vuex-pathify": "^1.4.0",
"vuex-router-sync": "^5.0.0",
Expand All @@ -59,6 +59,7 @@
"concurrently": "^4.1.1",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.1.0",
"date-fns": "^2.12.0",
"deepmerge": "^4.0.0",
"docsearch.js": "^2.6.3",
"eslint": "^6.1.0",
Expand All @@ -71,8 +72,10 @@
"html-webpack-plugin": "^3.2.0",
"markdown-it": "^10.0.0",
"mini-css-extract-plugin": "^0.8.0",
"minify-css-string": "^1.0.0",
"mkdirp": "^1.0.3",
"null-loader": "^3.0.0",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"prismjs": "^1.17.1",
"progress": "^2.0.3",
"pug": "^2.0.4",
Expand All @@ -88,11 +91,11 @@
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"sw-precache-webpack-plugin": "^0.11.5",
"terser-webpack-plugin": "^2.3.5",
"url-loader": "^2.1.0",
"vue-color": "^2.7.0",
"vue-prism-component": "^1.1.1",
"vue-style-loader": "^4.1.2",
"vue-the-mask": "^0.11.1",
"webpack-dev-middleware": "^3.7.0",
"webpack-hot-middleware": "^2.25.0",
"webpack-node-externals": "^1.7.2"
Expand Down
14 changes: 14 additions & 0 deletions packages/docs/src/components/ad/Jooble.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<template>
<a
class="d-block v-markdown--link"
href="https://jooble.org/jobs-web-developer"
target="_blank"
@click="$ga.event('jooble', 'click')"
>
Looking for Web Developer jobs? Try Jooble<i class="v-icon mdi mdi-open-in-new" />
</a>
</template>

<script>
export default { name: 'AdJooble' }
</script>

0 comments on commit ff1fd5b

Please sign in to comment.