From 000106c79a88c8599223c7ebccdf1ee8f93767a5 Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Tue, 8 Feb 2022 12:09:30 -0500 Subject: [PATCH] Upgrade typescript version, removed ClientRectList, needed to support angular implementations which use higher version of typescript. --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- src/modules/highlight/common/rect-utils.ts | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7824d547..3ede3cc6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@d-i-t-a/reader", - "version": "1.11.3", + "version": "1.11.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@d-i-t-a/reader", - "version": "1.11.3", + "version": "1.11.4", "license": "Apache-2.0", "dependencies": { "browserslist-useragent": "^3.0.3", @@ -66,7 +66,7 @@ "sinon": "^10.0.0", "ta-json-x": "^2.5.3", "ts-loader": "^8.0.18", - "typescript": "^4.2.3", + "typescript": "^4.5.2", "webpack": "^5.27.2", "webpack-cli": "^4.5.0" }, @@ -10223,9 +10223,9 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "node_modules/typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", + "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -18854,9 +18854,9 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", + "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", "dev": true }, "unbox-primitive": { diff --git a/package.json b/package.json index 0b6f54fd..476736a5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@d-i-t-a/reader", - "version": "1.11.3", + "version": "1.11.4", "description": "A viewer application for EPUB files.", "repository": "https://github.com/d-i-t-a/R2D2BC", "license": "Apache-2.0", @@ -94,7 +94,7 @@ "sinon": "^10.0.0", "ta-json-x": "^2.5.3", "ts-loader": "^8.0.18", - "typescript": "^4.2.3", + "typescript": "^4.5.2", "webpack": "^5.27.2", "webpack-cli": "^4.5.0" }, diff --git a/src/modules/highlight/common/rect-utils.ts b/src/modules/highlight/common/rect-utils.ts index a8b7b486..0725ca2c 100644 --- a/src/modules/highlight/common/rect-utils.ts +++ b/src/modules/highlight/common/rect-utils.ts @@ -44,7 +44,7 @@ export function getClientRectsNoOverlap( // tslint:disable-next-line:max-line-length export function getClientRectsNoOverlap_( - clientRects: ClientRectList | DOMRectList, + clientRects: DOMRectList, doNotMergeHorizontallyAlignedRects: boolean ): IRect[] { const tolerance = 1;