Merge branch 'master' into dev

.github/workflows/ci.yml

@@ -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 }}
@@ -80,10 +106,6 @@ jobs:
     needs: pre_job
     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
@@ -113,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:
@@ -127,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
@@ -156,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
@@ -169,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]
@@ -183,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 }}

lerna.json

@@ -13,6 +13,6 @@
     }
   },
   "npmClient": "yarn",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "useWorkspaces": true
 }

package.json

@@ -85,8 +85,5 @@
     "vue-analytics": "^5.16.1",
     "vue-router": "^4.1.6",
     "yargs": "^17.7.1"
-  },
-  "resolutions": {
-    "hookable": "npm:[email protected]"
   }
 }

packages/api-generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuetify/api-generator",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "private": true,
   "description": "",
   "scripts": {
@@ -18,7 +18,7 @@
     "rimraf": "^3.0.2",
     "ts-morph": "^18.0.0",
     "vue": "^3.2.47",
-    "vuetify": "^3.1.13"
+    "vuetify": "^3.1.14"
   },
   "devDependencies": {
     "@babel/node": "^7.20.7"

packages/api-generator/src/locale/en/v-progress-linear.json

@@ -10,10 +10,9 @@
     "stream": "An alternative style for portraying loading that works in tandem with **buffer-value**",
     "striped": "Adds a stripe background to the filled portion of the progress component",
     "top": "Aligns the content towards the top",
-    "clickable": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-progress-linear.json))",
-    "height": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-progress-linear.json))",
-    "max": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-progress-linear.json))",
-    "roundedBar": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-progress-linear.json))"
+    "clickable": "Clicking on the progress track will automatically set the value",
+    "max": "Sets the maximum value the progress can reach",
+    "roundedBar": "Applies a border radius to the progress bar"
   },
   "slots": {
     "default": "Provides the current value of the component"

packages/docs/.env.example

@@ -15,3 +15,8 @@ VITE_COSMIC_BUCKET_READ_KEY_STORE=
 VITE_EMAILJS_SERVICE_ID=
 VITE_EMAILJS_TEMPLATE_ID=
 VITE_EMAILJS_PUBLIC_KEY=
+
+# Auth0
+VITE_AUTH0_DOMAIN=
+VITE_AUTH0_CLIENT_ID=
+VITE_AUTH0_CLIENT_SECRET=

packages/docs/index.html

@@ -7,6 +7,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5, minimal-ui, shrink-to-fit=no">
     <title>Vuetify — A Vue Component Framework</title>
     <script defer src="https://polyfill.io/v3/polyfill.min.js?features=IntersectionObserver,ResizeObserver,WebAnimations,Object.fromEntries,Array.prototype.at"></script>
+    <link rel="preconnect" href="https://www.google-analytics.com">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://polyfill.io">
+    <link rel="preconnect" href="https://www.googletagmanager.com">
+    <link rel="preconnect" href="https://api.cosmicjs.com">
+    <link rel="preconnect" href="https://cdn.cosmicjs.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+    <link rel="preconnect" href="https://cdn.vuetifyjs.com">
   </head>
   <body>
     <div id="app"></div>

packages/docs/package.json

@@ -3,7 +3,7 @@
   "description": "A Vue.js project",
   "private": true,
   "author": "John Leider <[email protected]>",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -21,6 +21,7 @@
     "fix:md": "markdownlint --config .markdownlintrc src/pages/en --fix"
   },
   "dependencies": {
+    "@auth0/auth0-vue": "^2.2.0",
     "@vuelidate/core": "^2.0.1",
     "@vuelidate/validators": "^2.0.1",
     "algoliasearch": "^4.16.0",
@@ -39,7 +40,7 @@
     "vue-i18n": "^9.3.0-beta.16",
     "vue-instantsearch": "^4.8.8",
     "vue-prism-component": "^2.0.0",
-    "vuetify": "^3.1.13"
+    "vuetify": "^3.1.14"
   },
   "devDependencies": {
     "@emailjs/browser": "^3.10.0",
@@ -51,8 +52,9 @@
     "@vitejs/plugin-basic-ssl": "^1.0.1",
     "@vitejs/plugin-vue": "^4.1.0",
     "@vue/compiler-sfc": "^3.2.47",
-    "@vuetify/api-generator": "^3.1.13",
+    "@vuetify/api-generator": "^3.1.14",
     "@vuetify/vite-ssg": "^0.20.2",
+    "async-es": "^3.2.4",
     "ajv": "^8.12.0",
     "date-fns": "^2.29.3",
     "emailjs-com": "^3.2.0",
@@ -72,7 +74,7 @@
     "markdownlint-cli": "^0.33.0",
     "unplugin-fonts": "^1.0.0",
     "unplugin-vue-components": "^0.24.1",
-    "vite": "^4.3.0-beta.1",
+    "vite": "^4.3.0-beta.2",
     "vite-plugin-md": "^0.21.5",
     "vite-plugin-pages": "^0.29.0",
     "vite-plugin-pwa": "^0.14.7",

packages/docs/src/components/api/PrismCell.vue

@@ -1,7 +1,5 @@
 <template>
-  <pre
-    v-html="highlight(String(code))"
-  />
+  <pre v-html="html" />
 </template>
 
 <script setup lang="ts">
@@ -13,7 +11,7 @@
 
   // Utilities
   import { insertLinks, stripLinks } from './utils'
-  import { PropType } from 'vue'
+  import { PropType, ref, watchEffect } from 'vue'
 
   const props = defineProps({
     code: null,
@@ -23,6 +21,11 @@
     },
   })
 
+  const html = ref('')
+  watchEffect(async () => {
+    html.value = highlight(String(await props.code))
+  })
+
   const MAP = {
     typescript: [Prism.languages.typescript, 'ts'] as const,
     scss: [Prism.languages.scss, 'scss'] as const,

packages/docs/src/components/api/utils.ts

@@ -1,6 +1,3 @@
-import prettier from 'prettier'
-import typescriptParser from 'prettier/parser-typescript'
-
 export type Item = {
   name: string
   source: string
@@ -47,7 +44,11 @@ export function insertLinks (str: string, stripped: Record<string, string>) {
   return str
 }
 
-export function getType (item: { formatted: string }) {
+export async function getType (item: { formatted: string }) {
+  const [{ default: prettier }, { default: typescriptParser }] = await Promise.all([
+    import ('prettier'),
+    import('prettier/parser-typescript'),
+  ])
   const prefix = 'type Type = '
   const [str, stripped] = stripLinks(item.formatted)
   const formatted = prettier.format(prefix + str, {