Bump typescript from 4.0.5 to 4.3.2 (#415)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Federico <me@fregante.com>
pixiebrix · Jun 3, 2021 · 9851d6f · 9851d6f
1 parent ba99016
commit 9851d6f
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 44 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -122,7 +122,7 @@
     "howler": "^2.2.1",
     "html-loader": "^1.3.2",
     "htmlmetaparser": "^2.1.1",
-    "idb": "^5.0.8",
+    "idb": "^6.1.2",
     "immer": "^8.0.1",
     "install": "^0.13.0",
     "is-promise": "^4.0.0",
@@ -194,7 +194,7 @@
     "to-json-schema": "^0.2.5",
     "ts-loader": "^8.1.0",
     "type-fest": "^1.0.1",
-    "typescript": "^4.0.5",
+    "typescript": "^4.3.2",
     "url-join": "^4.0.1",
     "use-async-effect": "^2.2.3",
     "use-debounce": "^5.2.0",

diff --git a/src/background/executor.ts b/src/background/executor.ts
@@ -240,32 +240,28 @@ function backgroundListener(
       });
     }
     case MESSAGE_ACTIVATE_TAB: {
-      return new Promise((resolve) => {
+      return (
         browser.tabs
           .update(sender.tab.id, {
             active: true,
           })
           // ignore the returned tab
-          .then(() => resolve());
-      });
+          .then(() => {})
+      );
     }
     case MESSAGE_CLOSE_TAB: {
       return new Promise<unknown>((resolve) => {
         browser.tabs.remove(sender.tab.id).then(resolve);
       });
     }
     case MESSAGE_OPEN_TAB: {
-      return new Promise<unknown>((resolve, reject) => {
-        browser.tabs
-          .create(request.payload as Tabs.CreateCreatePropertiesType)
-          .then((tab) => {
-            // FIXME: include frame information here
-            tabToTarget.set(sender.tab.id, tab.id);
-            tabToOpener.set(tab.id, sender.tab.id);
-            resolve();
-          })
-          .catch(reject);
-      });
+      return browser.tabs
+        .create(request.payload as Tabs.CreateCreatePropertiesType)
+        .then((tab) => {
+          // FIXME: include frame information here
+          tabToTarget.set(sender.tab.id, tab.id);
+          tabToOpener.set(tab.id, sender.tab.id);
+        });
     }
     case MESSAGE_CONTENT_SCRIPT_READY: {
       const tabId = sender.tab.id;

diff --git a/src/contrib/google/auth.ts b/src/contrib/google/auth.ts
@@ -58,13 +58,14 @@ export async function resetToken(scopes: string[]): Promise<void> {
   if (token) {
     console.debug(`Clearing Google token: ${token}`);
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
       chrome.identity.removeCachedAuthToken({ token }, () => {
-        resolve();
+        if (chrome.runtime.lastError) {
+          reject(new Error(chrome.runtime.lastError.message));
+        } else {
+          resolve();
+        }
       });
-      if (chrome.runtime.lastError) {
-        reject(new Error(chrome.runtime.lastError.message));
-      }
     });
   }
 

diff --git a/src/contrib/google/sheets/FileField.tsx b/src/contrib/google/sheets/FileField.tsx
@@ -92,7 +92,7 @@ const FileField: React.FunctionComponent<
 
       console.debug(`Using Google token: ${token}`);
 
-      await new Promise((resolve) => {
+      await new Promise<void>((resolve) => {
         gapi.load("picker", {
           callback: () => resolve(),
         });

diff --git a/src/extensionPoints/contextMenu.ts b/src/extensionPoints/contextMenu.ts
@@ -85,7 +85,7 @@ function guessSelectedElement(): HTMLElement | null {
     const end = selection.getRangeAt(selection.rangeCount - 1).endContainer
       .parentNode;
     const node = getCommonAncestor(start, end);
-    if ("tagName" in node) {
+    if (node instanceof HTMLElement) {
       return node;
     } else {
       return null;
@@ -176,7 +176,7 @@ export abstract class ContextMenuExtensionPoint extends ExtensionPoint<ContextMe
     super(id, name, description, icon);
   }
   public readonly syncInstall: boolean = true;
-  abstract async getBaseReader(): Promise<IReader>;
+  abstract getBaseReader(): Promise<IReader>;
   abstract readonly documentUrlPatterns: Manifest.MatchPattern[];
   abstract readonly contexts: ContextMenus.ContextType[];
 

diff --git a/src/types.ts b/src/types.ts
@@ -154,19 +154,19 @@ export abstract class ExtensionPoint<TConfig extends BaseExtensionConfig>
     }
   }
 
-  abstract async defaultReader(): Promise<IReader>;
+  abstract defaultReader(): Promise<IReader>;
 
-  abstract async getBlocks(extension: IExtension<TConfig>): Promise<IBlock[]>;
+  abstract getBlocks(extension: IExtension<TConfig>): Promise<IBlock[]>;
 
-  abstract async isAvailable(): Promise<boolean>;
+  abstract isAvailable(): Promise<boolean>;
 
-  abstract async install(): Promise<boolean>;
+  abstract install(): Promise<boolean>;
 
   uninstall(options?: { global?: boolean }): void {
     console.warn(`Uninstall not implemented for extension point: ${this.id}`);
   }
 
-  abstract async run(): Promise<void>;
+  abstract run(): Promise<void>;
 }
 
 export abstract class Block implements IBlock {
@@ -193,7 +193,7 @@ export abstract class Block implements IBlock {
     this.icon = icon;
   }
 
-  abstract async run(value: BlockArg, options: BlockOptions): Promise<unknown>;
+  abstract run(value: BlockArg, options: BlockOptions): Promise<unknown>;
 }
 
 export abstract class Effect extends Block {
@@ -206,7 +206,7 @@ export abstract class Effect extends Block {
     super(id, name, description, icon);
   }
 
-  abstract async effect(inputs: BlockArg, env?: BlockOptions): Promise<void>;
+  abstract effect(inputs: BlockArg, env?: BlockOptions): Promise<void>;
 
   async run(value: BlockArg, options: BlockOptions): Promise<void> {
     return this.effect(value, options);
@@ -223,10 +223,7 @@ export abstract class Transformer extends Block {
     super(id, name, description, icon);
   }
 
-  abstract async transform(
-    value: BlockArg,
-    options: BlockOptions
-  ): Promise<unknown>;
+  abstract transform(value: BlockArg, options: BlockOptions): Promise<unknown>;
 
   async run(value: BlockArg, options: BlockOptions): Promise<unknown> {
     return this.transform(value, options);
@@ -243,7 +240,7 @@ export abstract class Renderer extends Block {
     super(id, name, description, icon);
   }
 
-  abstract async render(
+  abstract render(
     inputs: BlockArg,
     options: BlockOptions
   ): Promise<RenderedHTML>;
@@ -267,9 +264,9 @@ export abstract class Reader extends Block implements IReader {
     super(id, name, description, icon);
   }
 
-  abstract async isAvailable($elt?: JQuery): Promise<boolean>;
+  abstract isAvailable($elt?: JQuery): Promise<boolean>;
 
-  abstract async read(root: HTMLElement | Document): Promise<ReaderOutput>;
+  abstract read(root: HTMLElement | Document): Promise<ReaderOutput>;
 
   async run({ root }: { root: HTMLElement | Document }): Promise<ReaderOutput> {
     return this.read(root);