Skip to content

Commit

Permalink
Merge branch 'v2-dev' into fix/datepicker-arrow-keys
Browse files Browse the repository at this point in the history
  • Loading branch information
KaelWD committed Mar 23, 2023
2 parents c9406c7 + 354a999 commit e04efa3
Show file tree
Hide file tree
Showing 259 changed files with 2,889 additions and 2,672 deletions.
36 changes: 17 additions & 19 deletions .github/.git_commit_msg.txt
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
# <type>: (If applied, this commit will...) <subject> (Max 50 char)
# |<---- Using a Maximum Of 50 Characters ---->| Hard limit to 72 -->|


# Explain why this change is being made
# |<---- Try To Limit Each Line to a Maximum Of 72 Characters ---->|

# Provide links to any relevant issues, articles, commits, or other
# pull requests
# Example: See #23, fixes #58

# --- COMMIT END ---
# |<---- Using a Maximum Of 50 Characters ---->| Hard limit to 72 -->|
# <type>: <subject>
#
# <description>
#
# fixes #<issue>
#
# ----------------------------------------------------
#
# <type> can be
# feat (new feature)
# fix (bug fix)
# docs (documentation only)
# refactor (refactoring production code)
# style (formatting, missing semi colons, etc; no code change)
# style (formatting, missing semicolons, etc. no code change)
# test (adding or refactoring tests; no production code change)
# chore (updating npm scripts etc; no production code change)
# --------------------
# chore (updating npm scripts etc. no production code change)
# revert (revert a commit
# <subject> must be the reverted commit's title
# <description> must contain "This reverts commit <hash>.")
#
# Remember to
# Capitalize the subject line
# Not capitalize the subject line
# Use the imperative mood in the subject line
# Do not end the subject line with a period
# Separate subject from body with a blank line (comments don't count)
# Use the body to explain what and why vs. how
# Can use multiple lines with "-" for bullet points in body
#
# If you can't summarize your changes in a single line, they should
# probably be split into multiple commits
# --------------------
# For more information about this template, check out
# https://gist.github.com/adeekshith/cd4c95a064977cdc6c50
59 changes: 16 additions & 43 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,27 @@
MAKE SURE TO READ THE CONTRIBUTING GUIDE BEFORE CREATING A PR
https://vuetifyjs.com/getting-started/contributing
Testing and markup sections can be removed for documentation changes
Provide a general summary of your changes in the title above
Keep the title short and descriptive, as it will be used as a commit message
PR titles should follow conventional-changelog-angular:
https://vuetifyjs.com/getting-started/contributing/#commit-guidelines
-->

<!-- Provide a general summary of your changes in the Title above -->
<!-- Keep the title short and descriptive, as it will be used as a commit message -->

<!-- We use conventional-changelog-angular for all commit structures -->
<!-- https://vuetifyjs.com/getting-started/contributing#commit-guidelines-w-commitizen -->


## Description
<!-- Describe your changes in detail -->
<!-- Note any issues that are resolved by this PR -->
<!-- e.g. resolves #4213 or fixes #2312 -->

## Motivation and Context
<!-- Why is this change required? What problem does it solve? -->
<!-- If it fixes an open issue, please link to the issue here. -->

## How Has This Been Tested?
<!-- All PR's should implement unit tests if possible -->
<!-- Please describe how you tested your changes. -->
<!-- Have you created new tests or updated existing ones? -->
<!-- e.g. unit | visually | e2e | none -->
<!--
Describe your changes in detail. Why is this change required? What problem does it solve?
If it fixes an open issue, please link to the issue here.
e.g. resolves #4213 or fixes #2312
-->

## Markup:
<!-- Information on how to setup your local development environment can be found here: -->
<!-- https://vuetifyjs.com/getting-started/contributing#setup-dev-environment -->

<!-- Paste markup for testing your change --->
<details>
<!--
Information on how to set up your local development environment can be found here:
https://vuetifyjs.com/getting-started/contributing/#setting-up-your-environment
Remove this section for documentation or test-only changes.
-->

<!-- Paste your FULL packages/vuetify/dev/Playground.vue here --->
```vue
// Paste your FULL Playground.vue here
```
</details>

