smaller fixes and linting tweaks

webrecorder · Jan 3, 2024 · 9236377 · 9236377
1 parent 4c0fb23
commit 9236377
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 14 deletions.
diff --git a/src/electron/electron-rec-preload.ts b/src/electron/electron-rec-preload.ts
@@ -6,6 +6,7 @@ import { ensureDefaultColl } from "../utils";
 
 import { loader, getDB } from "replaywebpage/src/electron-preload";
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const { ipcRenderer, contextBridge } = require("electron");
 
 let downloadCallback;

diff --git a/src/electron/electron-recorder.ts b/src/electron/electron-recorder.ts
@@ -189,7 +189,7 @@ class ElectronRecorder extends Recorder {
 
     const base64Str = data.toString("base64");
 
-    const responseHeaders = [];
+    const responseHeaders: { name: string; value: string }[] = [];
 
     const origin = headers.get("origin");
 
@@ -199,15 +199,12 @@ class ElectronRecorder extends Recorder {
 
     if (origin) {
       responseHeaders.push({
-        // @ts-expect-error - TS2322 - Type 'string' is not assignable to type 'never'.
         name: "Access-Control-Allow-Origin",
-        // @ts-expect-error - TS2322 - Type 'string' is not assignable to type 'never'.
         value: origin,
       });
     }
 
     if (mimeType) {
-      // @ts-expect-error - TS2322 - Type 'string' is not assignable to type 'never'. | TS2322 - Type 'any' is not assignable to type 'never'.
       responseHeaders.push({ name: "Content-Type", value: mimeType });
     }
 

diff --git a/src/electron/rec-preload.ts b/src/electron/rec-preload.ts
@@ -1,5 +1,6 @@
 /*eslint-env node */
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const { ipcRenderer, contextBridge } = require("electron");
 
 ipcRenderer.on("stats", (event, stats) => {

diff --git a/src/recorder.ts b/src/recorder.ts
@@ -1372,7 +1372,7 @@ class Recorder {
   }
 
   _getContentType(headers) {
-    for (let header of headers) {
+    for (const header of headers) {
       if (header.name.toLowerCase() === "content-type") {
         return header.value.split(";")[0];
       }
@@ -1804,7 +1804,7 @@ class Recorder {
 
     if (reqresp.hasPostData && !reqresp.postData) {
       try {
-        let postRes = await this.send(
+        const postRes = await this.send(
           "Network.getRequestPostData",
           // @ts-expect-error - TS2345 - Argument of type '{ requestId: any; }' is not assignable to parameter of type 'null | undefined'.
           { requestId: reqresp.requestId },

diff --git a/src/ui/app.ts b/src/ui/app.ts
@@ -27,7 +27,6 @@ import {
 } from "auto-js-ipfs";
 import { getLocalOption, setLocalOption } from "../localstorage";
 
-// eslint-disable-next-line no-undef
 const VERSION = __AWP_VERSION__;
 
 const DEFAULT_GATEWAY_URL = "https://w3s.link/ipfs/";
@@ -265,7 +264,7 @@ class ArchiveWebApp extends ReplayWebApp {
     }
 
     console.log("attempt to disable CSP to ensure replay works");
-    let tabId = await new Promise((resolve) => {
+    const tabId = await new Promise((resolve) => {
       chrome.tabs.getCurrent((msg) => resolve(msg.id));
     });
 
@@ -976,7 +975,7 @@ class ArchiveWebApp extends ReplayWebApp {
                     <summary>Legalese:</summary>
                     <p style="font-size: 0.8rem">DISCLAIMER OF SOFTWARE WARRANTY. WEBRECORDER SOFTWARE PROVIDES THIS SOFTWARE TO YOU "AS AVAILABLE"
                     AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
-                    INCLUDING WITHOUT LIMITATION ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+                    INCLUDING WITHOUT LIMITATION ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.</p>
                   </details>
 
                   <div class="has-text-centered">
@@ -1450,7 +1449,6 @@ class ArchiveWebApp extends ReplayWebApp {
     }
 
     if (!ipfsOpts.daemonUrl && ipfsOpts.autoDetect) {
-      // eslint-disable-next-line no-undef
       const autoipfs = await createAutoIpfs({
         web3StorageToken: __WEB3_STORAGE_TOKEN__,
       });

diff --git a/src/ui/coll-info.ts b/src/ui/coll-info.ts
@@ -214,7 +214,7 @@ class WrRecCollInfo extends CollInfo {
               href="${apiPrefix}/c/${
                 // @ts-expect-error - TS2339 - Property 'coll' does not exist on type 'WrRecCollInfo'.
                 this.coll.id
-              }/dl?format=wacz&pages=all"
+              }/dl?format=wacz&amp;pages=all"
               class="button is-small"
               title="Download"
             >
@@ -387,7 +387,6 @@ class WrRecCollInfo extends CollInfo {
       : html`
           <div class="is-flex is-flex-direction-column">
             <button
-// @ts-expect-error - TS2339 - Property 'shareWait' does not exist on type 'WrRecCollInfo'.
               class="button is-small ${
                 // @ts-expect-error - TS2339 - Property 'shareWait' does not exist on type 'WrRecCollInfo'.
                 this.shareWait ? "is-loading" : ""

diff --git a/src/ui/upload.ts b/src/ui/upload.ts
@@ -12,7 +12,6 @@ import fasCheck from "@fortawesome/fontawesome-free/svgs/solid/check-circle.svg"
 import fasExternal from "@fortawesome/fontawesome-free/svgs/solid/external-link-alt.svg";
 import fasX from "@fortawesome/fontawesome-free/svgs/solid/times-circle.svg";
 
-// eslint-disable-next-line no-undef
 const VERSION = __AWP_VERSION__;
 
 class BtrixUploader extends LitElement {
@@ -71,7 +70,7 @@ class BtrixUploader extends LitElement {
     // @ts-expect-error - TS2339 - Property 'pollingUploadState' does not exist on type 'BtrixUploader'.
     this.pollingUploadState = true;
 
-    let loop = true;
+    const loop = true;
 
     while (loop) {
       // @ts-expect-error - TS2339 - Property 'coll' does not exist on type 'BtrixUploader'.