From bbb3fb7865c4437f4d5d3c9a0a05ef9d9d26a1fc Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Thu, 28 May 2020 21:48:29 +0200 Subject: [PATCH] fix(Dependencies): Resolve peer-dependency issues resolves #402 --- package-lock.json | 95 ++++++++++++++++++++++++++++++++++++++++++++--- package.json | 14 +++++-- 2 files changed, 100 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index fe2a2863..f07d1fb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -855,6 +855,15 @@ } } }, + "@egjs/hammerjs": { + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz", + "integrity": "sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==", + "dev": true, + "requires": { + "@types/hammerjs": "^2.0.36" + } + }, "@istanbuljs/schema": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", @@ -956,6 +965,12 @@ "@types/node": "*" } }, + "@types/hammerjs": { + "version": "2.0.36", + "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.36.tgz", + "integrity": "sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==", + "dev": true + }, "@types/jasmine": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.4.0.tgz", @@ -4194,6 +4209,14 @@ "requires": { "ansi-colors": "^3.0.0", "uuid": "^3.3.2" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } } } @@ -7703,6 +7726,12 @@ "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", "dev": true }, + "hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=", + "dev": true + }, "handle-thing": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", @@ -9508,9 +9537,9 @@ } }, "keycharm": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.2.0.tgz", - "integrity": "sha1-+m6i5DuQpoAohD0n8gddNajD5vk=", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.3.1.tgz", + "integrity": "sha512-zn47Ti4FJT9zdF+YBBLWJsfKF/fYQHkrYlBeB5Ez5e2PjW7SoIxr43yehAne2HruulIoid4NKZZxO0dHBygCtQ==", "dev": true }, "keyv": { @@ -11660,6 +11689,15 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, + "propagating-hammerjs": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/propagating-hammerjs/-/propagating-hammerjs-1.4.7.tgz", + "integrity": "sha512-oW9Wd+W2Tp5uOz6Fh4mEU7p+FoyU85smLH/mPga83Loh0pHa6AH4ZHGywvwMk3TWP31l7iUsvJyW265p4Ipwrg==", + "dev": true, + "requires": { + "hammerjs": "^2.0.8" + } + }, "proxy-addr": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", @@ -12381,6 +12419,13 @@ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "dev": true, "optional": true + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true, + "optional": true } } }, @@ -14160,6 +14205,14 @@ "https-proxy-agent": "^2.2.1", "node-fetch": "^2.2.0", "uuid": "^3.3.2" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "tempfile": { @@ -14303,6 +14356,12 @@ "setimmediate": "^1.0.4" } }, + "timsort": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", + "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", + "dev": true + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -14966,9 +15025,9 @@ "dev": true }, "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", + "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==", "dev": true }, "v8-compile-cache": { @@ -15477,6 +15536,14 @@ "requires": { "ansi-colors": "^3.0.0", "uuid": "^3.3.2" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } } } @@ -15692,6 +15759,14 @@ "requires": { "ansi-colors": "^3.0.0", "uuid": "^3.3.2" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "wrap-ansi": { @@ -15755,6 +15830,14 @@ "log-symbols": "^2.1.0", "loglevelnext": "^1.0.1", "uuid": "^3.1.0" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "webpack-merge": { diff --git a/package.json b/package.json index 5b99d8ad..48175bbf 100644 --- a/package.json +++ b/package.json @@ -65,10 +65,14 @@ "@angular/common": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0 || >=9.0.0", "@angular/core": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0 || >=9.0.0", "@angular/compiler": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0 || >=9.0.0", - "keycharm": "^0.2.0", + "keycharm": "^0.3.0", "vis-data": "^6.5.1", "vis-util": "^4.0.0", - "moment": "^2.24.0" + "moment": "^2.24.0", + "propagating-hammerjs": "^1.4.0", + "@egjs/hammerjs": "^2.0.0", + "timsort": "^0.3.0", + "uuid": "^7.0.0" }, "devDependencies": { "@angular/animations": "8.2.14", @@ -83,6 +87,7 @@ "@angular/router": "8.2.14", "@commitlint/cli": "8.3.5", "@commitlint/config-conventional": "8.3.4", + "@egjs/hammerjs": "^2.0.17", "@types/jasmine": "^3.3.1", "@types/node": "13.5.1", "@types/webpack": "^4.4.25", @@ -114,12 +119,13 @@ "karma-mocha-reporter": "^2.2.2", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^4.0.2", - "keycharm": "^0.2.0", + "keycharm": "^0.3.0", "mini-css-extract-plugin": "^0.9.0", "moment": "^2.24.0", "ng-packagr": "^5.7.1", "npm-audit-resolver": "^2.2.0", "null-loader": "^3.0.0", + "propagating-hammerjs": "^1.4.0", "puppeteer": "^2.0.0", "raw-loader": "^4.0.0", "reflect-metadata": "^0.1.10", @@ -131,11 +137,13 @@ "source-map-loader": "^0.2.0", "style-loader": "^1.0.1", "systemjs-builder": "^0.16.13", + "timsort": "^0.3.0", "to-string-loader": "^1.1.5", "ts-helpers": "^1.1.2", "tslint": "^5.20.1", "tslint-loader": "^3.4.3", "typescript": "^3.5.3", + "uuid": "^7.0.3", "vis-data": "^6.5.1", "vis-util": "^4.0.0", "webpack": "^4.41.3",