Merge branch 'quasarframework:dev' into dev

Author: sainf

.github/ISSUE_TEMPLATE/bug-report--quasar-v1.yml

@@ -42,8 +42,8 @@ body:
         Fork one of the following, hit save then copy-paste the URL here:
           - [Codepen](https://codepen.quasar.dev)
           - [jsFiddle](https://jsfiddle.quasar.dev)
-          - [StackBlitz - app-vite](https://stackblitz.com/fork/quasarframework)
-          - [StackBlitz - app-webpack](https://stackblitz.com/fork/quasarframework-webpack)
+          - [StackBlitz - app-vite](https://stackblitz-vite.quasar.dev)
+          - [StackBlitz - app-webpack](https://stackblitz-webpack.quasar.dev)
           - [Codesandbox](https://codesandbox.quasar.dev)
         _You can provide a GitHub repo only as a last resort. Keep in mind that it will be prioritized less as it makes the reproduction process slower._
       placeholder: https://codepen.io/rstoenescu/pen/xxEvBLR - DO NOT use this example value or a random URL

.github/ISSUE_TEMPLATE/bug-report--quasar-v2.yml

@@ -79,6 +79,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: types-build
+          include-hidden-files: true # to include the .pr-number file
           path: |
             ui/dist/api
             ui/dist/types

.github/ISSUE_TEMPLATE/docs-report--quasar-v1.yml

@@ -18,7 +18,8 @@ jobs:
     env:
       # Mimic ternary operator, see https://github.com/actions/runner/issues/409#issuecomment-752775072
       TEMPLATE_TYPE: ${{ contains(github.event.issue.labels.*.name, 'kind/bug 🐞') && 'bug' || 'docs' }}
-      TEMPLATE_VERSION: ${{ contains(github.event.issue.labels.*.name, 'Qv1') && 'v1' || 'v2' }}
+      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
 
@@ -34,7 +35,7 @@ jobs:
             Hi @${{ github.event.issue.user.login }}! 👋
 
             It looks like you provided an invalid or unsupported reproduction URL.
-            Do not use any service other than [Codepen](https://codepen.io), [jsFiddle](https://jsfiddle.net), [StackBlitz](https://stackblitz.com), [Codesandbox](https://codesandbox.io), and [GitHub](https://github.com).
+            Do not use any service other than [Codepen](https://codepen.io), [jsFiddle](https://jsfiddle.net), [StackBlitz](https://stackblitz.com), [CodeSandbox](https://codesandbox.io), and [GitHub](https://github.com).
             Make sure the URL you provided is correct and reachable. You can test it by visiting it in a private tab, another device, etc.
             Please **edit your original post above** and provide a valid reproduction URL as explained.
 

.github/workflows/build-types.yml

@@ -175,8 +175,9 @@ jobs:
             echo $WAIT_ON_CONFIG > wait-on.json
             npx wait-on@7.2.0 --config wait-on.json --timeout 5000 http-get://127.0.0.1:9000
           else
+            PORT=$([[ '${{ matrix.app-engine }}' == 'webpack-4' ]] && echo '9000' || echo '8080')
             # 15s is almost enough, but due to possible fluctuations in the CI environment, we set it higher than that
-            npx wait-on@7.2.0 --timeout 20000 http-get://127.0.0.1:8080
+            npx wait-on@7.2.0 --timeout 20000 http-get://127.0.0.1:$PORT
           fi
 
           kill $!

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

@@ -38,7 +38,7 @@ jobs:
               run_id: context.payload.workflow_run.id,
             });
 
-            const resultArtifacts = artifacts.filter(({ name }) => name.startsWith('test-results-'));
+            const resultArtifacts = artifacts.filter(({ name }) => name.startsWith('test-results'));
             for (const artifact of resultArtifacts) {
               const { data: artifactData } = await github.rest.actions.downloadArtifact({
                 owner: context.repo.owner,
@@ -70,5 +70,5 @@ jobs:
           commit: ${{ github.event.workflow_run.head_sha }}
           event_file: event-data/event.json
           event_name: ${{ github.event.workflow_run.event }}
-          files: 'test-results/*/*.xml'
+          files: 'test-results/*.xml'
           check_name: 'UI Tests Results'

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

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/tests-on-pr.yml'
       - 'ui/**/*.js'
       - 'ui/package.json'
-      - 'ui/dev/package.json'
+      - 'ui/playground/package.json'
 
 jobs:
   build:
@@ -63,7 +63,7 @@ jobs:
 
     permissions:
       contents: read # to fetch code (actions/checkout)
-      actions: read # to correctly identify workflow run (cypress-io/github-action)
+      actions: read # to correctly identify workflow run
 
     runs-on: ubuntu-latest
 
@@ -73,10 +73,8 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix:
-        browser: [chrome, firefox]
 
-    name: Tests on ${{ matrix.browser }}
+    name: Tests
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -93,25 +91,6 @@ jobs:
       - name: Install dependencies
         run: pnpm i
 
-      # We have to cache Cypress binary as well (https://on.cypress.io/not-installed-ci-error)
-      - name: Get Cypress version
-        id: cypress-version
-        working-directory: ui
-        run: |
-          echo "CYPRESS_VERSION=$(pnpm why cypress --depth 0 --json | jq -r '.[0].devDependencies.cypress.version')" > $GITHUB_OUTPUT
-      - name: Cache Cypress binary
-        id: cypress-cache
-        uses: actions/cache@v4
-        with:
-          # https://docs.cypress.io/guides/references/advanced-installation#Skipping-installation
-          path: ~/.cache/Cypress
-          key: cypress-cache-${{ steps.cypress-version.outputs.CYPRESS_VERSION }}
-          restore-keys: |
-            cypress-cache-
-      - name: Install Cypress
-        if: steps.cypress-cache.outputs.cache-hit != 'true'
-        run: pnpm cypress install
-
       - name: Download UI build artifact
         uses: actions/download-artifact@v4
         with:
@@ -124,23 +103,17 @@ jobs:
           name: vite-plugin-build
           path: vite-plugin/dist
 
-      - name: Run tests in ${{ matrix.browser }} browser
-        uses: cypress-io/github-action@v6
-        env:
-          CYPRESS_JUNIT_RESULTS_FILENAME: test-results/${{ matrix.browser }}/[hash].xml
-        with:
-          install: false
-          command: pnpm test:component:run --browser ${{ matrix.browser }}
-          working-directory: ui
+      - name: Run tests
+        run: pnpm test
 
       # Upload required artifacts to be used in tests-on-pr-report.yml
 
       - name: Upload test results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: test-results-${{ matrix.browser }}
-          path: ui/dev/test-results
+          name: test-results
+          path: ui/testing/test-results
 
       - name: Upload GitHub Actions event data
         if: ${{ always() }}

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

@@ -1,3 +1,4 @@
 # pnpm-related options
 shamefully-hoist=true
 strict-peer-dependencies=false
+link-workspace-packages=true