Merge branch '5.x-dev' into fix/icon/vertical-align

Author: roiLeo

.ddev/README.md

@@ -44,6 +44,23 @@ ddev matomo:init:dev
 
 This command will set up the environment for development, installing the additional dependencies required.
 
+We have also added a parameter to the `ddev matomo:init:dev` command to enable source maps for Vue components. 
+To enable them, you can run:
+```
+ddev matomo:init:dev --with-sourcemaps
+```
+
+You can also disable sourcemaps at any time if you want to, just run the default command again:
+```
+ddev matomo:init:dev
+```
+NOTE: You should tick 'Disable cache' on your browser developer tools to see the changes.
+
+To see help:
+```
+ddev help matomo:init:dev
+```
+
 ### 4. Set up the testing environment
 
 After Matomo is set up, you can initialize the testing environment by running:

.ddev/commands/host/matomo_init_dev

@@ -1,8 +1,18 @@
 #!/usr/bin/env bash
 
 ## Description: Initialize Matomo environment for development
-## Usage: matomo:init:dev
-## Example: ddev matomo:init:dev
+## Usage: matomo:init:dev [--with-sourcemaps]
+## Example: ddev matomo:init:dev --with-sourcemaps
+
+WITH_MAPS=0
+for arg in "$@"; do
+  if [ "$arg" = "--with-sourcemaps" ]; then
+    WITH_MAPS=1
+  fi
+done
+
+MAP_FLAG_VALUE=$([ "$WITH_MAPS" -eq 1 ] && echo 1 || echo 0)
+
 
 echo "Run npm install ..."
 ddev npm install
@@ -11,6 +21,10 @@ echo "Enable development mode and disable assets merging ..."
 ddev matomo:console development:enable
 ddev matomo:console config:set Development.disable_merged_assets=1
 
+echo "Configure Vue source maps"
+ddev matomo:console config:set Development.allow_vue_sourcemaps=$MAP_FLAG_VALUE
+## recreate the htaccess files to include/exclude maps
+ddev matomo:console core:create-security-files
+
 echo "Done: Matomo dev setup initialisation finished."
 echo ""
-

.github/scripts/clean-build.sh

@@ -111,10 +111,6 @@ rm -rf node_modules/chroma-js/test
 
 rm -rf node_modules/iframe-resizer/js/iframeResizer.contentWindow.js
 rm -rf node_modules/iframe-resizer/js/iframeResizer.js
-rm -rf node_modules/iframe-resizer/src/ie8.polyfils.js
-rm -rf node_modules/iframe-resizer/src/iframeResizer.contentWindow.js
-rm -rf node_modules/iframe-resizer/src/iframeResizer.js
-rm -rf node_modules/iframe-resizer/test-main.js
 
 rm -rf node_modules/jquery/dist/jquery.js
 rm -rf node_modules/jquery/src

.github/workflows/buildtrackerjs.yml

@@ -54,7 +54,7 @@ jobs:
         distribution: 'zulu'
         java-version: '9'
       if: steps.vars.outputs.branch != ''
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         ref: ${{ steps.vars.outputs.branch }}
         lfs: false

.github/workflows/buildvue.yml

@@ -45,7 +45,7 @@ jobs:
           echo "islocalbranch=$(expr $BASE == $GITHUB_REPOSITORY)" >> $GITHUB_OUTPUT
           echo "branch=$REF" >> $GITHUB_OUTPUT
           echo "base=$BASE_SHA" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: false
           persist-credentials: false

.github/workflows/buildwoff2.yml

@@ -45,7 +45,7 @@ jobs:
           echo "islocalbranch=$(expr $BASE == $GITHUB_REPOSITORY)" >> $GITHUB_OUTPUT
           echo "branch=$REF" >> $GITHUB_OUTPUT
           echo "base=$BASE_SHA" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: false
           persist-credentials: false

.github/workflows/composer-update.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         ref: '5.x-dev'
         lfs: false

.github/workflows/dependabot_prs.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Dependabot metadata
         id: dependabot-metadata
         uses: dependabot/fetch-metadata@v2
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         if: ${{ steps.dependabot-metadata.outputs.package-ecosystem == 'npm_and_yarn' }}
         with:
           ref: ${{ github.head_ref }}

.github/workflows/matomo-tests.yml

@@ -28,7 +28,18 @@ on:
         required: false
       TESTOMATIO_INTEGRATION:
         required: false
-
+  schedule:
+    # Run every 2 hours from Saturday 00:00 (Germany) until Sunday 16:00 (Germany)
+    # Germany assumed CET (UTC+1):
+    # - Start: Sat 00:00 DE  -> Fri 23:00 UTC
+    # - End:   Sun 16:00 DE -> Sun 15:00 UTC
+    #
+    # Friday 23:00 UTC (Sat 00:00 DE)
+    - cron: "0 23 * * 5"
+    # All odd hours on Saturday UTC: 01,03,...,23
+    - cron: "0 1-23/2 * * 6"
+    # Sunday UTC hours: 01,03,05,07,09,11,13,15 (up to 16:00 DE)
+    - cron: "0 1-15/2 * * 0"
 permissions:
   actions: read
   checks: none
@@ -66,7 +77,7 @@ jobs:
             mysql-engine: 'Mysql'
             mysql-version: '8.0'
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: false
           persist-credentials: false
@@ -89,7 +100,7 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: false
           persist-credentials: false
@@ -106,7 +117,7 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: false
           persist-credentials: false
@@ -126,7 +137,7 @@ jobs:
       matrix:
         parts: [ 0,1,2,3 ]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: true
           persist-credentials: false

.github/workflows/phpcs.yml

@@ -19,7 +19,7 @@ jobs:
     name: PHPCS
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: false
           persist-credentials: false