Merge remote-tracking branch 'upstream/master'

.github/actions/nightly-release/action.yml

@@ -35,7 +35,7 @@ runs:
         repository: ${{ inputs.checkout-repo }}
         ref: ${{ inputs.checkout-ref }}
         fetch-depth: 0
-    - uses: ./.github/actions/pnpm-install
+    - uses: vuetifyjs/setup-action@master
     - run: >-
         node -e "
           const json = require('./lerna.json');

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ env:
 
 jobs:
   pre_job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
@@ -28,83 +28,73 @@ jobs:
     name: Build vuetify
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/pnpm-install
+      - uses: vuetifyjs/setup-action@master
       - run: pnpm build vuetify
-      - uses: ./.github/actions/upload-artifact
+      - uses: actions/upload-artifact@v4
         with:
           name: vuetify-dist
-          path: >
+          path: |
             packages/vuetify/dist
             packages/vuetify/lib
 
   lint:
     name: Lint
     needs: [pre_job, build-vuetify]
     if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         scopes: ['--scope vuetify --scope @vuetify/api-generator', '--scope vuetifyjs.com']
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/download-artifact
+      - uses: actions/download-artifact@v4
         with:
           name: vuetify-dist
-      - uses: ./.github/actions/pnpm-install
+          path: packages/vuetify
+      - uses: vuetifyjs/setup-action@master
       - run: pnpm lerna run lint $SCOPES
         env:
           SCOPES: ${{ matrix.scopes }}
 
-  test-jest:
-    name: Test (Jest)
+  test-unit:
+    name: Test (Unit)
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/pnpm-install
-      - run: pnpm run test:coverage -i
+      - uses: vuetifyjs/setup-action@master
+      - run: pnpm run test --project unit
         working-directory: ./packages/vuetify
 
