Merge branch 'dev' into feat/Ability_to_sort_descending_on_first

.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

@@ -31,12 +31,12 @@ jobs:
     runs-on: ubuntu-latest
     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
 
@@ -51,10 +51,11 @@ jobs:
         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 }}
@@ -66,7 +67,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/pnpm-install
+      - uses: vuetifyjs/setup-action@master
       - run: pnpm run test --project unit
         working-directory: ./packages/vuetify
 
@@ -77,7 +78,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/pnpm-install
+      - uses: vuetifyjs/setup-action@master
       - run: pnpm run test --project browser
         working-directory: ./packages/vuetify
 
@@ -89,10 +90,11 @@ jobs:
       - 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
@@ -114,10 +116,11 @@ jobs:
     runs-on: ubuntu-latest
     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
@@ -134,53 +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-vercel:
-    needs: [lint, test-unit, 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@v4
-      - uses: ./.github/actions/download-artifact
-        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 }}
-
-  publish-docs-coolify:
+  publish-docs:
     needs: [lint, test-unit, build-docs]
     runs-on: ubuntu-latest
     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: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/vuetifyjs/docs
-      - uses: docker/build-push-action@v6
+          path: packages/docs/dist
+      - uses: vuetifyjs/coolify-action@master
         with:
-          context: .
-          file: Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-      - name: Deploy to Coolify
-        run: |
-          curl --request GET '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          token: ${{ secrets.GITHUB_TOKEN  }}
+          imageName: docs
+          coolifyWebhook: ${{ secrets.COOLIFY_WEBHOOK }}
+          coolifySecret: ${{ secrets.COOLIFY_TOKEN }}

.github/workflows/nightly-schedule.yml

@@ -64,7 +64,7 @@ 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
         working-directory: ./packages/vuetify

.npmrc

@@ -1,3 +1,4 @@
 auto-install-peers=false
 ignore-workspace-root-check=true
+link-workspace-packages=deep
 shell-emulator=true

lerna.json

@@ -13,5 +13,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "3.7.3"
+  "version": "3.7.4"
 }

packages/api-generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuetify/api-generator",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "private": true,
   "description": "",
   "scripts": {

packages/api-generator/src/locale/en/VCalendar.json

@@ -1,7 +1,6 @@
 {
   "props": {
     "allowedDates": "Determines which dates are selectable.",
-    "displayValue": "Value to display for the component, possibly a formatted date.",
     "hideHeader": "Determines whether the header is hidden in the calendar view.",
     "hideWeekNumber": "Toggles the display of week numbers in a calendar view.",
     "intervals": "Total number of intervals in a day view.",
@@ -14,7 +13,8 @@
     "year": "Specifies the year for the calendar view."
   },
   "slots": {
-    "header": "Slot for custom header content."
+    "header": "Slot for custom header content.",
+    "event": "Slot for custom event content."
   },
   "events": {
     "next": "Emitted when moving to the next time period.",

packages/api-generator/src/locale/en/VConfirmEdit.json

@@ -5,6 +5,7 @@
   },
   "events": {
     "ok": "The event emitted when the user clicks the OK button",
+    "save": "The event emitted when the user clicks the Save button",
     "cancel": "The event emitted when the user clicks the Cancel button"
   }
 }

packages/api-generator/src/locale/en/VDataIterator.json

@@ -43,6 +43,7 @@
     "input": "Array of selected items.",
     "itemExpanded": "Event emitted when an item is expanded or closed.",
     "itemSelected": "Event emitted when an item is selected or deselected.",
+    "update:currentItems": "The `.sync` event for `currentItems` prop.",
     "update:expanded": "The `.sync` event for `expanded` prop.",
     "update:groupBy": "The `.sync` event for `groupBy` prop.",
     "update:itemsPerPage": "The `.sync` event for `itemsPerPage` prop.",

packages/api-generator/src/locale/en/VDataTable.json

@@ -38,7 +38,10 @@
     "virtualRows": "Virtualizes the rendering of rows. Be aware that you can not use the `body`, `body.prepend` or `body.append` slots with this prop."
   },
   "slots": {
+    "[`header.${string}`]": "Slot for custom rendering of a header cell.",
     "[`item.${string}`]": "Slot for custom rendering of a row cell.",
+    "header.data-table-expand": "Slot to replace the default `v-icon` used when expanding header.",
+    "header": "Slot to replace the default table `<thead>`.",
     "body": "Slot to replace the default table `<tbody>`.",
     "body.append": "Appends elements to the end of the default table `<tbody>`.",
     "body.prepend": "Prepends elements to the start of the default table `<tbody>`.",
@@ -55,11 +58,15 @@
     "heading": "Slot to add a custom header.",
     "header.<name>": "Slot to customize a specific header column.",
     "header.data-table-select": "Slot to replace the default `v-checkbox-btn` in header.",
+    "headers": "An array of objects that each describe a header column. See the example below for a definition of all properties.",
     "item": "Slot to replace the default rendering of a row.",
     "item.data-table-select": "Slot to replace the default `v-checkbox-btn` used when selecting rows.",
     "item.data-table-expand": "Slot to replace the default `v-icon` used when expanding rows.",
     "item.<name>": "Slot to customize a specific column.",
     "loading": "Defines content for when `loading` is true and no items are provided.",
+    "tbody": "Slot to replace the default table `<tbody>`.",
+    "thead": "Slot to replace the default table `<thead>`.",
+    "tfoot": "Slot to replace the default table `<tfoot>`.",
     "no-data": "Defines content for when no items are provided.",
     "no-results": "Defines content for when `search` is provided but no results are found.",
     "progress": "Slot to replace the default `<v-progress-linear>` component.",
@@ -73,6 +80,7 @@
     "pageCount": "Emits when the **pageCount** property of the **pagination** prop is updated.",
     "pagination": "Emits when something changed to the `pagination` which can be provided via the `pagination` prop.",
     "toggleSelectAll": "Emits when the `select-all` checkbox in table header is clicked. This checkbox is enabled by the **show-select** prop.",
+    "update:currentItems": "Emits with the items currently being displayed.",
     "update:expanded": "Emits when the **expanded** property of the **options** prop is updated.",
     "update:groupBy": "Emits when the **group-by** property of the **options** property is updated.",
     "update:groupDesc": "Emits when the **group-desc** property of the **options** prop is updated.",

packages/api-generator/src/locale/en/VDataTableFooter.json

@@ -12,5 +12,8 @@
     "prevIcon": "Previous icon.",
     "prevPageLabel": "Label for previous page.",
     "showCurrentPage": "Show current page number between prev/next icons."
+  },
+  "slots": {
+    "prepend": "Extra content placed before the default pagination."
   }
 }

packages/api-generator/src/locale/en/VDataTableHeaders.json

@@ -6,6 +6,10 @@
     "sticky": "Sticks the header to the top of the table."
   },
   "slots": {
-    "[`column.${string}`]": "Slot for custom rendering of a column."
+    "[`column.${string}`]": "Slot for custom rendering of a column.",
+    "[`header.${string}`]": "Slot for custom rendering of a header cell.",
+    "header.data-table-expand": "Slot for the expand button in the header.",
+    "header.data-table-select": "Slot for the select-all checkbox in the header.",
+    "headers": "Slot to replace the default rendering of the `<thead>` element."
   }
 }