Merge branch '4.x-dev' into fix11796

1 files changed, 30 insertions, 2 deletions

diff --git a/package.json b/package.json
index 7a449d74dc..68cced0ee9 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "test": "tests"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "TZ=UTC vue-cli-service test:unit",
+    "eslint": "eslint"
   },
   "repository": {
     "type": "git",
@@ -26,12 +27,16 @@
   },
   "homepage": "https://github.com/matomo-org/matomo#readme",
   "dependencies": {
+    "@types/jquery": "^3.5.6",
+    "@types/jqueryui": "^1.12.16",
     "angular": "^1.8.2",
     "angular-animate": "^1.8.2",
     "angular-cookies": "^1.8.2",
     "angular-mocks": "^1.8.2",
     "angular-sanitize": "^1.8.2",
     "chroma-js": "^0.6.3",
+    "core-js": "^3.16.3",
+    "css-loader": "^6.2.0",
     "iframe-resizer": "^4.2.11",
     "jquery": "^2.2.4",
     "jquery-mousewheel": "^3.1.13",
@@ -44,6 +49,29 @@
     "ng-dialog": "^1.4.0",
     "qrcodejs2": "0.0.2",
     "sprintf-js": "^1.1.2",
-    "visibilityjs": "^2.0.2"
+    "visibilityjs": "^2.0.2",
+    "vue": "^3.2.6"
+  },
+  "devDependencies": {
+    "@types/angular": "^1.8.2",
+    "@types/jest": "^26.0.24",
+    "@typescript-eslint/eslint-plugin": "^4.29.3",
+    "@typescript-eslint/parser": "^4.29.3",
+    "@vue/cli-plugin-babel": "^4.5.13",
+    "@vue/cli-plugin-eslint": "^4.5.13",
+    "@vue/cli-plugin-typescript": "^4.5.13",
+    "@vue/cli-plugin-unit-jest": "^4.5.13",
+    "@vue/cli-service": "^4.5.13",
+    "@vue/compiler-sfc": "^3.2.6",
+    "@vue/eslint-config-airbnb": "^5.3.0",
+    "@vue/eslint-config-typescript": "^7.0.0",
+    "babel-loader": "^8.2.2",
+    "dompurify": "^2.3.3",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-vue": "^7.16.0",
+    "ts-jest": "^26.5.6",
+    "typescript": "^4.3.5",
+    "vue-jest": "^5.0.0-0"
   }
 }