.gitlab-ci.yml

@@ -39,7 +39,7 @@ stages:
     - !reference [.rules-map, on-dev]
     - !reference [.rules-map, not-on-semantic-release-commit]
     - !reference [.rules-map, on-branch]
-  image: hub.eole.education/proxyhub/geoffreybooth/meteor-base:2.12
+  image: hub.eole.education/proxyhub/geoffreybooth/meteor-base:2.13
   cache:
     key:
       files:

.meteor/packages

@@ -6,7 +6,7 @@
 
 meteor-base@1.5.1             # Packages every Meteor app needs to have
 mobile-experience@1.1.0       # Packages for a great mobile UX
-mongo@1.16.6                   # The database Meteor supports right now
+mongo@1.16.7                   # The database Meteor supports right now
 jquery                  # Wrapper package for npm-installed jquery
 reactive-var@1.0.12            # Reactive variable for tracker
 tracker@1.3.2                 # Meteor's client-side reactive programming library

.meteor/release

-METEOR@2.12
+METEOR@2.13

.meteor/versions

 accounts-base@2.2.8
 accounts-oauth@1.4.2
 accounts-password@2.3.4
-alanning:roles@3.4.0
+alanning:roles@3.5.1
 aldeed:collection2@3.5.0
 aldeed:schema-index@3.0.0
 allow-deny@1.1.1
@@ -21,7 +21,7 @@ ddp@1.4.1
 ddp-client@2.6.1
 ddp-common@1.4.0
 ddp-rate-limiter@1.2.0
-ddp-server@2.6.1
+ddp-server@2.6.2
 diff-sequence@1.1.2
 dynamic-import@0.7.3
 ecmascript@0.16.7
@@ -47,7 +47,7 @@ launch-screen@1.3.0
 localstorage@1.2.0
 logging@1.3.2
 mdg:validated-method@1.3.0
-meteor@1.11.2
+meteor@1.11.3
 meteor-base@1.5.1
 meteortesting:browser-tests@1.5.1
 meteortesting:mocha@2.1.0
@@ -60,7 +60,7 @@ mobile-status-bar@1.1.0
 modern-browsers@0.1.9
 modules@0.19.0
 modules-runtime@0.13.1
-mongo@1.16.6
+mongo@1.16.7
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
@@ -97,3 +97,4 @@ universe:i18n@1.32.6
 url@1.3.2
 webapp@1.13.5
 webapp-hashing@1.1.1
+zodern:types@1.0.9

Dockerfile

 # The tag here should match the Meteor version of your app, per .meteor/release
-FROM hub.eole.education/proxyhub/geoffreybooth/meteor-base:2.12
+FROM hub.eole.education/proxyhub/geoffreybooth/meteor-base:2.13
 
 # Copy app package.json and package-lock.json into container
 #COPY ./app/package*.json $APP_SOURCE_FOLDER/
@@ -14,7 +14,7 @@ RUN bash $SCRIPTS_FOLDER/build-meteor-bundle.sh
 
 
 # Rather than Node 8 latest (Alpine), you can also use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html
-FROM hub.eole.education/proxyhub/library/node:14.21.3-alpine
+FROM hub.eole.education/proxyhub/meteor/node:14.21.4-alpine3.17
 
 ENV APP_BUNDLE_FOLDER /opt/bundle
 ENV SCRIPTS_FOLDER /docker
@@ -38,7 +38,7 @@ RUN bash $SCRIPTS_FOLDER/build-meteor-npm-dependencies.sh --build-from-source
 
 # Start another Docker stage, so that the final image doesn’t contain the layer with the build dependencies
 # See previous FROM line; this must match
-FROM hub.eole.education/proxyhub/library/node:14.21.3-alpine
+FROM hub.eole.education/proxyhub/meteor/node:14.21.4-alpine3.17
 
 ENV APP_BUNDLE_FOLDER /opt/bundle
 ENV SCRIPTS_FOLDER /docker

config/settings.development.json.sample

@@ -9,6 +9,10 @@
         "useLocationOrigin": true
       }
     },
