From 32912046cb802c53fd0874c64a6850cfd8966f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Fri, 1 Jul 2022 14:47:40 +0200
Subject: [PATCH] replace ngx-matomo by ngx-matomo-v9, remove
angular-animations 0.11.0
refs #500
---
package-lock.json | 51 +++++--------------
package.json | 3 +-
src/app/app.component.ts | 2 +-
src/app/app.module.ts | 2 +-
.../app-setup/app-setup.component.ts | 2 +-
.../calculator.component.ts | 2 +-
.../modules-diagram.component.ts | 2 +-
.../session-properties.component.ts | 2 +-
8 files changed, 19 insertions(+), 47 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index d8ba10a0e..67d0d49aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,6 @@
"@angular/router": "^13.3.11",
"@types/pako": "^1.0.1",
"@types/sprintf-js": "^1.1.2",
- "angular-animations": "^0.11.0",
"angular2-chartjs": "^0.5.1",
"angular2-hotkeys": "^13.1.0",
"chartjs-plugin-zoom": "^0.7.7",
@@ -46,7 +45,7 @@
"mermaid": "^8.8.0",
"ngx-markdown": "^13.1.0",
"ngx-material-file-input": "^3.0.0",
- "ngx-matomo": "^1.0.0-rc.2",
+ "ngx-matomo-v9": "^0.6.0",
"ngx-webstorage-service": "^4.1.0",
"pako": "^1.0.11",
"primeng": "^13.4.1",
@@ -6289,17 +6288,6 @@
"semver": "^5.4.1"
}
},
- "node_modules/angular-animations": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/angular-animations/-/angular-animations-0.11.0.tgz",
- "integrity": "sha512-P2RuOe+T97bhgGDLtOYK9V45QA5y+kFUxoJfRAua8Ymo0bI5lWyw8oiVmBoEIZUU+nooYoJvQXgVKuZJA7/z3g==",
- "dependencies": {
- "tslib": "^2.0.0"
- },
- "peerDependencies": {
- "@angular/animations": ">=6.0.0"
- }
- },
"node_modules/angular2-chartjs": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/angular2-chartjs/-/angular2-chartjs-0.5.1.tgz",
@@ -18891,20 +18879,15 @@
"@angular/material": "^13.0.0"
}
},
- "node_modules/ngx-matomo": {
- "version": "1.0.0-rc.2",
- "resolved": "https://registry.npmjs.org/ngx-matomo/-/ngx-matomo-1.0.0-rc.2.tgz",
- "integrity": "sha512-RSftQrsc+2y5MlaXWcTE32Ugobg9pf4J6JqHJIFsrbYjyjWea5KgZxr1TTV9LnajBsFWu/aor2CIIxZsYTXYYQ==",
+ "node_modules/ngx-matomo-v9": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/ngx-matomo-v9/-/ngx-matomo-v9-0.6.0.tgz",
+ "integrity": "sha512-nLJC1QDpOB12BJ/kkcKsx+uqiE4I8hWh87cfqRaordhb98ihDrQssusOvQ2sANz2Ujdo7hXAbbtvzQ4DtCssVQ==",
"dependencies": {
- "tslib": "^2.3.0"
- },
- "optionalDependencies": {
- "@angular/router": ">=9.0.0 <15.0.0",
- "rxjs": "^6.6.0"
+ "tslib": "^2.0.0"
},
"peerDependencies": {
- "@angular/common": ">=9.0.0 <15.0.0",
- "@angular/core": ">=9.0.0 <15.0.0"
+ "@angular/core": ">=8.0.0 <14.0.0"
}
},
"node_modules/ngx-webstorage-service": {
@@ -30940,14 +30923,6 @@
"semver": "^5.4.1"
}
},
- "angular-animations": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/angular-animations/-/angular-animations-0.11.0.tgz",
- "integrity": "sha512-P2RuOe+T97bhgGDLtOYK9V45QA5y+kFUxoJfRAua8Ymo0bI5lWyw8oiVmBoEIZUU+nooYoJvQXgVKuZJA7/z3g==",
- "requires": {
- "tslib": "^2.0.0"
- }
- },
"angular2-chartjs": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/angular2-chartjs/-/angular2-chartjs-0.5.1.tgz",
@@ -40765,14 +40740,12 @@
"tslib": "^2.3.0"
}
},
- "ngx-matomo": {
- "version": "1.0.0-rc.2",
- "resolved": "https://registry.npmjs.org/ngx-matomo/-/ngx-matomo-1.0.0-rc.2.tgz",
- "integrity": "sha512-RSftQrsc+2y5MlaXWcTE32Ugobg9pf4J6JqHJIFsrbYjyjWea5KgZxr1TTV9LnajBsFWu/aor2CIIxZsYTXYYQ==",
+ "ngx-matomo-v9": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/ngx-matomo-v9/-/ngx-matomo-v9-0.6.0.tgz",
+ "integrity": "sha512-nLJC1QDpOB12BJ/kkcKsx+uqiE4I8hWh87cfqRaordhb98ihDrQssusOvQ2sANz2Ujdo7hXAbbtvzQ4DtCssVQ==",
"requires": {
- "@angular/router": ">=9.0.0 <15.0.0",
- "rxjs": "^6.6.0",
- "tslib": "^2.3.0"
+ "tslib": "^2.0.0"
}
},
"ngx-webstorage-service": {
diff --git a/package.json b/package.json
index f3c2891fd..aad569ad7 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
"@angular/router": "^13.3.11",
"@types/pako": "^1.0.1",
"@types/sprintf-js": "^1.1.2",
- "angular-animations": "^0.11.0",
"angular2-chartjs": "^0.5.1",
"angular2-hotkeys": "^13.1.0",
"chartjs-plugin-zoom": "^0.7.7",
@@ -72,7 +71,7 @@
"mermaid": "^8.8.0",
"ngx-markdown": "^13.1.0",
"ngx-material-file-input": "^3.0.0",
- "ngx-matomo": "^1.0.0-rc.2",
+ "ngx-matomo-v9": "^0.6.0",
"ngx-webstorage-service": "^4.1.0",
"pako": "^1.0.11",
"primeng": "^13.4.1",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index e005db3bc..d96808db9 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -26,7 +26,7 @@ import { decodeHtml } from "./util";
import { HotkeysService, Hotkey } from "angular2-hotkeys";
-import { MatomoInjector, MatomoTracker } from "ngx-matomo";
+import { MatomoInjector, MatomoTracker } from "ngx-matomo-v9";
import { saveAs } from "file-saver";
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a811a8d74..3bc05ee6f 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -44,7 +44,7 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms"; // <-- NgMode
import { ChartModule } from "angular2-chartjs";
import { RouterModule, Routes } from "@angular/router";
import { HotkeyModule } from "angular2-hotkeys";
-import { MatomoModule } from "ngx-matomo";
+import { MatomoModule } from "ngx-matomo-v9";
import { FormulaireService } from "./services/formulaire.service";
import { I18nService } from "./services/internationalisation.service";
diff --git a/src/app/components/app-setup/app-setup.component.ts b/src/app/components/app-setup/app-setup.component.ts
index 7010813af..0124b5cb5 100644
--- a/src/app/components/app-setup/app-setup.component.ts
+++ b/src/app/components/app-setup/app-setup.component.ts
@@ -8,7 +8,7 @@ import { NgBaseParam } from "../base-param-input/base-param-input.component";
import { ErrorStateMatcher } from "@angular/material/core";
import { MatSnackBar } from "@angular/material/snack-bar";
-import { MatomoTracker } from "ngx-matomo";
+import { MatomoTracker } from "ngx-matomo-v9";
@Component({
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index cd11ac0b4..f3335faf5 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -56,7 +56,7 @@ import { FormulairePrebarrage } from "../../formulaire/definition/form-prebarrag
import { HotkeysService, Hotkey } from "angular2-hotkeys";
-import { MatomoTracker } from "ngx-matomo";
+import { MatomoTracker } from "ngx-matomo-v9";
import { sprintf } from "sprintf-js";
diff --git a/src/app/components/modules-diagram/modules-diagram.component.ts b/src/app/components/modules-diagram/modules-diagram.component.ts
index 79118556f..fe9aee01f 100644
--- a/src/app/components/modules-diagram/modules-diagram.component.ts
+++ b/src/app/components/modules-diagram/modules-diagram.component.ts
@@ -31,7 +31,7 @@ import * as mermaid from "mermaid";
import * as SvgPanZoom from "svg-pan-zoom";
-import { MatomoTracker } from "ngx-matomo";
+import { MatomoTracker } from "ngx-matomo-v9";
import { fv } from "../../util";
diff --git a/src/app/components/session-properties/session-properties.component.ts b/src/app/components/session-properties/session-properties.component.ts
index d6dd8d6f5..c46c37e98 100644
--- a/src/app/components/session-properties/session-properties.component.ts
+++ b/src/app/components/session-properties/session-properties.component.ts
@@ -7,7 +7,7 @@ import { Session } from "jalhyd";
import { KatexOptions } from "ngx-markdown/src/katex-options";
-import { MatomoTracker } from "ngx-matomo";
+import { MatomoTracker } from "ngx-matomo-v9";
@Component({
selector: "session-properties",
--
GitLab