Merge pull request #69 from matomo-org/vue-migrate

[Vue] migrate all directives to vue
matomo-org · Apr 18, 2022 · f60a1ff · f60a1ff
2 parents 265ae3f + 4adc3ec
commit f60a1ff
Show file tree

Hide file tree

Showing 20 changed files with 734 additions and 260 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,6 @@
-tests/System/processed/*xml
+tests/System/processed/*xml
+tests/System/processed/*text
+/vue/dist/demo.html
+/vue/dist/*.common.js
+/vue/dist/*.map
+/vue/dist/*.development.*
diff --git a/AnonymousPiwikUsageMeasurement.php b/AnonymousPiwikUsageMeasurement.php
@@ -103,11 +103,6 @@ public function getJsFiles(&$jsFiles)
         $jsFiles[] = 'matomo.js';
         $jsFiles[] = 'plugins/AnonymousPiwikUsageMeasurement/javascripts/url.js';
         $jsFiles[] = 'plugins/AnonymousPiwikUsageMeasurement/javascripts/tracking.js';
-        $jsFiles[] = 'plugins/AnonymousPiwikUsageMeasurement/angularjs/common/dashboard.directive.js';
-        $jsFiles[] = 'plugins/AnonymousPiwikUsageMeasurement/angularjs/common/marketplace.directive.js';
-        $jsFiles[] = 'plugins/AnonymousPiwikUsageMeasurement/angularjs/common/segment.directive.js';
-        $jsFiles[] = 'plugins/AnonymousPiwikUsageMeasurement/angularjs/common/emailreports.directive.js';
-        $jsFiles[] = 'plugins/AnonymousPiwikUsageMeasurement/angularjs/common/multisites.directive.js';
     }
 
     public function addMatomoClientTracking(&$out)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Changelog
 
+* 4.1.0 Migrating from AngularJS to Vue
 * 4.0.2 Compatibility with Matomo 4
 * 4.0.1 Compatibility with Matomo 4
 * 4.0.0 Compatibility with Matomo 4

diff --git a/angularjs/common/dashboard.directive.js b/angularjs/common/dashboard.directive.js
diff --git a/angularjs/common/emailreports.directive.js b/angularjs/common/emailreports.directive.js
diff --git a/angularjs/common/marketplace.directive.js b/angularjs/common/marketplace.directive.js
diff --git a/angularjs/common/multisites.directive.js b/angularjs/common/multisites.directive.js
diff --git a/angularjs/common/segment.directive.js b/angularjs/common/segment.directive.js
diff --git a/plugin.json b/plugin.json
@@ -1,6 +1,6 @@
 {
     "name": "AnonymousPiwikUsageMeasurement",
-    "version": "4.0.2",
+    "version": "4.1.0",
     "description": "Send anonymized usage data to your own Matomo instance or to any other Matomo",
     "theme": false,
     "keywords": [
@@ -12,7 +12,7 @@
     "license": "GPL v3+",
     "homepage": "https:\/\/matomo.org",
     "require": {
-        "matomo": ">=4.0.0-b1,<5.0.0-b1"
+        "matomo": ">=4.10.0-b1,<6.0.0-b1"
     },
     "support": {
         "issues": "https://github.com/matomo-org/plugin-AnonymousPiwikUsageMeasurement/issues",