From e8b29567f2283eee0f8f44ffd6e9b75acbe4c27c Mon Sep 17 00:00:00 2001 From: Sandeep Kumar Sharma Date: Wed, 18 Aug 2021 18:53:58 +0530 Subject: [PATCH 1/2] feat: upgrade to angular 12 and update peer dependeencies --- package-lock.json | 36 ++++++++++++++++++++++--- package.json | 4 +-- projects/hyperdash-angular/package.json | 16 +++++------ 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 10a9828b..9bc425ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,6 +53,22 @@ "tslint": "~6.1.3", "tslint-config-prettier": "^1.18.0", "typescript": "~4.3.5" + }, + "peerDependencies": { + "@angular-devkit/build-angular": "~12.2.1", + "@angular/animations": "^12.2.1", + "@angular/cli": "^12.2.1", + "@angular/common": "^12.2.1", + "@angular/compiler": "^12.2.1", + "@angular/compiler-cli": "^12.2.1", + "@angular/core": "^12.2.1", + "@angular/forms": "^12.2.1", + "@angular/language-service": "^12.2.1", + "@angular/platform-browser": "^12.2.1", + "@angular/platform-browser-dynamic": "^12.2.1", + "@angular/router": "^12.2.1", + "ng-packagr": "^12.2.0", + "typescript": "~4.3.5" } }, "node_modules/@aduh95/viz.js": { @@ -424,6 +440,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.2.1.tgz", "integrity": "sha512-SDsBBQG2AifuVyo+LUiqFLqzQ8ourO60NhkYGugC934lRqox2ZXmAooDBGMh74K7yrzIxMpbrMbL+qGv4OGpjw==", + "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -515,6 +532,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.2.1.tgz", "integrity": "sha512-LGQwDN3QKX/0LVQQa6v+/Tc4Za+XiIfJMqmr6KNWh3q6/5zibkPE9YCq/nvolUg7RZzYpG7tFPgnggYtUmKURw==", + "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -530,6 +548,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-12.2.1.tgz", "integrity": "sha512-XUszrdfjSEi3oI81rL4h4+DeN+j7OZukFZ3Zj77a4lu0BcrHFUZ408hzGnAQVnK4xxcpSjQet8yKGnR08YGxxA==", + "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -603,6 +622,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/core/-/core-12.2.1.tgz", "integrity": "sha512-n3h2SIlTexQRhiU0YKk1qUobZBXtFisfNbV4kJLyjNsGyMt70NQLZVe5mUw7LV7aDAJEinuoCofqBl4FHCigEQ==", + "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -618,6 +638,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-12.2.1.tgz", "integrity": "sha512-frYYb/4KhGJkvQ27k0voRi3ZVPvY6NXBYidPmJf7WBnVY8jgHhfUcjc9wUNaS97TyXB3WG/eY/jLC38tO0atMA==", + "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -644,6 +665,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-12.2.1.tgz", "integrity": "sha512-14PSiuKrXe8KP0K5+WtpwdYALKRIFWp1KxIhmqrpjbW322W9d46dC7LAw8Wzof/aHmDJops63u6EDJG7UeiUOg==", + "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -665,6 +687,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.2.1.tgz", "integrity": "sha512-eAoLf8jdNHdBxK6yDc3ISPmrWxO46BtwTkibCT8vjVgBX2DweYB+ee0glPboIQao3d42nHRfxy4YeaIyJCvxTg==", + "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -682,6 +705,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/router/-/router-12.2.1.tgz", "integrity": "sha512-dWQu+C8U8SMeWtOAl3AlfZxQYv68bisBB4uAuPXoyXiLtHgGclyzu1QZVPXTkoiyGv+odrqX8LaG/eQtbU0G8Q==", + "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -34204,9 +34228,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz", "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==", "dev": true, - "requires": { - "ajv": "^8.0.0" - } + "requires": {} }, "json-schema-traverse": { "version": "1.0.0", @@ -34231,6 +34253,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.2.1.tgz", "integrity": "sha512-SDsBBQG2AifuVyo+LUiqFLqzQ8ourO60NhkYGugC934lRqox2ZXmAooDBGMh74K7yrzIxMpbrMbL+qGv4OGpjw==", + "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34292,6 +34315,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.2.1.tgz", "integrity": "sha512-LGQwDN3QKX/0LVQQa6v+/Tc4Za+XiIfJMqmr6KNWh3q6/5zibkPE9YCq/nvolUg7RZzYpG7tFPgnggYtUmKURw==", + "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34300,6 +34324,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-12.2.1.tgz", "integrity": "sha512-XUszrdfjSEi3oI81rL4h4+DeN+j7OZukFZ3Zj77a4lu0BcrHFUZ408hzGnAQVnK4xxcpSjQet8yKGnR08YGxxA==", + "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34353,6 +34378,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/core/-/core-12.2.1.tgz", "integrity": "sha512-n3h2SIlTexQRhiU0YKk1qUobZBXtFisfNbV4kJLyjNsGyMt70NQLZVe5mUw7LV7aDAJEinuoCofqBl4FHCigEQ==", + "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34361,6 +34387,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-12.2.1.tgz", "integrity": "sha512-frYYb/4KhGJkvQ27k0voRi3ZVPvY6NXBYidPmJf7WBnVY8jgHhfUcjc9wUNaS97TyXB3WG/eY/jLC38tO0atMA==", + "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34375,6 +34402,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-12.2.1.tgz", "integrity": "sha512-14PSiuKrXe8KP0K5+WtpwdYALKRIFWp1KxIhmqrpjbW322W9d46dC7LAw8Wzof/aHmDJops63u6EDJG7UeiUOg==", + "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34383,6 +34411,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.2.1.tgz", "integrity": "sha512-eAoLf8jdNHdBxK6yDc3ISPmrWxO46BtwTkibCT8vjVgBX2DweYB+ee0glPboIQao3d42nHRfxy4YeaIyJCvxTg==", + "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34391,6 +34420,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/router/-/router-12.2.1.tgz", "integrity": "sha512-dWQu+C8U8SMeWtOAl3AlfZxQYv68bisBB4uAuPXoyXiLtHgGclyzu1QZVPXTkoiyGv+odrqX8LaG/eQtbU0G8Q==", + "peer": true, "requires": { "tslib": "^2.2.0" } diff --git a/package.json b/package.json index cb818679..f996b648 100644 --- a/package.json +++ b/package.json @@ -17,14 +17,11 @@ }, "private": true, "dependencies": { - "@angular/animations": "^12.2.1", "@angular/common": "^12.2.1", - "@angular/compiler": "^12.2.1", "@angular/core": "^12.2.1", "@angular/forms": "^12.2.1", "@angular/platform-browser": "^12.2.1", "@angular/platform-browser-dynamic": "^12.2.1", - "@angular/router": "^12.2.1", "@hypertrace/hyperdash": "^1.2.1", "core-js": "^3.16.2", "lodash-es": "^4.17.21", @@ -36,6 +33,7 @@ "@angular-builders/jest": "^12.0.0", "@angular-devkit/build-angular": "~12.2.1", "@angular/cli": "^12.2.1", + "@angular/compiler": "^12.2.1", "@angular/compiler-cli": "^12.2.1", "@angular/language-service": "^12.2.1", "@commitlint/cli": "^13.1.0", diff --git a/projects/hyperdash-angular/package.json b/projects/hyperdash-angular/package.json index e8794bc3..1b4b8771 100644 --- a/projects/hyperdash-angular/package.json +++ b/projects/hyperdash-angular/package.json @@ -14,16 +14,16 @@ "commit": "pushd ../.. && npm run commit" }, "peerDependencies": { - "@angular/common": "^11.1.1", - "@angular/core": "^11.1.1", - "@angular/platform-browser": "^11.1.1", - "core-js": "^3.8.3", - "rxjs": "^6.6.3", - "zone.js": "~0.10.3", - "lodash-es": "^4.17.20", + "@angular/common": "^12.2.1", + "@angular/core": "^12.2.1", + "@angular/platform-browser": "^12.2.1", + "core-js": "^3.16.2", + "rxjs": "^6.6.7", + "zone.js": "~0.11.4", + "lodash-es": "^4.17.21", "@hypertrace/hyperdash": "^1.2.1" }, "dependencies": { - "tslib": "^2.0.3" + "tslib": "^2.3.1" } } From e2793e2e9f8b8027e24ab9032d91d04cad281283 Mon Sep 17 00:00:00 2001 From: Sandeep Kumar Sharma Date: Wed, 18 Aug 2021 19:02:05 +0530 Subject: [PATCH 2/2] fix: tests --- package-lock.json | 42 +++++++----------------------------------- package.json | 2 ++ 2 files changed, 9 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9bc425ba..78409a9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,14 +7,11 @@ "": { "version": "0.0.0", "dependencies": { - "@angular/animations": "^12.2.1", "@angular/common": "^12.2.1", - "@angular/compiler": "^12.2.1", "@angular/core": "^12.2.1", "@angular/forms": "^12.2.1", "@angular/platform-browser": "^12.2.1", "@angular/platform-browser-dynamic": "^12.2.1", - "@angular/router": "^12.2.1", "@hypertrace/hyperdash": "^1.2.1", "core-js": "^3.16.2", "lodash-es": "^4.17.21", @@ -25,9 +22,12 @@ "devDependencies": { "@angular-builders/jest": "^12.0.0", "@angular-devkit/build-angular": "~12.2.1", + "@angular/animations": "^12.2.1", "@angular/cli": "^12.2.1", + "@angular/compiler": "^12.2.1", "@angular/compiler-cli": "^12.2.1", "@angular/language-service": "^12.2.1", + "@angular/router": "^12.2.1", "@commitlint/cli": "^13.1.0", "@commitlint/config-conventional": "^13.1.0", "@compodoc/compodoc": "^1.1.14", @@ -53,22 +53,6 @@ "tslint": "~6.1.3", "tslint-config-prettier": "^1.18.0", "typescript": "~4.3.5" - }, - "peerDependencies": { - "@angular-devkit/build-angular": "~12.2.1", - "@angular/animations": "^12.2.1", - "@angular/cli": "^12.2.1", - "@angular/common": "^12.2.1", - "@angular/compiler": "^12.2.1", - "@angular/compiler-cli": "^12.2.1", - "@angular/core": "^12.2.1", - "@angular/forms": "^12.2.1", - "@angular/language-service": "^12.2.1", - "@angular/platform-browser": "^12.2.1", - "@angular/platform-browser-dynamic": "^12.2.1", - "@angular/router": "^12.2.1", - "ng-packagr": "^12.2.0", - "typescript": "~4.3.5" } }, "node_modules/@aduh95/viz.js": { @@ -440,7 +424,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.2.1.tgz", "integrity": "sha512-SDsBBQG2AifuVyo+LUiqFLqzQ8ourO60NhkYGugC934lRqox2ZXmAooDBGMh74K7yrzIxMpbrMbL+qGv4OGpjw==", - "peer": true, + "devOptional": true, "dependencies": { "tslib": "^2.2.0" }, @@ -532,7 +516,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.2.1.tgz", "integrity": "sha512-LGQwDN3QKX/0LVQQa6v+/Tc4Za+XiIfJMqmr6KNWh3q6/5zibkPE9YCq/nvolUg7RZzYpG7tFPgnggYtUmKURw==", - "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -548,7 +531,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-12.2.1.tgz", "integrity": "sha512-XUszrdfjSEi3oI81rL4h4+DeN+j7OZukFZ3Zj77a4lu0BcrHFUZ408hzGnAQVnK4xxcpSjQet8yKGnR08YGxxA==", - "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -622,7 +604,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/core/-/core-12.2.1.tgz", "integrity": "sha512-n3h2SIlTexQRhiU0YKk1qUobZBXtFisfNbV4kJLyjNsGyMt70NQLZVe5mUw7LV7aDAJEinuoCofqBl4FHCigEQ==", - "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -638,7 +619,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-12.2.1.tgz", "integrity": "sha512-frYYb/4KhGJkvQ27k0voRi3ZVPvY6NXBYidPmJf7WBnVY8jgHhfUcjc9wUNaS97TyXB3WG/eY/jLC38tO0atMA==", - "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -665,7 +645,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-12.2.1.tgz", "integrity": "sha512-14PSiuKrXe8KP0K5+WtpwdYALKRIFWp1KxIhmqrpjbW322W9d46dC7LAw8Wzof/aHmDJops63u6EDJG7UeiUOg==", - "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -687,7 +666,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.2.1.tgz", "integrity": "sha512-eAoLf8jdNHdBxK6yDc3ISPmrWxO46BtwTkibCT8vjVgBX2DweYB+ee0glPboIQao3d42nHRfxy4YeaIyJCvxTg==", - "peer": true, "dependencies": { "tslib": "^2.2.0" }, @@ -705,7 +683,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/router/-/router-12.2.1.tgz", "integrity": "sha512-dWQu+C8U8SMeWtOAl3AlfZxQYv68bisBB4uAuPXoyXiLtHgGclyzu1QZVPXTkoiyGv+odrqX8LaG/eQtbU0G8Q==", - "peer": true, + "dev": true, "dependencies": { "tslib": "^2.2.0" }, @@ -34253,7 +34231,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.2.1.tgz", "integrity": "sha512-SDsBBQG2AifuVyo+LUiqFLqzQ8ourO60NhkYGugC934lRqox2ZXmAooDBGMh74K7yrzIxMpbrMbL+qGv4OGpjw==", - "peer": true, + "devOptional": true, "requires": { "tslib": "^2.2.0" } @@ -34315,7 +34293,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.2.1.tgz", "integrity": "sha512-LGQwDN3QKX/0LVQQa6v+/Tc4Za+XiIfJMqmr6KNWh3q6/5zibkPE9YCq/nvolUg7RZzYpG7tFPgnggYtUmKURw==", - "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34324,7 +34301,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-12.2.1.tgz", "integrity": "sha512-XUszrdfjSEi3oI81rL4h4+DeN+j7OZukFZ3Zj77a4lu0BcrHFUZ408hzGnAQVnK4xxcpSjQet8yKGnR08YGxxA==", - "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34378,7 +34354,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/core/-/core-12.2.1.tgz", "integrity": "sha512-n3h2SIlTexQRhiU0YKk1qUobZBXtFisfNbV4kJLyjNsGyMt70NQLZVe5mUw7LV7aDAJEinuoCofqBl4FHCigEQ==", - "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34387,7 +34362,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-12.2.1.tgz", "integrity": "sha512-frYYb/4KhGJkvQ27k0voRi3ZVPvY6NXBYidPmJf7WBnVY8jgHhfUcjc9wUNaS97TyXB3WG/eY/jLC38tO0atMA==", - "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34402,7 +34376,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-12.2.1.tgz", "integrity": "sha512-14PSiuKrXe8KP0K5+WtpwdYALKRIFWp1KxIhmqrpjbW322W9d46dC7LAw8Wzof/aHmDJops63u6EDJG7UeiUOg==", - "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34411,7 +34384,6 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.2.1.tgz", "integrity": "sha512-eAoLf8jdNHdBxK6yDc3ISPmrWxO46BtwTkibCT8vjVgBX2DweYB+ee0glPboIQao3d42nHRfxy4YeaIyJCvxTg==", - "peer": true, "requires": { "tslib": "^2.2.0" } @@ -34420,7 +34392,7 @@ "version": "12.2.1", "resolved": "https://registry.npmjs.org/@angular/router/-/router-12.2.1.tgz", "integrity": "sha512-dWQu+C8U8SMeWtOAl3AlfZxQYv68bisBB4uAuPXoyXiLtHgGclyzu1QZVPXTkoiyGv+odrqX8LaG/eQtbU0G8Q==", - "peer": true, + "dev": true, "requires": { "tslib": "^2.2.0" } diff --git a/package.json b/package.json index f996b648..d7f0735d 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,12 @@ "devDependencies": { "@angular-builders/jest": "^12.0.0", "@angular-devkit/build-angular": "~12.2.1", + "@angular/animations": "^12.2.1", "@angular/cli": "^12.2.1", "@angular/compiler": "^12.2.1", "@angular/compiler-cli": "^12.2.1", "@angular/language-service": "^12.2.1", + "@angular/router": "^12.2.1", "@commitlint/cli": "^13.1.0", "@commitlint/config-conventional": "^13.1.0", "@compodoc/compodoc": "^1.1.14",