chore: resolve conflicts

Signed-off-by: Case Wylie <[email protected]>
defenseunicorns · Nov 5, 2024 · 45ac205 · 45ac205
1 parent b63f1e4
commit 45ac205
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 165 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/fluent/watch.ts b/src/fluent/watch.ts
@@ -5,7 +5,7 @@ import { createHash } from "crypto";
 import { EventEmitter } from "events";
 import byline from "byline";
 import https from "https";
-import legacyFetch from "node-fetch";
+import legacyFetch, { RequestInit } from "node-fetch";
 import { Agent, fetch } from "undici";
 import { fetch as wrappedFetch } from "../fetch";
 import { GenericClass, KubernetesListObject } from "../types";
@@ -470,7 +470,7 @@ export class Watcher<T extends GenericClass> {
     }
   };
 
-  #getHTTPSAgent = (opts: legacyFetch.RequestInit) => {
+  #getHTTPSAgent = (opts: RequestInit) => {
     // In cluster there will be agent - testing or dev no
     const agentOptions =
       opts.agent instanceof https.Agent