chore: update to latest TypeScript (#32596)

This commit is contained in:
Milan Burda 2022-01-31 12:37:40 +01:00 committed by GitHub
parent 32ae67c873
commit db9ab80694
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 15 additions and 69 deletions

View file

@ -92,7 +92,7 @@ function loadApplicationPackage (packagePath: string) {
try { try {
packageJson = require(packageJsonPath); packageJson = require(packageJsonPath);
} catch (e) { } catch (e) {
showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`); showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${(e as Error).message}`);
return; return;
} }
@ -111,7 +111,7 @@ function loadApplicationPackage (packagePath: string) {
const filePath = Module._resolveFilename(packagePath, module, true); const filePath = Module._resolveFilename(packagePath, module, true);
app.setAppPath(appPath || path.dirname(filePath)); app.setAppPath(appPath || path.dirname(filePath));
} catch (e) { } catch (e) {
showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`); showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${(e as Error).message}`);
return; return;
} }
@ -119,7 +119,7 @@ function loadApplicationPackage (packagePath: string) {
Module._load(packagePath, module, true); Module._load(packagePath, module, true);
} catch (e) { } catch (e) {
console.error('App threw an error during load'); console.error('App threw an error during load');
console.error(e.stack || e); console.error((e as Error).stack || e);
throw e; throw e;
} }
} }

View file

@ -35,7 +35,7 @@ const spawnUpdate = function (args: string[], detached: boolean, callback: Funct
spawnedArgs = args || []; spawnedArgs = args || [];
} }
} catch (error1) { } catch (error1) {
error = error1; error = error1 as Error;
// Shouldn't happen, but still guard it. // Shouldn't happen, but still guard it.
process.nextTick(function () { process.nextTick(function () {

View file

@ -15,7 +15,7 @@ export class IpcMainImpl extends EventEmitter {
try { try {
e._reply(await Promise.resolve(fn(e, ...args))); e._reply(await Promise.resolve(fn(e, ...args)));
} catch (err) { } catch (err) {
e._throw(err); e._throw(err as Error);
} }
}); });
} }

View file

@ -67,7 +67,7 @@
"timers-browserify": "1.4.2", "timers-browserify": "1.4.2",
"ts-loader": "^8.0.2", "ts-loader": "^8.0.2",
"ts-node": "6.2.0", "ts-node": "6.2.0",
"typescript": "^4.1.3", "typescript": "^4.5.5",
"webpack": "^4.43.0", "webpack": "^4.43.0",
"webpack-cli": "^3.3.12", "webpack-cli": "^3.3.12",
"wrapper-webpack-plugin": "^2.1.0" "wrapper-webpack-plugin": "^2.1.0"
@ -141,4 +141,4 @@
"node script/gen-hunspell-filenames.js" "node script/gen-hunspell-filenames.js"
] ]
} }
} }

View file

@ -372,7 +372,7 @@ describe('contextBridge', () => {
try { try {
root.example(); root.example();
} catch (e) { } catch (e) {
return e.message; return (e as Error).message;
} }
}); });
expect(result).equal('oh no'); expect(result).equal('oh no');

View file

@ -24,7 +24,7 @@ describe('ipc module', () => {
const result = await ipcRenderer.invoke('test', ...args); const result = await ipcRenderer.invoke('test', ...args);
ipcRenderer.send('result', { result }); ipcRenderer.send('result', { result });
} catch (e) { } catch (e) {
ipcRenderer.send('result', { error: e.message }); ipcRenderer.send('result', { error: (e as Error).message });
} }
} }

View file

@ -357,7 +357,7 @@ describe('webContents module', () => {
}); });
it('sets appropriate error information on rejection', async () => { it('sets appropriate error information on rejection', async () => {
let err; let err: any;
try { try {
await w.loadURL('file:non-existent'); await w.loadURL('file:non-existent');
} catch (e) { } catch (e) {

View file

@ -213,7 +213,7 @@ describe('node feature', () => {
ifdescribe(features.isRunAsNodeEnabled())('inspector', () => { ifdescribe(features.isRunAsNodeEnabled())('inspector', () => {
let child: childProcess.ChildProcessWithoutNullStreams; let child: childProcess.ChildProcessWithoutNullStreams;
let exitPromise: Promise<any[]>; let exitPromise: Promise<any[]> | null;
afterEach(async () => { afterEach(async () => {
if (child && exitPromise) { if (child && exitPromise) {

View file

@ -1,8 +1,5 @@
{ {
"extends": "./tsconfig.json", "extends": "./tsconfig.json",
"compilerOptions": {
"rootDir": "spec-main"
},
"include": [ "include": [
"spec-main", "spec-main",
"typings" "typings"

View file

@ -294,60 +294,9 @@ declare interface Window {
} }
}; };
WebView: typeof ElectronInternal.WebViewElement; WebView: typeof ElectronInternal.WebViewElement;
ResizeObserver: ResizeObserver;
trustedTypes: TrustedTypePolicyFactory; trustedTypes: TrustedTypePolicyFactory;
} }
/**
* The ResizeObserver interface is used to observe changes to Element's content
* rect.
*
* It is modeled after MutationObserver and IntersectionObserver.
*/
declare class ResizeObserver {
constructor (callback: ResizeObserverCallback);
/**
* Adds target to the list of observed elements.
*/
observe: (target: Element) => void;
/**
* Removes target from the list of observed elements.
*/
unobserve: (target: Element) => void;
/**
* Clears both the observationTargets and activeTargets lists.
*/
disconnect: () => void;
}
/**
* This callback delivers ResizeObserver's notifications. It is invoked by a
* broadcast active observations algorithm.
*/
interface ResizeObserverCallback {
(entries: ResizeObserverEntry[], observer: ResizeObserver): void;
}
interface ResizeObserverEntry {
/**
* @param target The Element whose size has changed.
*/
new (target: Element): ResizeObserverEntry;
/**
* The Element whose size has changed.
*/
readonly target: Element;
/**
* Element's content rect when ResizeObserverCallback is invoked.
*/
readonly contentRect: DOMRectReadOnly;
}
// https://w3c.github.io/webappsec-trusted-types/dist/spec/#trusted-types // https://w3c.github.io/webappsec-trusted-types/dist/spec/#trusted-types
type TrustedHTML = string; type TrustedHTML = string;

View file

@ -7498,10 +7498,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typescript@^4.1.3: typescript@^4.5.5:
version "4.1.3" version "4.5.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
uc.micro@^1.0.1, uc.micro@^1.0.5: uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6" version "1.0.6"