+    "matomo": {
+      "siteIdMezig": 1,
+      "urlBase": ""
+    }
   },
   "keycloak": {
     "pubkey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvyVtOgah8FjiXmFcnavID9b0lEhCl5k7jISPkPweOQtB1+hRAajcT7Y4v9babrUAXVL7bAb8nRTJVrks3Jl+o/nfZjfLxx7vIE1mMsRGVAqPg88UgyP79fFBvWdPnrIaIweNqlH5r1WoBOVjsoX0rFNijZqQ5llcC/uUYQW35urjGUJIZlHDSOdp34qnrrnohE3714PUuiKHhqFx15MpzmO/KQuIt0lJXuJ3NgAwt1OndksvP03Kkm0ls7IvveF0GiM2dki2xPRAHvv3jC1hLdHm0kGdrn+EndX0xFwBl9kL5zcjILGwm1gyfeJdfzOQrBUf6WL+FpgNseWq5MD+vwIDAQAB",

imports/ui/App.svelte

@@ -4,6 +4,7 @@
   import { Meteor } from 'meteor/meteor';
   import { useTracker } from 'meteor/rdb:svelte-meteor-data';
   import { _ } from 'svelte-i18n';
+  import Matomo, { matomo } from '@dexlib/svelte-matomo';
   import Search from './pages/Search.svelte';
   import Profil from './pages/Profil.svelte';
   import Nav from './components/Nav.svelte';
@@ -15,12 +16,14 @@
   import Maintenance from './pages/Maintenance.svelte';
   import NoAccount from './pages/NoAccount.svelte';
   import AppSettings from './../api/appsettings/appsettings';
+  import { onMount } from 'svelte';
 
   export let url = '';
   let userRedirect = false;
   let profileOk = true;
   let userActive = false;
   const { laboiteUrl, enableKeycloak = true } = Meteor.settings.public;
+  const { matomo: matomoSettings } = Meteor.settings.public;
   $: settings = useTracker(() => {
     const sub = Meteor.subscribe('appsettings.all');
     if (sub.ready()) {
@@ -28,6 +31,12 @@
     }
     return { maintenance: true, textMaintenance: '' };
   });
+
+  onMount(() => {
+    if (matomoSettings?.urlBase) {
+      matomo.trackPageView();
+    }
+  });
 </script>
 
 {#if $isLoading}
@@ -45,6 +54,9 @@
           </Route>
         </div>
       {:else}
+        {#if matomoSettings?.urlBase}
+          <Matomo url={matomoSettings.urlBase} siteId={matomoSettings.siteIdMezig} />
+        {/if}
         <div>
           <Route path="/profil/:publicName" component={Profil} />
           {#if !enableKeycloak}

package.json

 {
   "name": "mezig",
   "private": true,
-  "version": "1.9.0",
+  "version": "1.10.0-testing.1",
   "license": "EUPL-1.2",
   "description": "Online biography",
   "author": "EOLE/PCLL <team@eole.education> - DINUM",
@@ -15,8 +15,9 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/core": "^7.21.8",
-    "@babel/runtime": "^7.21.5",
+    "@babel/core": "^7.22.17",
+    "@babel/runtime": "^7.22.15",
+    "@dexlib/svelte-matomo": "^0.1.4",
     "@smui/button": "^6.1.4",
     "@smui/chips": "^6.1.4",
     "@smui/common": "^6.1.4",
@@ -31,19 +32,19 @@
     "@smui/snackbar": "^6.1.4",
     "@smui/switch": "^6.1.4",
     "@smui/textfield": "^6.1.4",
-    "axios": "^1.4.0",
-    "bcrypt": "^5.1.0",
-    "chai": "^4.3.7",
+    "axios": "^1.5.0",
+    "bcrypt": "^5.1.1",
+    "chai": "^4.3.8",
     "dom-parser": "^0.1.6",
     "eslint-plugin-n": "^15.7.0",
-    "jquery": "^3.6.4",
+    "jquery": "^3.7.1",
     "meteor-node-stubs": "^1.2.5",
     "moment": "^2.29.4",
-    "sanitize-html": "^2.10.0",
+    "sanitize-html": "^2.11.0",
     "simpl-schema": "^1.13.1",
     "sortablejs": "^1.15.0",
-    "svelte": "^3.58.0",
-    "svelte-i18n": "^3.6.0",
+    "svelte": "^3.59.2",
+    "svelte-i18n": "^3.7.4",
     "svelte-infinite-scroll": "^2.0.1",
     "svelte-material-icons": "^2.1.0",
     "svelte-routing": "^1.11.0",
@@ -61,26 +62,26 @@
     "extends": "@meteorjs/eslint-config-meteor"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.21.8",
+    "@babel/eslint-parser": "^7.22.15",
     "@meteorjs/eslint-config-meteor": "^1.0.5",
-    "eslint": "^8.39.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-config-standard": "^17.0.0",
+    "eslint-config-prettier": "^8.10.0",
+    "eslint-config-standard": "^17.1.0",
     "eslint-import-resolver-meteor": "^0.4.0",
     "eslint-plugin-i18n": "^2.0.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsx": "^0.1.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-meteor": "^7.2.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-standard": "^5.0.0",
     "prettier": "^2.8.8",
-    "prettier-plugin-svelte": "^2.10.0"
+    "prettier-plugin-svelte": "^2.10.1"
   },
   "overrides": {
     "semver": "^7.5.2"