-  test-cypress:
-    name: Test (Cypress)
+  test-e2e:
+    name: Test (e2e)
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/pnpm-install
-      - run: pnpm cy:run --record --parallel --ci-build-id $GITHUB_RUN_ID
-        if: ${{ !startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs' }}
+      - uses: vuetifyjs/setup-action@master
+      - run: pnpm run test --project browser
         working-directory: ./packages/vuetify
-        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-      - run: pnpm cy:run
-        if: ${{ !startswith(github.ref, 'refs/tags/v') && github.repository_owner != 'vuetifyjs' }}
-        working-directory: ./packages/vuetify
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-screenshots
-          path: ./packages/vuetify/cypress/screenshots/
-          if-no-files-found: ignore
 
   deploy:
-    needs: [lint, test-jest, test-cypress, build-vuetify]
-    runs-on: ubuntu-latest
+    needs: [lint, test-unit, test-e2e, build-vuetify]
+    runs-on: ubuntu-24.04
     if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: ./.github/actions/download-artifact
+      - uses: actions/download-artifact@v4
         with:
           name: vuetify-dist
-      - uses: ./.github/actions/pnpm-install
+          path: packages/vuetify
+      - uses: vuetifyjs/setup-action@master
       - run: pnpm build api
       - run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       - name: NPM Release
@@ -123,13 +113,14 @@ jobs:
     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
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/download-artifact
+      - uses: actions/download-artifact@v4
         with:
           name: vuetify-dist
-      - uses: ./.github/actions/pnpm-install
+          path: packages/vuetify
+      - uses: vuetifyjs/setup-action@master
       - uses: ./.github/actions/download-locales
       - run: pnpm build api
       - run: pnpm build docs
@@ -146,22 +137,25 @@ jobs:
           VITE_EMAILJS_TEMPLATE_ID: ${{ secrets.EMAILJS_TEMPLATE_ID }}
           VITE_API_SERVER_URL: ${{ secrets.API_SERVER_URL }}
           VITE_GITHUB_SHA: ${{ github.sha }}
-      - uses: ./.github/actions/upload-artifact
+      - uses: actions/upload-artifact@v4
         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')
+    needs: [lint, test-unit, build-docs]
+    runs-on: ubuntu-24.04
+    environment: Production
+    if: github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/download-artifact
+      - uses: actions/download-artifact@v4
         with:
           name: docs-dist
-      - uses: ./.github/actions/pnpm-install
-      - run: pnpm add vercel --global
-      - run: node scripts/deploy-and-alias.js ${{ github.ref }}
-        env:
-          NOW_TOKEN: ${{ secrets.NOW_TOKEN }}
+          path: packages/docs/dist
+      - uses: vuetifyjs/coolify-action@master
+        with:
+          token: ${{ secrets.GITHUB_TOKEN  }}
+          imageName: docs
+          coolifyWebhook: ${{ secrets.COOLIFY_WEBHOOK }}
+          coolifySecret: ${{ secrets.COOLIFY_TOKEN }}

.github/workflows/close-issue.yml

@@ -12,7 +12,7 @@ env:
 
 jobs:
   close:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: github.repository_owner == 'vuetifyjs'
     steps:
       - uses: vuetifyjs/close-action@master

.github/workflows/crowdin-uploads.yml

@@ -21,7 +21,7 @@ env:
 
 jobs:
   upload-to-crowdin:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/nightly-pr.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: ${{ github.repository_owner == 'vuetifyjs' }}
     steps:
       - uses: actions/checkout@v4

.github/workflows/nightly-schedule.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: ${{ github.repository_owner == 'vuetifyjs' }}
     strategy:
       max-parallel: 1
@@ -49,7 +49,7 @@ jobs:
 
   percy:
     name: Visual regression tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: ${{ github.repository_owner == 'vuetifyjs' }}
     steps:
       - uses: actions/checkout@v4
@@ -64,18 +64,12 @@ jobs:
               echo "Last commit was more than 24 hours ago, skipping tests"
               exit 1
           fi
-      - uses: ./.github/actions/pnpm-install
+      - uses: vuetifyjs/setup-action@master
       - run: echo "COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
-      - run: pnpm cy:run
+      - run: pnpm test:percy
         working-directory: ./packages/vuetify
         env:
           PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
           PERCY_BRANCH: master
           PERCY_TARGET_BRANCH: master
           PERCY_COMMIT: ${{ env.COMMIT }}
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-screenshots
-          path: ./packages/vuetify/cypress/screenshots/
-          if-no-files-found: ignore

.github/workflows/stale.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   stale:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/stale@v9
         with:

.github/workflows/triage.yml

@@ -1,18 +1,19 @@
 name: Issue triage
 on:
   issues:
-    types: [opened, labeled, unlabeled]
+    types: [opened, labeled, unlabeled, closed]
 
 jobs:
   triage:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: vuetifyjs/triage-action@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           triageLabel: 'S: triage'
           sponsorsFile: '.github/sponsors.yml'
+          duplicateLabel: 'duplicate'
           triagedLabels: |-
             T: documentation
             T: bug

.gitignore

@@ -21,5 +21,8 @@ coverage/
 cypress/screenshots
 cypress/videos
 
+# vitest
+__screenshots__/
+
 .vercel
 .now

.npmrc

@@ -1,2 +1,3 @@
 auto-install-peers=false
 ignore-workspace-root-check=true
+shell-emulator=true

.nvmrc

@@ -0,0 +1 @@
+22.6.0

.pnpmfile.cjs

@@ -14,6 +14,10 @@ module.exports = {
       if (['@rollup/pluginutils', 'rollup-plugin-terser', '@rollup/plugin-replace'].includes(pkg.name)) {
         pkg.peerDependencies.rollup = '*'
       }
+      if (pkg.name === 'brilliant-errors') {
+        delete pkg.dependencies.bumpp
+        delete pkg.dependencies.vitest
+      }
       return pkg
     }
   }