-
-
Notifications
You must be signed in to change notification settings - Fork 7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into feat/slider-events
- Loading branch information
Showing
468 changed files
with
10,659 additions
and
7,115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,9 +32,32 @@ jobs: | |
concurrent_skipping: same_content | ||
do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]' | ||
|
||
build-vuetify: | ||
name: Build vuetify | ||
needs: pre_job | ||
if: needs.pre_job.outputs.should_skip != 'true' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- 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: yarn build vuetify | ||
- uses: actions/upload-artifact@v3 | ||
with: | ||
name: vuetify-dist | ||
path: | | ||
packages/vuetify/dist | ||
packages/vuetify/lib | ||
lint: | ||
name: Lint | ||
needs: pre_job | ||
needs: [pre_job, build-vuetify] | ||
if: needs.pre_job.outputs.should_skip != 'true' | ||
runs-on: ubuntu-latest | ||
strategy: | ||
|
@@ -50,8 +73,11 @@ jobs: | |
**/node_modules | ||
/home/runner/.cache/Cypress | ||
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }} | ||
- uses: actions/download-artifact@v3 | ||
with: | ||
name: vuetify-dist | ||
path: packages/vuetify | ||
- run: yarn --frozen-lockfile --non-interactive | ||
- run: yarn build vuetify | ||
- run: yarn lerna run lint $SCOPES | ||
env: | ||
SCOPES: ${{ matrix.scopes }} | ||
|
@@ -78,12 +104,8 @@ jobs: | |
test-cypress: | ||
name: Test (Cypress) | ||
needs: pre_job | ||
if: needs.pre_job.outputs.should_skip != 'true' && github.ref != 'refs/heads/master' | ||
if: needs.pre_job.outputs.should_skip != 'true' | ||
runs-on: ubuntu-latest | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
containers: ${{ fromJSON(github.repository_owner == 'vuetifyjs' && '[1, 2, 3, 4]' || '[1]') }} | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/cache@v2 | ||
|
@@ -94,6 +116,8 @@ jobs: | |
/home/runner/.cache/Cypress | ||
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }} | ||
|
||
- run: npm pkg set devDependencies.cypress="https://cdn.cypress.io/beta/npm/12.8.2/linux-x64/retry-dynamic-imports-243502ae98b750e429789d373dd7175f487a62ee/cypress.tgz" | ||
working-directory: ./packages/vuetify | ||
- run: yarn --frozen-lockfile --non-interactive | ||
- run: yarn cy:run --record --parallel --ci-build-id $GITHUB_RUN_ID | ||
if: ${{ !startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs' }} | ||
|
@@ -111,7 +135,7 @@ jobs: | |
if-no-files-found: ignore | ||
|
||
deploy: | ||
needs: [lint, test-jest, test-cypress] | ||
needs: [lint, test-jest, test-cypress, build-vuetify] | ||
runs-on: ubuntu-latest | ||
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs' | ||
steps: | ||
|
@@ -125,8 +149,11 @@ jobs: | |
**/node_modules | ||
/home/runner/.cache/Cypress | ||
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }} | ||
- uses: actions/download-artifact@v3 | ||
with: | ||
name: vuetify-dist | ||
path: packages/vuetify | ||
- run: yarn --frozen-lockfile --non-interactive | ||
- run: yarn build vuetify | ||
- run: yarn build api | ||
- run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV | ||
- run: rm -rf release | ||
|
@@ -154,10 +181,11 @@ jobs: | |
asset_name: vuetify-${{ env.RELEASE_TAG }}.zip | ||
asset_content_type: application/zip | ||
|
||
publish-docs: | ||
needs: [lint, test-jest] | ||
build-docs: | ||
name: Build docs | ||
needs: [pre_job, build-vuetify] | ||
if: needs.pre_job.outputs.should_skip != 'true' && 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-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') | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/cache@v2 | ||
|
@@ -167,9 +195,11 @@ jobs: | |
**/node_modules | ||
/home/runner/.cache/Cypress | ||
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }} | ||
- run: yarn global add vercel | ||
- uses: actions/download-artifact@v3 | ||
with: | ||
name: vuetify-dist | ||
path: packages/vuetify | ||
- run: yarn --frozen-lockfile --non-interactive | ||
|
||
# TODO: crowdin is returning invalid markdown | ||
# - name: Download eo-UY | ||
# uses: crowdin/[email protected] | ||
|
@@ -181,40 +211,44 @@ jobs: | |
# export_only_approved: false | ||
# download_language: eo | ||
# crowdin_branch_name: ${{ env.CROWDIN_BRANCH }} | ||
# debug_mode: true | ||
|
||
# - name: Download ja | ||
# uses: crowdin/[email protected] | ||
# with: | ||
# config: crowdin.yml | ||
# upload_sources: false | ||
# download_translations: true | ||
# push_translations: false | ||
# export_only_approved: false | ||
# download_language: ja | ||
# crowdin_branch_name: ${{ env.CROWDIN_BRANCH }} | ||
# debug_mode: true | ||
# | ||
# - name: Download zh-CN | ||
# uses: crowdin/[email protected] | ||
# with: | ||
# config: crowdin.yml | ||
# upload_sources: false | ||
# download_translations: true | ||
# push_translations: false | ||
# export_only_approved: false | ||
# download_language: zh-CN | ||
# crowdin_branch_name: ${{ env.CROWDIN_BRANCH }} | ||
# debug_mode: true | ||
|
||
- run: yarn build | ||
- run: yarn build api | ||
- run: yarn build docs | ||
env: | ||
NODE_OPTIONS: --max-old-space-size=4096 | ||
VITE_COSMIC_BUCKET_SLUG: ${{ secrets.COSMIC_BUCKET_SLUG }} | ||
VITE_COSMIC_BUCKET_READ_KEY: ${{ secrets.COSMIC_BUCKET_READ_KEY }} | ||
VITE_COSMIC_BUCKET_SLUG_STORE: ${{ secrets.COSMIC_BUCKET_SLUG_STORE }} | ||
VITE_COSMIC_BUCKET_READ_KEY_STORE: ${{ secrets.COSMIC_BUCKET_READ_KEY_STORE }} | ||
VITE_EMAILJS_PUBLIC_KEY: ${{ secrets.EMAILJS_PUBLIC_KEY }} | ||
VITE_EMAILJS_SERVICE_ID: ${{ secrets.EMAILJS_SERVICE_ID }} | ||
VITE_EMAILJS_TEMPLATE_ID: ${{ secrets.EMAILJS_TEMPLATE_ID }} | ||
VITE_AUTH0_DOMAIN: ${{ secrets.AUTH0_DOMAIN }} | ||
VITE_AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }} | ||
VITE_GITHUB_SHA: ${{ github.sha }} | ||
- uses: actions/upload-artifact@v3 | ||
with: | ||
name: docs-dist | ||
path: packages/docs/dist | ||
|
||
publish-docs: | ||
needs: [lint, test-jest, build-docs] | ||
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') | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/cache@v2 | ||
with: | ||
path: | | ||
node_modules | ||
**/node_modules | ||
/home/runner/.cache/Cypress | ||
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }} | ||
- uses: actions/download-artifact@v3 | ||
with: | ||
name: docs-dist | ||
path: packages/docs/dist | ||
- run: yarn global add vercel | ||
- run: yarn --frozen-lockfile --non-interactive | ||
- run: node scripts/deploy-and-alias.js ${{ github.ref }} | ||
env: | ||
NOW_TOKEN: ${{ secrets.NOW_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,6 @@ | |
} | ||
}, | ||
"npmClient": "yarn", | ||
"version": "3.1.8", | ||
"version": "3.1.15", | ||
"useWorkspaces": true | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,35 +33,35 @@ | |
"yarn": "^1.19" | ||
}, | ||
"devDependencies": { | ||
"@babel/cli": "^7.20.7", | ||
"@babel/core": "^7.20.12", | ||
"@babel/cli": "^7.21.0", | ||
"@babel/core": "^7.21.3", | ||
"@babel/preset-env": "^7.20.2", | ||
"@babel/preset-typescript": "^7.18.6", | ||
"@babel/preset-typescript": "^7.21.0", | ||
"@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.51.0", | ||
"@typescript-eslint/parser": "^5.51.0", | ||
"@typescript-eslint/eslint-plugin": "^5.57.0", | ||
"@typescript-eslint/parser": "^5.57.0", | ||
"@vue/compiler-sfc": "^3.2.47", | ||
"@vueuse/head": "^1.0.26", | ||
"@vueuse/head": "^1.1.23", | ||
"babel-eslint": "^10.1.0", | ||
"babel-jest": "^28.1.3", | ||
"conventional-changelog-cli": "^2.2.2", | ||
"conventional-changelog-vuetify": "^1.1.0", | ||
"conventional-github-releaser": "^3.1.5", | ||
"cross-env": "^7.0.3", | ||
"cross-spawn": "^6.0.5", | ||
"eslint": "^8.34.0", | ||
"eslint": "^8.37.0", | ||
"eslint-config-standard": "^17.0.0", | ||
"eslint-formatter-codeframe": "^7.32.1", | ||
"eslint-plugin-import": "^2.27.5", | ||
"eslint-plugin-local-rules": "^1.3.2", | ||
"eslint-plugin-n": "^15.6.1", | ||
"eslint-plugin-n": "^15.7.0", | ||
"eslint-plugin-promise": "^6.1.1", | ||
"eslint-plugin-react": "^7.32.2", | ||
"eslint-plugin-sonarjs": "^0.18.0", | ||
"eslint-plugin-vue": "^9.9.0", | ||
"eslint-plugin-sonarjs": "^0.19.0", | ||
"eslint-plugin-vue": "^9.10.0", | ||
"eslint-plugin-vuetify": "^2.0.0-beta.2", | ||
"husky": "^3.0.1", | ||
"inquirer": "^6.5.2", | ||
|
@@ -70,20 +70,20 @@ | |
"jest-environment-jsdom": "^28.1.3", | ||
"jest-serializer-html": "^7.1.0", | ||
"lerna": "^3.22.1", | ||
"magic-string": "^0.30.0", | ||
"mkdirp": "^1.0.4", | ||
"moment": "^2.29.4", | ||
"patch-package": "^6.5.1", | ||
"sass": "^1.58.0", | ||
"sass": "^1.60.0", | ||
"semver": "^6.2.0", | ||
"shelljs": "^0.8.5", | ||
"typescript": "^4.9.5", | ||
"vite-plugin-inspect": "^0.6.1", | ||
"typescript": "^5.0.2", | ||
"upath": "^2.0.1", | ||
"vite-plugin-inspect": "^0.7.18", | ||
"vite-plugin-warmup": "^0.0.2", | ||
"vue": "^3.2.47", | ||
"vue-analytics": "^5.16.1", | ||
"vue-router": "^4.1.6", | ||
"yargs": "^17.6.2" | ||
}, | ||
"resolutions": { | ||
"hookable": "npm:[email protected]" | ||
"yargs": "^17.7.1" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
{ | ||
"exposed": { | ||
"date": "Takes any value and returns a date object.", | ||
"format": "Takes a date object and returns it in a specified format.", | ||
"startOfMonth": "Returns first day of the month.", | ||
"endOfMonth": "Returns the last day of the month.", | ||
"startOfWeek": "Returns the first day of the week.", | ||
"endOfWeek": "Returns the last day of the week.", | ||
"startOfDay": "Returns the first second of the day.", | ||
"endOfDay": "Returns the last second of the day.", | ||
"startOfYear": "Returns the first day of the year.", | ||
"endOfYear": "Returns the last day of the year.", | ||
"isAfter": "Returns true if the first date is after the second date.", | ||
"isEqual": "Returns true if the two dates are equal.", | ||
"isSameDay": "Returns true if the two dates are the same day.", | ||
"isSameMonth": "Returns true if the two dates are the same month.", | ||
"isValid": "Returns true if the date is valid.", | ||
"isWithinRange": "Returns true if the first date is within the range of the second and third dates.", | ||
"addDays": "Adds the specified number of days to the date.", | ||
"addMonths": "Adds the specified number of months to the date.", | ||
"getYear": "Returns the year of the date.", | ||
"setYear": "Sets the year of the date.", | ||
"getDiff": "Returns the difference between two dates in the specified unit.", | ||
"getWeek": "Returns the week of the year of the date.", | ||
"getWeekArray": "Returns an array of the days of the week of the date.", | ||
"getWeekdays": "Returns an array of the names of the days of the week.", | ||
"getMonth": "Returns the month of the date." | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 4 additions & 3 deletions
7
packages/api-generator/src/locale/en/v-defaults-provider.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
{ | ||
"props": { | ||
"defaults": "Specify new default prop values for components. Keep in mind that this will be merged with previously defined values", | ||
"reset": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-defaults-provider.json))", | ||
"root": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-defaults-provider.json))", | ||
"scoped": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-defaults-provider.json))" | ||
"disabled": "Turns off all calcuations of new default values for improved performance in situations where defaults propagation isn't necessary", | ||
"reset": "Reset the default values up the nested chain by {n} amount", | ||
"root": "Force current defaults to match the application root defaults", | ||
"scoped": "Prevents the ability for default values to be inherited from parent components" | ||
} | ||
} |
Oops, something went wrong.