Merge branch '5.x-dev' into dev-19682-existing

Author: caddoo

.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 ""
-

composer.lock

@@ -215,6 +215,10 @@
 ; Note that for quick debugging, instead of using below setting, you can add `&disable_merged_assets=1` to the Matomo URL
 disable_merged_assets = 0
 
+; if set to 1, the sourcemaps for built vue files will be allowed to be served.
+; this is useful for debugging vue files in the browser
+allow_vue_sourcemaps = 0
+
 [General]
 ; the following settings control whether Unique Visitors `nb_uniq_visitors` and Unique users `nb_users` will be processed for different period types.
 ; year and range periods are disabled by default, to ensure optimal performance for high traffic Matomo instances

config/global.ini.php

@@ -476,6 +476,8 @@
         "Testing": "Tástáil…",
         "ThankYouForUsingMatomo": "Go raibh maith agat as Matomo a úsáid",
         "TheMatomoTeam": "Foireann Matomo",
+        "ThirdPartyCookieSettingNote": "Ní mór fianáin tríú páirtí a dhíchumasú",
+        "ThirdPartyCookieSettingTitle": "Fianáin tríú páirtí",
         "TimeAgo": "%s ó shin",
         "TimeFormat": "Formáid ama",
         "TimeOnPage": "Am ar an leathanach",