fix(QDate): resolve merge conflict - preserve aria-label accessibility fix with upstream/dev formatting

Author: Jadu07

.editorconfig

@@ -3,8 +3,8 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = space
 indent_size = 2
+indent_style = space
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true

.github/PULL_REQUEST_TEMPLATE.md

@@ -32,6 +32,7 @@
 - [ ] Any necessary documentation has been added or updated [in the docs](https://github.com/quasarframework/quasar/tree/dev/docs) <!-- for faster update click on "Suggest an edit on GitHub" at bottom of page --> or explained in the PR's description.
 
 If adding a **new feature**, the PR's description includes:
+
 - [ ] A convincing reason for adding this feature (to avoid wasting your time, it's best to [start a new feature discussion](https://github.com/quasarframework/quasar/discussions/new?category=ideas-proposals) first and wait for approval before working on it)
 
 **Other information:**

.github/RELEASE-TEMPLATE.md

@@ -15,4 +15,4 @@ The documentation can be found at [quasar.dev](https://quasar.dev/)
 Quasar Framework is an open-source MIT licensed project that has been made possible due to the **generous contributions** by [sponsors and backers](https://github.com/sponsors/rstoenescu). If you are interested in supporting this project, please consider:
 
 - [Becoming a sponsor on Github](https://github.com/sponsors/rstoenescu)
-- [One-off donation via PayPal](https://paypal.me/rstoenescu1)
+- [One-off donation via PayPal](https://paypal.me/rstoenescu1)

.github/workflows/build-types.yml

@@ -45,19 +45,18 @@ jobs:
 
     permissions:
       contents: read # to fetch code (actions/checkout)
-      actions: write # to upload artifacts (actions/upload-artifact)
 
     defaults:
       run:
         working-directory: ui
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v5
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 24
           cache: 'pnpm'
@@ -66,17 +65,17 @@ jobs:
         run: pnpm i
 
       - name: Ensure types are formatted correctly
-        run: pnpm format:types --write=false --check
+        run: pnpm lint:check
 
       - name: Build the types
         run: pnpm build js types
 
       - if: ${{ github.event_name == 'pull_request' }}
         run: |
-          echo ${{ github.event.number }} > dist/.pr-number
+          echo "${{ github.event.number }}" > dist/.pr-number
 
       - name: Upload the build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: types-build
           include-hidden-files: true # to include the .pr-number file

.github/workflows/comment-build-results.yml

@@ -28,7 +28,7 @@ jobs:
     steps:
       - name: Check current types build workflow run
         id: current-workflow-run
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { data: { workflow_runs: [workflowRun] } } = await github.rest.actions.listWorkflowRuns({
@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Download the current types build
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         env:
           CURRENT_RUN_ID: ${{ needs.check-current-build.outputs.run-id }}
         with:
@@ -85,7 +85,7 @@ jobs:
 
       - name: Download the PR information artifact
         id: pr-info
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { readFile, writeFile, unlink } = require('node:fs/promises');
@@ -149,7 +149,7 @@ jobs:
           fi
           echo "" >> build-results.md
 
-      - uses: marocchino/sticky-pull-request-comment@v2
+      - uses: marocchino/sticky-pull-request-comment@v3
         with:
           number: ${{ fromJSON(steps.pr-info.outputs.result).number }}
           hide_and_recreate: true

.github/workflows/process-created-issue.yml

@@ -21,14 +21,14 @@ jobs:
       TEMPLATE_VERSION: 'v2'
       # TEMPLATE_VERSION: ${{ contains(github.event.issue.labels.*.name, 'Qv2') && 'v2' || 'v3' }} # uncomment when Quasar v3 is available
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: stefanbuck/github-issue-parser@v3
         id: issue-parser
         with:
           template-path: .github/ISSUE_TEMPLATE/${{ env.TEMPLATE_TYPE }}-report--quasar-${{ env.TEMPLATE_VERSION }}.yml
 
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         env:
           ISSUE_MODEL: ${{ steps.issue-parser.outputs.jsonString }}
           INVALID_REPRO_MESSAGE: |

.github/workflows/project-creation-tests.yml

@@ -13,6 +13,10 @@ on:
       - '.github/workflows/project-creation-tests.yml'
       - 'create-quasar/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     if: >-
@@ -38,15 +42,15 @@ jobs:
     name: Lint create-quasar
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v5
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install dependencies
@@ -83,13 +87,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v5
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
@@ -105,7 +109,7 @@ jobs:
           echo "PNPM_CACHE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
       - name: Setup pnpm cache
         if: ${{ matrix.package-manager == 'pnpm' }}
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.pnpm-cache.outputs.PNPM_CACHE_PATH }}
           key: pnpm-cache-${{ matrix.app-engine }}-${{ matrix.script-type }}
@@ -121,7 +125,7 @@ jobs:
           echo "YARN_CACHE_PATH=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Setup yarn cache
         if: ${{ matrix.package-manager == 'yarn' }}
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.yarn-cache.outputs.YARN_CACHE_PATH }}
           key: yarn-cache-${{ matrix.app-engine }}-${{ matrix.script-type }}
@@ -137,7 +141,7 @@ jobs:
           echo "NPM_CACHE_PATH=$(npm config get cache)" >> $GITHUB_OUTPUT
       - name: Setup npm cache
         if: ${{ matrix.package-manager == 'npm' }}
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.npm-cache.outputs.NPM_CACHE_PATH }}
           key: npm-cache-${{ matrix.app-engine }}-${{ matrix.script-type }}

.github/workflows/release-notes.yml

@@ -13,14 +13,14 @@ jobs:
       contents: read # to fetch code (actions/checkout) and to read releases (actions/github-script)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: dev
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v5
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 24
           cache: 'pnpm'
@@ -29,7 +29,7 @@ jobs:
         run: pnpm i
 
       - name: Generate Release Notes
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { mkdir, writeFile } = require('node:fs/promises');
@@ -154,7 +154,7 @@ jobs:
             );
 
       - name: Upload release notes JSON files
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: release-notes
           path: docs/dist/release-notes
@@ -167,18 +167,18 @@ jobs:
     runs-on: ubuntu-latest
     needs: generate
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           repository: quasarframework/cdn
           token: ${{ secrets.CDN_REPO_PAT }}
 
       - name: Download generated release notes JSON files
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: release-notes
           path: release-notes
 
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: |
             Generated release notes for Quasar packages

.github/workflows/tests-on-pr-report.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - name: Download the tests results artifacts
         id: results
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { readFile, writeFile, unlink } = require('node:fs/promises');

.github/workflows/tests-on-pr.yml

@@ -11,6 +11,10 @@ on:
       - 'ui/package.json'
       - 'ui/playground/package.json'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     permissions:
@@ -23,13 +27,13 @@ jobs:
     name: Build the packages
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v5
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 24
           cache: 'pnpm'
@@ -42,7 +46,7 @@ jobs:
         run: pnpm build
 
       - name: Upload UI build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ui-build
           path: ui/dist
@@ -52,7 +56,7 @@ jobs:
         run: pnpm build
 
       - name: Upload vite-plugin build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: vite-plugin-build
           path: vite-plugin/dist
@@ -77,28 +81,28 @@ jobs:
     name: Tests
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v5
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
 
       - name: Install dependencies
         run: pnpm i
 
       - name: Download UI build artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: ui-build
           path: ui/dist
 
       - name: Download vite-plugin build artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vite-plugin-build
           path: vite-plugin/dist
@@ -110,14 +114,14 @@ jobs:
 
       - name: Upload test results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: test-results
           path: ui/testing/test-results
 
       - name: Upload GitHub Actions event data
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: event-data
           path: ${{ github.event_path }}