diff --git a/package-lock.json b/package-lock.json index c1f1862a..726c7d45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -64,7 +64,7 @@ "stylelint-config-prettier": "^9.0.5", "ts-jest": "^29.0.5", "ts-unused-exports": "^8.0.5", - "typescript": "^4.6.3", + "typescript": "^5.6.2", "web-ext": "^7.4.0", "xo": "^0.48.0" } @@ -16983,16 +16983,16 @@ } }, "node_modules/typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/unbox-primitive": { @@ -19108,6 +19108,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/xo/node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "inBundle": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/xo/node_modules/yallist": { "version": "4.0.0", "dev": true, @@ -31793,9 +31807,9 @@ } }, "typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true }, "unbox-primitive": { @@ -33177,6 +33191,13 @@ "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", "dev": true }, + "typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "bundled": true, + "dev": true + }, "yallist": { "version": "4.0.0", "bundled": true, diff --git a/package.json b/package.json index bf626893..7c400a64 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "lint:css": "stylelint src/**/*.css", "lint:js": "xo", "lint": "run-p lint:* check-types", - "pretest": "NODE_ENV=test run-p lint:* unused-exports build:mv3", + "pretest": "NODE_ENV=test run-p lint unused-exports build:mv3", "test": "jest --runInBand", "watch": "parcel watch src/mv2/manifest.json --dist-dir dist-mv2 --no-cache --no-hmr", "watch:mv3": "parcel watch src/mv3/manifest.json --dist-dir dist-mv3 --no-cache --no-hmr", @@ -268,7 +268,7 @@ "stylelint-config-prettier": "^9.0.5", "ts-jest": "^29.0.5", "ts-unused-exports": "^8.0.5", - "typescript": "^4.6.3", + "typescript": "^5.6.2", "web-ext": "^7.4.0", "xo": "^0.48.0" }, diff --git a/src/content/actions/scroll.ts b/src/content/actions/scroll.ts index 1c057dd6..f8a283e9 100644 --- a/src/content/actions/scroll.ts +++ b/src/content/actions/scroll.ts @@ -5,16 +5,6 @@ import { getSetting } from "../settings/settingsManager"; const DEFAULT_SCROLL_FACTOR = 0.66; -// Officially "instant" is not part of the specification yet, although it works -// in Firefox, Chrome and Safari. -declare global { - interface ScrollToOptions { - left?: number; - top?: number; - behavior?: "auto" | "instant" | "smooth"; - } -} - let lastScrollContainer: Element | undefined; let lastScrollFactor: number; diff --git a/src/content/content.ts b/src/content/content.ts index aac1e1e9..9306a80a 100644 --- a/src/content/content.ts +++ b/src/content/content.ts @@ -39,7 +39,9 @@ async function isWrongFrame(request: RequestFromBackground) { browser.runtime.onMessage.addListener( async ( request: RequestFromBackground - ): Promise => { + ): Promise< + string | number | string[] | TalonAction[] | boolean | undefined + > => { if (await isWrongFrame(request)) return; if ("target" in request) { diff --git a/src/content/utils/combineArrays.ts b/src/content/utils/combineArrays.ts index d48d5523..09e9cf60 100644 --- a/src/content/utils/combineArrays.ts +++ b/src/content/utils/combineArrays.ts @@ -71,7 +71,7 @@ function odometerIncrement(odometer: number[], arrayOfArrays: T[][]) { if (odometer[iOdometerDigit]! + 1 <= maxee) { // Increment, and you're done... - odometer[iOdometerDigit]++; + odometer[iOdometerDigit]!++; return true; }