diff --git a/package-lock.json b/package-lock.json index cad3c5f8..aff18309 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,8 +16,8 @@ "@rollup/plugin-replace": "^2.3.4", "@surma/rollup-plugin-off-main-thread": "^2.2.2", "@types/dedent": "^0.7.0", - "@types/mime-types": "^2.1.0", - "@types/node": "^14.14.7", + "@types/mime-types": "^2.1.1", + "@types/node": "^16.11.1", "@web/rollup-plugin-import-meta-assets": "^1.0.6", "comlink": "^4.3.0", "cssnano": "^4.1.10", @@ -44,7 +44,7 @@ "rollup": "^2.38.0", "rollup-plugin-terser": "^7.0.2", "serve": "^11.3.2", - "typescript": "^4.1.3", + "typescript": "^4.4.4", "which": "^2.0.2" } }, @@ -315,9 +315,9 @@ } }, "node_modules/@types/mime-types": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", - "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz", + "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==", "dev": true }, "node_modules/@types/minimatch": { @@ -327,9 +327,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.14.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", - "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==", + "version": "16.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz", + "integrity": "sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==", "dev": true }, "node_modules/@types/parse-json": { @@ -8602,9 +8602,9 @@ } }, "node_modules/typescript": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz", - "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -9040,9 +9040,9 @@ } }, "@types/mime-types": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", - "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz", + "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==", "dev": true }, "@types/minimatch": { @@ -9052,9 +9052,9 @@ "dev": true }, "@types/node": { - "version": "14.14.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", - "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==", + "version": "16.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz", + "integrity": "sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==", "dev": true }, "@types/parse-json": { @@ -15917,9 +15917,9 @@ "dev": true }, "typescript": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz", - "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "dev": true }, "uniq": { diff --git a/package.json b/package.json index e381c971..953b7b90 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "@rollup/plugin-replace": "^2.3.4", "@surma/rollup-plugin-off-main-thread": "^2.2.2", "@types/dedent": "^0.7.0", - "@types/mime-types": "^2.1.0", - "@types/node": "^14.14.7", + "@types/mime-types": "^2.1.1", + "@types/node": "^16.11.1", "@web/rollup-plugin-import-meta-assets": "^1.0.6", "comlink": "^4.3.0", "cssnano": "^4.1.10", @@ -44,7 +44,7 @@ "rollup": "^2.38.0", "rollup-plugin-terser": "^7.0.2", "serve": "^11.3.2", - "typescript": "^4.1.3", + "typescript": "^4.4.4", "which": "^2.0.2" }, "husky": { diff --git a/src/client/lazy-app/Compress/index.tsx b/src/client/lazy-app/Compress/index.tsx index a7d7464a..5c37caae 100644 --- a/src/client/lazy-app/Compress/index.tsx +++ b/src/client/lazy-app/Compress/index.tsx @@ -116,7 +116,7 @@ async function decodeImage( // Otherwise fall through and try built-in decoding for a laugh. return await builtinDecode(signal, blob, mimeType); } catch (err) { - if (err.name === 'AbortError') throw err; + if (err instanceof Error && err.name === 'AbortError') throw err; console.log(err); throw Error("Couldn't decode image"); } @@ -481,7 +481,7 @@ export default class Compress extends Component { open('https://github.com/GoogleChromeLabs/squoosh/tree/dev/cli'); } } catch (e) { - this.props.showSnack(e); + this.props.showSnack(String(e)); } }; @@ -640,7 +640,7 @@ export default class Compress extends Component { return { sides }; }); } catch (err) { - if (err.name === 'AbortError') return; + if (err instanceof Error && err.name === 'AbortError') return; this.props.showSnack(`Source decoding error: ${err}`); throw err; } @@ -698,7 +698,7 @@ export default class Compress extends Component { return newState; }); } catch (err) { - if (err.name === 'AbortError') return; + if (err instanceof Error && err.name === 'AbortError') return; this.setState({ loading: false }); this.props.showSnack(`Preprocessing error: ${err}`); throw err; @@ -822,7 +822,7 @@ export default class Compress extends Component { this.activeSideJobs[sideIndex] = undefined; } catch (err) { - if (err.name === 'AbortError') return; + if (err instanceof Error && err.name === 'AbortError') return; this.setState((currentState) => { const sides = cleanMerge(currentState.sides, sideIndex, { loading: false, diff --git a/src/shared/missing-types.d.ts b/src/shared/missing-types.d.ts index 0320ec90..baf404ec 100644 --- a/src/shared/missing-types.d.ts +++ b/src/shared/missing-types.d.ts @@ -13,24 +13,3 @@ /// declare const __PRERENDER__: boolean; - -type ResizeObserverCallback = ( - entries: ResizeObserverEntry[], - observer: ResizeObserver, -) => void; - -interface ResizeObserverEntry { - readonly target: Element; - readonly contentRect: DOMRectReadOnly; -} - -interface ResizeObserver { - observe(target: Element): void; - unobserve(target: Element): void; - disconnect(): void; -} - -declare var ResizeObserver: { - prototype: ResizeObserver; - new (callback: ResizeObserverCallback): ResizeObserver; -}; diff --git a/src/shared/prerendered-app/Intro/missing-types.d.ts b/src/shared/prerendered-app/Intro/missing-types.d.ts index 6ef3d345..bf077eb8 100644 --- a/src/shared/prerendered-app/Intro/missing-types.d.ts +++ b/src/shared/prerendered-app/Intro/missing-types.d.ts @@ -30,11 +30,6 @@ interface WindowEventMap { beforeinstallprompt: BeforeInstallPromptEvent; } -interface ClipboardItem { - types: string[]; - getType(type: string): Promise; -} - interface Clipboard { read(): Promise; }