From 6f85bd4f8eebb923ed72f1585f8c589ede60fd03 Mon Sep 17 00:00:00 2001
From: Mark Lee <electronjs@lazymalevolence.com>
Date: Fri, 22 May 2020 14:50:47 -0700
Subject: [PATCH] build(deps-dev): upgrade typescript to 3.9.3

---
 packages/api/core/src/util/forge-config.ts | 5 ++++-
 yarn.lock                                  | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/api/core/src/util/forge-config.ts b/packages/api/core/src/util/forge-config.ts
index 2a7a7def2e..ea38030ad3 100644
--- a/packages/api/core/src/util/forge-config.ts
+++ b/packages/api/core/src/util/forge-config.ts
@@ -129,12 +129,15 @@ export default async (dir: string) => {
   } else if (typeof forgeConfig !== 'object') {
     throw new Error('Expected packageJSON.config.forge to be an object or point to a requirable JS file');
   }
-  forgeConfig = {
+  const defaultForgeConfig = {
     electronRebuildConfig: {},
     packagerConfig: {},
     makers: [],
     publishers: [],
     plugins: [],
+  };
+  forgeConfig = {
+    ...defaultForgeConfig,
     ...forgeConfig,
   };
 
diff --git a/yarn.lock b/yarn.lock
index fe365935e9..e0979c44d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9212,9 +9212,9 @@ typedoc@^0.17.6:
     typedoc-default-themes "^0.10.1"
 
 typescript@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+  version "3.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
+  integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
 
 uglify-js@^3.1.4:
   version "3.9.3"