## Types of changes
<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Improvement/refactoring (non-breaking change that doesn't add any features but makes things better)
## Checklist:
<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] The PR title is no longer than 64 characters.
- [ ] The PR is submitted to the correct branch (`master` for bug fixes and documentation updates, `dev` for new features and backwards compatible changes and `next` for non-backwards compatible changes).
- [ ] My code follows the code style of this project.
- [ ] I've added relevant changes to the documentation (applies to new features and breaking changes in core library)
```
8 changes: 8 additions & 0 deletions .github/sponsors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@

- label: 'P: elite sponsor'
members:
# Framework
- shaydoc
- seanogdev
- samternent
- LucasLeandro1204
- Vercadium
- gkubisa
- davidohalloran
38 changes: 27 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,23 @@ env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
CROWDIN_BRANCH: master
LOCAL_BRANCH: docs/update-from-crowdin
CROWDIN_BRANCH: v2

jobs:
close:
runs-on: ubuntu-22.04
if: github.event_name == 'push' && (github.ref == 'refs/heads/v2-stable' || github.ref == 'refs/heads/v2-dev') && github.repository_owner == 'vuetifyjs'
steps:
- uses: vuetifyjs/close-action@master
with:
token: ${{ secrets.GITHUB_TOKEN }}

lint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
Expand All @@ -28,8 +38,11 @@ jobs:
- run: yarn run lint

test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
Expand All @@ -44,9 +57,12 @@ jobs:

deploy:
needs: [lint, test]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
steps:
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
Expand Down Expand Up @@ -86,17 +102,20 @@ jobs:

publish-docs:
needs: [lint, test]
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')
runs-on: ubuntu-22.04
if: github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && (github.ref == 'refs/heads/v2-stable' || github.ref == 'refs/heads/v2-dev')
steps:
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: |
node_modules
**/node_modules
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }}
- run: yarn global add now
- run: yarn global add vercel

- name: Download eo-UY
uses: crowdin/github-action@1.1.2
Expand All @@ -107,7 +126,6 @@ jobs:
push_translations: false
export_only_approved: false
download_language: eo
localization_branch_name: ${{ env.LOCAL_BRANCH }}
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
debug_mode: true

Expand All @@ -120,7 +138,6 @@ jobs:
push_translations: false
export_only_approved: false
download_language: ja
localization_branch_name: ${{ env.LOCAL_BRANCH }}
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
debug_mode: true

Expand All @@ -133,7 +150,6 @@ jobs:
push_translations: false
export_only_approved: false
download_language: zh-CN
localization_branch_name: ${{ env.LOCAL_BRANCH }}
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
debug_mode: true

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 @@ -6,7 +6,7 @@ concurrency:
on:
push:
branches:
- 'master'
- 'v2-stable'
paths:
- 'packages/api-generator/src/locale/en/**'
- 'packages/docs/src/i18n/messages/en.json'
Expand All @@ -17,7 +17,7 @@ env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
CROWDIN_BRANCH: master
CROWDIN_BRANCH: v2

jobs:
upload-to-crowdin:
Expand Down
49 changes: 46 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ name: Nightly Release
on:
workflow_dispatch:
schedule:
- cron: '0 12 * * 1,3,5' # 1200 Mon,Wed,Fri UTC
- cron: '0 12 * * *' # 1200 UTC

jobs:
deploy:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'vuetifyjs' }}
strategy:
max-parallel: 1
fail-fast: false
Expand Down Expand Up @@ -38,8 +39,8 @@ jobs:
last=$(git show -s --format=%ct HEAD)
now=$(date +%s)
diff=$(($now - $last))
if [ $diff -gt 173000 ]; then
echo "Last commit was more than 48 hours ago, skipping release"
if [ $diff -gt 86400 ]; then
echo "Last commit was more than 24 hours ago, skipping release"
exit 1
fi
- uses: actions/cache@v2
Expand All @@ -51,17 +52,59 @@ jobs:
- run: yarn --frozen-lockfile --non-interactive
- run: yarn lerna version --conventional-commits --conventional-prerelease --no-push --no-commit-hooks --preid "$RELEASE_BRANCH-$(date +'%Y%m%d')" --yes
- run: yarn conventional-changelog -p angular --outfile ./packages/vuetify/CHANGELOG.md -r 2
- run: cat ./packages/vuetify/CHANGELOG.md
- run: >-
node -e "fs.writeFileSync(
'./package.json',
JSON.stringify({ ...require('./package.json'), name: '@vuetify/nightly' }, null, 2)
)"
working-directory: ./packages/vuetify
- run: yarn lerna run build --scope @vuetify/nightly
- run: ls -lah
- name: NPM Release
run: |
npm config set //registry.npmjs.org/:_authToken ${NPM_API_KEY:?}
npm publish ./packages/vuetify --tag $RELEASE_TAG --access public
env:
NPM_API_KEY: ${{ secrets.NPM_TOKEN }}
TAG_NAME: ${{ env.RELEASE_TAG }}

percy:
name: Visual regression tests
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'vuetifyjs' }}
steps:
- uses: actions/checkout@v2
with:
ref: next
fetch-depth: 0
- run: |
last=$(git show -s --format=%ct HEAD)
now=$(date +%s)
diff=$(($now - $last))
if [ $diff -gt 86400 ]; then
echo "Last commit was more than 24 hours ago, skipping tests"
exit 1
fi
- uses: actions/cache@v2
with:
path: |
node_modules
**/node_modules
/home/runner/.cache/Cypress
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }}
- run: yarn --frozen-lockfile --non-interactive
- run: echo "COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
- run: yarn cy:run
working-directory: ./packages/vuetify
env:
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
PERCY_BRANCH: next
PERCY_TARGET_BRANCH: next
PERCY_COMMIT: ${{ env.COMMIT }}
- uses: actions/upload-artifact@v2
if: failure()
with:
name: cypress-screenshots
path: ./packages/vuetify/cypress/screenshots/
if-no-files-found: ignore
2 changes: 2 additions & 0 deletions .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Issue triage
on:
issues:
types: [opened, labeled]
pull_request:
types: [opened, labeled]

jobs:
triage:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2020 John Jeremy Leider
Copyright (c) 2016-2022 John Jeremy Leider

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ Vue.use(Vuetify, {
```

### Goto (scrolling helper)
Import location has changed. Must be explicitly bootstrapped with the Vuetify instance to use in **vue-router** scroll-behavior. Example of how to do this [here](https://github.com/vuetifyjs/vuetify/blob/next/packages/docs/src/vuetify/index.js#L33). Reference documentation for scroll-behavior usage [here](https://next.vuetifyjs.com/en/framework/scroll#using-with-router).
Import location has changed. Must be explicitly bootstrapped with the Vuetify instance to use in **vue-router** scroll-behavior. Example of how to do this [here](https://github.com/vuetifyjs/vuetify/blob/v2-stable/packages/docs/src/vuetify/index.js#L33). Reference documentation for scroll-behavior usage [here](https://v2.vuetifyjs.com/en/framework/scroll#using-with-router).

```js
// v1.5
Expand Down

0 comments on commit e04efa3

Please sign in to comment.