From 0cb7999505ff6944ce9390d73d5c1259d18d8971 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@chromatic.com>
Date: Thu, 9 Mar 2023 16:49:18 +1100
Subject: [PATCH 1/2] Replace isomorphic-unfetch with node-fetch in telemetry

---
 code/lib/telemetry/package.json          | 3 ++-
 code/lib/telemetry/src/telemetry.test.ts | 6 +++---
 code/lib/telemetry/src/telemetry.ts      | 6 +++---
 code/yarn.lock                           | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json
index 6d91a72f425..21e81d11550 100644
--- a/code/lib/telemetry/package.json
+++ b/code/lib/telemetry/package.json
@@ -45,12 +45,13 @@
   "dependencies": {
     "@storybook/client-logger": "7.0.0-beta.64",
     "@storybook/core-common": "7.0.0-beta.64",
+    "@types/node-fetch": "^2.5.7",
     "chalk": "^4.1.0",
     "detect-package-manager": "^2.0.1",
     "fetch-retry": "^5.0.2",
     "fs-extra": "^11.1.0",
-    "isomorphic-unfetch": "^3.1.0",
     "nanoid": "^3.3.1",
+    "node-fetch": "^2.6.7",
     "read-pkg-up": "^7.0.1"
   },
   "devDependencies": {
diff --git a/code/lib/telemetry/src/telemetry.test.ts b/code/lib/telemetry/src/telemetry.test.ts
index 821848d1fc7..eb867acd13b 100644
--- a/code/lib/telemetry/src/telemetry.test.ts
+++ b/code/lib/telemetry/src/telemetry.test.ts
@@ -1,12 +1,12 @@
 /// <reference types="@types/jest" />;
 
-import fetch from 'isomorphic-unfetch';
+import fetch from 'node-fetch';
 
 import { sendTelemetry } from './telemetry';
 
-jest.mock('isomorphic-unfetch');
+jest.mock('node-fetch');
 
-const fetchMock = fetch as jest.Mock;
+const fetchMock = fetch as any as jest.Mock;
 
 beforeEach(() => {
   fetchMock.mockResolvedValue({ status: 200 });
diff --git a/code/lib/telemetry/src/telemetry.ts b/code/lib/telemetry/src/telemetry.ts
index 4ae1364a583..264472c245b 100644
--- a/code/lib/telemetry/src/telemetry.ts
+++ b/code/lib/telemetry/src/telemetry.ts
@@ -1,4 +1,4 @@
-import originalFetch from 'isomorphic-unfetch';
+import originalFetch from 'node-fetch';
 import retry from 'fetch-retry';
 import { nanoid } from 'nanoid';
 import type { Options, TelemetryData } from './types';
@@ -7,7 +7,7 @@ import { set as saveToCache } from './event-cache';
 
 const URL = process.env.STORYBOOK_TELEMETRY_URL || 'https://storybook.js.org/event-log';
 
-const fetch = retry(originalFetch);
+const fetch = retry(originalFetch as any);
 
 let tasks: Promise<any>[] = [];
 
@@ -55,7 +55,7 @@ export async function sendTelemetry(
     if (options.immediate) {
       await Promise.all(tasks);
     } else {
-      await request;
+      console.log(await request);
     }
 
     await saveToCache(eventType, body);
diff --git a/code/yarn.lock b/code/yarn.lock
index 7296da9df7c..b73a030973e 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -7106,12 +7106,13 @@ __metadata:
   dependencies:
     "@storybook/client-logger": 7.0.0-beta.64
     "@storybook/core-common": 7.0.0-beta.64
+    "@types/node-fetch": ^2.5.7
     chalk: ^4.1.0
     detect-package-manager: ^2.0.1
     fetch-retry: ^5.0.2
     fs-extra: ^11.1.0
-    isomorphic-unfetch: ^3.1.0
     nanoid: ^3.3.1
+    node-fetch: ^2.6.7
     read-pkg-up: ^7.0.1
     typescript: ~4.9.3
   languageName: unknown

From 9e726536d9d5bc5d25347605a78bac9ba1128c78 Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@users.noreply.github.com>
Date: Thu, 9 Mar 2023 17:43:28 +0800
Subject: [PATCH 2/2] Remove spurious console.log

---
 code/lib/telemetry/src/telemetry.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/lib/telemetry/src/telemetry.ts b/code/lib/telemetry/src/telemetry.ts
index 264472c245b..f66c10ee8d4 100644
--- a/code/lib/telemetry/src/telemetry.ts
+++ b/code/lib/telemetry/src/telemetry.ts
@@ -55,7 +55,7 @@ export async function sendTelemetry(
     if (options.immediate) {
       await Promise.all(tasks);
     } else {
-      console.log(await request);
+      await request;
     }
 
     await saveToCache(eventType, body);