Merge pull request #1165 from TimvdLippe/update-typescript

This commit is contained in:
Surma
2021-10-20 13:25:54 +01:00
committed by GitHub
5 changed files with 29 additions and 55 deletions

42
package-lock.json generated
View File

@@ -16,8 +16,8 @@
"@rollup/plugin-replace": "^2.3.4", "@rollup/plugin-replace": "^2.3.4",
"@surma/rollup-plugin-off-main-thread": "^2.2.2", "@surma/rollup-plugin-off-main-thread": "^2.2.2",
"@types/dedent": "^0.7.0", "@types/dedent": "^0.7.0",
"@types/mime-types": "^2.1.0", "@types/mime-types": "^2.1.1",
"@types/node": "^14.14.7", "@types/node": "^16.11.1",
"@web/rollup-plugin-import-meta-assets": "^1.0.6", "@web/rollup-plugin-import-meta-assets": "^1.0.6",
"comlink": "^4.3.0", "comlink": "^4.3.0",
"cssnano": "^4.1.10", "cssnano": "^4.1.10",
@@ -44,7 +44,7 @@
"rollup": "^2.38.0", "rollup": "^2.38.0",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"serve": "^11.3.2", "serve": "^11.3.2",
"typescript": "^4.1.3", "typescript": "^4.4.4",
"which": "^2.0.2" "which": "^2.0.2"
} }
}, },
@@ -315,9 +315,9 @@
} }
}, },
"node_modules/@types/mime-types": { "node_modules/@types/mime-types": {
"version": "2.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
"integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=", "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
"dev": true "dev": true
}, },
"node_modules/@types/minimatch": { "node_modules/@types/minimatch": {
@@ -327,9 +327,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "14.14.7", "version": "16.11.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz",
"integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==", "integrity": "sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==",
"dev": true "dev": true
}, },
"node_modules/@types/parse-json": { "node_modules/@types/parse-json": {
@@ -8471,9 +8471,9 @@
} }
}, },
"node_modules/typescript": { "node_modules/typescript": {
"version": "4.1.3", "version": "4.4.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
"integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==", "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
"dev": true, "dev": true,
"bin": { "bin": {
"tsc": "bin/tsc", "tsc": "bin/tsc",
@@ -8903,9 +8903,9 @@
} }
}, },
"@types/mime-types": { "@types/mime-types": {
"version": "2.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
"integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=", "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
"dev": true "dev": true
}, },
"@types/minimatch": { "@types/minimatch": {
@@ -8915,9 +8915,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "14.14.7", "version": "16.11.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz",
"integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==", "integrity": "sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==",
"dev": true "dev": true
}, },
"@types/parse-json": { "@types/parse-json": {
@@ -15677,9 +15677,9 @@
"dev": true "dev": true
}, },
"typescript": { "typescript": {
"version": "4.1.3", "version": "4.4.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
"integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==", "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
"dev": true "dev": true
}, },
"uniq": { "uniq": {

View File

@@ -17,8 +17,8 @@
"@rollup/plugin-replace": "^2.3.4", "@rollup/plugin-replace": "^2.3.4",
"@surma/rollup-plugin-off-main-thread": "^2.2.2", "@surma/rollup-plugin-off-main-thread": "^2.2.2",
"@types/dedent": "^0.7.0", "@types/dedent": "^0.7.0",
"@types/mime-types": "^2.1.0", "@types/mime-types": "^2.1.1",
"@types/node": "^14.14.7", "@types/node": "^16.11.1",
"@web/rollup-plugin-import-meta-assets": "^1.0.6", "@web/rollup-plugin-import-meta-assets": "^1.0.6",
"comlink": "^4.3.0", "comlink": "^4.3.0",
"cssnano": "^4.1.10", "cssnano": "^4.1.10",
@@ -45,7 +45,7 @@
"rollup": "^2.38.0", "rollup": "^2.38.0",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"serve": "^11.3.2", "serve": "^11.3.2",
"typescript": "^4.1.3", "typescript": "^4.4.4",
"which": "^2.0.2" "which": "^2.0.2"
}, },
"lint-staged": { "lint-staged": {

View File

@@ -116,7 +116,7 @@ async function decodeImage(
// Otherwise fall through and try built-in decoding for a laugh. // Otherwise fall through and try built-in decoding for a laugh.
return await builtinDecode(signal, blob, mimeType); return await builtinDecode(signal, blob, mimeType);
} catch (err) { } catch (err) {
if (err.name === 'AbortError') throw err; if (err instanceof Error && err.name === 'AbortError') throw err;
console.log(err); console.log(err);
throw Error("Couldn't decode image"); throw Error("Couldn't decode image");
} }
@@ -481,7 +481,7 @@ export default class Compress extends Component<Props, State> {
open('https://github.com/GoogleChromeLabs/squoosh/tree/dev/cli'); open('https://github.com/GoogleChromeLabs/squoosh/tree/dev/cli');
} }
} catch (e) { } catch (e) {
this.props.showSnack(e); this.props.showSnack(String(e));
} }
}; };
@@ -640,7 +640,7 @@ export default class Compress extends Component<Props, State> {
return { sides }; return { sides };
}); });
} catch (err) { } catch (err) {
if (err.name === 'AbortError') return; if (err instanceof Error && err.name === 'AbortError') return;
this.props.showSnack(`Source decoding error: ${err}`); this.props.showSnack(`Source decoding error: ${err}`);
throw err; throw err;
} }
@@ -698,7 +698,7 @@ export default class Compress extends Component<Props, State> {
return newState; return newState;
}); });
} catch (err) { } catch (err) {
if (err.name === 'AbortError') return; if (err instanceof Error && err.name === 'AbortError') return;
this.setState({ loading: false }); this.setState({ loading: false });
this.props.showSnack(`Preprocessing error: ${err}`); this.props.showSnack(`Preprocessing error: ${err}`);
throw err; throw err;
@@ -822,7 +822,7 @@ export default class Compress extends Component<Props, State> {
this.activeSideJobs[sideIndex] = undefined; this.activeSideJobs[sideIndex] = undefined;
} catch (err) { } catch (err) {
if (err.name === 'AbortError') return; if (err instanceof Error && err.name === 'AbortError') return;
this.setState((currentState) => { this.setState((currentState) => {
const sides = cleanMerge(currentState.sides, sideIndex, { const sides = cleanMerge(currentState.sides, sideIndex, {
loading: false, loading: false,

View File

@@ -13,24 +13,3 @@
/// <reference path="../../missing-types.d.ts" /> /// <reference path="../../missing-types.d.ts" />
declare const __PRERENDER__: boolean; 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;
};

View File

@@ -30,11 +30,6 @@ interface WindowEventMap {
beforeinstallprompt: BeforeInstallPromptEvent; beforeinstallprompt: BeforeInstallPromptEvent;
} }
interface ClipboardItem {
types: string[];
getType(type: string): Promise<Blob>;
}
interface Clipboard { interface Clipboard {
read(): Promise<ClipboardItem[]>; read(): Promise<ClipboardItem[]>;
} }