From 89446662946bd95a7b43a8c31513f585519236d0 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 6 Jul 2022 10:01:11 -0400
Subject: [PATCH] Remove reference to window in ExtensionLoader

- Resolves issue when loading an extension failed on main

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/extensions/extension-loader/extension-loader.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts
index 68399dc6ad..0b0db85819 100644
--- a/src/extensions/extension-loader/extension-loader.ts
+++ b/src/extensions/extension-loader/extension-loader.ts
@@ -398,11 +398,9 @@ export class ExtensionLoader {
     try {
       return __non_webpack_require__(extAbsolutePath).default;
     } catch (error) {
-      if (window && error instanceof window.Error) {
-        console.error(`${logModule}: can't load ${entryPointName} for "${extension.manifest.name}": ${error.stack || error}`, extension);
-      } else {
-        logger.error(`${logModule}: can't load ${entryPointName} for "${extension.manifest.name}": ${error}`, { extension });
-      }
+      const message = (error instanceof Error ? error.stack : undefined) || error;
+
+      logger.error(`${logModule}: can't load ${entryPointName} for "${extension.manifest.name}": ${message}`, { extension });
     }
 
     return null;